summaryrefslogtreecommitdiffstats
path: root/source/x/x11/makepkg/xorg-server
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-19 21:40:04 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-20 02:59:55 +0200
commitdae0b85c1c4fda0a19e38f6515c8a83be9650a6c (patch)
tree40ee8c41259c08c4b0754c2d9c05a2bc7466f10f /source/x/x11/makepkg/xorg-server
parent96ec6f0e63c74603e12941ffc8bb0c28ebe566cb (diff)
downloadcurrent-20210419214004.tar.gz
current-20210419214004.tar.xz
Mon Apr 19 21:40:04 UTC 202120210419214004
a/aaa_libraries-15.0-x86_64-6.txz: Rebuilt. Temporarily added the shared libraries from icu4c-68.2 and boost-1.75.0 to allow some time for things that depend on them to be recompiled. a/kernel-firmware-20210419_8528618-noarch-1.txz: Upgraded. a/less-581-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-38.txz: Rebuilt. upgradepkg: prefix path to installpkg with $ROOT. pkgtool.8: typo fix. Thanks to slvr32. a/sdparm-1.11-x86_64-4.txz: Rebuilt. Recompiled against sg3_utils-1.46. Thanks to USUARIONUEVO. a/udisks-1.0.5-x86_64-9.txz: Rebuilt. Recompiled against sg3_utils-1.46. Thanks to USUARIONUEVO. a/xfsprogs-5.11.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. ap/pamixer-1.4-x86_64-10.txz: Rebuilt. Recompiled against boost-1.76.0. ap/sqlite-3.35.4-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. d/Cython-0.29.23-x86_64-1.txz: Upgraded. d/poke-1.2-x86_64-1.txz: Upgraded. kde/kig-20.12.3-x86_64-2.txz: Rebuilt. Recompiled against boost-1.76.0. kde/krita-4.4.3-x86_64-3.txz: Rebuilt. Recompiled against boost-1.76.0. kde/plasma-workspace-5.21.4-x86_64-2.txz: Rebuilt. Patched to fix missing GTK+ window decorations and config file reading in a wayland session. Added "Full Wayland" session type (less stable / more experimental). The standard Plasma Wayland session will allow apps to use XCB rather than native Wayland, which is currently more stable. Thanks to LuckyCyborg. l/adwaita-icon-theme-40.0-noarch-1.txz: Upgraded. l/boost-1.76.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Compiled against icu4c-69.1. l/cryfs-0.10.3-x86_64-2.txz: Rebuilt. Recompiled against boost-1.76.0. l/harfbuzz-2.8.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. l/icu4c-69.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/imagemagick-7.0.11_8-x86_64-1.txz: Upgraded. l/jasper-2.0.32-x86_64-1.txz: Upgraded. l/libdvdread-6.1.2-x86_64-1.txz: Upgraded. l/libgpod-0.8.3-x86_64-10.txz: Rebuilt. Recompiled against sg3_utils-1.46. Thanks to Toutatis and USUARIONUEVO. l/libical-3.0.10-x86_64-1.txz: Upgraded. l/libical-3.0.9-x86_64-4.txz: Rebuilt. Recompiled against icu4c-69.1. l/libqalculate-3.18.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. l/libvisio-0.1.7-x86_64-7.txz: Rebuilt. Recompiled against icu4c-69.1. l/mozilla-nss-3.64-x86_64-1.txz: Upgraded. l/mozjs78-78.10.0esr-x86_64-1.txz: Upgraded. l/openexr-2.5.5-x86_64-3.txz: Rebuilt. Recompiled against boost-1.76.0. l/python-docutils-0.17.1-x86_64-1.txz: Upgraded. l/qt5-5.15.2-x86_64-8.txz: Rebuilt. Recompiled against icu4c-69.1. Recompiled with options: -qpa "xcb;wayland" -egl -eglfs This allows using either XCB (XWayland) or native Wayland for QPA. Thanks to LuckyCyborg. l/qt5-webkit-5.212.0_alpha4-x86_64-7.txz: Rebuilt. Recompiled against icu4c-69.1. l/vte-0.64.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/daemon-0.8-x86_64-1.txz: Added. Thanks to ZhaoLin1457 and LuckyCyborg. n/dovecot-2.3.14-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/openssh-8.6p1-x86_64-1.txz: Upgraded. n/php-7.4.16-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/postfix-3.5.10-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/samba-4.14.2-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/tin-2.4.5-x86_64-3.txz: Rebuilt. Recompiled against icu4c-69.1. t/texlive-2020.200608-x86_64-5.txz: Rebuilt. Recompiled against icu4c-69.1. x/egl-wayland-1.1.6-x86_64-1.txz: Added. Needed for Wayland EGLstreams support. Thanks to LuckyCyborg. x/eglexternalplatform-1.1-x86_64-1.txz: Added. Needed for egl-wayland. Thanks to LuckyCyborg. x/xf86-input-libinput-1.0.1-x86_64-1.txz: Upgraded. x/xorg-server-xwayland-21.1.1-x86_64-1.txz: Upgraded. Thanks to LuckyCyborg. xap/MPlayer-20210418-x86_64-1.txz: Upgraded. xap/mozilla-firefox-88.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/88.0/releasenotes/ https://www.mozilla.org/security/advisories/mfsa2021-16/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23994 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23995 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23996 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23997 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23998 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23999 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24000 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24001 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24002 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29945 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29944 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29946 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29947 (* Security fix *) xap/mozilla-thunderbird-78.10.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/78.10.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-14/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23994 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23995 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23998 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23961 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23999 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24002 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29945 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29946 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29948 (* Security fix *)
Diffstat (limited to 'source/x/x11/makepkg/xorg-server')
-rw-r--r--source/x/x11/makepkg/xorg-server31
1 files changed, 18 insertions, 13 deletions
diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server
index cc4f4f78d..1f5faf3c4 100644
--- a/source/x/x11/makepkg/xorg-server
+++ b/source/x/x11/makepkg/xorg-server
@@ -29,16 +29,18 @@ cat $CWD/slack-desc/xorg-server-xephyr > ${SLACK_X_BUILD_DIR}/package-xorg-serve
cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr
/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
-rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
-mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
-mv $PKG/usr/bin/Xwayland ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
-# No man page yet...
-#mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
-#mv $PKG/usr/man/man1/Xwayland.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
-mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install
-cat $CWD/slack-desc/xorg-server-xwayland > ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install/slack-desc
-cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
-/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+if [ -r $PKG/usr/bin/Xwayland ]; then
+ rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
+ mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
+ mv $PKG/usr/bin/Xwayland ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
+ # No man page yet...
+ #mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
+ #mv $PKG/usr/man/man1/Xwayland.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
+ mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install
+ cat $CWD/slack-desc/xorg-server-xwayland > ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install/slack-desc
+ cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
+ /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+fi
# Build the main xorg-server package:
cd $PKG
@@ -48,13 +50,16 @@ if [ "$UPGRADE_PACKAGES" = "yes" ]; then
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
- /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ if [ -r ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz ]; then
+ /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ fi
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
elif [ "$UPGRADE_PACKAGES" = "always" ]; then
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
- /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ if [ -r ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz ]; then
+ /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ fi
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
fi
-