Browse Source

update xcb/x11/xkb packages (#6702)

Arthur Laurent 5 months ago
parent
commit
871a9651c4

+ 8 - 1
packages/l/libice/xmake.lua

@@ -5,6 +5,7 @@ package("libice")
 
     add_urls("https://www.x.org/archive/individual/lib/libICE-$(version).tar.gz")
     add_versions("1.0.10", "1116bc64c772fd127a0d0c0ffa2833479905e3d3d8197740b3abd5f292f22d2d")
+    add_versions("1.1.2", "1da62f732f8679c20045708a29372b82dff9e7eceee543ed488b845002b3b0ff")
 
     if is_plat("linux") then
         add_extsources("apt::libice-dev", "pacman::libice")
@@ -13,7 +14,13 @@ package("libice")
     add_deps("xtrans")
 
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-dependency-tracking",
+                         "--disable-silent-rules",
+                         "--enable-docs=no",
+                         "--enable-specs=no"}
+        import("package.tools.autoconf").install(package, configs)
     end)
 
     on_test(function (package)

+ 19 - 2
packages/l/libsm/xmake.lua

@@ -5,15 +5,32 @@ package("libsm")
 
     add_urls("https://www.x.org/archive/individual/lib/libSM-$(version).tar.gz")
     add_versions("1.2.3", "1e92408417cb6c6c477a8a6104291001a40b3bb56a4a60608fdd9cd2c5a0f320")
+    add_versions("1.2.6", "166b4b50d606cdd83f1ddc61b5b9162600034f848b3e32ccbb0e63536b7d6cdd")
 
     if is_plat("linux") then
         add_extsources("apt::libsm-dev", "pacman::libsm")
     end
 
-    add_deps("libice")
+    add_deps("libice", "xtrans")
 
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-dependency-tracking",
+                         "--disable-silent-rules",
+                         "--enable-docs=no",
+                         "--enable-specs=no"}
+        -- fix missing xtrans includedir on some linux platforms
+        local cflags = {}
+        for _, dep in ipairs(package:orderdeps()) do
+            local fetchinfo = dep:fetch()
+            if fetchinfo then
+                for _, includedir in ipairs(fetchinfo.includedirs or fetchinfo.sysincludedirs) do
+                    table.insert(cflags, "-I" .. includedir)
+                end
+            end
+        end
+        import("package.tools.autoconf").install(package, configs, {cflags = cflags})
     end)
 
     on_test(function (package)

+ 1 - 1
packages/l/libx11/xmake.lua

@@ -8,6 +8,7 @@ package("libx11")
     add_versions("1.7.3", "029acf61e7e760a3150716b145a58ce5052ee953e8cccc8441d4f550c420debb")
     add_versions("1.8.1", "d52f0a7c02a45449f37b0831d99ff936d92eb4ce8b4c97dc17a63cea79ce5a76")
     add_versions("1.8.7", "793ebebf569f12c864b77401798d38814b51790fce206e01a431e5feb982e20b")
+    add_versions("1.8.12", "220fbcf54b6e4d8dc40076ff4ab87954358019982490b33c7802190b62d89ce1")
 
     if is_plat("linux") then
         add_extsources("apt::libx11-dev", "pacman::libx11")
@@ -37,7 +38,6 @@ package("libx11")
                          "--enable-unix-transport",
                          "--enable-tcp-transport",
                          "--enable-ipv6",
-                         "--enable-local-transport",
                          "--enable-loadable-i18n",
                          "--enable-xthreads",
                          "--enable-specs=no"}

+ 1 - 0
packages/l/libxau/xmake.lua

@@ -6,6 +6,7 @@ package("libxau")
     set_urls("https://www.x.org/archive/individual/lib/libXau-$(version).tar.gz")
     add_versions("1.0.10", "51a54da42475d4572a0b59979ec107c27dacf6c687c2b7b04e5cf989a7c7e60c")
     add_versions("1.0.11", "3a321aaceb803577a4776a5efe78836eb095a9e44bbc7a465d29463e1a14f189")
+    add_versions("1.0.12", "2402dd938da4d0a332349ab3d3586606175e19cb32cb9fe013c19f1dc922dcee")
 
     if is_plat("linux") then
         add_extsources("apt::libxau-dev", "pacman::libxau")

+ 31 - 4
packages/l/libxaw/xmake.lua

@@ -3,11 +3,12 @@ package("libxaw")
     set_homepage("https://gitlab.freedesktop.org/xorg/lib/libxaw")
     set_description("X.Org: X Athena Widget Set")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXaw-$(version).tar.bz2")
-    add_versions("1.0.14", "76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e")
+    set_urls("https://www.x.org/archive/individual/lib/libXaw-$(version).tar.gz")
+    add_versions("1.0.14", "59cfed2712cc80bbfe62dd1aacf24f58d74a76dd08329a922077b134a8d8048f")
+    add_versions("1.0.16", "012f90adf8739f2f023d63a5fee1528949cf2aba92ef7ac1abcfc2ae9cf28798")
 
     if is_plat("macosx", "linux") then
-        add_deps("libxmu", "libxpm")
+        add_deps("libxmu", "libxpm", "libx11", "libxt", "libxext", "libice", "libsm")
     end
 
     if is_plat("linux") then
@@ -15,7 +16,33 @@ package("libxaw")
     end
 
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-dependency-tracking",
+                         "--disable-silent-rules",
+                         "--disable-specs"}
+        -- fix undefined reference on macOS
+        if package:is_plat("macosx") then
+            local cflags = {}
+            local ldflags = {}
+            for _, dep in ipairs(package:orderdeps()) do
+                local fetchinfo = dep:fetch()
+                if fetchinfo then
+                    for _, includedir in ipairs(fetchinfo.includedirs or fetchinfo.sysincludedirs) do
+                        table.insert(cflags, "-I" .. includedir)
+                    end
+                    for _, linkdir in ipairs(fetchinfo.linkdirs) do
+                        table.insert(ldflags, "-L" .. linkdir)
+                    end
+                    for _, link in ipairs(fetchinfo.links) do
+                        table.insert(ldflags, "-l" .. link)
+                    end
+                end
+            end
+            import("package.tools.autoconf").install(package, configs, {cflags = cflags, ldflags = ldflags})
+        else
+            import("package.tools.autoconf").install(package, configs)
+        end
     end)
 
     on_test(function (package)

+ 1 - 0
packages/l/libxcb/xmake.lua

@@ -37,6 +37,7 @@ package("libxcb")
     add_versions("1.13.1", "f09a76971437780a602303170fd51b5f7474051722bc39d566a272d2c4bde1b5")
     add_versions("1.14", "2c7fcddd1da34d9b238c9caeda20d3bd7486456fc50b3cc6567185dbd5b0ad02")
     add_versions("1.16", "bc0f75f84b28e6496a19a1d094d7e47def861a50cb7cce5b23b62eecdc2a4479")
+    add_versions("1.17.0", "2c69287424c9e2128cb47ffe92171e10417041ec2963bceafb65cb3fcf8f0b85")
 
     for name, opt in pairs(components) do
         add_configs(name, {description = format("Enable %s submodule (default is %s).", name, opt.default_value), default = opt.default_value})

+ 1 - 0
packages/l/libxcursor/xmake.lua

@@ -5,6 +5,7 @@ package("libxcursor")
 
     set_urls("https://www.x.org/archive/individual/lib/libXcursor-$(version).tar.gz")
     add_versions("1.2.1", "77f96b9ad0a3c422cfa826afabaf1e02b9bfbfc8908c5fa1a45094faad074b98")
+    add_versions("1.2.3", "74e72da27e61cc2cfd2e267c14f500ea47775850048ee0b00362a55c9b60ee9b")
 
     if is_plat("linux") then
         add_extsources("apt::libxcursor-dev")

+ 3 - 2
packages/l/libxdamage/xmake.lua

@@ -3,8 +3,9 @@ package("libxdamage")
     set_homepage("https://www.x.org/")
     set_description("X.Org: X Damage Extension library")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXdamage-$(version).tar.bz2")
-    add_versions("1.1.5", "b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45")
+    set_urls("https://www.x.org/archive/individual/lib/libXdamage-$(version).tar.gz")
+    add_versions("1.1.5", "630ec53abb8c2d6dac5cd9f06c1f73ffb4a3167f8118fdebd77afd639dbc2019")
+    add_versions("1.1.6", "2afcc139eb6eb926ffe344494b1fc023da25def42874496e6e6d3aa8acef8595")
 
     if is_plat("linux") then
         add_extsources("apt::libxdamage-dev")

+ 1 - 0
packages/l/libxdmcp/xmake.lua

@@ -5,6 +5,7 @@ package("libxdmcp")
     set_urls("https://www.x.org/archive/individual/lib/libXdmcp-$(version).tar.gz")
     add_versions("1.1.3", "2ef9653d32e09d1bf1b837d0e0311024979653fe755ad3aaada8db1aa6ea180c")
     add_versions("1.1.4", "55041a8ff8992ab02777478c4b19c249c0f8399f05a752cb4a1a868a9a0ccb9a")
+    add_versions("1.1.5", "31a7abc4f129dcf6f27ae912c3eedcb94d25ad2e8f317f69df6eda0bc4e4f2f3")
 
     if is_plat("linux") then
         add_extsources("apt::libxdmcp-dev", "pacman::libxmdcp")

+ 1 - 0
packages/l/libxfixes/xmake.lua

@@ -5,6 +5,7 @@ package("libxfixes")
 
     set_urls("https://www.x.org/archive/individual/lib/libXfixes-$(version).tar.gz")
     add_versions("6.0.0", "82045da5625350838390c9440598b90d69c882c324ca92f73af9f0e992cb57c7")
+    add_versions("6.0.1", "e69eaa321173c748ba6e2f15c7cf8da87f911d3ea1b6af4b547974aef6366bec")
 
     if is_plat("linux") then
         add_extsources("apt::libxfixes-dev", "pacman::libxfixes")

+ 4 - 2
packages/l/libxft/xmake.lua

@@ -4,8 +4,10 @@ package("libxft")
     set_description("X.Org: X FreeType library")
     set_license("MIT")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXft-$(version).tar.bz2")
-    add_versions("2.3.3", "225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216")
+    set_urls("https://www.x.org/archive/individual/lib/libXft-$(version).tar.gz")
+    add_versions("2.3.3", "3c3cf88b1a96e49a3d87d67d9452d34b6e25e96ae83959b8d0a980935014d701")
+    add_versions("2.3.7", "75b4378644f5df3a15f684f8f0b5ff1324d37aacd5a381f3b830a2fbe985f660")
+    add_versions("2.3.8", "32e48fe2d844422e64809e4e99b9d8aed26c1b541a5acf837c5037b8d9f278a8")
 
     if is_plat("linux") then
         add_extsources("apt::libxft-dev")

+ 1 - 0
packages/l/libxi/xmake.lua

@@ -7,6 +7,7 @@ package("libxi")
     add_versions("1.7.10", "b51e106c445a49409f3da877aa2f9129839001b24697d75a54e5c60507e9a5e3")
     add_versions("1.8",    "c80fd200a1190e4406bb4cc6958839d9651638cb47fa546a595d4bebcd3b9e2d")
     add_versions("1.8.1",  "3b5f47c223e4b63d7f7fe758886b8bf665b20a7edb6962c423892fd150e326ea")
+    add_versions("1.8.2",  "5542daec66febfeb6f51d57abfa915826efe2e3af57534f4105b82240ea3188d")
 
     if is_plat("linux") then
         add_extsources("apt::libxi-dev")

+ 2 - 1
packages/l/libxkbcommon/xmake.lua

@@ -7,6 +7,7 @@ package("libxkbcommon")
              "https://github.com/xkbcommon/libxkbcommon.git")
 
     add_versions("1.0.3", "5d10a57ab65daad7d975926166770eca1d2c899131ab96c23845df1c42da5c31")
+    add_versions("1.8.1", "c65c668810db305c4454ba26a10b6d84a96b5469719fe3c729e1c6542b8d0d87")
 
     if is_plat("linux") then
         add_extsources("apt::libxkbcommon-dev")
@@ -19,7 +20,7 @@ package("libxkbcommon")
         if package:config("x11") then
             package:add("deps", "libxcb", "xcb-proto", "libxml2")
             if package:is_plat("linux") then
-                package:add("extsources", "pacman::libxkbcommon-x11")
+                package:add("extsources", "pacman::libxkbcommon-x11", "apt::libxkbcommon-x11-dev")
             end
         end
 

+ 1 - 0
packages/l/libxmu/xmake.lua

@@ -5,6 +5,7 @@ package("libxmu")
 
     add_urls("https://www.x.org/archive/individual/lib/libXmu-$(version).tar.gz")
     add_versions("1.1.3", "5bd9d4ed1ceaac9ea023d86bf1c1632cd3b172dce4a193a72a94e1d9df87a62e")
+    add_versions("1.2.1", "bf0902583dd1123856c11e0a5085bd3c6e9886fbbd44954464975fd7d52eb599")
 
     if is_plat("linux") then
         add_extsources("apt::libxmu-dev", "pacman::libxmu")

+ 1 - 0
packages/l/libxpm/xmake.lua

@@ -5,6 +5,7 @@ package("libxpm")
 
     add_urls("https://www.x.org/archive/individual/lib/libXpm-$(version).tar.gz")
     add_versions("3.5.13", "e3dfb0fb8c1f127432f2a498c7856b37ce78a61e8da73f1aab165a73dd97ad00")
+    add_versions("3.5.17", "959466c7dfcfcaa8a65055bfc311f74d4c43d9257900f85ab042604d286df0c6")
 
     if is_plat("linux") then
         add_extsources("apt::libxpm-dev", "pacman::libxpm")

+ 3 - 2
packages/l/libxshmfence/xmake.lua

@@ -3,8 +3,9 @@ package("libxshmfence")
     set_homepage("https://www.x.org/")
     set_description("X.Org: Shared memory 'SyncFence' synchronization primitive")
 
-    set_urls("https://www.x.org/archive/individual/lib/libxshmfence-$(version).tar.bz2")
-    add_versions("1.3", "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7")
+    set_urls("https://www.x.org/archive/individual/lib/libxshmfence-$(version).tar.gz")
+    add_versions("1.3", "7eb3d46ad91bab444f121d475b11b39273142d090f7e9ac43e6a87f4ff5f902c")
+    add_versions("1.3.3", "6233ccd9fa80198835efc3039cdf8086ab2b218b17e77ebdb0a19913fcee58d3")
 
     if is_plat("linux") then
         add_extsources("apt::libxshmfence-dev")

+ 1 - 0
packages/l/libxt/xmake.lua

@@ -5,6 +5,7 @@ package("libxt")
 
     add_urls("https://www.x.org/archive/individual/lib/libXt-$(version).tar.gz")
     add_versions("1.2.1", "6da1bfa9dd0ed87430a5ce95b129485086394df308998ebe34d98e378e3dfb33")
+    add_versions("1.3.1", "cf2212189869adb94ffd58c7d9a545a369b83d2274930bfbe148da354030b355")
 
     if is_plat("linux") then
         add_extsources("apt::libxt-dev", "pacman::libxt")

+ 3 - 2
packages/l/libxtst/xmake.lua

@@ -4,8 +4,9 @@ package("libxtst")
     set_description("X.Org: Client API for the XTEST & RECORD extensions")
     set_license("MIT")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXtst-$(version).tar.bz2")
-    add_versions("1.2.3", "4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204")
+    set_urls("https://www.x.org/archive/individual/lib/libXtst-$(version).tar.gz")
+    add_versions("1.2.3", "a0c83acce02d4923018c744662cb28eb0dbbc33b4adc027726879ccf68fbc2c2")
+    add_versions("1.2.5", "244ba6e1c5ffa44f1ba251affdfa984d55d99c94bb925a342657e5e7aaf6d39c")
 
     if is_plat("linux") then
         add_extsources("apt::libxtst-dev", "pacman::libxtst")

+ 3 - 2
packages/l/libxv/xmake.lua

@@ -3,8 +3,9 @@ package("libxv")
     set_homepage("https://www.x.org/")
     set_description("X.Org: X Video (Xv) extension")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXv-$(version).tar.bz2")
-    add_versions("1.0.11", "d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088")
+    set_urls("https://www.x.org/archive/individual/lib/libXv-$(version).tar.gz")
+    add_versions("1.0.11", "c4112532889b210e21cf05f46f0f2f8354ff7e1b58061e12d7a76c95c0d47bb1")
+    add_versions("1.0.13", "9a0c31392b8968a4f29a0ad9c51e7ce225bcec3c4cbab9f2a241f921776b2991")
 
     if is_plat("linux") then
         add_extsources("apt::libxv-dev", "pacman::libxv")

+ 3 - 2
packages/l/libxvmc/xmake.lua

@@ -3,8 +3,9 @@ package("libxvmc")
     set_homepage("https://www.x.org/")
     set_description("X.Org: X-Video Motion Compensation API")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXvMC-$(version).tar.bz2")
