Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2022-05-20 17:50:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip" Fri May 20 17:50:04 2022 rev:143 rq:977924 version:3.22.4 Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2022-05-17 17:24:03.211150309 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new.1538/hplip.changes 2022-05-20 17:50:05.447191798 +0200 @@ -1,0 +2,7 @@ +Tue May 17 20:47:46 UTC 2022 - Hans-Peter Jansen <h...@urpla.net> + +- Add rebased hplip-3.20.6-python-includes.patch to fix the non- + functional scanning: libsane-hpaio.so.1: undefined symbol: _DBG + (fixes boo#1198794) + +------------------------------------------------------------------- New: ---- hplip-3.20.6-python-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.Rtr2nF/_old 2022-05-20 17:50:06.387192640 +0200 +++ /var/tmp/diff_new_pack.Rtr2nF/_new 2022-05-20 17:50:06.391192643 +0200 @@ -85,6 +85,8 @@ Patch402: hplip-change-pgp-server.patch # boo#1107711 Patch403: Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch +# PATCH-FIX-UPSTREAM: https://bugs.launchpad.net/hplip/+bug/1879445 +Patch404: hplip-3.20.6-python-includes.patch Patch500: hplip-missing-drivers.patch BuildRequires: %{pymod devel} BuildRequires: %{pymod qt5-devel} @@ -321,6 +323,7 @@ %patch401 -p1 %patch402 -p1 %patch403 -p1 +%patch404 -p1 %patch500 -p1 # replace "env" shebang and "/usr/bin/python" with real executable find . -name '*.py' -o -name pstotiff | \ ++++++ hplip-3.20.6-python-includes.patch ++++++ Index: b/configure.in =================================================================== --- a/configure.in +++ b/configure.in @@ -628,20 +628,31 @@ if test "$class_driver" = "no" && test " 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]) @@ -655,7 +666,6 @@ if test "$class_driver" = "no" && test " 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)])
