diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-app')
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/iceauth_1.0.10.bb (renamed from meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb (renamed from meta-oe/recipes-graphics/xorg-app/sessreg_1.1.2.bb) | 6 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb (renamed from meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.2.bb) | 6 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb (renamed from meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xclock_1.1.1.bb (renamed from meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xfontsel_1.1.0.bb (renamed from meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xgamma_1.0.7.bb (renamed from meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb (renamed from meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb (renamed from meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb (renamed from meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb) | 8 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.4.bb (renamed from meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.3.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.5.bb (renamed from meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb (renamed from meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb (renamed from meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xmessage_1.0.7.bb (renamed from meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb (renamed from meta-oe/recipes-graphics/xorg-app/xrdb_1.2.0.bb) | 6 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xrefresh_1.1.0.bb (renamed from meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.6.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb | 15 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.3.bb (renamed from meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb) | 7 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.5.bb (renamed from meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.4.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch | 77 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xterm_391.bb (renamed from meta-oe/recipes-graphics/xorg-app/xterm_367.bb) | 15 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb (renamed from meta-oe/recipes-graphics/xorg-app/xwd_1.0.7.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb (renamed from meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb) | 4 |
26 files changed, 88 insertions, 151 deletions
diff --git a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.10.bb index 62296b5be9..7d025de4c4 100644 --- a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb +++ b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.10.bb @@ -11,6 +11,6 @@ BBCLASSEXTEND = "native" DEPENDS += "libice" -SRC_URI[md5sum] = "3b9b79fa0f9928161f4bad94273de7ae" -SRC_URI[sha256sum] = "e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "3deefb7da26af9dc799b5628d929d91c9af68c78575639944db3b955f29aa029" diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch index 207285373c..bfda2dfe71 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch +++ b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch @@ -6,9 +6,9 @@ Subject: [PATCH] Makefile.am: Error Fix Do not compile man dir since error always occur. | sed: file filenames.sed line 3: unterminated `s' command | make[2]: *** [sessreg.1] Error 1 -It is not a good way.But can remove it from PNBLACKLIST. +It is not a good way.But can remove it from SKIP_RECIPE. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.2.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb index ad6bd17ad8..33ab22cde4 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.2.bb +++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb @@ -4,8 +4,8 @@ SUMMARY = "a simple program for managing utmp/wtmp entries" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" -SRC_URI[md5sum] = "92be564d4be7d8aa7b5024057b715210" -SRC_URI[sha256sum] = "dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2" -CFLAGS_append_libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " +CFLAGS:append:libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " diff --git a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.2.bb b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb index 30fbd1b8de..9c522d6ae1 100644 --- a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.2.bb +++ b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb @@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5feafdbe6dfe9e2bd32325be0cfc86f8" PE = "1" -DEPENDS += "libxkbfile" +DEPENDS += "libxkbfile xrandr" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "93e736c98fb75856ee8227a0c49a128d" -SRC_URI[sha256sum] = "8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade" diff --git a/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb b/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb index 45caaacf2f..91b1abc211 100644 --- a/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb +++ b/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb @@ -6,10 +6,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "48e83210b39a7bfb492604ba0bcfb19e" -SRC_URI[sha256sum] = "410ecabac54e6db7afd5c20a78d89c0134f3c74b149bee71b1fec775e6e060cc" +SRC_URI[sha256sum] = "4150c9ec595520167ab8c4efcb5cf82641a4c4db78ce0a1cb4834e6aeb7c87fb" -FILES_${PN} += "${datadir}/X11/twm/system.twmrc" +FILES:${PN} += "${datadir}/X11/twm/system.twmrc" ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_PATH = "${bindir}/twm" ALTERNATIVE_LINK = "${bindir}/x-window-manager" diff --git a/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb b/meta-oe/recipes-graphics/xorg-app/xclock_1.1.1.bb index 31c553eee0..a7360b6496 100644 --- a/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb +++ b/meta-oe/recipes-graphics/xorg-app/xclock_1.1.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=857759ade8f2ddde5c7b32ef7356ea36" DEPENDS += " libxaw libxrender libxft libxkbfile libxt" -SRC_URI[md5sum] = "437522a96f424f68fc64ed34ece9b211" -SRC_URI[sha256sum] = "cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c" diff --git a/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xfontsel_1.1.0.bb index e9260240da..4c31d0b77a 100644 --- a/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xfontsel_1.1.0.bb @@ -9,5 +9,5 @@ DEPENDS += " libxaw" LIC_FILES_CHKSUM = "file://COPYING;md5=4669d2703c60d585cc29ba7e9a69bcb3" -SRC_URI[md5sum] = "13150ff98846bf6d9a14bee00697fa47" -SRC_URI[sha256sum] = "25aa0b7c4262f5e99c07c2b96e00e4eb25b7e53f94fa803942af9d0e8da3001c" +SRC_URI[sha256sum] = "17052c3357bbfe44b8468675ae3d099c2427ba9fcac10540aef524ae4d77d1b4" +SRC_URI_EXT = "xz" diff --git a/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.7.bb index 4949616ddc..dc9cbadb4c 100644 --- a/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.7.bb @@ -11,5 +11,5 @@ DEPENDS += "libxxf86vm" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "90b4305157c2b966d5180e2ee61262be" -SRC_URI[sha256sum] = "0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "1c79dae85a8953a15f4fe5c2895a033307b43b8613456c87ec47b374b113bc8f" diff --git a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb index b42c1b9506..afc1fe17d5 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb @@ -9,5 +9,5 @@ DEPENDS += "libxkbfile bison-native" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "c747faf1f78f5a5962419f8bdd066501" -SRC_URI[sha256sum] = "2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b" diff --git a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb index 7b6ef96825..e866bed016 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb @@ -9,5 +9,5 @@ DEPENDS += "libxkbfile" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "9c34da77363dc3d0f616980da87244bf" -SRC_URI[sha256sum] = "5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa" +SRC_URI[sha256sum] = "99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0" +SRC_URI_EXT = "xz" diff --git a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb index 6a05e98e32..0274608d05 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb @@ -9,11 +9,9 @@ It includes: \ xkbvleds - display the state of LEDs on an XKB keyboard in a window \ xkbwatch - reports changes in the XKB keyboard state \ " -LIC_FILES_CHKSUM = "file://COPYING;md5=64322fab5239f5c8d97cf6e0e14f1c62" +LIC_FILES_CHKSUM = "file://COPYING;md5=6767a97a97e21260134637b657b922ae" DEPENDS += "libxaw libxkbfile" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "502b14843f610af977dffc6cbf2102d5" -SRC_URI[sha256sum] = "d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "31a2bbee1e09ccba01de92897b8f540b545de812f318d31de07bd3a5a75ee25e" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.3.bb b/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.4.bb index 288bcfc8fe..ad06612d5e 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.3.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.4.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b08d9e2e718ac83e6fe2b974d4b5fd8" DEPENDS += "libxmu" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "61671fee12535347db24ec3a715032a7" -SRC_URI[sha256sum] = "57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "f4bfa15f56c066d326a5d5b292646708f25b9247506840b9047cd2687dcc71b7" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.5.bb index 42bda7ea35..d73a27f971 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.5.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=350e1b718a56df39cfe8ca9345ea4575" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "4fa92377e0ddc137cd226a7a87b6b29a" -SRC_URI[sha256sum] = "773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "68baee57e70250ac4a7759fb78221831f97d88bc8e51dcc2e64eb3f8ca56bae3" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb index 76b76e4b37..4ddb1b9887 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb @@ -6,5 +6,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" -SRC_URI[md5sum] = "5774fd4f518b3f338f2b28f270e04bfc" -SRC_URI[sha256sum] = "89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "807f909eace684b866fc63b3e962729c120822a6c96e051ff51cf350b3ffb6cd" diff --git a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb index ab74f5bd67..f3dac53451 100644 --- a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb @@ -7,5 +7,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387" DEPENDS += " libxaw libxt" -SRC_URI[md5sum] = "8aaa41374935d697ee55d7dc9de70781" -SRC_URI[sha256sum] = "87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "009936cc5a2706084079127b26cf55c713767650a34cb69e5682d60e33ce7461" diff --git a/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.7.bb index 23cfb26c7b..6682784fbf 100644 --- a/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.7.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73c7f696a728de728d7446cbca814cc5" DEPENDS += "libxaw" -SRC_URI[md5sum] = "e50ffae17eeb3943079620cb78f5ce0b" -SRC_URI[sha256sum] = "373dfb81e7a6f06d3d22485a12fcde6e255d58c6dee1bbaeb00c7d0caa9b2029" +SRC_URI[sha256sum] = "703fccb7a0b772d61d7e603c189b9739866aa97ba985c727275420f829a30356" +SRC_URI_EXT = "xz" diff --git a/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.0.bb b/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb index c5e0e88ed3..53214c8fe8 100644 --- a/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.0.bb +++ b/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb @@ -5,5 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69" DEPENDS += "libxmu" -SRC_URI[md5sum] = "34ae801ef994d192c70fcce2bdb2a1b2" -SRC_URI[sha256sum] = "f23a65cfa1f7126040d68b6cf1e4567523edac10f8dc06f23d840d330c7c6946" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4" + +EXTRA_OECONF += "--with-cpp=${bindir}/cpp" diff --git a/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xrefresh_1.1.0.bb index 99dc3b5aa8..12d05b1307 100644 --- a/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xrefresh_1.1.0.bb @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dad633bce9c3cd0e3abf72a16e0057cf" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "c56fa4adbeed1ee5173f464a4c4a61a6" -SRC_URI[sha256sum] = "287dfb9bb7e8d780d07e672e3252150850869cb550958ed5f8401f0835cd6353" +SRC_URI[sha256sum] = "29ed592d5ece35a3029004d8c46f3002f92970870a96c11e38baf7f1122b8b5f" +SRC_URI_EXT = "xz" diff --git a/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb b/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb deleted file mode 100644 index b757329d94..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "X.Org X11 X client utilities" -HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xsetmode/" -DESCRIPTION = "xsetmode sets the mode of an XInput device to either absolute \ -or relative." -SECTION = "x11/app" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9b37e00e7793b667cbc64f9df7b6d733" - -DEPENDS += "libxi" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "d074e79d380b031d2f60e4cd56538c93" -SRC_URI[sha256sum] = "988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa" diff --git a/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb b/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.3.bb index 30a1e089e3..7e909f90cf 100644 --- a/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb +++ b/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.3.bb @@ -7,8 +7,7 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6ea29dbee22324787c061f039e0529de" -DEPENDS += "xbitmaps libxcursor" -BBCLASSEXTEND = "native" +DEPENDS += "xbitmaps libxcursor libxmu" -SRC_URI[md5sum] = "5fe769c8777a6e873ed1305e4ce2c353" -SRC_URI[sha256sum] = "10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "6081b45a9eb4426e045d259d1e144b32417fb635e5b96aa90647365ac96638d1" diff --git a/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.5.bb index 9d523bd7b1..7d3aab501c 100644 --- a/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.5.bb @@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b08d9e2e718ac83e6fe2b974d4b5fd8" DEPENDS += "libxmu" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "da67142c128d18386ff145882e0afc66" -SRC_URI[sha256sum] = "06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "365847e379398499ec9ad9a299cc47a0d6e7feba9546dfd4e5b422204b5ac180" diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch deleted file mode 100644 index 92ecdac224..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3730a38efad969fb6f8227df07eb4461a078f5a3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 13 Dec 2019 12:59:26 -0800 -Subject: [PATCH] Add configure time check for setsid - -Do not assume glibc == linux - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure | 1 + - configure.in | 1 + - main.c | 4 ++-- - xtermcfg.hin | 1 + - 5 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 0aafefc..03e8df0 100755 ---- a/configure -+++ b/configure -@@ -5605,6 +5605,7 @@ for ac_func in \ - unsetenv \ - sched_yield \ - setpgid \ -+ setsid \ - strftime \ - tcgetattr \ - waitpid \ -diff --git a/configure.in b/configure.in -index d2fee88..74d65df 100644 ---- a/configure.in -+++ b/configure.in -@@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \ - unsetenv \ - sched_yield \ - setpgid \ -+ setsid \ - strftime \ - tcgetattr \ - waitpid \ -diff --git a/main.c b/main.c -index 5e60589..b81d2be 100644 ---- a/main.c -+++ b/main.c -@@ -2903,7 +2903,7 @@ main(int argc, char *argv[]ENVP_ARG) - } - } - --#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - #define USE_OPENPTY 1 - static int opened_tty = -1; - #endif -@@ -4074,7 +4074,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) - /* - * now in child process - */ --#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) -+#if HAVE_SETSID - int pgrp = setsid(); /* variable may not be used... */ - #else - int pgrp = getpid(); -diff --git a/xtermcfg.hin b/xtermcfg.hin -index 1dbc3b8..4f3ff5b 100644 ---- a/xtermcfg.hin -+++ b/xtermcfg.hin -@@ -95,6 +95,7 @@ - #undef HAVE_PUTENV /* AC_CHECK_FUNCS(putenv) */ - #undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */ - #undef HAVE_SETPGID /* AC_CHECK_FUNCS(setpgid) */ -+#undef HAVE_SETSID /* AC_CHECK_FUNCS(setsid) */ - #undef HAVE_STDINT_H /* AC_PROG_CC_STDC */ - #undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */ - #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */ --- -2.24.1 - diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch new file mode 100644 index 0000000000..0c9d64c82c --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch @@ -0,0 +1,30 @@ +From e30ab2d73a21bc55511cbedbb9ae603246dbfcd1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 May 2024 23:10:00 -0700 +Subject: [PATCH] include missing pty.h header for openpty() + +On musl this problem is unearthed + +Fix +./main.c: In function 'get_pty': +./main.c:3123:14: error: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] + 3123 | result = openpty(pty, &opened_tty, ttydev, NULL, NULL); + | ^~~~~~~ + | openat + +Upstream-Status: Submitted [sent to dickey@invisible-island.net] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + main.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/main.c ++++ b/main.c +@@ -89,6 +89,7 @@ + + #define RES_OFFSET(field) XtOffsetOf(XTERM_RESOURCE, field) + ++#include <pty.h> + #include <xterm.h> + #include <version.h> + #include <graphics.h> diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_367.bb b/meta-oe/recipes-graphics/xorg-app/xterm_391.bb index e0d3dcec13..633d025eea 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_367.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_391.bb @@ -2,13 +2,12 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17" +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d686948940ca58d" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ + file://0001-include-missing-pty.h-header-for-openpty.patch \ " - -SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f" +SRC_URI[sha256sum] = "6091371e94de867ce186cc1bc306947b0482d71631847fdeab7982acb20ae6b8" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" @@ -27,22 +26,24 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ B = "${S}" +CFLAGS += "-D_GNU_SOURCE" + do_configure() { gnu-configize --force sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure oe_runconf } -do_install_append() { +do_install:append() { oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" } -RPROVIDES_${PN} = "virtual/x-terminal-emulator" +RPROVIDES:${PN} = "virtual-x-terminal-emulator" # busybox can supply resize too inherit update-alternatives -ALTERNATIVE_${PN} = "resize x-terminal-emulator" +ALTERNATIVE:${PN} = "resize x-terminal-emulator" ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" # rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" diff --git a/meta-oe/recipes-graphics/xorg-app/xwd_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb index 1ad48b071e..4a05a4437a 100644 --- a/meta-oe/recipes-graphics/xorg-app/xwd_1.0.7.bb +++ b/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb @@ -7,5 +7,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c0cdb783e9a0198237371fdaa26a18bf" DEPENDS = "libxmu libxkbfile" -SRC_URI[md5sum] = "11794a8eba6d295a192a8975287fd947" -SRC_URI[sha256sum] = "cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "dc121b84947eb4a3d1131bff1e9844cfa2124d95b47b35f9932340fa931fbd3f" diff --git a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb index 7cb550d276..1be0b5cd77 100644 --- a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb @@ -8,5 +8,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=31e8892c80b7a0c1c5f37c8e8ae6d794" -SRC_URI[md5sum] = "79972093bb0766fcd0223b2bd6d11932" -SRC_URI[sha256sum] = "99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "64048cd15eba3cd9a3d2e3280650391259ebf6b529f2101d1a20f441038c1afe" |