diff options
Diffstat (limited to 'source/ap/hplip/hplip.SlackBuild')
| -rwxr-xr-x | source/ap/hplip/hplip.SlackBuild | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild index 2d389d5e4..c39b0f047 100755 --- a/source/ap/hplip/hplip.SlackBuild +++ b/source/ap/hplip/hplip.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hplip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +#SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -86,6 +89,16 @@ zcat $CWD/hplip.python3.shebang.diff.gz | patch -p1 --verbose || exit 1 # Fix the desktop file to show correct icon and category zcat $CWD/fix-desktop-file.patch.gz | patch -p1 --verbose || exit 1 +# GCC 14 fixes: +cat $CWD/hplip-pserror-c99.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-hpaio-gcc14.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-covscan.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-scan-orblite-c99.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-scan-hpaio-include.patch | patch -p1 --verbose || exit 1 + +# This extension was never ported to python3: +cat $CWD/hplip-pcardext-disable.patch | patch -p1 --verbose || exit 1 + # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then unset SHADOW_OPTIONS @@ -117,6 +130,18 @@ zcat $CWD/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch.gz | p # Add a cups-2.2.x header since some definitions were moved: zcat $CWD/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch.gz | patch -p1 -l --verbose || exit 1 +# Fix for python3: +zcat $CWD/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch.gz | patch -p1 --verbose || exit 1 + +# Add back some printer drivers that were removed upstream: +zcat $CWD/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch.gz | patch -p1 --verbose || exit 1 + +# Allow-non-JPEG-scanning-on-the-HP-DeskJet-3520-All-i(n-one and similar): +zcat $CWD/0018-Allow-non-JPEG-scanning-on-the-HP-DeskJet-3520-All-i.patch.gz | patch -p1 --verbose || exit 1 + +# Remove a unicode space character to fix more python3 breakage: +zcat $CWD/0026-remove-unicode-space-from-models.dat.gz | patch -p1 --verbose || exit 1 + # autoreconf will fail if these files do not exist: for file in NEWS README AUTHORS ChangeLog ; do if [ ! -r $file ]; then @@ -191,4 +216,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - |