mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
ac00706594
The --enable-systemd-logind change to xorg-server that caused resume from suspend regressions (and others) has been reverted, and in retrospect it was a bad idea to take it at that point, but it had appeared as if it wouldn't cause problems in the case where Xorg was running as root. Oh well, lesson learned. But the build script has been enhanced to make it easy to build rootless versions of the xorg-server packages. Just do this: ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server Depending on your GPU, this could work for your use case with no problems. Also, I've gone ahead and taken a couple of shared library version bumps since the projects (opencv and poppler) have decent track records as far as not introducing regressions, and if there are any, we've got time to test and fix. I'm still avoiding some things that aren't as trusted in that regard, and will likely continue to do so. :-) ap/cups-filters-1.28.10-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/ark-21.12.0-x86_64-2.txz: Rebuilt. Applied upstream patches: [PATCH] Fix extraction "Dolphin Actions" not abiding "Open destination folder after extracting" setting. [PATCH] Do not highlight file after compression. Thanks to ctrlaltca. kde/calligra-3.2.1-x86_64-15.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/cantor-21.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/digikam-7.4.0-x86_64-2.txz: Rebuilt. Recompiled against opencv-4.5.5. kde/kfilemetadata-5.89.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/kile-2.9.93-x86_64-15.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/kitinerary-21.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/krita-5.0.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/okular-21.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. l/gegl-0.4.34-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. l/gst-plugins-bad-free-1.18.5-x86_64-3.txz: Rebuilt. Recompiled against opencv-4.5.5. l/imagemagick-7.1.0_19-x86_64-1.txz: Upgraded. l/mlt-7.4.0-x86_64-1.txz: Upgraded. l/opencv-4.5.5-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/poppler-21.12.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/fetchmail-6.4.26-x86_64-1.txz: Upgraded. n/tin-2.6.1-x86_64-1.txz: Upgraded. x/ibus-anthy-1.5.14-x86_64-1.txz: Upgraded. x/xorg-server-1.20.14-x86_64-2.txz: Rebuilt. Recompiled using these options: --enable-suid-wrapper --enable-install-setuid --disable-systemd-logind. x/xorg-server-xephyr-1.20.14-x86_64-2.txz: Rebuilt. x/xorg-server-xnest-1.20.14-x86_64-2.txz: Rebuilt. x/xorg-server-xvfb-1.20.14-x86_64-2.txz: Rebuilt. xap/geeqie-1.6-x86_64-4.txz: Rebuilt. Recompiled against poppler-21.12.0. xap/gimp-2.10.30-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. xfce/tumbler-4.16.0-x86_64-4.txz: Rebuilt. Recompiled against poppler-21.12.0. extra/rust-for-mozilla/rust-1.54.0-x86_64-3.txz: Added. This is an alternate version of Rust that may be useful for compiling software from Mozilla since using the very latest Rust often won't compile, or produces an unstable build.
69 lines
4.5 KiB
Text
69 lines
4.5 KiB
Text
# Add _rootless tag to the $BUILD if making rootless X packages:
|
|
if [ "$ROOTLESSX" = "YES" ]; then
|
|
BUILD="${BUILD}_rootless"
|
|
fi
|
|
|
|
rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/bin
|
|
mv $PKG/usr/bin/Xnest ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/bin
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/man/man1
|
|
mv $PKG/usr/man/man1/Xnest.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/man/man1
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/install
|
|
cat $CWD/slack-desc/xorg-server-xnest > ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/install/slack-desc
|
|
cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest
|
|
/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
|
|
|
|
rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb/usr/bin
|
|
mv $PKG/usr/bin/Xvfb ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb/usr/bin
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb/usr/man/man1
|
|
mv $PKG/usr/man/man1/Xvfb.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb/usr/man/man1
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb/install
|
|
cat $CWD/slack-desc/xorg-server-xvfb > ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb/install/slack-desc
|
|
cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xvfb
|
|
/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
|
|
|
|
rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr/usr/bin
|
|
mv $PKG/usr/bin/Xephyr ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr/usr/bin
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr/usr/man/man1
|
|
mv $PKG/usr/man/man1/Xephyr.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr/usr/man/man1
|
|
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr/install
|
|
cat $CWD/slack-desc/xorg-server-xephyr > ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr/install/slack-desc
|
|
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
|
|
|
|
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
|
|
/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
|
|
|
|
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
|
|
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
|
|
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
|