diff --git a/extra/hplip/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch b/extra/hplip/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch deleted file mode 100644 index 491c3072b..000000000 --- a/extra/hplip/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Sat, 24 Sep 2016 10:37:20 +0200 -Subject: Add 'include ' in various places as CUPS 2.2 moved some - definitions to ppd.h - ---- - configure.in | 2 +- - prnt/hpcups/HPCupsFilter.h | 2 ++ - prnt/hpijs/hpcupsfax.cpp | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index d3a1ddb..eabe14a 100755 ---- a/configure.in -+++ b/configure.in -@@ -554,7 +554,7 @@ fi - - if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then - AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) - if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h -index ff5548e..c517989 100644 ---- a/prnt/hpcups/HPCupsFilter.h -+++ b/prnt/hpcups/HPCupsFilter.h -@@ -38,6 +38,8 @@ - - #include "dbuscomm.h" - -+#include -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp -index 8514775..994e50f 100644 ---- a/prnt/hpijs/hpcupsfax.cpp -+++ b/prnt/hpijs/hpcupsfax.cpp -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef FALSE diff --git a/extra/hplip/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch b/extra/hplip/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch deleted file mode 100644 index f3a8c1732..000000000 --- a/extra/hplip/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001 -From: Gaurav Sood -Date: Thu, 4 May 2017 18:32:08 +0200 -Subject: Fix handling of unicode filenames in sixext.py - -LP: #1480152 -Closes: #861731 ---- - base/sixext.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/sixext.py b/base/sixext.py -index 0bf4fc4f4..311bf72c6 100644 ---- a/base/sixext.py -+++ b/base/sixext.py -@@ -110,11 +110,11 @@ if PY3: - - - def to_string_utf8(s): -- return s.decode("utf-8") -+ return s.decode("utf-8", 'ignore') - - - def to_string_latin(s): -- return s.decode("latin-1") -+ return s.decode("latin-1", 'ignore') - - - def to_unicode(s, enc=None): diff --git a/extra/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch b/extra/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch deleted file mode 100644 index 8d3b4d7bf..000000000 --- a/extra/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch +++ /dev/null @@ -1,113 +0,0 @@ -From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 -From: Didier Raboud -Date: Tue, 21 Aug 2018 18:18:10 +0200 -Subject: Remove all ImageProcessor functionality, which is closed-source - ---- - Makefile.am | 14 ++------------ - prnt/hpcups/HPCupsFilter.cpp | 21 --------------------- - 2 files changed, 2 insertions(+), 33 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1b097c4f9..8d5d78c9f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER - dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py - endif #HPLIP_CLASS_DRIVER - --dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so -+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template - dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv - - if !HPLIP_CLASS_DRIVER -@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp - prnt/hpcups/ImageProcessor.h - - hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) --hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) -+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) - #else - #hpcupsdir = $(cupsfilterdir) - #hpcups_PROGRAMS = hpcups -@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER - - install-data-hook: - if HPLIP_BUILD -- if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ -- cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ -- chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ -- ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ -- fi; \ -- if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ -- cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ -- chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ -- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ -- fi - if !HPLIP_CLASS_DRIVER - # If scanner build, add hpaio entry to sane dll.conf. - if [ "$(scan_build)" = "yes" ]; then \ -diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp -index 5b282d83f..0bacfafac 100644 ---- a/prnt/hpcups/HPCupsFilter.cpp -+++ b/prnt/hpcups/HPCupsFilter.cpp -@@ -31,7 +31,6 @@ - \*****************************************************************************/ - - #include "HPCupsFilter.h" --#include "ImageProcessor.h" - - #include - #include -@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - - - sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); -- image_processor_t* imageProcessor = imageProcessorCreate(); - - while (cupsRasterReadHeader2(cups_raster, &cups_header)) - { - -- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); -- if (result != IPE_SUCCESS){ -- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result); -- } -- - current_page_number++; - - if (current_page_number == 1) { -@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - color_raster = rgbRaster; - black_raster = kRaster; - -- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine); -- if (result != IPE_SUCCESS){ -- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result); -- } -- -- - if ((y == 0) && !is_ljmono) { - //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer - //may not skip blank lines before actual data -@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - } - } // for() loop end - -- result = imageProcessorEndPage(imageProcessor); -- if (result != IPE_SUCCESS){ -- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result); -- } -- -- - m_Job.NewPage(); - if (err != NO_ERROR) { - break; -@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - rgbRaster = NULL; - } - -- imageProcessorDestroy(imageProcessor); -- - unlink(hpPreProcessedRasterFile); - return ret_status; - } diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD deleted file mode 100644 index d99261913..000000000 --- a/extra/hplip/PKGBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# Maintainer: Andreas Radke -# Maintainer: Tom Gundersen -# Contributor : Rémy Oudompheng -# Contributor: Morgan LEFIEUX - -# remove when bumped upstream - -pkgname=hplip -pkgver=3.19.1 -pkgrel=1 -epoch=1 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" -arch=('x86_64') -url="https://hplipopensource.com" -license=('GPL2' 'custom') -depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine' 'python-gobject') -makedepends=('python-pyqt5' 'sane' 'rpcbind' 'cups' 'libusb') -optdepends=('cups: for printing support' - 'sane: for scanner support' - 'xsane: sane scanner frontend' - 'python-pillow: for commandline scanning support' - 'python-reportlab: for pdf output in hp-scan' - 'rpcbind: for network support' - 'python-pyqt5: for running GUI and hp-toolbox' - 'libusb: for advanced usb support' - 'wget: for network support') -# 'hplip-plugin: binary blobs for specific devices (AUR) or run hp-setup to download the plugin' -backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio') -source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} - disable_upgrade.patch - 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch - 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch - 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) -sha512sums=('b1d663a3538a19ab2c195bc627c765b9dded047b0431f6fc2096a8a31b4efb5cf52c88ad9665a2d78893ba66c1c47ccf79c161965f308a27eeeb11b156b446c8' - 'SKIP' - 'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525' - '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67' - '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff' - '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b') -validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) - -prepare() { - cd $pkgname-$pkgver - - # disable insecure update - https://bugs.archlinux.org/task/38083 - patch -Np0 -i ${srcdir}/disable_upgrade.patch - - # add missing 'include ' at various places - patch -Np1 -i ${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch - # fix some handling unicode file names FS#58412 - patch -Np1 -i ${srcdir}/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch - # remove binary blob libImageProcessor and all linking - FS#59681 - patch -Np1 -i ${srcdir}/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch - - export AUTOMAKE='automake --foreign' - autoreconf --force --install -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-qt5 \ - --disable-qt4 \ - --enable-hpcups-install \ - --enable-cups-drv-install \ - --enable-pp-build #--help - make -} - -package() { - cd $pkgname-$pkgver - make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install - - # remove config provided by sane and autostart of hp-daemon - rm -rf "$pkgdir"/etc/{sane.d,xdg} - install -dm755 ${pkgdir}/etc/sane.d/dll.d - echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio - - # remove HAL .fdi file because HAL is no longer used - rm -vrf "$pkgdir"/usr/share/hal - - # remove rc script - rm -vrf "$pkgdir"/etc/init.d - - # add mixed license file - install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 COPYING -} diff --git a/extra/hplip/disable_upgrade.patch b/extra/hplip/disable_upgrade.patch deleted file mode 100644 index f7d8fb322..000000000 --- a/extra/hplip/disable_upgrade.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100 -+++ upgrade.py 2013-12-04 14:58:03.000000000 +0100 -@@ -134,6 +134,11 @@ except getopt.GetoptError, e: - if os.getenv("HPLIP_DEBUG"): - log.set_level('debug') - -+ -+log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Archlinux software package manager pacman.") -+clean_exit(1) -+ -+ - for o, a in opts: - if o in ('-h', '--help'): - usage()