cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to hplip-3.20.11.

Browse Source
This commit is contained in:
ajacoutot 2020-12-04 12:36:50 +00:00
parent 5e429985a1
commit 137f27400a
7 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
print/hplip/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.186 2020/11/09 12:38:27 kirby Exp $
# $OpenBSD: Makefile,v 1.187 2020/12/04 12:36:50 ajacoutot Exp $
PORTROACH= skipv:${V}_py2.5
@ -9,14 +9,10 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.20.9
V= 3.20.11
DISTNAME= hplip-${V}
SUBST_VARS= V
REVISION-main= 0
REVISION-common= 0
REVISION-gui= 1
# https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
MASTER_SITES0= https://src.fedoraproject.org/rpms/hplip/raw/master/f/
PATCHFILES= 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch:0

4
print/hplip/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = r1AFXMXXdB126in1K8leeXVFYiAyI2bu1XXb05gulrc=
SHA256 (hplip-3.20.9.tar.gz) = NiURiaqcw0n2o+rLt6w8T9JvyfCHyfdc7gUQEMhdLd8=
SHA256 (hplip-3.20.11.tar.gz) = CxZ1s9jnCaEyX+hj9arOO9NxB3mnPq6Gj3su6aVv2xE=
SIZE (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = 21964
SIZE (hplip-3.20.9.tar.gz) = 26141198
SIZE (hplip-3.20.11.tar.gz) = 26301441

20
print/hplip/patches/patch-Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_in,v 1.60 2020/10/03 13:39:31 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.61 2020/12/04 12:36:50 ajacoutot Exp $
https://sources.debian.org/src/hplip/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch/
@ -41,7 +41,7 @@ Index: Makefile.in
installer/text_install.py data/localization/hplip_de.ts \
data/localization/hplip_es.ts data/localization/hplip_fr.ts \
data/localization/hplip_it.ts data/localization/hplip_pt.ts \
@@ -4475,7 +4474,7 @@ dist_unrel_DATA =
@@ -4474,7 +4473,7 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/orblitei.h scan/sane/orblite.h scan/sane/orblite.c \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/OrbliteScan/LinuxCommon.h scan/sane/OrbliteScan/MacCommon.h
@ -50,7 +50,7 @@ Index: Makefile.in
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
# The following is a interlibrary dependency that must be compiled first.
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la \
@@ -4483,7 +4482,6 @@ dist_unrel_DATA =
@@ -4482,7 +4481,6 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ libhpipp.la \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(DBUS_LIBS) \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ -lcups \
@ -58,7 +58,7 @@ Index: Makefile.in
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(am__append_1)
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) \
@@ -4505,7 +4503,6 @@ dist_unrel_DATA =
@@ -4504,7 +4502,6 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@libhpmud_la_LDFLAGS = \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ -version-info \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ 0:6:0 -lpthread \
@ -66,7 +66,7 @@ Index: Makefile.in
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(am__append_6) \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(am__append_9) \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(am__append_11)
@@ -4559,7 +4556,7 @@ dist_unrel_DATA =
@@ -4558,7 +4555,7 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@ -75,7 +75,7 @@ Index: Makefile.in
@HPLIP_BUILD_TRUE@dist_hplip_state_DATA =
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir)
@@ -4759,7 +4756,7 @@ dist_unrel_DATA =
@@ -4758,7 +4755,7 @@ dist_unrel_DATA =
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
@ -84,7 +84,7 @@ Index: Makefile.in
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4828,8 +4825,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4827,8 +4824,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
@ -95,7 +95,7 @@ Index: Makefile.in
# hpcups
#if NEW_HPCUPS
@@ -4873,7 +4870,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4872,7 +4869,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@ -104,7 +104,7 @@ Index: Makefile.in
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -4881,15 +4878,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4880,15 +4877,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
@ -123,7 +123,7 @@ Index: Makefile.in
dat2drvdir = $(hplipdir)
dat2drv_SOURCES = Common.h Dat2drv.cpp Dat2drv.h Normalize.cpp Normalize.h
@GCC_GE_47_TRUE@dat2drv_CXXFLAGS = -std=c++11
@@ -9644,16 +9641,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
@@ -9643,16 +9640,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
install-data-hook:

