openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to hplip-3.26.4.

Browse Source
This commit is contained in:
ajacoutot
2026-05-21 07:41:19 +00:00
parent cdbd81235e
commit df8cee6a0a
9 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
print/hplip/Makefile
+2 -4
View File
@@ -7,7 +7,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.25.8
V= 3.26.4
DISTNAME= hplip-${V}
SUBST_VARS= V
@@ -18,8 +18,6 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-hpcups= 0
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud 2.0 # 0.6
SHARED_LIBS += hpipp 0.0 # 0.1
@@ -101,7 +99,7 @@ RUN_DEPENDS-hpaio= # empty
### -hpcups
WANTLIB-hpcups += ${cWANTLIB} z netsnmp hpdiscovery iconv intl ssl
WANTLIB-hpcups += c jpeg hpip cups cupsimage dbus-1
WANTLIB-hpcups += c jpeg hpip cups cupsimage dbus-1 ${COMPILER_LIBCXX}
WANTLIB-hpcups += z usb-1.0 avahi-client avahi-common hpmud avahi-core
LIB_DEPENDS-hpcups= graphics/jpeg \
print/hplip/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (hplip-3.25.8.tar.gz) = HPbWwoc1Q1yOtmRug7z7ch5RxLHw6M+RBab6+W3JrSU=
SIZE (hplip-3.25.8.tar.gz) = 30874051
SHA256 (hplip-3.26.4.tar.gz) = ucYSUnVPNbSiNzlsqJYeez4MVtt21mpnEre/PjDmlGM=
SIZE (hplip-3.26.4.tar.gz) = 30963728
print/hplip/patches/patch-Makefile_in
+9 -9
View File
@@ -39,7 +39,7 @@ Index: Makefile.in
prnt/ipp-usb/HPLIP.conf scan/sane/hpaio.desc \
installer/text_install.py data/localization/hplip_de.ts \
data/localization/hplip_es.ts data/localization/hplip_fr.ts \
@@ -4940,7 +4936,7 @@ dist_unrel_DATA =
@@ -4968,7 +4964,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
@@ -48,7 +48,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 \
@@ -4948,7 +4944,6 @@ dist_unrel_DATA =
@@ -4976,7 +4972,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 \
@@ -56,7 +56,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) \
@@ -4970,7 +4965,6 @@ dist_unrel_DATA =
@@ -4998,7 +4993,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 \
@@ -64,7 +64,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)
@@ -5024,7 +5018,7 @@ dist_unrel_DATA =
@@ -5052,7 +5046,7 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@@ -73,7 +73,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)
@@ -5222,7 +5216,7 @@ dist_unrel_DATA =
@@ -5250,7 +5244,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)
@@ -82,7 +82,7 @@ Index: Makefile.in
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -5291,8 +5285,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5319,8 +5313,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)
@@ -93,7 +93,7 @@ Index: Makefile.in
# hpcups
#if NEW_HPCUPS
@@ -5336,7 +5330,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5364,7 +5358,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)
@@ -102,7 +102,7 @@ Index: Makefile.in
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -5344,21 +5338,21 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5372,21 +5366,21 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
@@ -128,7 +128,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
@@ -10308,19 +10302,9 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
@@ -10336,19 +10330,9 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
install-data-hook:
print/hplip/patches/patch-base_device_py
+1 -1
View File
@@ -1,7 +1,7 @@
Index: base/device.py
--- base/device.py.orig
+++ base/device.py
@@ -2450,9 +2450,9 @@ Content-length: %d\r
@@ -2452,9 +2452,9 @@ Content-length: %d\r
if remove: rem_str = '-r'
if is_gzip:
print/hplip/patches/patch-base_utils_py
+1 -19
View File
@@ -4,8 +4,6 @@ that results in text string going into translate function in base/utils.py, whic
expects binary string because of parameters. Remove this patch if base/utils.py
code gets fixed.
locale.format -> locale.format_string for python 3.12 compat
Disable download_from_network()
Index: base/utils.py
@@ -26,15 +24,6 @@ Index: base/utils.py
except OSError:
return lis
@@ -505,7 +505,7 @@ def sort_dict_by_value(d):
def commafy(val):
- return locale.format("%s", val, grouping=True)
+ return locale.format_string("%s", val, grouping=True)
def format_bytes(s, show_bytes=False):
@@ -617,7 +617,7 @@ class UserSettings(object): # Note: Deprecated after 2
if len(path):
self.cmd_pcard = 'hp-unload -d %DEVICE_URI%'
@@ -186,7 +175,7 @@ Index: base/utils.py
log.debug("Requied groups list =[%s]"%exp_grp_list)
@@ -2665,6 +2662,8 @@ def readAuthType():
@@ -2663,6 +2660,8 @@ def readAuthType():
authType = 'sudo'
else:
authType = 'su'
@@ -195,10 +184,3 @@ Index: base/utils.py
except :
log.warn("unable to determine auth_type ")
return authType
@@ -2675,4 +2674,4 @@ def sanitize_filename(filename):
# Ensure the filename only contains safe characters
if not re.match(r'^[\w\-. ]+$', filename):
raise ValueError("Invalid filename")
- return filename
\ No newline at end of file
+ return filename
print/hplip/patches/patch-common_utils_c
+2 -2
View File
@@ -10,7 +10,7 @@ Index: common/utils.c
#include <dlfcn.h>
#include <sys/stat.h>
#include <errno.h>
@@ -159,7 +160,7 @@ enum UTILS_PLUGIN_STATUS validate_plugin_version()
@@ -183,7 +184,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 )
{
@@ -19,7 +19,7 @@ Index: common/utils.c
return UTILS_PLUGIN_STATUS_NOT_INSTALLED;
}
@@ -311,7 +312,7 @@ int getHPLogLevel()
@@ -335,7 +336,7 @@ int getHPLogLevel()
char *p;
int iLogLevel = 0;
print/hplip/patches/patch-common_utils_h
+1 -1
View File
@@ -1,7 +1,7 @@
Index: common/utils.h
--- common/utils.h.orig
+++ common/utils.h
@@ -25,7 +25,7 @@
@@ -29,7 +29,7 @@
#define SCAN_PLUGIN_ESCL "bb_escl.so"
#define SCAN_PLUGIN_ORBLITE "bb_orblite.so"
print/hplip/patches/patch-configure
+2 -2
View File
@@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
@@ -12022,6 +12022,11 @@ else
@@ -12023,6 +12023,11 @@ else
lt_cv_dlopen_libs=
;;
@@ -13,7 +13,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
@@ -16087,50 +16092,6 @@ if test "x$ac_cv_lib_jpeg_jpeg_set_defaults" = xyes; t
@@ -16088,50 +16093,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
print/hplip/pkg/PLIST-hpijs
+12 -1
View File
@@ -108,7 +108,6 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_9500-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_9500-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_E65150_E65160-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_X557-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm1015-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm1017-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
@@ -251,6 +250,7 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m776-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_x677-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_x67755-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_x67765-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_x778-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_4201-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_m453-4-ps.ppd.gz
@@ -354,6 +354,7 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_2540_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_2600_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_2640_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_2700_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_2900_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3000_j310_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3050_j610_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3050a_j611_series.ppd.gz
@@ -389,6 +390,7 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_3940.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_400.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_400l.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4100_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4300_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_450.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4510_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4530_series.ppd.gz
@@ -405,6 +407,7 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_500c.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_505j.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_510.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5100.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5100_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_520.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5200_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_540.ppd.gz
@@ -422,6 +425,7 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_5652.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5700.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5730_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5800.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5800_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5810_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5820_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5850.ppd.gz
@@ -528,6 +532,8 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_ink_advant_k209a-z.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_plus_4100_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_plus_6000_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_plus_6400_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_plus_ink_advantage_6100_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_plus_ink_advantage_6500_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_100_d410_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_110_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_120_series.ppd.gz
@@ -540,7 +546,11 @@ share/foomatic/db/source/PPD/HP/hp-envy_5540_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_5640_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_5660_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_6000_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_6100_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_6100e_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_6400_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_6500_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_6500e_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_7640_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_8000_series.ppd.gz
share/foomatic/db/source/PPD/HP/hp-envy_inspire_7200_series.ppd.gz
@@ -860,6 +870,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m725-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_x529-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_x530-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_x627-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_x728.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p1005.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p1006.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p1007.ppd.gz