-    add_versions("1.0.12", "6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd")
+    set_urls("https://www.x.org/archive/individual/lib/libXvMC-$(version).tar.gz")
+    add_versions("1.0.12", "024c9ec4f001f037eeca501ee724c7e51cf287eb69ced8c6126e16e7fa9864b5")
+    add_versions("1.0.14", "3ad5d2b991219e2bf9b2f85d40b12c16f1afec038715e462f6058af73a9b5ef8")
 
     if is_plat("linux") then
         add_extsources("apt::libxvmc-dev")

+ 1 - 0
packages/l/libxxf86vm/xmake.lua

@@ -5,6 +5,7 @@ package("libxxf86vm")
 
     set_urls("https://www.x.org/archive/individual/lib/libXxf86vm-$(version).tar.gz")
     add_versions("1.1.5", "f3f1c29fef8accb0adbd854900c03c6c42f1804f2bc1e4f3ad7b2e1f3b878128")
+    add_versions("1.1.6", "d2b4b1ec4eb833efca9981f19ed1078a8a73eed0bb3ca5563b64527ae8021e52")
 
     if is_plat("linux") then
         add_extsources("apt::libxxf86vm-dev")

+ 1 - 0
packages/x/xcb-proto/xmake.lua

@@ -8,6 +8,7 @@ package("xcb-proto")
     add_versions("1.14", "1c3fa23d091fb5e4f1e9bf145a902161cec00d260fabf880a7a248b02ab27031")
     add_versions("1.14.1", "85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd")
     add_versions("1.16.0", "d9c7f010b1105fc3858bf07b5169b2dd8e7493c6652b1fe45f3321d874f291d7")
+    add_versions("1.17.0", "392d3c9690f8c8202a68fdb89c16fd55159ab8d65000a6da213f4a1576e97a16")
 
     if is_plat("macosx", "linux", "bsd", "cross") then
         add_deps("pkg-config", "python 3.x", {kind = "binary"})

+ 2 - 0
packages/x/xcb-util-cursor/xmake.lua

@@ -8,6 +8,8 @@ package("xcb-util-cursor")
     add_versions("0.1.1", "3f89a77e1a7bd29bd82b935225f640dee02daf46cb0394bfafb180412b5b7252")
     add_versions("0.1.2", "b9e55161eb283ce14b5f73d09aba58c7ccadebc010984db659ae2d95d2ada02e")
     add_versions("0.1.3", "a322332716a384c94d3cbf98f2d8fe2ce63c2fe7e2b26664b6cea1d411723df8")
+    add_versions("0.1.4", "cc8608ebb695742b6cf84712be29b2b66aa5f6768039528794fca0fa283022bf")
+    add_versions("0.1.5", "0e9c5446dc6f3beb8af6ebfcc9e27bcc6da6fe2860f7fc07b99144dfa568e93b")
 
     if is_plat("linux") then
         add_extsources("apt::libxcb-cursor-dev", "pacman::xcb-util-cursor")

+ 1 - 0
packages/x/xcb-util-errors/xmake.lua

@@ -5,6 +5,7 @@ package("xcb-util-errors")
 
     set_urls("https://xcb.freedesktop.org/dist/xcb-util-errors-$(version).tar.gz")
     add_versions("1.0", "7752a722e580efdbada30632cb23aed35c18757399ac3b547b59fd7257cf5e33")
+    add_versions("1.0.1", "cfbd3b022bdb27a6921a4abd6b41f4071b4e4960447598abd30955d3454f4d99")
 
     if is_plat("linux") then
         add_extsources("pacman::xcb-util-errors")

+ 1 - 0
packages/x/xcb-util-image/xmake.lua

@@ -7,6 +7,7 @@ package("xcb-util-image")
     add_versions("0.3.8", "3d7f6e3e7e73ca0d42154d360ad61a1e16fc62f6bb000f4e69c0d00305d1e00b")
     add_versions("0.3.9", "ac7fa09eddc9ecda6fd872d32b6dc23d451a1c6c201873dfe7cac8362c87acf3")
     add_versions("0.4.0", "cb2c86190cf6216260b7357a57d9100811bb6f78c24576a3a5bfef6ad3740a42")
+    add_versions("0.4.1", "0ebd4cf809043fdeb4f980d58cdcf2b527035018924f8c14da76d1c81001293b")
 
     if is_plat("linux") then
         add_extsources("apt::libxcb-image0-dev", "pacman::xcb-util-image")

