diff '--color=auto' -Naur hplip-3.25.2/Makefile.am.rej hplip-3.25.2.new/Makefile.am.rej --- hplip-3.25.2/Makefile.am.rej 1970-01-01 01:00:00.000000000 +0100 +++ hplip-3.25.2.new/Makefile.am.rej 2025-03-20 13:22:34.262337969 +0100 @@ -0,0 +1,16 @@ +--- Makefile.am 2023-11-27 16:06:40.000000000 +0100 ++++ Makefile.am 2024-05-17 12:17:03.164743549 +0200 +@@ -306,13 +306,6 @@ + pcarddir = $(hplipdir)/pcard + dist_pcard_DATA = pcard/__init__.py pcard/photocard.py + +-# pcardext +-pcardextdir = $(pyexecdir) +-pcardext_LTLIBRARIES = pcardext.la +-pcardext_la_LDFLAGS = -module -avoid-version +-pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c +-pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) +- + # prnt + prntdir = $(hplipdir)/prnt + dist_prnt_DATA = prnt/cups.py prnt/__init__.py prnt/ldl.py prnt/pcl.py prnt/colorcal.py diff '--color=auto' -Naur hplip-3.25.2/protocol/hp_ipp.c hplip-3.25.2.new/protocol/hp_ipp.c --- hplip-3.25.2/protocol/hp_ipp.c 2025-02-27 13:12:29.000000000 +0100 +++ hplip-3.25.2.new/protocol/hp_ipp.c 2025-03-20 13:22:34.262500280 +0100 @@ -18,6 +18,7 @@ \******************************************************************************/ +#define _GNU_SOURCE #include #include #include diff '--color=auto' -Naur hplip-3.25.2/scan/sane/hpaio.c hplip-3.25.2.new/scan/sane/hpaio.c --- hplip-3.25.2/scan/sane/hpaio.c 2025-02-27 13:12:29.000000000 +0100 +++ hplip-3.25.2.new/scan/sane/hpaio.c 2025-03-20 13:22:34.300953331 +0100 @@ -50,6 +50,7 @@ #include "sclpml.h" #include "escl.h" #include "io.h" +#include "orblite.h" #include "orblitei.h" diff '--color=auto' -Naur hplip-3.25.2/scan/sane/orblite.c hplip-3.25.2.new/scan/sane/orblite.c --- hplip-3.25.2/scan/sane/orblite.c 2025-02-27 13:12:29.000000000 +0100 +++ hplip-3.25.2.new/scan/sane/orblite.c 2025-03-20 13:22:34.301167434 +0100 @@ -20,6 +20,7 @@ #include "orblitei.h" #include "orblite.h"//Added New #include +#include #include "utils.h" #include "io.h" @@ -193,27 +194,6 @@ } -static int bb_unload(SANE_THandle ps) -{ - _DBG("Calling orblite bb_unload: \n"); - if (ps->bb_handle) - { - dlclose(ps->bb_handle); - ps->bb_handle = NULL; - } - if (ps->hpmud_handle) - { - dlclose(ps->hpmud_handle); - ps->hpmud_handle = NULL; - } -// if (ps->math_handle) -// { -// dlclose(ps->math_handle); -// ps->math_handle = NULL; -// } - return 0; -} - SANE_Status orblite_init (SANE_Int * version_code, SANE_Auth_Callback authorize) { diff '--color=auto' -Naur hplip-3.25.2/scan/sane/sclpml.c hplip-3.25.2.new/scan/sane/sclpml.c --- hplip-3.25.2/scan/sane/sclpml.c 2025-02-27 13:12:29.000000000 +0100 +++ hplip-3.25.2.new/scan/sane/sclpml.c 2025-03-20 13:22:34.301500518 +0100 @@ -46,6 +46,9 @@ #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" +/* This file is not built with _GNU_SOURCE. */ +char *strcasestr(const char *, const char *); + //# define SCLPML_DEBUG # ifdef SCLPML_DEBUG # define _DBG(args...) syslog(LOG_INFO, __FILE__ " " STRINGIZE(__LINE__) ": " args)