summaryrefslogtreecommitdiffstats
path: root/source/ap/hplip/hplip.SlackBuild
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-09-15 21:19:23 +0000
committer Eric Hameleers <alien@slackware.com>2018-09-16 09:00:33 +0200
commit77f4f1f5e6332a7c51dad716aba3ff2b03dc8d8a (patch)
tree3452730572f2f95f43e4b9ef756384579e2deb3d /source/ap/hplip/hplip.SlackBuild
parent1b2f3407f0e85eec4d4628f6f36fd1ad88c31063 (diff)
downloadcurrent-20180915211923.tar.gz
current-20180915211923.tar.xz
Sat Sep 15 21:19:23 UTC 201820180915211923
a/kernel-firmware-20180913_44d4fca-noarch-1.txz: Upgraded. a/kernel-generic-4.14.70-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.70-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.70-x86_64-1.txz: Upgraded. ap/hplip-3.18.7-x86_64-4.txz: Rebuilt. Applied fixed patch - this has a better chance of working now. I've checked and hpcups no longer links to libImageProcessor. Which, by the way, the previous build dumped onto my main system (not even in "make install"), but not into the package itself. I no longer own an HP printer and will never buy another one, so if there are any remaining problems please report. Thanks to Matteo Bernardini. d/kernel-headers-4.14.70-x86-1.txz: Upgraded. k/kernel-source-4.14.70-noarch-1.txz: Upgraded. Config changes since 4.14.69: CLEANCACHE n -> y CMA n -> y MEMORY_FAILURE n -> y NUMA n -> y X86_CHECK_BIOS_CORRUPTION n -> y Z3FOLD m -> y ZBUD m -> y ZSMALLOC m -> y +ACPI_APEI_MEMORY_FAILURE y +ACPI_NUMA y +AMD_NUMA y +CMA_AREAS 7 +CMA_DEBUG n +CMA_DEBUGFS n +DMA_CMA n +HWPOISON_INJECT m +NEED_MULTIPLE_NODES y +NODES_SHIFT 6 +NODES_SPAN_OTHER_NODES y +NUMA_BALANCING n +NUMA_EMU n +RAS_CEC n +USE_PERCPU_NUMA_NODE_ID y +X86_64_ACPI_NUMA y +X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK n n/NetworkManager-1.14.0-x86_64-1.txz: Upgraded. Added new options: --enable-json-validation --enable-ovs xap/network-manager-applet-1.8.18-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. pasture/php-5.6.38-x86_64-1.txz: Upgraded. One security bug has been fixed in this release: Apache2: XSS due to the header Transfer-Encoding: chunked For more information, see: https://php.net/ChangeLog-5.php#5.6.38 (* Security fix *) usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap/hplip/hplip.SlackBuild')
-rwxr-xr-xsource/ap/hplip/hplip.SlackBuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index a83ac9e64..8e18782aa 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:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -107,7 +107,9 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,' \
# sees fit to make ImageProcessor mandatory, we'll likely stick with the last
# hplip release that can be made to work without it, and any HP printers that
# require a newer version of hplip will not be supported.
-zcat $CWD/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch.gz | patch -p1 -l --verbose || exit 1
+#zcat $CWD/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch.gz | patch -p1 -l --verbose || exit 1
+# Use this version instead to patch Makefile.in rather than Makefile.am:
+zcat $CWD/hplip.remove-ImageProcessor.diff.gz | patch -p1 -l --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \