Update to hplip-3.17.6.
This commit is contained in:
parent
08ca515e54
commit
df5ec82286
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.156 2017/06/05 16:03:32 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.157 2017/06/06 09:15:46 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.4
|
||||
V= 3.17.6
|
||||
DISTNAME= hplip-${V}
|
||||
SUBST_VARS= V
|
||||
|
||||
@ -20,9 +20,6 @@ PKGNAME-hpcups= hpcups-${V}
|
||||
PKGNAME-hpijs= hpijs-${V}
|
||||
PKGNAME-gui= hplip-gui-${V}
|
||||
|
||||
REVISION-common= 0
|
||||
REVISION-hpaio= 1
|
||||
|
||||
SHARED_LIBS += hpdiscovery 0.0 # 0.1
|
||||
SHARED_LIBS += hpmud 2.0 # 0.6
|
||||
SHARED_LIBS += hpipp 0.0 # 0.1
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (hplip-3.17.4.tar.gz) = 5vbvcffagKYgmDyUC2NgVBU6KHmUoT3+wdXIaxWv5u8=
|
||||
SIZE (hplip-3.17.4.tar.gz) = 23212715
|
||||
SHA256 (hplip-3.17.6.tar.gz) = gCh4NKrX4/ow8uJS/ygdNR4/LrFSZ6xUFTE1Pce1EH4=
|
||||
SIZE (hplip-3.17.6.tar.gz) = 23620156
|
||||
|
@ -1,6 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
--- Makefile.in.orig Wed Apr 12 08:36:54 2017
|
||||
+++ Makefile.in Tue Apr 18 20:04:23 2017
|
||||
$OpenBSD: patch-Makefile_in,v 1.50 2017/06/06 09:15:46 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
|
||||
@ -19,7 +20,7 @@ $OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
@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@@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 \
|
||||
@@ -4780,13 +4780,13 @@ cups_drv = prnt/drv/hpcups.drv
|
||||
@@ -4828,13 +4828,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
|
||||
|
||||
@ -35,7 +36,7 @@ $OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
#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 \
|
||||
@@ -4802,7 +4802,7 @@ cups_drv = prnt/drv/hpcups.drv
|
||||
@@ -4850,7 +4850,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 \
|
||||
@ -44,7 +45,7 @@ $OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
@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 \
|
||||
@@ -4843,7 +4843,7 @@ cups_drv = prnt/drv/hpcups.drv
|
||||
@@ -4891,7 +4891,7 @@ cups_drv = prnt/drv/hpcups.drv
|
||||
@HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
|
||||
|
||||
# hplip.state
|
||||
@ -53,7 +54,7 @@ $OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
@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@cmddir = $(hplipdir)
|
||||
@@ -5048,7 +5048,7 @@ cups_drv = prnt/drv/hpcups.drv
|
||||
@@ -5096,7 +5096,7 @@ cups_drv = prnt/drv/hpcups.drv
|
||||
@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)
|
||||
@ -62,7 +63,7 @@ $OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
|
||||
# hplip.desktop
|
||||
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
|
||||
@@ -5113,8 +5113,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
|
||||
@@ -5161,8 +5161,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)
|
||||
@ -73,7 +74,7 @@ $OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
|
||||
# hpcups
|
||||
#if NEW_HPCUPS
|
||||
@@ -5154,7 +5154,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
|
||||
@@ -5202,7 +5202,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
|
||||
@HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h
|
||||
|
||||
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
||||
@ -82,7 +83,7 @@ $OpenBSD: patch-Makefile_in,v 1.49 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
|
||||
#else
|
||||
#hpcupsdir = $(cupsfilterdir)
|
||||
@@ -5163,15 +5163,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
|
||||
@@ -5211,15 +5211,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
|
||||
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
|
||||
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
|
||||
#if HPCUPS_ONLY_BUILD
|
||||
|
@ -1,6 +1,8 @@
|
||||
@comment $OpenBSD: PLIST-hpaio,v 1.5 2017/06/05 16:03:32 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-hpaio,v 1.6 2017/06/06 09:15:47 ajacoutot Exp $
|
||||
@conflict hplip-<3.13.7p2
|
||||
lib/python${MODPY_VERSION}/site-packages/scanext.so
|
||||
lib/sane/libsane-hpaio.so
|
||||
share/examples/hplip/sane.d/
|
||||
share/examples/hplip/sane.d/dll.d/
|
||||
share/examples/hplip/sane.d/dll.d/hpaio
|
||||
@sample ${SYSCONFDIR}/sane.d/dll.d/hpaio
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-hpijs,v 1.54 2017/04/18 18:18:35 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-hpijs,v 1.55 2017/06/06 09:15:47 ajacoutot Exp $
|
||||
@conflict hplip-libs-<=3.9.8
|
||||
@conflict hpcups-<=3.2.11
|
||||
@pkgpath print/hpijs
|
||||
@ -157,6 +157,8 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.g
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_e65050_e65060-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m452-ps.ppd.gz
|
||||
@ -164,11 +166,13 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_m452d-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m552-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m553-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m651-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m652_m653-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m750-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m855-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz
|
||||
@ -616,6 +620,8 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_cp1520_series-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_cp_1025-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_e60055-e60075-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_e62555-e62575-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
|
||||
@ -650,6 +656,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_m506-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_m607_m608_m609-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_m806-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
|
||||
@ -666,6 +673,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m521-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m527-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m630-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m725-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_p1005-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_p1006-hpijs.ppd.gz
|
||||
@ -738,6 +746,12 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m25a-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m25nw-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m26a-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m26nw-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m27c-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m27cnw-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
|
||||
@ -934,11 +948,15 @@ share/foomatic/db/source/PPD/HP/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_color_mfp_586-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_color_mfp_e58650-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_mfp_p57750-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_p55250-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_p75050-60-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_pro_452_printer-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_pro_477_mfp-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_pro_552_printer-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_pro_750-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-pagewide_pro_mfp_772-777-ps.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-photosmart_100-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-photosmart_1115-hpijs.ppd.gz
|
||||
share/foomatic/db/source/PPD/HP/hp-photosmart_1215-hpijs.ppd.gz
|
||||
|
Loading…
Reference in New Issue
Block a user