+ 1 - 0
packages/x/xcb-util-keysyms/xmake.lua

@@ -7,6 +7,7 @@ package("xcb-util-keysyms")
     add_versions("0.3.8", "99fcf9273f9866c1682bcf8a51df41296fe239e0f1df14f55350a33fd0e948b0")
     add_versions("0.3.9", "9fda86f6a26be8872f33c10f47505c40c9305758d320b170aa976b7201533a42")
     add_versions("0.4.0", "0807cf078fbe38489a41d755095c58239e1b67299f14460dec2ec811e96caa96")
+    add_versions("0.4.1", "1fa21c0cea3060caee7612b6577c1730da470b88cbdf846fa4e3e0ff78948e54")
 
     if is_plat("linux") then
         add_extsources("apt::libxcb-keysyms1-dev", "pacman::xcb-util-keysyms")

+ 1 - 0
packages/x/xcb-util-renderutil/xmake.lua

@@ -6,6 +6,7 @@ package("xcb-util-renderutil")
     set_urls("https://xcb.freedesktop.org/dist/xcb-util-renderutil-$(version).tar.gz")
     add_versions("0.3.8", "cfa1130bfff8f281e10285ae063475dd172c78dad609ac10bce3924b5ca11484")
     add_versions("0.3.9", "55eee797e3214fe39d0f3f4d9448cc53cffe06706d108824ea37bb79fcedcad5")
+    add_versions("0.3.10", "e04143c48e1644c5e074243fa293d88f99005b3c50d1d54358954404e635128a")
 
     if is_plat("linux") then
         add_extsources("apt::libxcb-render-util0-dev", "pacman::xcb-util-renderutil")

+ 1 - 0
packages/x/xcb-util-wm/xmake.lua

@@ -8,6 +8,7 @@ package("xcb-util-wm")
     add_versions("0.3.9", "7a2f032f0f791dda6e75f2dc7b6cf347f62f27234fab58308124feff5f27be69")
     add_versions("0.4.0", "48c9b2a8c5697e0fde189706a6fa4b09b7b65762d88a495308e646eaf891f42a")
     add_versions("0.4.1", "038b39c4bdc04a792d62d163ba7908f4bb3373057208c07110be73c1b04b8334")
+    add_versions("0.4.2", "dcecaaa535802fd57c84cceeff50c64efe7f2326bf752e16d2b77945649c8cd7")
 
     if is_plat("linux") then
         add_extsources("apt::libxcb-icccm4-dev", "pacman::xcb-util-wm")

+ 1 - 0
packages/x/xcb-util/xmake.lua

@@ -8,6 +8,7 @@ package("xcb-util")
     add_versions("0.3.8", "e9e7f68d60ddd1bab6da714399dd1d91c78cb900c88427d3b8436a013178b3be")
     add_versions("0.3.9", "c3f9e8921998d92b3709baeb6c0b78179d0d8b6f592efdb11120584c5dfedc7e")
     add_versions("0.4.0", "0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7")
+    add_versions("0.4.1", "21c6e720162858f15fe686cef833cf96a3e2a79875f84007d76f6d00417f593a")
 
     if is_plat("linux") then
         add_extsources("apt::libxcb-util-dev", "pacman::xcb-util")

+ 2 - 0
packages/x/xtrans/xmake.lua

@@ -5,6 +5,7 @@ package("xtrans")
 
     set_urls("https://www.x.org/archive/individual/lib/xtrans-$(version).tar.gz")
     add_versions("1.4.0", "48ed850ce772fef1b44ca23639b0a57e38884045ed2cbb18ab137ef33ec713f9")
+    add_versions("1.6.0", "936b74c60b19c317c3f3cb1b114575032528dbdaf428740483200ea874c2ca0a")
 
     if is_plat("linux") then
         add_extsources("apt::xtrans-dev", "pacman::xtrans")
@@ -22,6 +23,7 @@ package("xtrans")
                          "--enable-docs=no"}
         -- fedora systems do not provide sys/stropts.h
         io.replace("Xtranslcl.c", "# include <sys/stropts.h>", "# include <sys/ioctl.h>")
+        io.replace("Xtranslcl.c", "# include <stropts.h>", "# include <sys/ioctl.h>")
         import("package.tools.autoconf").install(package, configs)
     end)