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

Update to hplip-3.13.4.

Browse Source
This commit is contained in:
ajacoutot 2013-05-13 08:34:09 +00:00
parent 470a805167
commit 06fd468afa
9 changed files with 53 additions and 53 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.77 2013/05/11 11:15:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.78 2013/05/13 08:34:09 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-libs= HPLIP backend libraries
COMMENT-gui= HPLIP graphical tools
V= 3.13.3
V= 3.13.4
DISTNAME= hplip-${V}
PKGNAME-main= ${DISTNAME}
@ -17,10 +17,6 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-libs= hplip-libs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-main= 3
REVISION-libs= 1
REVISION-gui= 0
SHARED_LIBS += hpmud 2.0 # .0.6
SHARED_LIBS += hpip 2.0 # .0.1

4
print/hplip/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hplip-3.13.3.tar.gz) = NuWQsG84EME8+6dyHwp1s9PwEzp9YjEtXSWGT6bZQ2Y=
SIZE (hplip-3.13.3.tar.gz) = 21685109
SHA256 (hplip-3.13.4.tar.gz) = GtrTsVV4v4Hq6T1VT4d/6njHNPS08uNGBiMLL+YtaVY=
SIZE (hplip-3.13.4.tar.gz) = 20680774

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
--- Makefile.in.orig Wed Feb 13 17:39:40 2013
+++ Makefile.in Fri Feb 22 15:48:13 2013
@@ -4313,16 +4313,16 @@ cups_drv = prnt/drv/hpcups.drv
$OpenBSD: patch-Makefile_in,v 1.22 2013/05/13 08:34:09 ajacoutot Exp $
--- Makefile.in.orig Mon Apr 8 11:59:37 2013
+++ Makefile.in Mon May 13 10:23:18 2013
@@ -4321,16 +4321,16 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \
@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
@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
@@ -4335,7 +4335,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4343,7 +4343,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ common/utils.c common/utils.h
@HPLIP_BUILD_TRUE@libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread \
@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
@HPLIP_BUILD_TRUE@ $(am__append_4)
@HPLIP_BUILD_TRUE@libhpip_la_LDFLAGS = -version-info 0:1:0
@HPLIP_BUILD_TRUE@libhpip_la_LIBADD = -lm
@@ -4348,7 +4348,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4356,7 +4356,7 @@ cups_drv = prnt/drv/hpcups.drv
# hp-mkuri.
@HPLIP_BUILD_TRUE@hp_mkuridir = $(bindir)
@HPLIP_BUILD_TRUE@hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c
@ -39,7 +39,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
@HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
# cron files
@@ -4381,7 +4381,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4389,7 +4389,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@ -48,7 +48,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
@HPLIP_BUILD_TRUE@dist_hplip_state_DATA =
#dist_hplip_state_DATA = hplip.state
@@ -4510,7 +4510,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4518,7 +4518,7 @@ cups_drv = prnt/drv/hpcups.drv
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LDFLAGS = -module -avoid-version
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_SOURCES = io/mudext/hpmudext.c
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LIBADD = libhpmud.la
@ -57,7 +57,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
# ui (qt3)
@@ -4566,7 +4566,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4574,7 +4574,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)
@ -66,7 +66,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4639,8 +4639,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4647,8 +4647,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)
@ -77,7 +77,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
# hpcups
#if NEW_HPCUPS
@@ -4680,7 +4680,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4688,7 +4688,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)
@ -86,7 +86,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -4688,15 +4688,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4696,15 +4696,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
@ -105,7 +105,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
# PPDs
ppddir = $(hpppddir)
@@ -8735,11 +8735,11 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
@@ -8743,11 +8743,11 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
install-dist_cacSCRIPTS install-dist_cmdSCRIPTS \
install-dist_copierDATA install-dist_cronDATA \
install-dist_faxDATA install-dist_fax_filtersDATA \
@ -120,7 +120,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
install-dist_images_128x128DATA install-dist_images_16x16DATA \
install-dist_images_24x24DATA install-dist_images_256x256DATA \
install-dist_images_32x32DATA install-dist_images_64x64DATA \
@@ -8752,7 +8752,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
@@ -8760,7 +8760,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
install-dist_policykit_dbus_shareDATA \
install-dist_policykit_policyDATA install-dist_postscriptDATA \
install-dist_ppdDATA install-dist_prntDATA \
@ -129,7 +129,7 @@ $OpenBSD: patch-Makefile_in,v 1.21 2013/03/08 06:51:46 ajacoutot Exp $
install-dist_scanDATA install-dist_ui4DATA install-dist_uiDATA \
install-dist_unrelDATA install-dist_www0DATA \
install-dist_www3DATA install-dist_www4DATA install-docDATA \
@@ -8979,17 +8979,6 @@ install-dist_cronDATA:$(dist_cron_DATA)
@@ -8987,17 +8987,6 @@ install-dist_cronDATA:$(dist_cron_DATA)
done
install-data-hook:

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

