SHA256
1
0
forked from printing/hplip
Files
hplip/hplip-3.20.6-python-includes.patch

69 lines
2.2 KiB
Diff
Raw Permalink Normal View History

Update to HPLIP 3.25.8 Added support for the following new Printers * HP LaserJet Enterprise Flow MFP 8601z * HP LaserJet Enterprise 5501 * HP LaserJet Enterprise MFP 5601dn * HP LaserJet Enterprise 6500dn * HP LaserJet Enterprise 5501n * HP LaserJet Enterprise MFP 5601 * HP LaserJet Enterprise 6500 * HP LaserJet Enterprise 5502dn * HP LaserJet Enterprise MFP 5602dn * HP LaserJet Enterprise 6500n * HP LaserJet Enterprise 5502 * HP LaserJet Enterprise MFP 5602f * HP LaserJet Enterprise 6501dn * HP LaserJet Enterprise X50452dn * HP LaserJet Enterprise Flow MFP 5602zfw * HP LaserJet Enterprise 6501 * HP LaserJet Enterprise X50452 * HP LaserJet Enterprise MFP 5602 * HP LaserJet Enterprise X60257dn * HP LaserJet Enterprise MFP X53052dn * HP LaserJet Enterprise Flow MFP X530 * HP LaserJet Enterprise X60257 * HP LaserJet Enterprise MFP X53052 * HP LaserJet Enterprise X60357dn * HP LaserJet Enterprise X60357 * HP LaserJet Enterprise MFP 6600dn * HP LaserJet Enterprise Flow MFP 6600zfw * HP LaserJet Enterprise MFP 6600 * HP LaserJet Enterprise Flow MFP 6600zfsw * HP LaserJet Enterprise MFP X62757dn * HP LaserJet Enterprise Flow MFP X62757zs * HP LaserJet Enterprise MFP X62757 * DEX D50452dn * DEX MFP D53052dn Drop patches that have been merged upstream * Drop hplip-change-pgp-server.patch * Drop hp-setup-fix-python-crash-when-manually-importing-gz.patch Fix handling of readfp() and read_filke() for ConfigParser objects, avoiding confusing error messages (lp#2139771) * Add hplip-fix-handling-of-ConfigParser-.readfp-vs.-read_.patch * Drop hplip-base-replace-f-string-with-string.format-for-p.patch Fix compiler warnings on SLE15 * Add Fix-two-compiler-warnings-that-cause-build-failure-o.patch Renamed patch files to achieve a consistent patch naming according to the rules of git-format-patch * Rename change-udev-rules.diff -> hplip-change-udev-rules.patch * Rename disable_hp-upgrade.patch -> disable-hp-upgrade.patch * Rename add_missing_includes_and_define_GNU_SOURCE.patch -> add-missing-includes-and-define-GNU_SOURCE.patch * Rename hplip-remove-imageprocessor.diff -> hplip-remove-imageprocessor.patch * Rename hplip-orblite-return-null.diff -> hplip-orblite-return-null.patch * Rename hplip-hpaio-gcc14.patch -> hplip-hpaio-avoid-C99-violations.patch * Rename hplip-no-urlopener.patch -> URLopener-was-removed-in-Python-3.14-and-hplip-trace.patch * Rename hplip-3.24.4-gcc15.patch -> hplip-sane-fix-compilation-with-gcc-15.patch Patches are now managed under https://github.com/mwilck/hplip
2026-02-03 20:51:10 +01:00
From 15c0c0a70812c6793b8d5b21f33d809c2ef586b0 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Tue, 3 Feb 2026 17:57:27 +0100
Subject: [PATCH 16/33] hplip 3.20.6 python includes
---
configure.in | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/configure.in b/configure.in
index f1919cb..46e8ec3 100644
--- a/configure.in
+++ b/configure.in
Update to HPLIP 3.25.8 Added support for the following new Printers * HP LaserJet Enterprise Flow MFP 8601z * HP LaserJet Enterprise 5501 * HP LaserJet Enterprise MFP 5601dn * HP LaserJet Enterprise 6500dn * HP LaserJet Enterprise 5501n * HP LaserJet Enterprise MFP 5601 * HP LaserJet Enterprise 6500 * HP LaserJet Enterprise 5502dn * HP LaserJet Enterprise MFP 5602dn * HP LaserJet Enterprise 6500n * HP LaserJet Enterprise 5502 * HP LaserJet Enterprise MFP 5602f * HP LaserJet Enterprise 6501dn * HP LaserJet Enterprise X50452dn * HP LaserJet Enterprise Flow MFP 5602zfw * HP LaserJet Enterprise 6501 * HP LaserJet Enterprise X50452 * HP LaserJet Enterprise MFP 5602 * HP LaserJet Enterprise X60257dn * HP LaserJet Enterprise MFP X53052dn * HP LaserJet Enterprise Flow MFP X530 * HP LaserJet Enterprise X60257 * HP LaserJet Enterprise MFP X53052 * HP LaserJet Enterprise X60357dn * HP LaserJet Enterprise X60357 * HP LaserJet Enterprise MFP 6600dn * HP LaserJet Enterprise Flow MFP 6600zfw * HP LaserJet Enterprise MFP 6600 * HP LaserJet Enterprise Flow MFP 6600zfsw * HP LaserJet Enterprise MFP X62757dn * HP LaserJet Enterprise Flow MFP X62757zs * HP LaserJet Enterprise MFP X62757 * DEX D50452dn * DEX MFP D53052dn Drop patches that have been merged upstream * Drop hplip-change-pgp-server.patch * Drop hp-setup-fix-python-crash-when-manually-importing-gz.patch Fix handling of readfp() and read_filke() for ConfigParser objects, avoiding confusing error messages (lp#2139771) * Add hplip-fix-handling-of-ConfigParser-.readfp-vs.-read_.patch * Drop hplip-base-replace-f-string-with-string.format-for-p.patch Fix compiler warnings on SLE15 * Add Fix-two-compiler-warnings-that-cause-build-failure-o.patch Renamed patch files to achieve a consistent patch naming according to the rules of git-format-patch * Rename change-udev-rules.diff -> hplip-change-udev-rules.patch * Rename disable_hp-upgrade.patch -> disable-hp-upgrade.patch * Rename add_missing_includes_and_define_GNU_SOURCE.patch -> add-missing-includes-and-define-GNU_SOURCE.patch * Rename hplip-remove-imageprocessor.diff -> hplip-remove-imageprocessor.patch * Rename hplip-orblite-return-null.diff -> hplip-orblite-return-null.patch * Rename hplip-hpaio-gcc14.patch -> hplip-hpaio-avoid-C99-violations.patch * Rename hplip-no-urlopener.patch -> URLopener-was-removed-in-Python-3.14-and-hplip-trace.patch * Rename hplip-3.24.4-gcc15.patch -> hplip-sane-fix-compilation-with-gcc-15.patch Patches are now managed under https://github.com/mwilck/hplip
2026-02-03 20:51:10 +01:00
@@ -630,20 +630,31 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcu
fi
fi
-SAVE_CPPFLAGS="$CPPFLAGS"
-CFLAGS=`python-config --includes`
-if [ $? -eq 0 ]
-then
- echo $FLAGS
-else
-CFLAGS=`python3-config --includes`
- if [ $? -eq 0 ]
- then
- echo $FLAGS
- fi
+AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)])
+
+PYTHON_INCLUDES=`$python3_config_path --includes`
+if test "X$PYTHON_INCLUDES" = "X" ; then
+ AC_MSG_ERROR([Cannot get Python includes via python3-config], 6)
+fi
+
+PYTHON_LIBS=`$python3_config_path --libs`
+if test "X$PYTHON_LIBS" = "X" ; then
+ AC_MSG_ERROR([Cannot get Python libs via python3-config], 6)
+fi
+
+SAVE_CFLAGS=$CFLAGS
+SAVE_LIBS=$LIBS
+
+CFLAGS="$CFLAGS $PYTHON_INCLUDES"
+LIBS="$LIBS $PYTHON_LIBS"
+
+AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6))
+
+if test "X$python_includes" != "Xok" ; then
+ CFLAGS="$SAVE_CFLAGS"
+ LIBS="$SAVE_LIBS"
fi
-#CFLAGS=`(python-config --includes)`
if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then
AC_ARG_VAR([PYTHON], [Python interpreter/compiler command])
AC_CHECK_PROGS(PYTHON,[python python3 python2])
Update to HPLIP 3.25.8 Added support for the following new Printers * HP LaserJet Enterprise Flow MFP 8601z * HP LaserJet Enterprise 5501 * HP LaserJet Enterprise MFP 5601dn * HP LaserJet Enterprise 6500dn * HP LaserJet Enterprise 5501n * HP LaserJet Enterprise MFP 5601 * HP LaserJet Enterprise 6500 * HP LaserJet Enterprise 5502dn * HP LaserJet Enterprise MFP 5602dn * HP LaserJet Enterprise 6500n * HP LaserJet Enterprise 5502 * HP LaserJet Enterprise MFP 5602f * HP LaserJet Enterprise 6501dn * HP LaserJet Enterprise X50452dn * HP LaserJet Enterprise Flow MFP 5602zfw * HP LaserJet Enterprise 6501 * HP LaserJet Enterprise X50452 * HP LaserJet Enterprise MFP 5602 * HP LaserJet Enterprise X60257dn * HP LaserJet Enterprise MFP X53052dn * HP LaserJet Enterprise Flow MFP X530 * HP LaserJet Enterprise X60257 * HP LaserJet Enterprise MFP X53052 * HP LaserJet Enterprise X60357dn * HP LaserJet Enterprise X60357 * HP LaserJet Enterprise MFP 6600dn * HP LaserJet Enterprise Flow MFP 6600zfw * HP LaserJet Enterprise MFP 6600 * HP LaserJet Enterprise Flow MFP 6600zfsw * HP LaserJet Enterprise MFP X62757dn * HP LaserJet Enterprise Flow MFP X62757zs * HP LaserJet Enterprise MFP X62757 * DEX D50452dn * DEX MFP D53052dn Drop patches that have been merged upstream * Drop hplip-change-pgp-server.patch * Drop hp-setup-fix-python-crash-when-manually-importing-gz.patch Fix handling of readfp() and read_filke() for ConfigParser objects, avoiding confusing error messages (lp#2139771) * Add hplip-fix-handling-of-ConfigParser-.readfp-vs.-read_.patch * Drop hplip-base-replace-f-string-with-string.format-for-p.patch Fix compiler warnings on SLE15 * Add Fix-two-compiler-warnings-that-cause-build-failure-o.patch Renamed patch files to achieve a consistent patch naming according to the rules of git-format-patch * Rename change-udev-rules.diff -> hplip-change-udev-rules.patch * Rename disable_hp-upgrade.patch -> disable-hp-upgrade.patch * Rename add_missing_includes_and_define_GNU_SOURCE.patch -> add-missing-includes-and-define-GNU_SOURCE.patch * Rename hplip-remove-imageprocessor.diff -> hplip-remove-imageprocessor.patch * Rename hplip-orblite-return-null.diff -> hplip-orblite-return-null.patch * Rename hplip-hpaio-gcc14.patch -> hplip-hpaio-avoid-C99-violations.patch * Rename hplip-no-urlopener.patch -> URLopener-was-removed-in-Python-3.14-and-hplip-trace.patch * Rename hplip-3.24.4-gcc15.patch -> hplip-sane-fix-compilation-with-gcc-15.patch Patches are now managed under https://github.com/mwilck/hplip
2026-02-03 20:51:10 +01:00
@@ -683,7 +694,6 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite
AS_IF([test "x$FOUND_HEADER" != "xyes"],
[AC_MSG_ERROR([cannot find python-devel support], 6)])
fi
-CFLAGS="$save_CFLAGS"
if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)])
Update to HPLIP 3.25.8 Added support for the following new Printers * HP LaserJet Enterprise Flow MFP 8601z * HP LaserJet Enterprise 5501 * HP LaserJet Enterprise MFP 5601dn * HP LaserJet Enterprise 6500dn * HP LaserJet Enterprise 5501n * HP LaserJet Enterprise MFP 5601 * HP LaserJet Enterprise 6500 * HP LaserJet Enterprise 5502dn * HP LaserJet Enterprise MFP 5602dn * HP LaserJet Enterprise 6500n * HP LaserJet Enterprise 5502 * HP LaserJet Enterprise MFP 5602f * HP LaserJet Enterprise 6501dn * HP LaserJet Enterprise X50452dn * HP LaserJet Enterprise Flow MFP 5602zfw * HP LaserJet Enterprise 6501 * HP LaserJet Enterprise X50452 * HP LaserJet Enterprise MFP 5602 * HP LaserJet Enterprise X60257dn * HP LaserJet Enterprise MFP X53052dn * HP LaserJet Enterprise Flow MFP X530 * HP LaserJet Enterprise X60257 * HP LaserJet Enterprise MFP X53052 * HP LaserJet Enterprise X60357dn * HP LaserJet Enterprise X60357 * HP LaserJet Enterprise MFP 6600dn * HP LaserJet Enterprise Flow MFP 6600zfw * HP LaserJet Enterprise MFP 6600 * HP LaserJet Enterprise Flow MFP 6600zfsw * HP LaserJet Enterprise MFP X62757dn * HP LaserJet Enterprise Flow MFP X62757zs * HP LaserJet Enterprise MFP X62757 * DEX D50452dn * DEX MFP D53052dn Drop patches that have been merged upstream * Drop hplip-change-pgp-server.patch * Drop hp-setup-fix-python-crash-when-manually-importing-gz.patch Fix handling of readfp() and read_filke() for ConfigParser objects, avoiding confusing error messages (lp#2139771) * Add hplip-fix-handling-of-ConfigParser-.readfp-vs.-read_.patch * Drop hplip-base-replace-f-string-with-string.format-for-p.patch Fix compiler warnings on SLE15 * Add Fix-two-compiler-warnings-that-cause-build-failure-o.patch Renamed patch files to achieve a consistent patch naming according to the rules of git-format-patch * Rename change-udev-rules.diff -> hplip-change-udev-rules.patch * Rename disable_hp-upgrade.patch -> disable-hp-upgrade.patch * Rename add_missing_includes_and_define_GNU_SOURCE.patch -> add-missing-includes-and-define-GNU_SOURCE.patch * Rename hplip-remove-imageprocessor.diff -> hplip-remove-imageprocessor.patch * Rename hplip-orblite-return-null.diff -> hplip-orblite-return-null.patch * Rename hplip-hpaio-gcc14.patch -> hplip-hpaio-avoid-C99-violations.patch * Rename hplip-no-urlopener.patch -> URLopener-was-removed-in-Python-3.14-and-hplip-trace.patch * Rename hplip-3.24.4-gcc15.patch -> hplip-sane-fix-compilation-with-gcc-15.patch Patches are now managed under https://github.com/mwilck/hplip
2026-02-03 20:51:10 +01:00
--
2.52.0