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

Update to hplip-3.18.10.

Browse Source 
Very *lightly* tested so far; please send any regression to me directly.
This commit is contained in:
ajacoutot 2018-10-31 14:14:30 +00:00
parent 6ca9071a96
commit 0018626186
49 changed files with 1292 additions and 1039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
print/hplip/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.164 2018/10/24 14:28:09 sthen Exp $
# $OpenBSD: Makefile,v 1.165 2018/10/31 14:14:30 ajacoutot Exp $
PORTROACH= skipv:${V}_py2.5
@ -9,7 +9,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.17.7
V= 3.18.10
DISTNAME= hplip-${V}
SUBST_VARS= V
@ -19,12 +19,6 @@ PKGNAME-hpaio= hpaio-${V}
PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-common= 2
REVISION-gui= 2
REVISION-hpaio= 1
REVISION-hpcups= 1
REVISION-hpijs= 1
REVISION-main= 1
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud 2.0 # 0.6
@ -48,8 +42,15 @@ MODULES= lang/python
MODPY_RUNDEP= No
# createPPD.sh: make -f Makefile_dat2drv
USE_GMAKE= Yes
SUBST_VARS += MAKE_PROGRAM
COMPILER = base-clang ports-gcc base-gcc
# configure needs it
BUILD_DEPENDS += lang/gawk
cWANTLIB += crypto m pthread
### -main
@ -57,6 +58,7 @@ WANTLIB-main += ${cWANTLIB}
WANTLIB-main += avahi-client avahi-common cups dbus-1 hpmud netsnmp
WANTLIB-main += ffi gmp gnutls hogweed nettle p11-kit tasn1 usb-1.0 z
WANTLIB-main += hpdiscovery hpipp idn2 iconv intl unistring
WANTLIB-main += ${COMPILER_LIBCXX} c
LIB_DEPENDS-main= print/cups,-libs \
print/hplip,-common
@ -151,6 +153,9 @@ CONFIGURE_ARGS= --with-hpppddir=${PREFIX}/share/foomatic/db/source/PPD/HP \
--enable-foomatic-ppd-install \
--enable-foomatic-drv-install
# XXX scan/sane/hpaio.c:422:8: error: void function 'sane_hpaio_close' should not return a value
CFLAGS += -Wno-return-type
pre-configure:
find ${WRKSRC} -name \*.py | \
xargs perl -pi -e 's,(/usr/bin/python|/usr/bin/env python),${MODPY_BIN},g'
@ -189,7 +194,8 @@ pre-configure:
${WRKSRC}/ui4/nodevicesdialog.py \
${WRKSRC}/ui/devmgr4.py \
${WRKSRC}/ui/nodevicesform.py \
${WRKSRC}/logcapture.py
${WRKSRC}/logcapture.py \
${WRKSRC}/createPPD.sh
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hplip/{db,sane.d/dll.d}

4
print/hplip/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hplip-3.17.7.tar.gz) = NXe9Wv1Atz/XVGZK1p8Bh93i5kh550RjCfLtn9fcQA0=
SIZE (hplip-3.17.7.tar.gz) = 23644395
SHA256 (hplip-3.18.10.tar.gz) = UNPGRfS6WuShDA+HztzQwP0VmLQSyVEUdqm7OxMQGQE=
SIZE (hplip-3.18.10.tar.gz) = 24572132

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

@ -1,60 +1,61 @@
$OpenBSD: patch-Makefile_in,v 1.51 2017/07/26 08:15:54 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.52 2018/10/31 14:14:30 ajacoutot Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -95,7 +95,7 @@ DIST_COMMON = $(am__configure_deps) \
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_5 = io/hpmud/musb_libusb01.c
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_6 = -lusb
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_7 = io/hpmud/musb.c
-@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_8 = -I/usr/include/libusb-1.0
+@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_8 = -I${LOCALBASE}/include/libusb-1.0
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_9 = -lusb-1.0
@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_10 = -Iprotocol/discovery
@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_11 = -l$(SNMPLIB) -lcrypto
@@ -96,7 +96,7 @@ DIST_COMMON = $(am__configure_deps) \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_TRUE@am__append_5 = io/hpmud/musb_libusb01.c
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_TRUE@am__append_6 = -lusb
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_7 = io/hpmud/musb.c
-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_8 = -I/usr/include/libusb-1.0
+@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_8 = -I${LOCALBASE}/include/libusb-1.0
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_9 = -lusb-1.0
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_10 = -Iprotocol/discovery
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_11 = -l$(SNMPLIB) -lcrypto
@@ -121,7 +121,7 @@ DIST_COMMON = $(am__configure_deps) \
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_15 = libhpipp.la
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_16 = libhpdiscovery.la
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_17 = -Iprotocol/discovery
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_18 = -I/usr/include/libusb-1.0
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_18 = -I${LOCALBASE}/include/libusb-1.0
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_19 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_17 = libhpipp.la
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_18 = libhpdiscovery.la
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_19 = -Iprotocol/discovery
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_20 = -I/usr/include/libusb-1.0
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_20 = -I${LOCALBASE}/include/libusb-1.0
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_21 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \
@@ -4845,13 +4845,13 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c
@@ -4276,7 +4276,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
-@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -avoid-version
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
-@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -avoid-version
@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@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libhpip.la libhpmud.la \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libhpipp.la $(DBUS_LIBS) \
-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ -lcups -ldl $(am__append_1)
+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ -lcups $(am__append_1)
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la \
@@ -4284,7 +4284,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 \
-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ -ldl \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(am__append_1)
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(DBUS_CFLAGS) -Iprotocol \
@@ -4867,7 +4867,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@ -DCONFDIR=\"$(hplip_confdir)\" -Iprotocol \
@HPLIP_BUILD_TRUE@ $(am__append_8) $(am__append_10)
@HPLIP_BUILD_TRUE@libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread \
-@HPLIP_BUILD_TRUE@ -ldl $(am__append_6) $(am__append_9) \
+@HPLIP_BUILD_TRUE@ $(am__append_6) $(am__append_9) \
@HPLIP_BUILD_TRUE@ $(am__append_11)
@HPLIP_BUILD_TRUE@libhpmud_la_SOURCES = io/hpmud/hpmud.c \
@HPLIP_BUILD_TRUE@ io/hpmud/mlc.c io/hpmud/model.c \
@@ -4908,7 +4908,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) \
@@ -4305,7 +4304,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 \
-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ -ldl \
@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)
@@ -4359,7 +4357,7 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
-@HPLIP_BUILD_TRUE@hplip_statedir = /var/lib/hp
+@HPLIP_BUILD_TRUE@hplip_statedir = /var/db/hp
@HPLIP_BUILD_TRUE@dist_hplip_state_DATA =
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
@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)
@@ -5113,7 +5113,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4559,7 +4557,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)
@ -63,7 +64,7 @@ Index: Makefile.in
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -5178,8 +5178,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4628,8 +4626,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)
@ -74,16 +75,16 @@ Index: Makefile.in
# hpcups
#if NEW_HPCUPS
@@ -5219,7 +5219,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h
@@ -4673,7 +4671,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)
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage $(DBUS_LIBS)
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -lcups -lcupsimage $(DBUS_LIBS)
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
#else
#hpcupsdir = $(cupsfilterdir)
@@ -5228,15 +5228,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_PROGRAMS = hpcups
@@ -4681,15 +4679,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
@ -95,10 +96,10 @@ Index: Makefile.in
#endif #HPCUPS_ONLY_BUILD
#endif # NEW_HPCUPS
# hpcupsfax
@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@hpcupsfaxdir = $(cupsfilterdir)
@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@hpcupsfax_SOURCES = prnt/hpijs/hpcupsfax.cpp prnt/hpijs/hpcupsfax.h common/utils.h common/utils.c
-@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@hpcupsfax_LDADD = libhpip.la -lcups -lcupsimage -ldl
+@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@hpcupsfax_LDADD = libhpip.la -lcups -lcupsimage
@HPPS_INSTALL_TRUE@hppsdir = $(cupsfilterdir)
@HPPS_INSTALL_TRUE@hpps_SOURCES = prnt/hpps/hppsfilter.c prnt/hpps/hppsfilter.h
@HPPS_INSTALL_TRUE@hpps_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@@HPLIP_CLASS_DRIVER_FALSE@hpcupsfaxdir = $(cupsfilterdir)
@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@@HPLIP_CLASS_DRIVER_FALSE@hpcupsfax_SOURCES = prnt/hpijs/hpcupsfax.cpp prnt/hpijs/hpcupsfax.h common/utils.h common/utils.c
-@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@@HPLIP_CLASS_DRIVER_FALSE@hpcupsfax_LDADD = libhpip.la -lcups -lcupsimage -ldl
+@FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@@HPLIP_CLASS_DRIVER_FALSE@hpcupsfax_LDADD = libhpip.la -lcups -lcupsimage
dat2drvdir = $(hplipdir)
dat2drv_SOURCES = Common.h Dat2drv.cpp Dat2drv.h Normalize.cpp Normalize.h
@GCC_GE_47_TRUE@dat2drv_CXXFLAGS = -std=c++11

3
print/hplip/patches/patch-base_codes_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-base_codes_py,v 1.16 2016/05/05 08:25:31 ajacoutot Exp $
$OpenBSD: patch-base_codes_py,v 1.17 2018/10/31 14:14:30 ajacoutot Exp $
--- base/codes.py.orig Wed May 4 07:23:22 2016
+++ base/codes.py Thu May 5 10:02:31 2016
@@ -335,7 +335,7 @@ EVENT_RAISE_DEVICE_MANAGER = 9001

3
print/hplip/patches/patch-base_g_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-base_g_py,v 1.12 2016/02/25 03:50:37 ajacoutot Exp $
$OpenBSD: patch-base_g_py,v 1.13 2018/10/31 14:14:30 ajacoutot Exp $
--- base/g.py.orig Mon Feb 8 10:42:52 2016
+++ base/g.py Wed Feb 10 09:14:55 2016
@@ -182,16 +182,16 @@ class ConfigBase(object):

3
print/hplip/patches/patch-base_magic_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-base_magic_py,v 1.2 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-base_magic_py,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
--- base/magic.py.orig Thu Jan 29 13:20:35 2015
+++ base/magic.py Thu Feb 5 14:32:58 2015
@@ -255,10 +255,10 @@ magic = [

31
print/hplip/patches/patch-base_password_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-base_password_py,v 1.6 2017/06/15 14:40:37 ajacoutot Exp $
$OpenBSD: patch-base_password_py,v 1.7 2018/10/31 14:14:30 ajacoutot Exp $
Index: base/password.py
--- base/password.py.orig
+++ base/password.py
@ -10,22 +11,22 @@ Index: base/password.py
from . import utils, tui
from .g import *
@@ -55,6 +56,7 @@ AUTH_TYPES ={'mepis':'su',
'gos':'sudo',
'boss':'su',
'lfs':'su',
+ 'openbsd':'su',
}
@@ -57,6 +58,7 @@ AUTH_TYPES = {'mepis': 'su',
'boss': 'su',
'lfs': 'su',
'manjarolinux': 'sudo',
+ 'openbsd':'su',
}
@@ -86,10 +88,13 @@ def get_distro_name():
@@ -88,10 +90,13 @@ def get_distro_name():
name.close()
if not os_name:
- name = os.popen("cat /etc/issue | awk '{print $1}' | head -n 1")
+ name = os.popen("cat /etc/issue 2>/dev/null | awk '{print $1}' | head -n 1")
os_name = name.read().strip()
name.close()
- name = os.popen("cat /etc/issue | awk '{print $1}' | head -n 1")
+ name = os.popen("cat /etc/issue 2>/dev/null | awk '{print $1}' | head -n 1")
os_name = name.read().strip()
name.close()
+ if not os_name:
+ os_name = platform.system()
@ -33,7 +34,7 @@ Index: base/password.py
os_name = os_name.lower()
if "redhatenterprise" in os_name:
os_name = 'rhel'
@@ -315,7 +320,11 @@ class Password(object):
@@ -323,7 +328,11 @@ class Password(object):
def __get_password_utils(self):
if self.__authType == "su":
@ -46,11 +47,11 @@ Index: base/password.py
else:
AuthType, AuthCmd = 'sudo', 'sudo %s'
@@ -327,7 +336,11 @@ class Password(object):
@@ -334,7 +343,11 @@ class Password(object):
if self.__authType == "sudo":
AuthType, AuthCmd = 'sudo', 'sudo %s'
else:
- AuthType, AuthCmd = 'su', 'su -c "%s"'
- AuthType, AuthCmd = 'su', 'su -c "%s"'
+ # in this context, `-c' refers to the BSD login class
+ if sys.platform.startswith('openbsd'):
+ AuthType, AuthCmd = 'su', 'su root -c "%s"'

3
print/hplip/patches/patch-base_queues_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-base_queues_py,v 1.7 2016/05/05 08:25:31 ajacoutot Exp $
$OpenBSD: patch-base_queues_py,v 1.8 2018/10/31 14:14:30 ajacoutot Exp $
--- base/queues.py.orig Wed May 4 07:23:22 2016
+++ base/queues.py Thu May 5 10:02:31 2016
@@ -128,7 +128,7 @@ def parseQueues(mode):

3
print/hplip/patches/patch-base_services_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-base_services_py,v 1.2 2013/10/15 14:20:59 ajacoutot Exp $
$OpenBSD: patch-base_services_py,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
--- base/services.py.orig Fri Oct 11 11:40:14 2013
+++ base/services.py Tue Oct 15 15:42:07 2013
@@ -67,6 +67,9 @@ def restart_cups():

14
print/hplip/patches/patch-base_utils_py
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-base_utils_py,v 1.18 2016/05/05 08:25:31 ajacoutot Exp $
--- base/utils.py.orig Wed May 4 07:23:22 2016
+++ base/utils.py Thu May 5 10:02:31 2016
$OpenBSD: patch-base_utils_py,v 1.19 2018/10/31 14:14:30 ajacoutot Exp $
Index: base/utils.py
--- base/utils.py.orig
+++ base/utils.py
@@ -138,11 +138,11 @@ for s in EXPECT_WORD_LIST:
def get_cups_systemgroup_list():
lis = []
@ -52,7 +54,7 @@ $OpenBSD: patch-base_utils_py,v 1.18 2016/05/05 08:25:31 ajacoutot Exp $
def load(self):
self.loadDefaults()
@@ -967,10 +967,9 @@ def all(S,f=lambda x:x):
@@ -970,10 +970,9 @@ def all(S,f=lambda x:x):
if not f(x): return False
return True
@ -65,7 +67,7 @@ $OpenBSD: patch-base_utils_py,v 1.18 2016/05/05 08:25:31 ajacoutot Exp $
def find_browser():
if platform_avail and platform.system() == 'Darwin':
return "open"
@@ -2036,51 +2035,54 @@ def chunk_write(response, out_fd, chunk_size =8192, st
@@ -2057,51 +2056,54 @@ def chunk_write(response, out_fd, chunk_size =8192, st
def download_from_network(weburl, outputFile = None, useURLLIB=False):
retValue = -1
@ -153,7 +155,7 @@ $OpenBSD: patch-base_utils_py,v 1.18 2016/05/05 08:25:31 ajacoutot Exp $
class Sync_Lock:
def __init__(self, filename):
self.Lock_filename = filename
@@ -2176,7 +2178,7 @@ def check_user_groups(required_grps_str, avl_grps):
@@ -2197,7 +2199,7 @@ def check_user_groups(required_grps_str, avl_grps):
grps =re.sub(r'\s', '', str(grps))
exp_grp_list = grps.split(',')
else:

3
print/hplip/patches/patch-check_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-check_py,v 1.18 2016/05/05 08:25:31 ajacoutot Exp $
$OpenBSD: patch-check_py,v 1.19 2018/10/31 14:14:30 ajacoutot Exp $
--- check.py.orig Wed May 4 07:23:31 2016
+++ check.py Thu May 5 10:02:31 2016
@@ -139,9 +139,9 @@ def get_comment(package, Inst_status, installed_ver):

11
print/hplip/patches/patch-common_utils_c
View File

@ -1,9 +1,10 @@
$OpenBSD: patch-common_utils_c,v 1.4 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-common_utils_c,v 1.5 2018/10/31 14:14:30 ajacoutot Exp $
implicit declaration of function 'mkstemp'
--- common/utils.c.orig Thu Jan 29 13:20:21 2015
+++ common/utils.c Thu Feb 5 16:44:21 2015
Index: common/utils.c
--- common/utils.c.orig
+++ common/utils.c
@@ -1,5 +1,6 @@
#include "utils.h"
#include "string.h"
@ -11,7 +12,7 @@ implicit declaration of function 'mkstemp'
#include <dlfcn.h>
#include <sys/stat.h>
#include <errno.h>
@@ -116,7 +117,7 @@ enum UTILS_PLUGIN_STATUS validate_plugin_version()
@@ -159,7 +160,7 @@ enum UTILS_PLUGIN_STATUS validate_plugin_version()
if (get_key_value(HPLIP_PLUGIN_STATE,"[plugin]" , "version", plugin_version, sizeof(plugin_version)) != UTILS_CONF_OK )
{
@ -20,7 +21,7 @@ implicit declaration of function 'mkstemp'
return UTILS_PLUGIN_STATUS_NOT_INSTALLED;
}
@@ -254,7 +255,7 @@ int getHPLogLevel()
@@ -311,7 +312,7 @@ int getHPLogLevel()
char *p;
int iLogLevel = 0;

12
print/hplip/patches/patch-common_utils_h
View File

@ -1,9 +1,11 @@
$OpenBSD: patch-common_utils_h,v 1.3 2015/11/17 08:57:45 ajacoutot Exp $
--- common/utils.h.orig Thu Nov 12 11:28:47 2015
+++ common/utils.h Tue Nov 17 09:23:50 2015
@@ -24,7 +24,7 @@
#define SCAN_PLUGIN_SOAPHT "bb_soapht.so"
$OpenBSD: patch-common_utils_h,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
Index: common/utils.h
--- common/utils.h.orig
+++ common/utils.h
@@ -25,7 +25,7 @@
#define SCAN_PLUGIN_ESCL "bb_escl.so"
#define SCAN_PLUGIN_ORBLITE "bb_orblite.so"
-#define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state"
+#define HPLIP_PLUGIN_STATE "/var/db/hp/hplip.state"

7
print/hplip/patches/patch-configure
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-configure,v 1.21 2017/07/26 08:15:54 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.22 2018/10/31 14:14:30 ajacoutot Exp $
Index: configure
--- configure.orig
+++ configure
@@ -11427,6 +11427,11 @@ else
@@ -11438,6 +11438,11 @@ else
lt_cv_dlopen_libs=
;;
@ -14,7 +15,7 @@ Index: configure
darwin*)
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
@@ -15365,50 +15370,6 @@ if test "x$ac_cv_lib_jpeg_jpeg_set_defaults" = xyes; t
@@ -15376,50 +15381,6 @@ if test "x$ac_cv_lib_jpeg_jpeg_set_defaults" = xyes; t
else
as_fn_error 102 "\"cannot find libjpeg support\"" "$LINENO" 5
fi

23
print/hplip/patches/patch-createPPD_sh Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-createPPD_sh,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
Index: createPPD.sh
--- createPPD.sh.orig
+++ createPPD.sh
@@ -19,7 +19,7 @@
# Author:
#
#echo "HP Linux Imaging and Printing System createPPD file"
-make -f Makefile_dat2drv
+${MAKE_PROGRAM} -f Makefile_dat2drv
rip="foomatic-rip-hplip"
for argument in $*;do
@@ -113,7 +113,7 @@ UNAME='uname -m'
VER=`$UNAME`
cd prnt/hpcups
-if [ "$VER" = "x86_64" ]
+if [ "$VER" = "x86_64" -o "$VER" = "amd64" ]
then
ln -sf libImageProcessor-x86_64.so libImageProcessor.so
else

3
print/hplip/patches/patch-doc_troubleshooting_html
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-doc_troubleshooting_html,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
$OpenBSD: patch-doc_troubleshooting_html,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
--- doc/troubleshooting.html.orig Thu Jun 25 21:04:33 2009
+++ doc/troubleshooting.html Thu Jul 2 17:28:48 2009
@@ -25,7 +25,7 @@ section describes what is currently enabled or disable

3
print/hplip/patches/patch-doc_uninstalling_html
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-doc_uninstalling_html,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
$OpenBSD: patch-doc_uninstalling_html,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
--- doc/uninstalling.html.orig Thu Jul 2 17:28:54 2009
+++ doc/uninstalling.html Thu Jul 2 17:29:17 2009
@@ -17,7 +17,7 @@

3
print/hplip/patches/patch-doc_upgrading_html
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-doc_upgrading_html,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
$OpenBSD: patch-doc_upgrading_html,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
--- doc/upgrading.html.orig Thu Jul 2 17:27:36 2009
+++ doc/upgrading.html Thu Jul 2 17:27:51 2009
@@ -17,7 +17,7 @@

3
print/hplip/patches/patch-fax_backend_hpfax_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-fax_backend_hpfax_py,v 1.3 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-fax_backend_hpfax_py,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
--- fax/backend/hpfax.py.orig Thu Jan 29 13:20:35 2015
+++ fax/backend/hpfax.py Thu Feb 5 14:28:00 2015
@@ -49,7 +49,7 @@ PIPE_BUF = 4096

3
print/hplip/patches/patch-fax_coverpages_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-fax_coverpages_py,v 1.2 2015/03/31 09:44:48 ajacoutot Exp $
$OpenBSD: patch-fax_coverpages_py,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
--- fax/coverpages.py.orig Thu Jul 2 17:30:02 2009
+++ fax/coverpages.py Thu Jul 2 17:31:08 2009
@@ -73,7 +73,7 @@ def createStandardCoverPage(page_size=PAGE_SIZE_LETTER

3
print/hplip/patches/patch-fax_filters_pstotiff
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-fax_filters_pstotiff,v 1.3 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-fax_filters_pstotiff,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
--- fax/filters/pstotiff.orig Thu Jan 29 13:20:35 2015
+++ fax/filters/pstotiff Thu Feb 5 14:28:00 2015
@@ -18,10 +18,10 @@ if (len(sys.argv) > 6):

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

@ -1,16 +1,18 @@
$OpenBSD: patch-installer_core_install_py,v 1.27 2016/05/05 08:25:31 ajacoutot Exp $
--- installer/core_install.py.orig Wed May 4 07:23:15 2016
+++ installer/core_install.py Thu May 5 10:06:53 2016
@@ -110,7 +110,7 @@ HPLIP_LIST=['*.py','*.pyc', 'base', 'copier','data','i
$OpenBSD: patch-installer_core_install_py,v 1.28 2018/10/31 14:14:30 ajacoutot Exp $
Index: installer/core_install.py
--- installer/core_install.py.orig
+++ installer/core_install.py
@@ -114,7 +114,7 @@ HPLIP_LIST = ['*.py', '*.pyc', 'base', 'copier', 'data
PLUGIN_LIST=['fax/plugins/','prnt/plugins/','scan/plugins/']
PLUGIN_LIST = ['fax/plugins/', 'prnt/plugins/', 'scan/plugins/']
-PLUGIN_STATE =['/var/lib/hp/hplip.state']
+PLUGIN_STATE =['/var/db/hp/hplip.state']
-PLUGIN_STATE = ['/var/lib/hp/hplip.state']
+PLUGIN_STATE = ['/var/db/hp/hplip.state']
# end
@@ -228,7 +228,7 @@ class CoreInstall(object):
@@ -243,7 +243,7 @@ class CoreInstall(object):
self.endian = utils.LITTLE_ENDIAN
self.distro, self.distro_name, self.distro_version = DISTRO_UNKNOWN, '', DISTRO_VER_UNKNOWN
self.distro_version_supported = False
@ -19,43 +21,43 @@ $OpenBSD: patch-installer_core_install_py,v 1.27 2016/05/05 08:25:31 ajacoutot E
self.hplip_present = False
self.have_dependencies = {}
self.native_cups = True
@@ -342,7 +342,7 @@ class CoreInstall(object):
'cups-devel': (True, ['base'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP),
'cups-image': (True, ['base'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP),
'gcc' : (True, ['base'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-','gcc --version',COMPILEDEP),
- 'make' : (True, ['base'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME,'3.0','make --version',COMPILEDEP),
+ 'make' : (True, ['base'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME,'-','-',COMPILEDEP),
'libpthread' : (True, ['base'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','FUNC#get_libpthread_version', GENERALDEP),
'gs': (True, ['base'], GS_STR, self.check_gs, DEPENDENCY_RUN_TIME, '7.05','gs --version', EXTERNALDEP),
'libusb': (True, ['base'], USB_STR, self.check_libusb, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','FUNC#get_libusb_version', GENERALDEP),
@@ -373,7 +373,7 @@ class CoreInstall(object):
@@ -364,7 +364,7 @@ class CoreInstall(object):
'cups-devel': (True, ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
'cups-image': (True, ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
'gcc': (True, ['base', 'prnt'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-', 'gcc --version', COMPILEDEP),
- 'make': (True, ['base', 'prnt'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME, '3.0', 'make --version', COMPILEDEP),
+ 'make': (True, ['base', 'prnt'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME, '-', '-', COMPILEDEP),
'libpthread': (True, ['base', 'prnt'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libpthread_version', GENERALDEP),
'gs': (True, ['base', 'prnt'], GS_STR, self.check_gs, DEPENDENCY_RUN_TIME, '7.05', 'gs --version', EXTERNALDEP),
'libusb': (True, ['base'], USB_STR, self.check_libusb, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libusb_version', GENERALDEP),
@@ -402,7 +402,7 @@ class CoreInstall(object):
}
python2_dep = {
- 'python2X': (True, ['base'], PYTHON_STR, self.check_python, DEPENDENCY_RUN_AND_COMPILE_TIME,'2.2','python --version',GENERALDEP),
+ 'python2X': (True, ['base'], PYTHON_STR, self.check_python, DEPENDENCY_RUN_AND_COMPILE_TIME,'2.2','${MODPY_BIN} --version',GENERALDEP),
'python-notify' : (False, ['gui_qt5', 'gui_qt4'], PYNTF_STR, self.check_pynotify, DEPENDENCY_RUN_TIME,'-','python-notify --version',GENERALDEP), # Optional for libnotify style popups from hp-systray
'pyqt4-dbus' : (True, ['gui_qt4'], QT4DBUS_STR, self.check_pyqt4_dbus, DEPENDENCY_RUN_TIME,'4.0','FUNC#get_pyQt4_version', GENERALDEP),
'pyqt4': (True, ['gui_qt4'], QT4_STR, self.check_pyqt4, DEPENDENCY_RUN_TIME,'4.0','FUNC#get_pyQt4_version', GENERALDEP), # PyQt 4.x )
@@ -381,7 +381,7 @@ class CoreInstall(object):
'pyqt5': (True, ['gui_qt5'], QT5_STR, self.check_pyqt5, DEPENDENCY_RUN_TIME,'5.0','FUNC#get_pyQt5_version', GENERALDEP), # PyQt 5.x )
'python-dbus': (True, ['fax'], PYDBUS_STR, self.check_python_dbus, DEPENDENCY_RUN_TIME,'0.80.0','FUNC#get_python_dbus_ver', GENERALDEP),
'python-xml' : (True, ['base'], PYXML_STR, self.check_python_xml, DEPENDENCY_RUN_TIME,'-','FUNC#get_python_xml_version',GENERALDEP),
- 'python-devel' : (True, ['base'], PY_DEV_STR, self.check_python_devel, DEPENDENCY_COMPILE_TIME,'2.2','python --version',GENERALDEP),
+ 'python-devel' : (True, ['base'], PY_DEV_STR, self.check_python_devel, DEPENDENCY_COMPILE_TIME,'2.2','${MODPY_BIN} --version',GENERALDEP),
'pil': (False, ['scan'], PIL_STR, self.check_pil, DEPENDENCY_RUN_TIME,'-','FUNC#get_pil_version',GENERALDEP),
- 'python2X': (True, ['base'], PYTHON_STR, self.check_python, DEPENDENCY_RUN_AND_COMPILE_TIME, '2.2', 'python --version', GENERALDEP),
+ 'python2X': (True, ['base'], PYTHON_STR, self.check_python, DEPENDENCY_RUN_AND_COMPILE_TIME, '2.2', '${MODPY_BIN} --version', GENERALDEP),
#'setuptools': (False, ['scan'], SETUPTOOLS_STR, self.check_setuptools, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
#'pip': (True, ['scan'], PIP_STR, self.check_pip, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
#'pypdf2': (True, ['scan'], PYPDF2_STR, self.check_pypdf2, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
@@ -418,7 +418,7 @@ class CoreInstall(object):
'pyqt5': (True, ['gui_qt5'], QT5_STR, self.check_pyqt5, DEPENDENCY_RUN_TIME, '5.0', 'FUNC#get_pyQt5_version', GENERALDEP),
'python-dbus': (True, ['fax'], PYDBUS_STR, self.check_python_dbus, DEPENDENCY_RUN_TIME, '0.80.0', 'FUNC#get_python_dbus_ver', GENERALDEP),
'python-xml': (True, ['base'], PYXML_STR, self.check_python_xml, DEPENDENCY_RUN_TIME, '-', 'FUNC#get_python_xml_version', GENERALDEP),
- 'python-devel': (True, ['base'], PY_DEV_STR, self.check_python_devel, DEPENDENCY_COMPILE_TIME, '2.2', 'python --version', GENERALDEP),
+ 'python-devel': (True, ['base'], PY_DEV_STR, self.check_python_devel, DEPENDENCY_COMPILE_TIME, '2.2', '${MODPY_BIN} --version', GENERALDEP),
'pil': (False, ['scan'], PIL_STR, self.check_pil, DEPENDENCY_RUN_TIME, '-', 'FUNC#get_pil_version', GENERALDEP),
#'imutils': (True, ['scan'], IMUTILS_STR, self.check_imutils, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
# Optional fax packages
'reportlab': (False, ['fax'], REPORTLAB_STR, self.check_reportlab, DEPENDENCY_RUN_TIME,'2.0','FUNC#get_reportlab_version',GENERALDEP),
@@ -881,7 +881,7 @@ class CoreInstall(object):
@@ -946,7 +946,7 @@ class CoreInstall(object):
return check_tool('gcc --version', 0) and check_tool('g++ --version', 0)
def check_make(self):
- return check_tool('make --version', 3.0)
+ return True
def check_libusb(self):
@@ -890,14 +890,14 @@ class CoreInstall(object):
Is_libusb01_enabled = self.get_distro_ver_data('libusb01', False)
@@ -954,14 +954,14 @@ class CoreInstall(object):
if not check_lib('libusb'):
return False
if self.distro_name != "rhel":
@ -72,127 +74,129 @@ $OpenBSD: patch-installer_core_install_py,v 1.27 2016/05/05 08:25:31 ajacoutot E
else:
return True
@@ -907,11 +907,10 @@ class CoreInstall(object):
@@ -975,10 +975,10 @@ class CoreInstall(object):
return check_lib("libjpeg") and check_file("jpeglib.h")
def check_libcrypto(self):
- return check_lib("libcrypto") and check_file("crypto.h")
+ return True
-
def check_libpthread(self):
- return check_lib("libpthread") and check_file("pthread.h")
+ return True
def check_libnetsnmp(self):
@@ -957,7 +956,7 @@ class CoreInstall(object):
return check_lib("libnetsnmp") and check_file("net-snmp-config.h")
@@ -1018,7 +1018,7 @@ class CoreInstall(object):
return check_lib('libsane')
def check_sane_devel(self):
- return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
+ return len(locate_file_contains("sane.h", '${LOCALBASE}/include', 'extern SANE_Status sane_init'))
def check_xsane(self):
@@ -1035,7 +1034,7 @@ class CoreInstall(object):
if os.getenv('DISPLAY'):
@@ -1093,7 +1093,7 @@ class CoreInstall(object):
return False
def check_python_devel(self):
- dir_list = glob.glob('/usr/include/python%d*'%sys.version_info[0])
- dir_list = glob.glob('/usr/include/python%d*' % sys.version_info[0])
+ dir_list = glob.glob('${LOCALBASE}/include/python%d*'%sys.version_info[0])
Found = False
for p in dir_list:
if check_file('Python.h',dir=p):
@@ -1089,9 +1088,8 @@ class CoreInstall(object):
if check_file('Python.h', dir=p):
@@ -1145,11 +1145,8 @@ class CoreInstall(object):
return False
def check_dbus(self):
- log.debug("Checking for dbus running and header files present (dbus-devel)...")
- log.debug(
- "Checking for dbus running and header files present (dbus-devel)...")
- return check_ps(['dbus-daemon']) and \
- len(locate_file_contains("dbus-message.h", '/usr/include', 'dbus_message_new_signal'))
- len(locate_file_contains("dbus-message.h",
- '/usr/include', 'dbus_message_new_signal'))
+ log.debug("Checking for dbus header files...")
+ return check_file("dbus-message.h", "${LOCALBASE}/include")
def check_cups_devel(self):
@@ -1109,12 +1107,12 @@ class CoreInstall(object):
return check_file('cups.h') and bool(utils.which('lpr'))
@@ -1164,11 +1161,11 @@ class CoreInstall(object):
return True
def check_cups_image(self):
- return check_file("raster.h", "/usr/include/cups")
+ return check_file("raster.h", "${LOCALBASE}/include/cups")
- return check_file("raster.h", "/usr/include/cups")
+ return check_file("raster.h", "${LOCALBASE}/include/cups")
def check_hplip(self):
log.debug("Checking for HPLIP...")
- return locate_files('hplip.conf', '/etc/hp')
+ return locate_files('hplip.conf', '${SYSCONFDIR}/hp')
def check_libtool(self):
@@ -1134,7 +1132,7 @@ class CoreInstall(object):
log.debug("Checking for libtool...")
@@ -1235,7 +1232,7 @@ class CoreInstall(object):
def check_cupsddk(self):
log.debug("Checking for cups-ddk...")
# TODO: Compute these paths some way or another...
- return check_file('media.defs', "/usr/share/cups/ppdc/")
+ return check_file('media.defs', "${LOCALBASE}/share/cups/ppdc/")
@@ -1185,7 +1183,7 @@ class CoreInstall(object):
def check_policykit(self):
log.debug("Checking for PolicyKit...")
@@ -1283,7 +1280,7 @@ class CoreInstall(object):
def check_hpaio(self):
found = False
- for path in ['/etc/sane.d/dll.conf','/etc/sane.d/dll.d/hpaio', '/etc/sane.d/dll.d/hplip']:
+ for path in ['${SYSCONFDIR}/sane.d/dll.conf','/etc/sane.d/dll.d/hpaio', '/etc/sane.d/dll.d/hplip']:
- for path in ['/etc/sane.d/dll.conf', '/etc/sane.d/dll.d/hpaio', '/etc/sane.d/dll.d/hplip']:
+ for path in ['${SYSCONFDIR}/sane.d/dll.conf','${SYSCONFDIR}/sane.d/dll.d/hpaio', '${SYSCONFDIR}/sane.d/dll.d/hplip']:
log.debug("'Checking for hpaio' in '%s'..." % path)
try:
f = open(path, 'r')
@@ -1214,12 +1212,12 @@ class CoreInstall(object):
@@ -1312,13 +1309,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'):
usrlib_dir = pat.match(home_dir).group(1) + "lib/"
if os.path.exists(usrlib_dir + 'sane/libsane-hpaio.so.1'):
- log.debug("'Updating hpaio' in '/etc/sane.d/dll.conf'...")
+ log.debug("'Updating hpaio' in '${SYSCONFDIR}/sane.d/dll.conf'...")
try:
- f = open('/etc/sane.d/dll.conf', 'r')
+ f = open('${SYSCONFDIR}/sane.d/dll.conf', 'r')
except IOError:
- log.error("'/etc/sane.d/dll.conf' not found. Creating dll.conf file")
- cmd = self.passwordObj.getAuthCmd()%'touch /etc/sane.d/dll.conf'
+ log.error("'${SYSCONFDIR}/sane.d/dll.conf' not found. Creating dll.conf file")
+ cmd = self.passwordObj.getAuthCmd()%'touch ${SYSCONFDIR}/sane.d/dll.conf'
log.debug("cmd=%s"%cmd)
log.error(
- "'/etc/sane.d/dll.conf' not found. Creating dll.conf file")
- cmd = self.passwordObj.getAuthCmd() % 'touch /etc/sane.d/dll.conf'
+ "'${SYSCONFDIR}/sane.d/dll.conf' not found. Creating dll.conf file")
+ cmd = self.passwordObj.getAuthCmd() % 'touch ${SYSCONFDIR}/sane.d/dll.conf'
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
else:
@@ -1232,19 +1230,19 @@ class CoreInstall(object):
@@ -1331,20 +1328,20 @@ class CoreInstall(object):
f.close()
if not found:
- st = os.stat('/etc/sane.d/dll.conf')
- cmd= self.passwordObj.getAuthCmd()%'chmod 777 /etc/sane.d/dll.conf'
- cmd = self.passwordObj.getAuthCmd() % 'chmod 777 /etc/sane.d/dll.conf'
+ st = os.stat('${SYSCONFDIR}/sane.d/dll.conf')
+ cmd= self.passwordObj.getAuthCmd()%'chmod 777 ${SYSCONFDIR}/sane.d/dll.conf'
log.debug("cmd=%s"%cmd)
+ cmd = self.passwordObj.getAuthCmd() % 'chmod 777 ${SYSCONFDIR}/sane.d/dll.conf'
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
try:
- f = open('/etc/sane.d/dll.conf', 'a+')
+ f = open('${SYSCONFDIR}/sane.d/dll.conf', 'a+')
except IOError:
- log.error("'/etc/sane.d/dll.conf' not found. Creating dll.conf file")
+ log.error("'${SYSCONFDIR}/sane.d/dll.conf' not found. Creating dll.conf file")
log.error(
- "'/etc/sane.d/dll.conf' not found. Creating dll.conf file")
+ "'${SYSCONFDIR}/sane.d/dll.conf' not found. Creating dll.conf file")
else:
f.write('hpaio')
f.close()
actv_permissions = st.st_mode &0o777
- cmd = 'chmod %o /etc/sane.d/dll.conf'%actv_permissions
+ cmd = 'chmod %o ${SYSCONFDIR}/sane.d/dll.conf'%actv_permissions
cmd= self.passwordObj.getAuthCmd()%cmd
log.debug("cmd=%s"%cmd)
actv_permissions = st.st_mode & 0o777
- cmd = 'chmod %o /etc/sane.d/dll.conf' % actv_permissions
+ cmd = 'chmod %o ${SYSCONFDIR}/sane.d/dll.conf' % actv_permissions
cmd = self.passwordObj.getAuthCmd() % cmd
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
@@ -1667,11 +1665,14 @@ class CoreInstall(object):
@@ -1808,11 +1805,14 @@ class CoreInstall(object):
return num_opt_missing
def check_wget(self):
- if utils.which("wget"):
@ -210,12 +214,12 @@ $OpenBSD: patch-installer_core_install_py,v 1.27 2016/05/05 08:25:31 ajacoutot E
def check_avahi_utils(self):
if utils.which("avahi-browse"):
@@ -1757,7 +1758,7 @@ class CoreInstall(object):
def pre_build(self,distro_ver=None):
@@ -1919,7 +1919,7 @@ class CoreInstall(object):
cmds = []
if self.get_distro_ver_data('fix_ppd_symlink', False,distro_ver):
- cmds.append(self.passwordObj.getAuthCmd() % 'python ./installer/fix_symlink.py')
+ cmds.append(self.passwordObj.getAuthCmd() % '${MODPY_BIN} ./installer/fix_symlink.py')
if self.get_distro_ver_data('fix_ppd_symlink', False, distro_ver):
cmds.append(self.passwordObj.getAuthCmd() %
- 'python ./installer/fix_symlink.py')
+ '${MODPY_BIN} ./installer/fix_symlink.py')
return cmds

3
print/hplip/patches/patch-installer_dcheck_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-installer_dcheck_py,v 1.9 2016/05/05 08:25:31 ajacoutot Exp $
$OpenBSD: patch-installer_dcheck_py,v 1.10 2018/10/31 14:14:30 ajacoutot Exp $
--- installer/dcheck.py.orig Wed May 4 07:23:15 2016
+++ installer/dcheck.py Thu May 5 10:02:31 2016
@@ -48,7 +48,7 @@ mod_output = ''

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

@ -1,13 +1,15 @@
$OpenBSD: patch-installer_pluginhandler_py,v 1.5 2015/04/17 04:18:13 ajacoutot Exp $
--- installer/pluginhandler.py.orig Tue Apr 14 11:53:21 2015
+++ installer/pluginhandler.py Fri Apr 17 05:53:22 2015
$OpenBSD: patch-installer_pluginhandler_py,v 1.6 2018/10/31 14:14:30 ajacoutot Exp $
Index: installer/pluginhandler.py
--- installer/pluginhandler.py.orig
+++ installer/pluginhandler.py
@@ -42,7 +42,7 @@ except ImportError:
return sha.new(s).hexdigest()
-PLUGIN_STATE_FILE = '/var/lib/hp/hplip.state'
+PLUGIN_STATE_FILE = '/var/db/hp/hplip.state'
PLUGIN_FALLBACK_LOCATION = 'http://hplipopensource.com/hplip-web/plugin/'
PLUGIN_FALLBACK_LOCATION = 'https://developers.hp.com/sites/default/files/'
@@ -97,11 +97,11 @@ class PluginHandle(object):

3
print/hplip/patches/patch-io_hpmud_jd_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-io_hpmud_jd_c,v 1.2 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-io_hpmud_jd_c,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
--- io/hpmud/jd.c.orig Thu Jan 29 13:20:45 2015
+++ io/hpmud/jd.c Thu Feb 5 14:28:00 2015
@@ -31,6 +31,8 @@

3
print/hplip/patches/patch-logcapture_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-logcapture_py,v 1.3 2015/06/11 06:25:07 ajacoutot Exp $
$OpenBSD: patch-logcapture_py,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
--- logcapture.py.orig Sun Jun 7 21:25:33 2015
+++ logcapture.py Thu Jun 11 08:11:35 2015
@@ -37,8 +37,8 @@ from base.sixext import to_string_utf8

24
print/hplip/patches/patch-prnt_cups_py
View File

@ -1,8 +1,10 @@
$OpenBSD: patch-prnt_cups_py,v 1.8 2015/07/16 04:55:46 ajacoutot Exp $
--- prnt/cups.py.orig Mon Jul 13 09:49:01 2015
+++ prnt/cups.py Thu Jul 16 06:48:04 2015
@@ -175,8 +175,8 @@ ppd_pat = re.compile(r'''.*hp-(.*?)(-.*)*\.ppd.*''', r
$OpenBSD: patch-prnt_cups_py,v 1.9 2018/10/31 14:14:30 ajacoutot Exp $
Index: prnt/cups.py
--- prnt/cups.py.orig
+++ prnt/cups.py
@@ -203,8 +203,8 @@ def isfamilydrv(ppds):
def getPPDPath(addtional_paths=None):
"""
- Returns the CUPS ppd path (not the foomatic one under /usr/share/ppd).
@ -12,7 +14,7 @@ $OpenBSD: patch-prnt_cups_py,v 1.8 2015/07/16 04:55:46 ajacoutot Exp $
"""
if addtional_paths is None:
addtional_paths = []
@@ -191,16 +191,16 @@ def getPPDPath(addtional_paths=None):
@@ -219,16 +219,16 @@ def getPPDPath(addtional_paths=None):
def getAllowableMIMETypes():
"""
@ -34,7 +36,7 @@ $OpenBSD: patch-prnt_cups_py,v 1.8 2015/07/16 04:55:46 ajacoutot Exp $
for path in paths:
files.extend(glob.glob(path))
for f in files:
@@ -261,11 +261,11 @@ def getSystemPPDs():
@@ -289,11 +289,11 @@ def getSystemPPDs():
else: # 1.2.x
log.debug("(CUPS 1.2.x) Getting list of PPDs using CUPS_GET_PPDS...")
ppd_dict = cupsext.getPPDList()
@ -49,7 +51,7 @@ $OpenBSD: patch-prnt_cups_py,v 1.8 2015/07/16 04:55:46 ajacoutot Exp $
log.debug("CUPS PPD base path = %s" % cups_ppd_path)
log.debug("Foomatic PPD base path = %s" % foomatic_ppd_path)
@@ -284,8 +284,8 @@ def getSystemPPDs():
@@ -312,8 +312,8 @@ def getSystemPPDs():
'gutenprint' in ppd):
# PPD files returned by CUPS_GET_PPDS (and by lpinfo -m)
@ -60,16 +62,16 @@ $OpenBSD: patch-prnt_cups_py,v 1.8 2015/07/16 04:55:46 ajacoutot Exp $
# Here we will try both and see which one it is...
if os.path.exists(ppd):
@@ -343,7 +343,7 @@ number_pat = re.compile(r""".*?(\d+)""", re.IGNORECASE
@@ -371,7 +371,7 @@ number_pat = re.compile(r""".*?(\d+)""", re.IGNORECASE
STRIP_STRINGS2 = ['foomatic:', 'hp-', 'hp_', 'hp ', '.gz', '.ppd',
'drv:', '-pcl', '-pcl3', '-jetready',
'-zxs', '-zjs', '-ps', '-postscript',
'-zxs', '-zjs', '-ps', '-postscript', '-pdf',
- '-jr', '-lidl', '-lidil', '-ldl', '-hpijs']
+ '-jr', '-lidl', '-lidil', '-hpijs']
for p in list(models.TECH_CLASS_PDLS.values()):
@@ -604,7 +604,7 @@ def getFaxPPDFile(mq, model):
@@ -651,7 +651,7 @@ def getFaxPPDFile(mq, model):
def getErrorLogLevel():

3
print/hplip/patches/patch-prnt_filters_hpps
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-prnt_filters_hpps,v 1.1 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-prnt_filters_hpps,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
--- prnt/filters/hpps.orig Thu Jan 29 13:20:42 2015
+++ prnt/filters/hpps Thu Feb 5 16:56:22 2015
@@ -48,7 +48,7 @@ output_fd = 1

3
print/hplip/patches/patch-prnt_hpcups_ErnieFilter_cpp
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-prnt_hpcups_ErnieFilter_cpp,v 1.3 2013/11/14 14:58:51 ajacoutot Exp $
$OpenBSD: patch-prnt_hpcups_ErnieFilter_cpp,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
--- prnt/hpcups/ErnieFilter.cpp.orig Thu Oct 31 12:42:20 2013
+++ prnt/hpcups/ErnieFilter.cpp Thu Nov 14 15:44:07 2013
@@ -50,7 +50,7 @@

14
print/hplip/patches/patch-prnt_hpcups_genJPEGStrips_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-prnt_hpcups_genJPEGStrips_cpp,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
Index: prnt/hpcups/genJPEGStrips.cpp
--- prnt/hpcups/genJPEGStrips.cpp.orig
+++ prnt/hpcups/genJPEGStrips.cpp
@@ -28,7 +28,7 @@ extern "C"
#include <setjmp.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <memory.h>

3
print/hplip/patches/patch-prnt_hpijs_globals_cpp
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-prnt_hpijs_globals_cpp,v 1.3 2010/03/21 11:07:43 ajacoutot Exp $
$OpenBSD: patch-prnt_hpijs_globals_cpp,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
--- prnt/hpijs/globals.cpp.orig Thu Feb 25 00:10:32 2010
+++ prnt/hpijs/globals.cpp Fri Mar 12 13:40:17 2010
@@ -251,7 +251,7 @@ void *LoadPlugin (const char *szPluginName)

3
print/hplip/patches/patch-prnt_hpijs_hpijs_cpp
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-prnt_hpijs_hpijs_cpp,v 1.3 2013/10/15 14:21:00 ajacoutot Exp $
$OpenBSD: patch-prnt_hpijs_hpijs_cpp,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
--- prnt/hpijs/hpijs.cpp.orig Fri Oct 11 11:35:57 2013
+++ prnt/hpijs/hpijs.cpp Tue Oct 15 15:42:07 2013
@@ -77,7 +77,7 @@ void setLogLevel(UXServices *pSS, char*user_name)

16
print/hplip/patches/patch-protocol_discovery_mdns_c
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-protocol_discovery_mdns_c,v 1.1 2016/09/10 13:03:43 ajacoutot Exp $
--- protocol/discovery/mdns.c.orig Sat Sep 10 12:16:35 2016
+++ protocol/discovery/mdns.c Sat Sep 10 12:16:26 2016
@@ -24,9 +24,11 @@
$OpenBSD: patch-protocol_discovery_mdns_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
Index: protocol/discovery/mdns.c
--- protocol/discovery/mdns.c.orig
+++ protocol/discovery/mdns.c
@@ -24,13 +24,17 @@
Author: Sanjay Kumar
\*****************************************************************************/
@ -12,5 +14,11 @@ $OpenBSD: patch-protocol_discovery_mdns_c,v 1.1 2016/09/10 13:03:43 ajacoutot Ex
#include <syslog.h>
+#include <sys/select.h> /* fd_set */
#include <sys/socket.h>
+#include <unistd.h> /* close */
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
+#include <ctype.h> /* tolower */
#include "mdns.h"
/* Convert "www.google.com" to "3www6google3com". */

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

@ -1,7 +1,9 @@
$OpenBSD: patch-scan_py,v 1.15 2016/02/25 03:50:37 ajacoutot Exp $
--- scan.py.orig Mon Feb 8 10:43:43 2016
+++ scan.py Wed Feb 10 09:14:55 2016
@@ -1147,7 +1147,7 @@ try:
$OpenBSD: patch-scan_py,v 1.16 2018/10/31 14:14:30 ajacoutot Exp $
Index: scan.py
--- scan.py.orig
+++ scan.py
@@ -1857,7 +1857,7 @@ try:
elif d == 'print':
hp_print = utils.which("hp-print", True)
if not hp_print:

18
print/hplip/patches/patch-scan_sane_OrbliteScan_LinuxCommon_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-scan_sane_OrbliteScan_LinuxCommon_h,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
Index: scan/sane/OrbliteScan/LinuxCommon.h
--- scan/sane/OrbliteScan/LinuxCommon.h.orig
+++ scan/sane/OrbliteScan/LinuxCommon.h
@@ -18,10 +18,12 @@ typedef u_int32_t UInt32;
typedef int32_t SInt32;
//typedef unsigned long UInt32;
//typedef signed long SInt32;
+#ifdef __linux__
typedef __S64_TYPE SInt64;
typedef __U64_TYPE UInt64;
typedef __S64_TYPE int64_t;
typedef __U64_TYPE uint64_t;
+#endif
//typedef unsigned long ULONG;
//typedef void* LPVOID;

29
print/hplip/patches/patch-scan_sane_OrbliteScan_MacCommon_h Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-scan_sane_OrbliteScan_MacCommon_h,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
Index: scan/sane/OrbliteScan/MacCommon.h
--- scan/sane/OrbliteScan/MacCommon.h.orig
+++ scan/sane/OrbliteScan/MacCommon.h
@@ -1,12 +1,12 @@
#ifndef H_MacCommon
#define H_MacCommon
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__OpenBSD__)
#include <CoreFoundation/CFPlugInCOM.h>
#define __CFPlugInCOM_Included__
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(__OpenBSD__)
# include "LinuxCommon.h"
#endif
@@ -257,7 +257,7 @@ typedef struct _GUID {
typedef GUID CLSID;
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__OpenBSD__)
const extern CLSID CLSID_NULL;
const extern GUID GUID_NULL;
#else

3
print/hplip/patches/patch-scan_sane_bb_ledm_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-scan_sane_bb_ledm_c,v 1.1 2012/06/26 06:17:11 ajacoutot Exp $
$OpenBSD: patch-scan_sane_bb_ledm_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
--- scan/sane/bb_ledm.c.orig Tue Jun 26 07:48:50 2012
+++ scan/sane/bb_ledm.c Tue Jun 26 07:49:17 2012
@@ -16,6 +16,7 @@

13
print/hplip/patches/patch-scan_sane_http_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-scan_sane_http_c,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
Index: scan/sane/http.c
--- scan/sane/http.c.orig
+++ scan/sane/http.c
@@ -35,6 +35,7 @@
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
+#include <unistd.h> /* usleep */
#include <ctype.h>
#include "hpmud.h"
#include "http.h"

3
print/hplip/patches/patch-scan_sane_marvell_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-scan_sane_marvell_c,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
$OpenBSD: patch-scan_sane_marvell_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
--- scan/sane/marvell.c.orig Thu Jul 2 14:35:52 2009
+++ scan/sane/marvell.c Thu Jul 2 14:36:00 2009
@@ -29,13 +29,13 @@

14
print/hplip/patches/patch-scan_sane_orblite_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-scan_sane_orblite_c,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
Index: scan/sane/orblite.c
--- scan/sane/orblite.c.orig
+++ scan/sane/orblite.c
@@ -14,6 +14,8 @@
extern "C" {
#endif
+#include <dlfcn.h> /* dlclose */
+
#include "sane.h" /* SANE API */
#define DEBUG_NOT_STATIC
#undef NDEBUG

3
print/hplip/patches/patch-scan_sane_soapht_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-scan_sane_soapht_c,v 1.1 2014/06/17 08:51:18 ajacoutot Exp $
$OpenBSD: patch-scan_sane_soapht_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
--- scan/sane/soapht.c.orig Tue Jun 17 10:32:52 2014
+++ scan/sane/soapht.c Tue Jun 17 10:33:11 2014
@@ -62,7 +62,7 @@ static int bb_load(struct soap_session *ps, const char

3
print/hplip/patches/patch-setup_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-setup_py,v 1.14 2016/11/14 15:29:24 dcoppa Exp $
$OpenBSD: patch-setup_py,v 1.15 2018/10/31 14:14:30 ajacoutot Exp $
--- setup.py.orig Fri Oct 21 12:46:25 2016
+++ setup.py Mon Nov 14 15:23:47 2016
@@ -919,7 +919,7 @@ else: # INTERACTIVE_MODE

3
print/hplip/patches/patch-ui4_devmgr5_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-ui4_devmgr5_py,v 1.13 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-ui4_devmgr5_py,v 1.14 2018/10/31 14:14:30 ajacoutot Exp $
--- ui4/devmgr5.py.orig Thu Jan 29 13:20:15 2015
+++ ui4/devmgr5.py Thu Feb 5 14:35:07 2015
@@ -1023,7 +1023,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):

3
print/hplip/patches/patch-ui4_nodevicesdialog_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-ui4_nodevicesdialog_py,v 1.4 2013/03/08 06:51:46 ajacoutot Exp $
$OpenBSD: patch-ui4_nodevicesdialog_py,v 1.5 2018/10/31 14:14:30 ajacoutot Exp $
--- ui4/nodevicesdialog.py.orig Wed Feb 13 17:35:05 2013
+++ ui4/nodevicesdialog.py Fri Feb 22 15:05:19 2013
@@ -53,7 +53,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base

3
print/hplip/patches/patch-ui_devmgr4_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-ui_devmgr4_py,v 1.13 2015/02/05 17:34:33 ajacoutot Exp $
$OpenBSD: patch-ui_devmgr4_py,v 1.14 2018/10/31 14:14:30 ajacoutot Exp $
--- ui/devmgr4.py.orig Thu Jan 29 13:20:22 2015
+++ ui/devmgr4.py Thu Feb 5 16:41:34 2015
@@ -1226,7 +1226,7 @@ class DevMgr4(DevMgr4_base):

3
print/hplip/patches/patch-ui_nodevicesform_py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-ui_nodevicesform_py,v 1.4 2013/03/08 06:51:46 ajacoutot Exp $
$OpenBSD: patch-ui_nodevicesform_py,v 1.5 2018/10/31 14:14:30 ajacoutot Exp $
--- ui/nodevicesform.py.orig Wed Feb 13 17:35:09 2013
+++ ui/nodevicesform.py Fri Feb 22 15:05:19 2013
@@ -56,7 +56,7 @@ class NoDevicesForm(NoDevicesForm_base):

13
print/hplip/pkg/PLIST-gui
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gui,v 1.12 2018/06/27 21:04:01 espie Exp $
@comment $OpenBSD: PLIST-gui,v 1.13 2018/10/31 14:14:30 ajacoutot Exp $
@conflict hplip-<3.11.3p0
bin/hp-align
bin/hp-colorcal
@ -19,12 +19,12 @@ bin/hp-sendfax
bin/hp-systray
bin/hp-testpage
bin/hp-toolbox
bin/hp-uiscan
bin/hp-wificonfig
share/applications/hp-uiscan.desktop
share/applications/hplip.desktop
share/examples/hplip/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/hplip/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/hplip/xdg/autostart/hplip-systray.desktop
@sample ${SYSCONFDIR}/xdg/autostart/hplip-systray.desktop
share/hplip/data/images/
@ -323,6 +323,7 @@ share/hplip/data/images/other/confidential_coverpage.png
share/hplip/data/images/other/confidential_title.png
share/hplip/data/images/other/fax.png
share/hplip/data/images/other/fax2.png
share/hplip/data/images/other/flat1.png
share/hplip/data/images/other/generic_coverpage.png
share/hplip/data/images/other/generic_title.png
share/hplip/data/images/other/h-k-2.png
@ -335,6 +336,7 @@ share/hplip/data/images/other/opensource-75x65.png
share/hplip/data/images/other/panel_lcd.png
share/hplip/data/images/other/pens.png
share/hplip/data/images/other/powered_by_python.png
share/hplip/data/images/other/resolution.png
share/hplip/data/images/other/signal0.png
share/hplip/data/images/other/signal1.png
share/hplip/data/images/other/signal2.png
@ -353,6 +355,7 @@ share/hplip/data/images/other/v-k-2.png
share/hplip/data/images/other/v-k-3.png
share/hplip/data/images/other/v-kc-2.png
share/hplip/data/images/other/v-kc-3.png
share/hplip/data/images/other/viewer.png
share/hplip/data/images/other/zca.png
share/hplip/ui4/
share/hplip/ui4/__init__.py
@ -460,6 +463,8 @@ share/hplip/ui4/queuesconf.py
share/hplip/ui4/queuesconf.pyc
share/hplip/ui4/readonlyradiobutton.py
share/hplip/ui4/readonlyradiobutton.pyc
share/hplip/ui4/scandialog.py
share/hplip/ui4/scandialog.pyc
share/hplip/ui4/sendfaxdialog.py
share/hplip/ui4/sendfaxdialog.pyc
share/hplip/ui4/sendfaxdialog_base.py
@ -488,4 +493,6 @@ share/hplip/ui4/wifisetupdialog.py
share/hplip/ui4/wifisetupdialog.pyc
share/hplip/ui4/wifisetupdialog_base.py
share/hplip/ui4/wifisetupdialog_base.pyc
share/hplip/uiscan.py
share/hplip/uiscan.pyc
@tag update-desktop-database

1650
print/hplip/pkg/PLIST-hpijs
View File

File diff suppressed because it is too large Load Diff

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

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST-main,v 1.31 2015/02/05 17:34:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.32 2018/10/31 14:14:30 ajacoutot Exp $
@conflict hplip-docs-*
@conflict hplip-gui-<3.13.7p2
@extraunexec rm -rf /usr/local/share/hplip/data/firmware
@extraunexec rm -rf /usr/local/share/hplip/data/plugins
@extraunexec rm -rf /usr/local/share/hplip/fax/plugins
@extraunexec rm -rf /usr/local/share/hplip/prnt/plugins
@extraunexec rm -rf /usr/local/share/hplip/scan/plugins
@extraunexec rm -f /usr/local/share/hplip/plugin.spec
@extraunexec rm -rf ${PREFIX}/share/hplip/data/firmware
@extraunexec rm -rf ${PREFIX}/share/hplip/data/plugins
@extraunexec rm -rf ${PREFIX}/share/hplip/fax/plugins
@extraunexec rm -rf ${PREFIX}/share/hplip/prnt/plugins
@extraunexec rm -rf ${PREFIX}/share/hplip/scan/plugins
@extraunexec rm -f ${PREFIX}/share/hplip/plugin.spec
bin/hp-check
bin/hp-clean
bin/hp-config_usb_printer
@ -85,6 +85,8 @@ share/hplip/base/exif.py
share/hplip/base/exif.pyc
share/hplip/base/g.py
share/hplip/base/g.pyc
share/hplip/base/imageprocessing.py
share/hplip/base/imageprocessing.pyc
share/hplip/base/imagesize.py
share/hplip/base/imagesize.pyc
share/hplip/base/ldif.py
@ -155,6 +157,7 @@ share/hplip/copier/__init__.py
share/hplip/copier/__init__.pyc
share/hplip/copier/copier.py
share/hplip/copier/copier.pyc
@bin share/hplip/dat2drv
share/hplip/data/ldl/
share/hplip/data/ldl/cb2pcal.ldl.gz
share/hplip/data/ldl/cb2pcal_done.ldl.gz
@ -250,6 +253,7 @@ share/hplip/levels.py
share/hplip/levels.pyc
share/hplip/linefeedcal.py
share/hplip/linefeedcal.pyc
@bin share/hplip/locatedriver
share/hplip/logcapture.py
share/hplip/logcapture.pyc
share/hplip/makecopies.py