@ -1,6 +1,6 @@
$OpenBSD: patch-check_py,v 1.11 2013/03/08 06:51:46 ajacoutot Exp $
--- check.py.orig Wed Feb 13 17:38:51 2013
+++ check.py Fri Feb 22 17:02:30 2013
$OpenBSD: patch-check_py,v 1.12 2013/05/13 08:34:09 ajacoutot Exp $
--- check.py.orig Mon Apr 8 11:58:46 2013
+++ check.py Mon May 13 10:23:18 2013
@@ -142,9 +142,9 @@ def get_comment(package, Inst_status, installed_ver):
comment = "Python Programming is not supported if version is lessthan 2.2"
elif package == 'hpaio':
@ -42,7 +42,7 @@ $OpenBSD: patch-check_py,v 1.11 2013/03/08 06:51:46 ajacoutot Exp $
+ Sts, Proc_info =utils.run("uname -r -v -s")
log.info(" Kernel: %s Host: %s Proc: %s Distribution: %s %s"\
%(Kernel_info,Host_info,Proc_info,self.distro_name, self.distro_version))
log.info(" Bitness: %s bit\n"%utils.getBitness())
@@ -328,9 +328,9 @@ class DependenciesCheck(CoreInstall):
log.warn("HPLIP-Installation: Auto installation is not supported for %s distro %s version " %(self.distro_name, self.distro_version))

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

@ -1,7 +1,7 @@
$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.9 2013/03/08 06:51:46 ajacoutot Exp $
--- prnt/hpcups/HPCupsFilter.cpp.orig Wed Feb 13 17:32:39 2013
+++ prnt/hpcups/HPCupsFilter.cpp Fri Feb 22 15:05:18 2013
@@ -868,7 +868,7 @@ void HPCupsFilter::getLogLevel ()
$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.10 2013/05/13 08:34:09 ajacoutot Exp $
--- prnt/hpcups/HPCupsFilter.cpp.orig Mon Apr 8 11:52:06 2013
+++ prnt/hpcups/HPCupsFilter.cpp Mon May 13 10:23:18 2013
@@ -871,7 +871,7 @@ void HPCupsFilter::getLogLevel ()
FILE *fp;
char str[258];
char *p;

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

