summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/x/FTBFSlog5
-rwxr-xr-xsource/x/freeglut/freeglut.SlackBuild12
-rw-r--r--source/x/x11/arch.use.flags10
-rw-r--r--source/x/x11/configure/pixman3
-rw-r--r--source/xap/FTBFSlog4
-rwxr-xr-xsource/xap/gnuchess/gnuchess.SlackBuild10
-rwxr-xr-xsource/xap/seyon/seyon.SlackBuild4
-rwxr-xr-xsource/xfce/garcon/garcon.SlackBuild7
-rw-r--r--source/xfce/garcon/garcon.url2
9 files changed, 35 insertions, 22 deletions
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog
index 98419e30a..2b8c29ba0 100644
--- a/source/x/FTBFSlog
+++ b/source/x/FTBFSlog
@@ -1,3 +1,8 @@
+Sat Jan 16 18:43:10 UTC 2021
+ freeglut: add -fcommon to CFLAGS. Thanks to nobodino.
+ x11: add -fcommon to CFLAGS. Thanks to nobodino.
+ x11/pixman: Don't use icecream.
++--------------------------+
Sat Oct 12 17:04:36 UTC 2019
xorg-server: patched to build with libglvnd >= 1.2.0. Thanks to bartgymnast.
+--------------------------+
diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild
index 7a4cadc85..52023e245 100755
--- a/source/x/freeglut/freeglut.SlackBuild
+++ b/source/x/freeglut/freeglut.SlackBuild
@@ -1,9 +1,7 @@
#!/bin/bash
-# Slackware build script for freeglut
-
# Copyright 2012 Robby Workman, Northport, Alabama, USA
-# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -55,16 +53,16 @@ TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fcommon"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -fPIC -fcommon"
LIBDIRSUFFIX="64"
else
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -fcommon"
LIBDIRSUFFIX=""
fi
diff --git a/source/x/x11/arch.use.flags b/source/x/x11/arch.use.flags
index eb8fbb71f..0e30c3eeb 100644
--- a/source/x/x11/arch.use.flags
+++ b/source/x/x11/arch.use.flags
@@ -1,11 +1,11 @@
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fcommon"
elif [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fcommon"
elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -fcommon"
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -fPIC -fcommon"
fi
diff --git a/source/x/x11/configure/pixman b/source/x/x11/configure/pixman
index 492cf8ae0..52cb86c34 100644
--- a/source/x/x11/configure/pixman
+++ b/source/x/x11/configure/pixman
@@ -1,3 +1,6 @@
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
if [ "$ARCH" = "x86_64" ]; then
do_sse2="--enable-sse2"
else
diff --git a/source/xap/FTBFSlog b/source/xap/FTBFSlog
index 299f08714..f0a9f1eb5 100644
--- a/source/xap/FTBFSlog
+++ b/source/xap/FTBFSlog
@@ -1,3 +1,7 @@
+Sat Jan 16 18:45:27 UTC 2021
+ gnuchess: add -fcommon to CFLAGS. Thanks to nobodino.
+ seyon: add -fcommon to CFLAGS. Thanks to nobodino.
++--------------------------+
Fri Jul 24 18:28:43 UTC 2020
mozilla-firefox: Patch for rust-1.45.0 related build failure.
mozilla-thunderbird: Patch for rust-1.45.0 related build failure.
diff --git a/source/xap/gnuchess/gnuchess.SlackBuild b/source/xap/gnuchess/gnuchess.SlackBuild
index 3c0b65aa6..0937194d1 100755
--- a/source/xap/gnuchess/gnuchess.SlackBuild
+++ b/source/xap/gnuchess/gnuchess.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -50,13 +50,13 @@ fi
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -fcommon"
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -fPIC -fcommon"
else
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -fcommon"
fi
TMP=${TMP:-/tmp}
diff --git a/source/xap/seyon/seyon.SlackBuild b/source/xap/seyon/seyon.SlackBuild
index 518dd9927..e74da637e 100755
--- a/source/xap/seyon/seyon.SlackBuild
+++ b/source/xap/seyon/seyon.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2002-2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -92,6 +92,8 @@ sed -i "s/getline/seyon_getline/g" *
chmod 755 makever.sh
xmkmf
+# Add -fcommon to CFLAGS:
+sed -i -e 's/-fno-strict-aliasing/-fno-strict-aliasing -fcommon/' Makefile
make || exit 1
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/X11
diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild
index 1ef822a08..7f8ca66c6 100755
--- a/source/xfce/garcon/garcon.SlackBuild
+++ b/source/xfce/garcon/garcon.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2012, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -69,9 +69,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $PKGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION $PKGNAM-$PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
+cd $PKGNAM-$PKGNAM-$VERSION || cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find . \
@@ -92,6 +92,7 @@ CFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--mandir=/usr/man \
--docdir=/usr/doc/$PKGNAM-$VERSION \
+ --enable-gtk-doc \
--disable-static \
--disable-debug \
--build=$ARCH-slackware-linux || exit 1
diff --git a/source/xfce/garcon/garcon.url b/source/xfce/garcon/garcon.url
index 9980ede87..398e7f900 100644
--- a/source/xfce/garcon/garcon.url
+++ b/source/xfce/garcon/garcon.url
@@ -1 +1 @@
-https://github.com/xfce-mirror/garcon/releases
+https://github.com/xfce-mirror/garcon