32
print/hplip/patches/patch-installer_core_install_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-installer_core_install_py,v 1.32 2020/10/03 13:39:31 ajacoutot Exp $
$OpenBSD: patch-installer_core_install_py,v 1.33 2020/12/04 12:36:50 ajacoutot Exp $
Index: installer/core_install.py
--- installer/core_install.py.orig
@ -54,10 +54,10 @@ Index: installer/core_install.py
def check_make(self):
- return check_tool('make --version', 3.0)
+ return True
def check_libusb(self):
Is_libusb01_enabled = self.get_distro_ver_data('libusb01', False)
@@ -963,14 +963,14 @@ class CoreInstall(object):
#def check_pkgconf(self):
#return check_tool('pkgconf --version', 0)
@@ -966,14 +966,14 @@ class CoreInstall(object):
if not check_lib('libusb'):
return False
if self.distro_name != "rhel":
@ -74,7 +74,7 @@ Index: installer/core_install.py
else:
return True
@@ -984,10 +984,10 @@ class CoreInstall(object):
@@ -987,10 +987,10 @@ class CoreInstall(object):
return check_lib("libjpeg") and check_file("jpeglib.h")
def check_libcrypto(self):
@ -87,7 +87,7 @@ Index: installer/core_install.py
def check_libnetsnmp(self):
return check_lib("libnetsnmp") and check_file("net-snmp-config.h")
@@ -1027,7 +1027,7 @@ class CoreInstall(object):
@@ -1030,7 +1030,7 @@ class CoreInstall(object):
return check_lib('libsane')
def check_sane_devel(self):
@ -96,7 +96,7 @@ Index: installer/core_install.py
def check_xsane(self):
if os.getenv('DISPLAY'):
@@ -1102,7 +1102,7 @@ class CoreInstall(object):
@@ -1105,7 +1105,7 @@ class CoreInstall(object):
return False
def check_python_devel(self):
@ -105,7 +105,7 @@ Index: installer/core_install.py
Found = False
for p in dir_list:
if check_file('Python.h', dir=p):
@@ -1154,13 +1154,8 @@ class CoreInstall(object):
@@ -1157,13 +1157,8 @@ class CoreInstall(object):
return False
def check_dbus(self):
@ -121,7 +121,7 @@ Index: installer/core_install.py
def check_cups_devel(self):
return check_file('cups.h') and bool(utils.which('lpr'))
@@ -1175,11 +1170,11 @@ class CoreInstall(object):
@@ -1178,11 +1173,11 @@ class CoreInstall(object):
return True
def check_cups_image(self):
@ -135,7 +135,7 @@ Index: installer/core_install.py
def check_libtool(self):
log.debug("Checking for libtool...")
@@ -1246,7 +1241,7 @@ class CoreInstall(object):
@@ -1249,7 +1244,7 @@ class CoreInstall(object):
def check_cupsddk(self):
log.debug("Checking for cups-ddk...")
# TODO: Compute these paths some way or another...
@ -144,7 +144,7 @@ Index: installer/core_install.py
def check_libavahi_dev(self):
log.debug("Checking for libavahi-dev")
@@ -1301,7 +1296,7 @@ class CoreInstall(object):
@@ -1304,7 +1299,7 @@ class CoreInstall(object):
def check_hpaio(self):
found = False
@ -153,7 +153,7 @@ Index: installer/core_install.py
log.debug("'Checking for hpaio' in '%s'..." % path)
try:
f = open(path, 'r')
@@ -1330,13 +1325,13 @@ class CoreInstall(object):
@@ -1333,13 +1328,13 @@ class CoreInstall(object):
if pat.match(home_dir) is not None:
usrlib_dir = pat.match(home_dir).group(1) + "lib/"
if os.path.exists(usrlib_dir + 'sane/libsane-hpaio.so.1'):
@ -171,7 +171,7 @@ Index: installer/core_install.py
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
else:
@@ -1349,20 +1344,20 @@ class CoreInstall(object):
@@ -1352,20 +1347,20 @@ class CoreInstall(object):
f.close()
if not found:
@ -197,7 +197,7 @@ Index: installer/core_install.py
cmd = self.passwordObj.getAuthCmd() % cmd
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
@@ -1828,11 +1823,14 @@ class CoreInstall(object):
@@ -1831,11 +1826,14 @@ class CoreInstall(object):
return num_opt_missing
def check_wget(self):
@ -216,7 +216,7 @@ Index: installer/core_install.py
def check_avahi_utils(self):
if utils.which("avahi-browse"):
@@ -1958,7 +1956,7 @@ class CoreInstall(object):
@@ -1961,7 +1959,7 @@ class CoreInstall(object):
cmds = []
if self.get_distro_ver_data('fix_ppd_symlink', False, distro_ver):
cmds.append(self.passwordObj.getAuthCmd() %

10
print/hplip/patches/patch-prnt_hpcups_HPCupsFilter_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.15 2018/11/03 10:41:33 ajacoutot Exp $
$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.16 2020/12/04 12:36:50 ajacoutot Exp $
https://sources.debian.org/src/hplip/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch/
@ -13,7 +13,7 @@ Index: prnt/hpcups/HPCupsFilter.cpp
#include <signal.h>
#include <sys/wait.h>
@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup
@@ -650,16 +649,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup
sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
@ -30,7 +30,7 @@ Index: prnt/hpcups/HPCupsFilter.cpp
current_page_number++;
if (current_page_number == 1) {
@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup
@@ -758,12 +751,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup
color_raster = rgbRaster;
black_raster = kRaster;
@ -43,7 +43,7 @@ Index: prnt/hpcups/HPCupsFilter.cpp
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 *cup
@@ -793,12 +780,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup
}
} // for() loop end
@ -56,7 +56,7 @@ Index: prnt/hpcups/HPCupsFilter.cpp
m_Job.NewPage();
if (err != NO_ERROR) {
break;
@@ -799,8 +780,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup
@@ -812,8 +793,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup
kRaster = NULL;
rgbRaster = NULL;
}

6
print/hplip/patches/patch-scan_sane_hpaio_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-scan_sane_hpaio_c,v 1.4 2020/10/03 13:39:31 ajacoutot Exp $
$OpenBSD: patch-scan_sane_hpaio_c,v 1.5 2020/12/04 12:36:50 ajacoutot Exp $
scan/sane/hpaio.c:555:8: error: void function 'sane_hpaio_cancel' should not return a value [-Wreturn-type]
return orblite_cancel(handle)
@ -6,7 +6,7 @@ scan/sane/hpaio.c:555:8: error: void function 'sane_hpaio_cancel' should not ret
Index: scan/sane/hpaio.c
--- scan/sane/hpaio.c.orig
+++ scan/sane/hpaio.c
@@ -425,7 +425,7 @@ extern void sane_hpaio_close(SANE_Handle handle)
@@ -427,7 +427,7 @@ extern void sane_hpaio_close(SANE_Handle handle)
if (strcmp(*((char **)handle), "ESCL") == 0)
return escl_close(handle);
if (strcmp(*((char **)handle), "ORBLITE") == 0)
@ -15,7 +15,7 @@ Index: scan/sane/hpaio.c
} /* sane_hpaio_close() */
extern const SANE_Option_Descriptor * sane_hpaio_get_option_descriptor(SANE_Handle handle, SANE_Int option)
@@ -558,7 +558,7 @@ extern void sane_hpaio_cancel( SANE_Handle handle )
@@ -560,7 +560,7 @@ extern void sane_hpaio_cancel( SANE_Handle handle )
if (strcmp(*((char **)handle), "ESCL") == 0)
return escl_cancel(handle);
if (strcmp(*((char **)handle), "ORBLITE") == 0)

4
print/hplip/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.34 2020/02/22 15:02:05 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.35 2020/12/04 12:36:50 ajacoutot Exp $
@conflict hplip-docs-*
@conflict hplip-gui-<3.13.7p2
@extraunexec rm -rf ${PREFIX}/share/hplip/data/firmware
@ -123,6 +123,7 @@ share/hplip/base/${MODPY_PYCACHE}g.${MODPY_PYC_MAGIC_TAG}pyc
share/hplip/base/${MODPY_PYCACHE}imageprocessing.${MODPY_PYC_MAGIC_TAG}pyc
share/hplip/base/${MODPY_PYCACHE}imagesize.${MODPY_PYC_MAGIC_TAG}pyc
share/hplip/base/${MODPY_PYCACHE}ldif.${MODPY_PYC_MAGIC_TAG}pyc
share/hplip/base/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}pyc
share/hplip/base/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
share/hplip/base/${MODPY_PYCACHE}magic.${MODPY_PYC_MAGIC_TAG}pyc
share/hplip/base/${MODPY_PYCACHE}maint.${MODPY_PYC_MAGIC_TAG}pyc
@ -156,6 +157,7 @@ share/hplip/base/g.py
share/hplip/base/imageprocessing.py
share/hplip/base/imagesize.py
share/hplip/base/ldif.py
share/hplip/base/local.py
share/hplip/base/logger.py
share/hplip/base/magic.py
share/hplip/base/maint.py