@ -1,12 +1,12 @@
$OpenBSD: patch-scan_py,v 1.8 2013/03/08 06:51:46 ajacoutot Exp $
--- scan.py.orig Wed Feb 13 17:38:51 2013
+++ scan.py Fri Feb 22 15:05:18 2013
@@ -1088,7 +1088,7 @@ try:
if hp_print:
cmd = 'hp-print %s &' % output
else:
- cmd = "python ./print.py %s &" % output
+ cmd = "${MODPY_BIN} ./print.py %s &" % output
os_utils.execute(cmd)
$OpenBSD: patch-scan_py,v 1.9 2013/05/13 08:34:09 ajacoutot Exp $
--- scan.py.orig Mon Apr 8 11:58:45 2013
+++ scan.py Mon May 13 10:23:46 2013
@@ -1096,7 +1096,7 @@ try:
elif d == 'print':
hp_print = utils.which("hp-print", True)
if not hp_print:
- hp_print = 'python ./print.py'
+ hp_print = '${MODPY_BIN} ./print.py'
if dest_printer is not None:
cmd = '%s -p %s %s &' % (hp_print, dest_printer, output)

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

@ -1,6 +1,6 @@
$OpenBSD: patch-ui4_devmgr5_py,v 1.9 2013/03/17 13:04:30 ajacoutot Exp $
--- ui4/devmgr5.py.orig Fri Mar 8 08:11:44 2013
+++ ui4/devmgr5.py Sun Mar 17 13:51:21 2013
$OpenBSD: patch-ui4_devmgr5_py,v 1.10 2013/05/13 08:34:09 ajacoutot Exp $
--- ui4/devmgr5.py.orig Mon Apr 8 11:54:34 2013
+++ ui4/devmgr5.py Mon May 13 10:23:18 2013
@@ -1022,7 +1022,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
return
@ -10,7 +10,7 @@ $OpenBSD: patch-ui4_devmgr5_py,v 1.9 2013/03/17 13:04:30 ajacoutot Exp $
hplip_conf.readfp(fp)
fp.close()
@@ -2093,7 +2093,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
@@ -2095,7 +2095,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
if utils.which('hp-setup'):
cmd = 'hp-setup --gui'
else:
@ -19,7 +19,7 @@ $OpenBSD: patch-ui4_devmgr5_py,v 1.9 2013/03/17 13:04:30 ajacoutot Exp $
log.debug(cmd)
utils.run(cmd)
@@ -2105,7 +2105,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
@@ -2107,7 +2107,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
if utils.which('hp-setup'):
cmd = 'hp-setup --gui --remove'
else:

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

@ -1,7 +1,7 @@
$OpenBSD: patch-ui_devmgr4_py,v 1.7 2013/03/17 13:04:30 ajacoutot Exp $
--- ui/devmgr4.py.orig Fri Mar 8 08:11:48 2013
+++ ui/devmgr4.py Sun Mar 17 13:51:21 2013
@@ -2801,7 +2801,7 @@ class DevMgr4(DevMgr4_base):
$OpenBSD: patch-ui_devmgr4_py,v 1.8 2013/05/13 08:34:09 ajacoutot Exp $
--- ui/devmgr4.py.orig Mon Apr 8 11:54:38 2013
+++ ui/devmgr4.py Mon May 13 10:23:18 2013
@@ -2809,7 +2809,7 @@ class DevMgr4(DevMgr4_base):
if utils.which('hp-setup'):
cmd = 'hp-setup -u'
else:

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-hpijs,v 1.24 2013/03/17 13:04:31 ajacoutot Exp $
@comment $OpenBSD: PLIST-hpijs,v 1.25 2013/05/13 08:34:09 ajacoutot Exp $
@conflict hplip-libs-<=3.9.8
@conflict hpcups-<=3.2.11
@pkgpath print/hpijs
@ -183,6 +183,7 @@ share/foomatic/db/source/PPD/HP/hp-designjet_t770_postscript-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_t770ps_24in-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_t790ps_24in-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_t790ps_44in-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_z5200_postscript-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
@ -598,6 +599,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m521-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
share/foomatic/db/source/PPD/HP/hp-laserjet_p1007-hpijs.ppd.gz
@ -753,6 +755,8 @@ share/foomatic/db/source/PPD/HP/hp-officejet_k80xi-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_lx-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_pro_1150c-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_pro_451_series-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-officejet_pro_551_series-ps.ppd.gz