summaryrefslogtreecommitdiff
path: root/source/xap/xgames
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-12-25 00:52:08 +0000
committerEric Hameleers <alien@slackware.com>2020-12-25 08:59:52 +0100
commit0cde31b79d54a3553040d395d63f4ef79959892d (patch)
tree3e85947726ef5c239510fabaab328ffc8b5f8b08 /source/xap/xgames
parent84c2304885a8a91702b657dbd82831ba6eb168e5 (diff)
downloadcurrent-0cde31b79d54a3553040d395d63f4ef79959892d.tar.gz
Fri Dec 25 00:52:08 UTC 202020201225005208
Here are some updates to provide a little holiday cheer. The kernels are rebuilt (yeah, we'll probably have new ones tomorrow but whatever) to build in HWMON making NVMe temperature monitoring available, and there's also a massive cleanup of polkit/dbus related packages to move most of the config files out of /etc and not install them as .new. Local config files that override the shipped ones may be placed in the directories in /etc to override the ones that we ship. Thanks to Robby Workman for this! None of the packages included in Slackware place any files in /etc/polkit-1/rules.d/ or /etc/dbus-1/system.d/ any more, but there may be third-party packages that still do. However, since Slackware's packages originally installed these as .new files, the leftover configs will remain. You'll probably want to take a look in those directories to clean out any config files that you haven't modified yourself or that belong to packages that aren't part of Slackware itself. Hope everyone has a great day. :-) a/dbus-1.12.20-x86_64-3.txz: Rebuilt. Added local config override directory /etc/dbus-1/system.d/ since no other package provides it now. a/kernel-generic-5.10.2-x86_64-2.txz: Upgraded. a/kernel-huge-5.10.2-x86_64-2.txz: Upgraded. a/kernel-modules-5.10.2-x86_64-2.txz: Upgraded. a/udisks-1.0.5-x86_64-6.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. a/udisks2-2.9.1-x86_64-2.txz: Rebuilt. Include 20-plugdev-group-mount-override.rules, installed in the system location. Thanks to Robby Workman. ap/cups-2.3.3-x86_64-3.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. ap/hplip-3.20.6-x86_64-4.txz: Rebuilt. Use --enable-qt5. Move D-Bus configs from /etc to the system location. Drop HAL support (LOL!) Thanks to Robby Workman. ap/mpg123-1.26.4-x86_64-1.txz: Upgraded. d/gnucobol-3.1.2-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.2-x86-2.txz: Upgraded. k/kernel-source-5.10.2-noarch-2.txz: Upgraded. HWMON m -> y +NVME_HWMON y +POWER_SUPPLY_HWMON y +THERMAL_HWMON y Thanks to Daedra. kde/sddm-0.19.0-x86_64-4.txz: Rebuilt. Don't include the /etc/dbus-1/system.d/ directory. l/GConf-3.2.6-x86_64-5.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/accountsservice-0.6.55-x86_64-2.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/cryptopp-8.3.0-x86_64-1.txz: Upgraded. l/harfbuzz-2.7.3-x86_64-1.txz: Upgraded. l/polkit-0.118-x86_64-3.txz: Rebuilt. Remove D-Bus rules for udisks2 and NetworkManager (moved to those packages). Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/pulseaudio-14.0-x86_64-2.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/system-config-printer-1.5.12-x86_64-6.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/ModemManager-1.14.8-x86_64-2.txz: Rebuilt. Added elogind support. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/NetworkManager-1.28.0-x86_64-2.txz: Rebuilt. Include 10-org.freedesktop.NetworkManager.rules, installed in the system location. Thanks to Robby Workman. n/bluez-5.55-x86_64-2.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/netatalk-3.1.12-x86_64-5.txz: Rebuilt. Patched to fix failure to build from source with gcc10. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/wpa_supplicant-2.9-x86_64-3.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. x/mesa-20.3.1-x86_64-2.txz: Rebuilt. [PATCH] vulkan/device_select: Store Vulkan vendorID and deviceID as uint32_t. Thanks to sasha69 for the link to the upstream discussion/commit. xap/blueman-2.1.4-x86_64-3.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. xap/xgames-0.3-x86_64-6.txz: Rebuilt. Fixed spider failing to build from source with gcc10. Removed the ancient version of xsnow. xap/xscreensaver-5.45-x86_64-2.txz: Rebuilt. Make the description of the xscreensaver settings be clearly for xscreensaver as opposed to a generic "screensaver" settings. Thanks to Robby Workman. xap/xsnow-3.1.9-x86_64-1.txz: Added. Merry Christmas / Happy Holidays! :-) xfce/mousepad-0.5.1-x86_64-1.txz: Upgraded. xfce/xfce4-screensaver-0.1.11-x86_64-2.txz: Rebuilt. Make the description of the xfce4-screensaver settings be clearly for xfce4-screensaver as opposed to a generic "screensaver" settings. Thanks to Robby Workman. xfce/xfce4-session-4.14.2-x86_64-2.txz: Rebuilt. Use xfce4-screensaver by default and don't ship the xscreensaver.desktop autostart file. Thanks to Robby Workman. extra/pure-alsa-system/*: Removed. This served a purpose during the pure ALSA to PulseAudio transition, but it's time for it to go away. If the latency is an issue for your use case, a look around should turn up documentation on how to reduce it, or how to send output directly to ALSA without having to uninstall PulseAudio or recompile anything that's linked to it. As an example, see this one (which was mentioned here before): https://wiki.archlinux.org/index.php/PulseAudio/Examples#PulseAudio_as_a_minimal_unintrusive_dumb_pipe_to_ALSA isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/xap/xgames')
-rw-r--r--source/xap/xgames/spider.gcc10.diff11
-rwxr-xr-xsource/xap/xgames/xgames.SlackBuild35
2 files changed, 23 insertions, 23 deletions
diff --git a/source/xap/xgames/spider.gcc10.diff b/source/xap/xgames/spider.gcc10.diff
new file mode 100644
index 00000000..cbde66d6
--- /dev/null
+++ b/source/xap/xgames/spider.gcc10.diff
@@ -0,0 +1,11 @@
+--- ./Makefile.orig 2020-12-24 15:54:29.538553593 -0600
++++ ./Makefile 2020-12-24 15:56:23.320547299 -0600
+@@ -295,7 +295,7 @@
+
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -fcommon
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS)
+ LDPOSTLIB =
diff --git a/source/xap/xgames/xgames.SlackBuild b/source/xap/xgames/xgames.SlackBuild
index f688a41c..6931b8dc 100755
--- a/source/xap/xgames/xgames.SlackBuild
+++ b/source/xap/xgames/xgames.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xgames
VERSION=0.3
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -53,10 +53,11 @@ mkdir -p $TMP $PKG
# Build spider:
cd $TMP
-tar xvf $CWD/spider.tar.gz || exit 1
+tar xvf $CWD/spider.tar.lz || exit 1
cd spider || exit 1
zcat $CWD/spider.diff.gz | patch -p1 --verbose || exit 1
xmkmf
+zcat $CWD/spider.gcc10.diff.gz | patch -p1 --verbose || exit 1
make $NUMJOBS || make || exit 1
mkdir -p $PKG/usr/bin
cat spider > $PKG/usr/bin/spider
@@ -67,7 +68,7 @@ cp -a README* $PKG/usr/doc/xgames-$VERSION/spider
# Build maze:
cd $TMP
-tar xvf $CWD/maze.tar.gz || exit 1
+tar xvf $CWD/maze.tar.lz || exit 1
cd maze || exit 1
zcat $CWD/maze.diff.gz | patch -p1 || exit 1
xmkmf
@@ -79,7 +80,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/maze
# Build xcolormap:
cd $TMP
-tar xvf $CWD/xcolormap.tar.gz || exit 1
+tar xvf $CWD/xcolormap.tar.lz || exit 1
cd xcolormap || exit 1
zcat $CWD/xcolormap.diff.gz | patch -p1 || exit 1
make $NUMJOBS || make || exit 1
@@ -89,7 +90,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xcolormap
# Build xcuckoo:
cd $TMP
-tar xvf $CWD/xcuckoo-1.1.tar.gz || exit 1
+tar xvf $CWD/xcuckoo-1.1.tar.lz || exit 1
cd xcuckoo || exit 1
zcat $CWD/xcuckoo.diff.gz | patch -p1 --verbose || exit 1
xmkmf
@@ -101,7 +102,7 @@ cp -a CHANGES $PKG/usr/doc/xgames-$VERSION/xcuckoo
# Build xlander:
cd $TMP
-tar xvf $CWD/xlander.tar.gz || exit 1
+tar xvf $CWD/xlander.tar.lz || exit 1
cd xlander || exit 1
zcat $CWD/xlander.fixes.diff.gz | patch -p1 || exit 1
zcat $CWD/xlander-2009-07-18.diff.gz | patch -p1 || exit 1
@@ -114,7 +115,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xlander
# Build xminesweep:
cd $TMP
-tar xvf $CWD/xminesweep3.0.tar.gz || exit 1
+tar xvf $CWD/xminesweep3.0.tar.lz || exit 1
cd xminesweep3.0 || exit 1
xmkmf
make $NUMJOBS || make || exit 1
@@ -125,7 +126,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xminesweep
# Build xneko:
cd $TMP
-tar xvf $CWD/xneko.tar.gz || exit 1
+tar xvf $CWD/xneko.tar.lz || exit 1
cd xneko || exit 1
xmkmf
make $NUMJOBS || make || exit 1
@@ -136,7 +137,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xneko
# Build xroach:
cd $TMP
-tar xvf $CWD/xroach.tar.gz || exit 1
+tar xvf $CWD/xroach.tar.lz || exit 1
cd xroach || exit 1
xmkmf
make $NUMJOBS || make || exit 1
@@ -145,24 +146,13 @@ cat xroach.man | gzip -9c > $PKG/usr/man/man6/xroach.6.gz
mkdir -p $PKG/usr/doc/xgames-$VERSION/xroach
cp -a README.linux $PKG/usr/doc/xgames-$VERSION/xroach
-# Build xsnow:
-cd $TMP
-tar xvf $CWD/xsnow-1.42.tar.gz || exit 1
-cd xsnow-1.42 || exit 1
-xmkmf
-make $NUMJOBS || make || exit 1
-cat xsnow > $PKG/usr/bin/xsnow
-cat xsnow.man | gzip -9c > $PKG/usr/man/man6/xsnow.6.gz
-mkdir -p $PKG/usr/doc/xgames-$VERSION/xsnow
-cp -a README $PKG/usr/doc/xgames-$VERSION/xsnow
-
# Fix everything up:
chmod 755 $PKG/usr/bin/*
strip $PKG/usr/bin/*
( cd $PKG/usr/doc
- find . -type f -exec chown root.root {} \+
- find . -type f -exec chmod 644 {} \+
+ find . -type f -exec chown root.root {} \;
+ find . -type f -exec chmod 644 {} \;
)
mkdir -p $PKG/install
@@ -170,4 +160,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $TMP/xgames-$VERSION-$ARCH-$BUILD.txz
-