From e34f89623c246d261efb7fd0f2ce4a30b10bd59d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 15 Apr 2021 15:53:51 -0500 Subject: meta-openembedded: subtree update:da393545a2..08c0280b7c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Andreas Müller (8): networkmanager-openvpn: Fix packageing mousepad: upgrade 0.5.3 -> 0.5.4 xfce4-battery-plugin: upgrade 1.1.3 -> 1.1.4 gigolo: upgrade 0.5.1 -> 0.5.2 thunar: upgrade 4.16.4 -> 4.16.6 poppler: upgrade 21.03.0 -> 21.04.0 catfish: add python3-dbus to RDEPENDS fluidsynth: upgrade 2.1.7 -> 2.2.0 Andrew Geissler (1): nodejs: ppc64le machine support Awais Belal (1): libnet-ssleay-perl: add rdep on perl-module-autoloader Hermes Zhang (1): gpsd: backport d-bus message time patch from upstream Hongxu Jia (1): debootstrap: 1.0.67 -> 1.0.123 Kamil Dziezyk (1): bats: upgrade 1.1.0 -> 1.3.0 Kartikey Rameshbhai Parmar (1): fluidsynth: update SRC_URI to remove non-existing 2.1.x branch Khem Raj (12): mariadb: Fix build on newer 32bit architectures iwd: Upgade to 1.13 libmanette: Add recipe pidgin-sipe: Fix build with glib-2.0 >= 2.68 gjs: Fix build with gcc11 poppler: Backport patches to fix build with glib-2.0 2.68+ and GCC11 opencv: Upgrade to 5.4.2 Revert "iwd: Upgade to 1.13" core-image-minimal-xfce: Use graphical.target as default tbb: Fix build with musl vnstat: Disable install parallism to fix a potential install race open-vm-tools: Fix build with gcc 11 Leon Anavi (57): python3-sqlalchemy: Upgrade 1.4.3 -> 1.4.4 python3-bitarray: Upgrade 1.8.1 -> 1.8.2 python3-httplib2: Upgrade 0.19.0 -> 0.19.1 python3-parso: Upgrade 0.8.1 -> 0.8.2 python3-matplotlib: Upgrade 3.3.4 -> 3.4.1 python3-pyroute2: Upgrade 0.5.15 -> 0.5.16 python3-h5py: Upgrade 3.1.0 -> 3.2.1 python3-cheetah: Upgrade 3.2.6 -> 3.2.6.post1 python3-google-api-python-client: Upgrade 2.0.2 -> 2.1.0 python3-xlsxwriter: Upgrade 1.3.7 -> 1.3.8 python3-pymisp: Upgrade 2.4.140 -> 2.4.141 python3-tqdm: Upgrade 4.58.0 -> 4.59.0 python3-contextlib2: Upgrade 0.6.0 -> 0.6.0.post1 python3-typeguard: Upgrade 2.11.1 -> 2.12.0 python3-decorator: Upgrade 4.4.2 -> 5.0.1 python3-pillow: Upgrade 8.1.2 -> 8.2.0 python3-aiohttp: Upgrade 3.7.4 -> 3.7.4.post0 python3-networkx: Upgrade 2.5 -> 2.5.1 python3-pysonos: Upgrade 0.0.40 -> 0.0.41 python3-docutils: Upgrade 0.16 -> 0.17 python3-bitarray: Upgrade 1.8.2 -> 1.9.0 python3-regex: Upgrade 2021.3.17 -> 2021.4.4 python3-sqlalchemy: Upgrade 1.4.4 -> 1.4.5 python3-pychromecast: Upgrade 9.1.1 -> 9.1.2 python3-decorator: Upgrade 5.0.1 -> 5.0.5 python3-pymisp: Upgrade 2.4.141 -> 2.4.141.1 python3-pyroute2: Upgrade 0.5.16 -> 0.5.17 python3-transitions: Upgrade 0.8.7 -> 0.8.8 python3-sqlalchemy: Upgrade 1.4.5 -> 1.4.6 python3-bitarray: Upgrade 1.9.0 -> 1.9.1 python3-pysonos: Upgrade 0.0.41 -> 0.0.42 python3-django: Upgrade 3.1.7 -> 3.2 python3-tqdm: Upgrade 4.59.0 -> 4.60.0 python3-xmlschema: Upgrade 1.5.3 -> 1.6.0 python3-ruamel-yaml: Upgrade 0.17.2 -> 0.17.4 python3-croniter: Upgrade 1.0.10 -> 1.0.11 python3-decorator: Upgrade 5.0.5 -> 5.0.6 python3-grpcio-tools: Upgrade 1.36.1 -> 1.37.0 python3-speedtest-cli: Upgrade 2.1.2 -> 2.1.3 python3-python-vlc: Upgrade 3.0.11115 -> 3.0.12117 python3-robotframework: Upgrade 4.0 -> 4.0.1 python3-grpcio: Upgrade 1.36.1 -> 1.37.0 python3-cerberus: Upgrade 1.3.2 -> 1.3.3 python3-humanize: Upgrade 3.3.0 -> 3.4.0 python3-monotonic: Upgrade 1.5 -> 1.6 python3-sqlalchemy: Upgrade 1.4.6 -> 1.4.7 python3-typed-ast: Upgrade 1.4.2 -> 1.4.3 python3-backports-functools-lru-cache: Upgrade 1.6.3 -> 1.6.4 python3-xmlschema: Upgrade 1.6.0 -> 1.6.1 python3-pyroute2: Upgrade 0.5.17 -> 0.5.18 python3-sympy: Upgrade 1.7.1 -> 1.8 python3-pandas: Upgrade 1.2.3 -> 1.2.4 python3-humanize: Upgrade 3.4.0 -> 3.4.1 python3-decorator: Upgrade 5.0.6 -> 5.0.7 python3-colorlog: Upgrade 4.8.0 -> 5.0.1 python3-google-api-python-client: Upgrade 2.1.0 -> 2.2.0 python3-croniter: Upgrade 1.0.11 -> 1.0.12 Martin Jansa (13): packagegroup-meta-oe: include glfw, icewm, geis only with x11 in DISTRO_FEATURES phonet-utils: remove packagegroup-meta-oe: use 4 spaces for identation telepathy-glib: respect GI_DATA_ENABLED when enabling vala-bindings uml-utilities: fix installed-vs-shipped with usrmerge libsmi: use /bin/sh instead of ${base_bindir}/sh to silence QA error with usrmerge libyui: switch to libyui-old repo which still has this SRCREV libyui(-ncurses): upgrade to 4.1.1, libyui repo was rewritten completely android-tools: use PN instead of BPN in RDEPENDS pidgin-sipe: fix g_memdup2 changes to be backwards compatible with glib-1.67 pidgin: upgrade to 2.14.2 opencv: fetch wechat_qrcode files used by dnn PACKAGECONFIG opencv: link sfm module with Glog Mingli Yu (2): freeradius: Upgrade to 3.0.21 hostapd: fix CVE-2021-0326 and CVE-2021-27803 Naveen Saini (2): tbb: upgrade 2020.3 -> 2021.2.0 ocl-icd: upgrade 2.2.14 -> 2.3.0 Randy MacLeod (2): doxygen: Upgrade 1.8.20 -> 1.9.1 open-vm-tools: upgrade 11.0.1 -> 11.2.5 Ross Burton (1): fwts: upgrade to 21.03.00 Stefan Ghinea (1): hostapd: fix CVE-2021-30004 Vinicius Aquino (1): networkmanager: upgrade 1.28.0 -> 1.30.2 Vinícius Ossanes Aquino (2): modemmanager: upgrade 1.14.10 -> 1.16.2 libqmi: upgrade 1.26.6 -> 1.28.2 Yi Fan Yu (2): rsyslog: fix some of the ptests redis: upgrade 6.0.9 -> 6.2.1 hasan.men (2): librdkafka: Add initial recipe v1.6.1 libcppkafka: Add initial recipe for cppkafka wrapper persianpros (5): PEP8 double aggressive E701, E70 and E502 PEP8 double aggressive E20 and E211 PEP8 double aggressive E22, E224, E241, E242 and E27 PEP8 double aggressive E301 ~ E306 PEP8 double aggressive W291 ~ W293 and W391 wangmy (2): mariadb: upgrade 10.5.8 -> 10.5.9 uftrace: Fix error on aarch64 when binutils update to 2.35.1 zangrc (14): gnome-autoar: upgrade 0.2.4 -> 0.3.1 emacs: upgrade 27.1 -> 27.2 fbgrab: upgrade 1.4 -> 1.5 ostree: upgrade 2020.8 -> 2021.1 zabbix: upgrade 5.2.5 -> 5.2.6 libxaw: upgrade 1.0.13 -> 1.0.14 mosquitto: upgrade 2.0.9 -> 2.0.10 nbdkit: upgrade 1.25.4 -> 1.25.5 stunnel: upgrade 5.58 -> 5.59 usbredir: upgrade 0.8.0 -> 0.9.0 hwdata: upgrade 0.345 -> 0.346 live555: upgrade 20210322 -> 20210406 rabbitmq-c: upgrade 0.10.0 -> 0.11.0 xterm: upgrade 366 -> 367 zhengruoqin (7): fetchmail: upgrade 6.4.17 -> 6.4.18 lldpd: upgrade 1.0.4 -> 1.0.8 networkmanager-openvpn: upgrade 1.8.12 -> 1.8.14 snort: upgrade 2.9.17 -> 2.9.17.1 python3-absl: upgrade 0.10.0 -> 0.12.0 python3-astroid: upgrade 2.5.2 -> 2.5.3 python3-bitarray: upgrade 1.9.1 -> 1.9.2 Signed-off-by: Andrew Geissler Change-Id: I1f0f809aeda70e82140fec5e3310cbf89c760ad4 --- .../meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb | 16 ------- .../meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb | 16 +++++++ .../libyui/libyui-ncurses_4.0.0.bb | 49 ---------------------- .../libyui/libyui-ncurses_4.1.1.bb | 48 +++++++++++++++++++++ .../recipes-graphics/libyui/libyui_4.0.0.bb | 36 ---------------- .../recipes-graphics/libyui/libyui_4.1.1.bb | 36 ++++++++++++++++ .../0001-Add-configure-time-check-for-setsid.patch | 10 ++--- .../meta-oe/recipes-graphics/xorg-app/xterm_366.bb | 48 --------------------- .../meta-oe/recipes-graphics/xorg-app/xterm_367.bb | 48 +++++++++++++++++++++ .../recipes-graphics/xorg-lib/libxaw_1.0.13.bb | 28 ------------- .../recipes-graphics/xorg-lib/libxaw_1.0.14.bb | 27 ++++++++++++ 11 files changed, 180 insertions(+), 182 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_366.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb (limited to 'meta-openembedded/meta-oe/recipes-graphics') diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb deleted file mode 100644 index a1294b98a..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "FBGrab is a framebuffer screenshot program" -HOMEPAGE = "https://github.com/GunnarMonell/fbgrab" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a" -SECTION = "console/utils" -DEPENDS = "libpng zlib" -SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https" - -SRCREV = "74373aafc0b496e67642562d86eac6b858a31f24" -S = "${WORKDIR}/git" - -inherit autotools-brokensep - -do_configure_prepend() { - sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile -} diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb new file mode 100644 index 000000000..419881d5c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb @@ -0,0 +1,16 @@ +SUMMARY = "FBGrab is a framebuffer screenshot program" +HOMEPAGE = "https://github.com/GunnarMonell/fbgrab" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a" +SECTION = "console/utils" +DEPENDS = "libpng zlib" +SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https" + +SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8" +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +do_configure_prepend() { + sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb deleted file mode 100644 index a3a4a1506..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Character Based User Interface for libyui" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ -" - -SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ - " - -SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" - -SRCREV = "37d3a1e815a47f536b4f694f139f279cc93a3854" - -S = "${WORKDIR}/git" - -inherit cmake gettext pkgconfig - -DEPENDS += "boost libyui ncurses" - -BBCLASSEXTEND = "nativesdk" - -EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" - -CXXFLAGS += "-DNCURSES_WIDECHAR" - -do_configure_prepend () { - cd ${S} - if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then - mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ - cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ - fi - cd - - sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt -} - -do_install_append () { - if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then - mv ${D}/usr/lib64 ${D}/usr/lib - fi -} - -do_install_append_class-nativesdk () { - mkdir -p ${D}/${base_prefix} - mv ${D}/usr ${D}/${base_prefix} -} - -FILES_${PN} += "${datadir}/*" - -FILES_${PN}-dev += "${libdir}/*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb new file mode 100644 index 000000000..fdf01618a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb @@ -0,0 +1,48 @@ +SUMMARY = "Character Based User Interface for libyui" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ +" + +SRC_URI = "git://github.com/libyui/libyui.git" + +SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" + +SRCREV = "718ac672374a2b0f50cbc7d637d90e6471babc3d" + +S = "${WORKDIR}/git/libyui-ncurses" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost libyui ncurses" + +BBCLASSEXTEND = "nativesdk" + +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" + +CXXFLAGS += "-DNCURSES_WIDECHAR" + +do_configure_prepend () { + cd ${S} + if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then + mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + fi + cd - + sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt +} + +do_install_append () { + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} +} + +FILES_${PN} += "${datadir}/*" + +FILES_${PN}-dev += "${libdir}/*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb deleted file mode 100644 index bba17962e..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends." -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - " - -SRC_URI = "git://github.com/libyui/libyui.git \ - file://0001-Fix-build-with-clang.patch \ - file://0001-Use-relative-install-paths-for-CMake.patch \ - " - -SRCREV = "af06143017fc5f18c4b6488ba4aed26bcc43ff6e" - -S = "${WORKDIR}/git" - -inherit cmake gettext pkgconfig - -DEPENDS += "boost" - -EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" - -BBCLASSEXTEND = "native nativesdk" - -do_install_append () { - if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then - mv ${D}/usr/lib64 ${D}/usr/lib - fi -} - -do_install_append_class-nativesdk () { - mkdir -p ${D}/${base_prefix} - mv ${D}/usr ${D}/${base_prefix} -} - -FILES_${PN}-dev = "${libdir}/* ${includedir}/yui*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb new file mode 100644 index 000000000..acab7d456 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends." +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://../COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ + file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ + file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +SRC_URI = "git://github.com/libyui/libyui.git \ + file://0001-Fix-build-with-clang.patch \ + file://0001-Use-relative-install-paths-for-CMake.patch \ + " + +SRCREV = "718ac672374a2b0f50cbc7d637d90e6471babc3d" + +S = "${WORKDIR}/git/libyui" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost" + +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" + +BBCLASSEXTEND = "native nativesdk" + +do_install_append () { + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} +} + +FILES_${PN}-dev = "${libdir}/* ${includedir}/yui*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch index d3beea8be..92ecdac22 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch @@ -18,7 +18,7 @@ diff --git a/configure b/configure index 0aafefc..03e8df0 100755 --- a/configure +++ b/configure -@@ -5411,6 +5411,7 @@ for ac_func in \ +@@ -5605,6 +5605,7 @@ for ac_func in \ unsetenv \ sched_yield \ setpgid \ @@ -42,7 +42,7 @@ diff --git a/main.c b/main.c index 5e60589..b81d2be 100644 --- a/main.c +++ b/main.c -@@ -2868,7 +2868,7 @@ main(int argc, char *argv[]ENVP_ARG) +@@ -2903,7 +2903,7 @@ main(int argc, char *argv[]ENVP_ARG) } } @@ -51,7 +51,7 @@ index 5e60589..b81d2be 100644 #define USE_OPENPTY 1 static int opened_tty = -1; #endif -@@ -4040,7 +4040,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) +@@ -4074,7 +4074,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) /* * now in child process */ @@ -64,14 +64,14 @@ diff --git a/xtermcfg.hin b/xtermcfg.hin index 1dbc3b8..4f3ff5b 100644 --- a/xtermcfg.hin +++ b/xtermcfg.hin -@@ -96,6 +96,7 @@ +@@ -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_STRFTIME /* AC_CHECK_FUNCS(strftime) */ + #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */ -- 2.24.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_366.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_366.bb deleted file mode 100644 index 969159bc5..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_366.bb +++ /dev/null @@ -1,48 +0,0 @@ -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=996b1ce0584c0747b17b57654cc81e8e" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ - " - -SRC_URI[sha256sum] = "858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" - -# Let xterm install .desktop files -inherit mime-xdg - -EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ - --disable-imake \ - --disable-rpath-hack \ - --disable-setuid \ - --with-app-defaults=${datadir}/X11/app-defaults \ - " - -B = "${S}" - -do_configure() { - gnu-configize --force - sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure - oe_runconf -} - -do_install_append() { - oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" -} - -RPROVIDES_${PN} = "virtual/x-terminal-emulator" - -# busybox can supply resize too -inherit update-alternatives - -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-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb new file mode 100644 index 000000000..e0d3dcec1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb @@ -0,0 +1,48 @@ +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" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ + file://0001-Add-configure-time-check-for-setsid.patch \ + " + +SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" + +# Let xterm install .desktop files +inherit mime-xdg + +EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ + --disable-imake \ + --disable-rpath-hack \ + --disable-setuid \ + --with-app-defaults=${datadir}/X11/app-defaults \ + " + +B = "${S}" + +do_configure() { + gnu-configize --force + sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure + oe_runconf +} + +do_install_append() { + oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" +} + +RPROVIDES_${PN} = "virtual/x-terminal-emulator" + +# busybox can supply resize too +inherit update-alternatives + +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-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb deleted file mode 100644 index cb1ffcd8c..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb +++ /dev/null @@ -1,28 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc -SUMMARY = "X Athena Widget Set" -DEPENDS += "xorgproto virtual/libx11 libxext libxt libxmu libxpm libxau xmlto-native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" - -PE = "1" -PR = "r2" - -SRC_URI[md5sum] = "e5e06eb14a608b58746bdd1c0bd7b8e3" -SRC_URI[sha256sum] = "8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd" - -do_install_append () { - ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so -} - -PACKAGES =+ "libxaw6 libxaw7 libxaw8" - -FILES_libxaw6 = "${libdir}/libXaw*.so.6*" -FILES_libxaw7 = "${libdir}/libXaw*.so.7*" -FILES_libxaw8 = "${libdir}/libXaw8.so.8*" - -# Avoid dependency on libxaw as it is not build -RDEPENDS_${PN}-dev = "" - -XORG_PN = "libXaw" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb new file mode 100644 index 000000000..15f52d8d4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb @@ -0,0 +1,27 @@ +require recipes-graphics/xorg-lib/xorg-lib-common.inc +SUMMARY = "X Athena Widget Set" +DEPENDS += "xorgproto virtual/libx11 libxext libxt libxmu libxpm libxau xmlto-native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" + +PE = "1" + +SRC_URI[md5sum] = "c1ce21c296bbf3da3e30cf651649563e" +SRC_URI[sha256sum] = "76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e" + +do_install_append () { + ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so +} + +PACKAGES =+ "libxaw6 libxaw7 libxaw8" + +FILES_libxaw6 = "${libdir}/libXaw*.so.6*" +FILES_libxaw7 = "${libdir}/libXaw*.so.7*" +FILES_libxaw8 = "${libdir}/libXaw8.so.8*" + +# Avoid dependency on libxaw as it is not build +RDEPENDS_${PN}-dev = "" + +XORG_PN = "libXaw" -- cgit v1.2.3