summaryrefslogtreecommitdiffstats
path: root/source/xap
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap')
-rwxr-xr-xsource/xap/MPlayer/MPlayer.SlackBuild1
-rwxr-xr-xsource/xap/electricsheep/electricsheep.SlackBuild6
-rw-r--r--source/xap/electricsheep/electricsheep.evil.gcc14.diff11
-rwxr-xr-xsource/xap/freerdp/freerdp.SlackBuild3
-rwxr-xr-xsource/xap/fvwm/fvwm.SlackBuild3
-rwxr-xr-xsource/xap/gftp/gftp.SlackBuild3
-rwxr-xr-xsource/xap/gimp/gimp.SlackBuild3
-rwxr-xr-xsource/xap/gnuchess/gnuchess.SlackBuild3
-rwxr-xr-xsource/xap/pidgin/pidgin.SlackBuild5
-rwxr-xr-xsource/xap/rdesktop/rdesktop.SlackBuild3
-rwxr-xr-xsource/xap/sane/sane.SlackBuild3
-rwxr-xr-xsource/xap/seyon/seyon.SlackBuild2
-rwxr-xr-xsource/xap/xgames/xgames.SlackBuild8
-rwxr-xr-xsource/xap/xmms/xmms.SlackBuild5
-rwxr-xr-xsource/xap/xsane/xsane.SlackBuild3
15 files changed, 61 insertions, 1 deletions
diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild
index 44df8d0ff..f4eb6b5b3 100755
--- a/source/xap/MPlayer/MPlayer.SlackBuild
+++ b/source/xap/MPlayer/MPlayer.SlackBuild
@@ -272,6 +272,7 @@ echo Building ...
--disable-ffmpeg_a \
--codecsdir=${CODECSDIR} \
--language="${LANGUAGES}" \
+ --extra-cflags="-Wno-error=incompatible-pointer-types -Wno-error=int-conversion" \
${EXTRACONFIGUREOPTIONS} \
${DO_PATENTED} || exit 1
diff --git a/source/xap/electricsheep/electricsheep.SlackBuild b/source/xap/electricsheep/electricsheep.SlackBuild
index 0c151d0e5..d513e8c41 100755
--- a/source/xap/electricsheep/electricsheep.SlackBuild
+++ b/source/xap/electricsheep/electricsheep.SlackBuild
@@ -140,6 +140,9 @@ case "$ARCH" in
;;
esac
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"
+
# Create working directories:
mkdir -p $OUTPUT # place for the package to be saved
mkdir -p $TMP/tmp-$PKGNAM # location to build the source
@@ -205,6 +208,9 @@ cd client
# We do not use gnome:
cat $SRCDIR/electricsheep_gnome-open.patch | patch -p1 --verbose \
2>&1 | tee $OUTPUT/patch-$PKGNAM.log
+ # This optimization is broken, oh well
+ cat $SRCDIR/electricsheep.evil.gcc14.diff | patch -p2 --verbose \
+ 2>&1 | tee $OUTPUT/patch-$PKGNAM.log
# Prevent install errors due to missing gnome
sed -i -e "/^install-data-local:/,/^$/d" Makefile.in
LDFLAGS="$SLKLDFLAGS" \
diff --git a/source/xap/electricsheep/electricsheep.evil.gcc14.diff b/source/xap/electricsheep/electricsheep.evil.gcc14.diff
new file mode 100644
index 000000000..981a4814f
--- /dev/null
+++ b/source/xap/electricsheep/electricsheep.evil.gcc14.diff
@@ -0,0 +1,11 @@
+--- ./client/ffmpeg/libavcodec/bitstream.h.orig 2024-05-10 17:20:22.784264430 -0500
++++ ./client/ffmpeg/libavcodec/bitstream.h 2024-05-10 17:20:14.597264247 -0500
+@@ -53,7 +53,7 @@
+
+ extern const uint8_t ff_reverse[256];
+
+-#if defined(ARCH_X86)
++#if defined(ARCH_X8666)
+ // avoid +32 for shift optimization (gcc should do that ...)
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
+ asm ("sarl %1, %0\n\t"
diff --git a/source/xap/freerdp/freerdp.SlackBuild b/source/xap/freerdp/freerdp.SlackBuild
index 21e78ee05..32dd124a9 100755
--- a/source/xap/freerdp/freerdp.SlackBuild
+++ b/source/xap/freerdp/freerdp.SlackBuild
@@ -67,6 +67,9 @@ else
LIBDIRSUFFIX=""
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/xap/fvwm/fvwm.SlackBuild b/source/xap/fvwm/fvwm.SlackBuild
index 5a41c9c3a..9de111625 100755
--- a/source/xap/fvwm/fvwm.SlackBuild
+++ b/source/xap/fvwm/fvwm.SlackBuild
@@ -60,6 +60,9 @@ else
LIBDIRSUFFIX=""
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/xap/gftp/gftp.SlackBuild b/source/xap/gftp/gftp.SlackBuild
index 9431f3ac4..7d42bd65b 100755
--- a/source/xap/gftp/gftp.SlackBuild
+++ b/source/xap/gftp/gftp.SlackBuild
@@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-gftp
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index 3c54f1cd9..55fe46b4a 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -65,6 +65,9 @@ else
LIBDIRSUFFIX=""
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
+
cd $TMP
rm -rf gimp-$VERSION
tar xvf $CWD/gimp-$VERSION.tar.?z || exit 1
diff --git a/source/xap/gnuchess/gnuchess.SlackBuild b/source/xap/gnuchess/gnuchess.SlackBuild
index a0be62186..cac5e2091 100755
--- a/source/xap/gnuchess/gnuchess.SlackBuild
+++ b/source/xap/gnuchess/gnuchess.SlackBuild
@@ -65,6 +65,9 @@ PKG=/tmp/package-gnuchess
rm -rf $PKG
mkdir -p $TMP $PKG
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration"
+
### gnuchess
cd $TMP
rm -rf gnuchess-$VERGNUCHESS
diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild
index 18362ef80..627d1b1bf 100755
--- a/source/xap/pidgin/pidgin.SlackBuild
+++ b/source/xap/pidgin/pidgin.SlackBuild
@@ -74,6 +74,9 @@ else
ARCHQUADLET=""
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion"
+
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
@@ -173,6 +176,8 @@ done
PIDGIN_LIBS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \
PURPLE_CFLAGS="-I${PKG}/usr/include/libpurple" \
PURPLE_LIBS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild
index 63086bb5b..ce1b5235f 100755
--- a/source/xap/rdesktop/rdesktop.SlackBuild
+++ b/source/xap/rdesktop/rdesktop.SlackBuild
@@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
+
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild
index 3e700ba30..472aa849b 100755
--- a/source/xap/sane/sane.SlackBuild
+++ b/source/xap/sane/sane.SlackBuild
@@ -62,6 +62,9 @@ else
LIBDIRSUFFIX=""
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-sane
diff --git a/source/xap/seyon/seyon.SlackBuild b/source/xap/seyon/seyon.SlackBuild
index ae3087113..9b478f420 100755
--- a/source/xap/seyon/seyon.SlackBuild
+++ b/source/xap/seyon/seyon.SlackBuild
@@ -93,7 +93,7 @@ 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
+sed -i -e 's/-fno-strict-aliasing/-fno-strict-aliasing -fcommon -Wno-error=implicit-function-declaration/' Makefile
make || exit 1
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/X11
diff --git a/source/xap/xgames/xgames.SlackBuild b/source/xap/xgames/xgames.SlackBuild
index bcccbb5b3..52b817910 100755
--- a/source/xap/xgames/xgames.SlackBuild
+++ b/source/xap/xgames/xgames.SlackBuild
@@ -58,6 +58,7 @@ 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
+sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch |g" Makefile
make $NUMJOBS || make || exit 1
mkdir -p $PKG/usr/bin
cat spider > $PKG/usr/bin/spider
@@ -72,6 +73,7 @@ tar xvf $CWD/maze.tar.lz || exit 1
cd maze || exit 1
zcat $CWD/maze.diff.gz | patch -p1 || exit 1
xmkmf
+sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile
make $NUMJOBS || make || exit 1
cat maze > $PKG/usr/bin/maze
cat maze.man | gzip -9c > $PKG/usr/man/man6/maze.6.gz
@@ -83,6 +85,7 @@ cd $TMP
tar xvf $CWD/xcolormap.tar.lz || exit 1
cd xcolormap || exit 1
zcat $CWD/xcolormap.diff.gz | patch -p1 || exit 1
+sed -i "s|CFLAGS = |CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion -Wno-error=incompatible-pointer-types |g" Makefile
make $NUMJOBS || make || exit 1
cat xcolormap > $PKG/usr/bin/xcolormap
mkdir -p $PKG/usr/doc/xgames-$VERSION/xcolormap
@@ -94,6 +97,7 @@ 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
+sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile
make $NUMJOBS || make || exit 1
cat xcuckoo > $PKG/usr/bin/xcuckoo
cat xcuckoo.man | gzip -9c > $PKG/usr/man/man6/xcuckoo.6.gz
@@ -107,6 +111,7 @@ 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
xmkmf
+sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile
make $NUMJOBS || make || exit 1
cat xlander > $PKG/usr/bin/xlander
cat xlander.man | gzip -9c > $PKG/usr/man/man6/xlander.6.gz
@@ -118,6 +123,7 @@ cd $TMP
tar xvf $CWD/xminesweep3.0.tar.lz || exit 1
cd xminesweep3.0 || exit 1
xmkmf
+sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile
make $NUMJOBS || make || exit 1
cat xminesweep > $PKG/usr/bin/xminesweep
cat xminesweep.man | gzip -9c > $PKG/usr/man/man6/xminesweep.6.gz
@@ -129,6 +135,7 @@ cd $TMP
tar xvf $CWD/xneko.tar.lz || exit 1
cd xneko || exit 1
xmkmf
+sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile
make $NUMJOBS || make || exit 1
cat xneko > $PKG/usr/bin/xneko
cat xneko.man | gzip -9c > $PKG/usr/man/man6/xneko.6.gz
@@ -140,6 +147,7 @@ cd $TMP
tar xvf $CWD/xroach.tar.lz || exit 1
cd xroach || exit 1
xmkmf
+sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile
make $NUMJOBS || make || exit 1
cat xroach > $PKG/usr/bin/xroach
cat xroach.man | gzip -9c > $PKG/usr/man/man6/xroach.6.gz
diff --git a/source/xap/xmms/xmms.SlackBuild b/source/xap/xmms/xmms.SlackBuild
index 63f4cbeda..2ee85e524 100755
--- a/source/xap/xmms/xmms.SlackBuild
+++ b/source/xap/xmms/xmms.SlackBuild
@@ -62,6 +62,9 @@ else
ARCHOPTS=""
fi
+# GCC^H^H^Hclang "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
+
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
@@ -85,6 +88,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+CC=clang \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LIBS="-ldl" \
@@ -93,6 +97,7 @@ LIBS="-ldl" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--localstatedir=/var/lib \
--disable-static \
+ --disable-simd \
--enable-ipv6 \
$ARCHOPTS \
--build=$ARCH-slackware-linux || exit 1
diff --git a/source/xap/xsane/xsane.SlackBuild b/source/xap/xsane/xsane.SlackBuild
index 4f71ff8cf..0a3d9fb96 100755
--- a/source/xap/xsane/xsane.SlackBuild
+++ b/source/xap/xsane/xsane.SlackBuild
@@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
+
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP