14 changed files with 574 additions and 105 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,27 @@
-SOURCES/gutenprint-5.2.14.tar.bz2
+gutenprint-5.0.0.tar.bz2
+gutenprint-5.0.0.99.1.tar.bz2
+gutenprint-5.0.1.tar.bz2
+gutenprint-5.0.2.tar.bz2
+gutenprint-5.2.2.tar.bz2
+gutenprint-5.2.3.tar.bz2
+gutenprint-5.2.4.tar.bz2
+gutenprint-5.2.5.tar.bz2
+gutenprint-5.2.6.tar.bz2
+/gutenprint-5.2.7.tar.bz2
+/gutenprint-5.2.8.tar.bz2
+/gutenprint-5.2.9.tar.bz2
+/gutenprint-5.2.10-pre1.tar.bz2
+/gutenprint-5.2.10-pre2.tar.bz2
+/gutenprint-5.2.10.tar.bz2
+/gutenprint-5.2.11-pre2.tar.bz2
+/gutenprint-5.2.11.tar.bz2
+/gutenprint-5.2.12-pre2.tar.bz2
+/gutenprint-5.2.12-pre3.tar.bz2
+/gutenprint-5.2.12-pre4.tar.bz2
+/gutenprint-5.2.12.tar.bz2
+/gutenprint-5.2.13-pre1.tar.bz2
+/gutenprint-5.2.13.tar.bz2
+/gutenprint-5.2.14-pre2.tar.bz2
 /gutenprint-5.2.14.tar.bz2
+/gutenprint-5.3.3.tar.xz
+/gutenprint-5.3.4.tar.xz
--- a/ci.fmf
+++ b/ci.fmf
@ -0,0 +1 @@
+resultsdb-testcase: separate
--- a/cups-genppdupdate.py.in
+++ b/cups-genppdupdate.py.in
@ -255,6 +255,23 @@ def parse_options():

    return args

+def check_encoding(filename):
+    import charset_normalizer
+
+    with open(filename, 'rb') as f:
+         charenc = charset_normalizer.detect(f.read())['encoding']
+
+    if debug & 1:
+        print("File encoding: {}".format(charenc))
+
+    if charenc in ['ascii', 'utf-8']:
+        return 'utf-8'
+    else:
+        if debug & 1:
+            print("Trying to use latin1 for decoding {}".format(charenc))
+
+        return 'latin1'
+
 def update_ppd (ppd_source_filename):
    global ppd_dest_filename
    global ppd_out_dir
@ -271,7 +288,8 @@ def update_ppd (ppd_source_filename):
        ppd_dest_filename = "%s/%s" % (ppd_out_dir,
                                       os.path.basename (ppd_dest_filename))

-    orig = open (ppd_source_filename, encoding="utf-8")
+    fenc = check_encoding(ppd_source_filename)
+    orig = open(ppd_source_filename, encoding=fenc)
    orig_metadata = os.fstat (orig.fileno ())
    if debug & 1:
        print ("Source Filename: %s" % ppd_source_filename)
@ -284,7 +302,17 @@ def update_ppd (ppd_source_filename):
    region = ""
    valid = 0
    orig_locale = ""
-    for line in orig.readlines ():
+
+    try:
+        orig_lines = orig.readlines()
+    except UnicodeDecodeError:
+        if debug & 1:
+            print('PPD {} has an unexpected enconding, '
+                  'skipping.'.format(ppd_source_filename))
+
+        return -1
+
+    for line in orig_lines:
        line.rstrip ()
        if line.find ("*StpLocale:") != -1:
            match = re.search ("\*StpLocale:\s*\"(.*)\"$", line)
--- a/gating.yaml
+++ b/gating.yaml
@ -1,7 +1,25 @@
 --- !Policy
 product_versions:
-    - rhel-8
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
-    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
--- a/gutenprint-c99.patch
+++ b/gutenprint-c99.patch
@ -0,0 +1,24 @@
+commit 75af7caf4d3369de2d0c5432220da15fae64f58b
+Author: Solomon Peachy <pizza@shaftnet.org>
+Date:   Fri Dec 22 08:56:32 2023 -0500
+
+    gimpui:  Fix two implicit-pointer-cast-to-int instances
+    
+    (The GIMP API uses an opaque 32-bit "handle")
+
+diff --git a/src/gimp2/print.c b/src/gimp2/print.c
+index fc1344f6..2ebdb352 100644
+--- a/src/gimp2/print.c
+++ b/src/gimp2/print.c
+@@ -114,8 +114,8 @@ stpui_get_thumbnail_data_function(void *image_ID, gint *width, gint *height,
+ {
+   if (gimp_thumbnail_data)
+     g_free(gimp_thumbnail_data);
+-  gint x = gimp_image_width(image_ID);
+-  gint y = gimp_image_height(image_ID);
+  gint x = gimp_image_width(p2gint(image_ID));
+  gint y = gimp_image_height(p2gint(image_ID));
+   if (*width > x)
+     *width = x;
+   if (*height > y)
+
--- a/gutenprint-libusb-crash.patch
+++ b/gutenprint-libusb-crash.patch
@ -0,0 +1,75 @@
+diff --git a/src/cups/backend_common.c b/src/cups/backend_common.c
+index 6333408..b19668d 100644
+--- a/src/cups/backend_common.c
+++ b/src/cups/backend_common.c
+@@ -753,8 +753,7 @@ static struct dyesub_backend *backends[] = {
+ 	NULL,
+ };
+ 
+-static int find_and_enumerate(struct libusb_context *ctx,
+-			      struct libusb_device ***list,
+static int find_and_enumerate(struct libusb_device ***list,
+ 			      const struct dyesub_backend *backend,
+ 			      const char *match_serno,
+ 			      const char *make,
+@@ -777,7 +776,7 @@ static int find_and_enumerate(struct libusb_context *ctx,
+ 	STATE("+org.gutenprint.searching-for-device\n");
+ 
+ 	/* Enumerate and find suitable device */
+-	num = libusb_get_device_list(ctx, list);
+	num = libusb_get_device_list(NULL, list);
+ 
+ 	/* See if we can actually match on the supplied make! */
+ 	if (backend && make) {
+@@ -1010,7 +1009,6 @@ along with this program; if not, see <https://www.gnu.org/licenses/>.\n\n";
+ 
+ void print_help(const char *argv0, const struct dyesub_backend *backend)
+ {
+-	struct libusb_context *ctx = NULL;
+ 	struct libusb_device **list = NULL;
+ 
+ 	const char *ptr = getenv("BACKEND");
+@@ -1072,7 +1070,7 @@ void print_help(const char *argv0, const struct dyesub_backend *backend)
+ 	}
+ 
+ 	/* Scan for all printers for the specified backend */
+-	find_and_enumerate(ctx, &list, backend, NULL, ptr, 1, 1, NULL);
+	find_and_enumerate(&list, backend, NULL, ptr, 1, 1, NULL);
+ 	libusb_free_device_list(list, 1);
+ }
+ 
+@@ -1251,7 +1249,6 @@ done:
+ 
+ int main (int argc, char **argv)
+ {
+-	struct libusb_context *ctx = NULL;
+ 	struct libusb_device **list = NULL;
+ 
+ 	struct dyesub_backend *backend = NULL;
+@@ -1414,7 +1411,7 @@ int main (int argc, char **argv)
+ #endif
+ 
+ 	/* Libusb setup */
+-	ret = libusb_init(&ctx);
+	ret = libusb_init(NULL);
+ 	if (ret) {
+ 		ERROR("Failed to initialize libusb (%d)\n", ret);
+ 		ret = CUPS_BACKEND_RETRY_CURRENT;
+@@ -1438,7 +1435,7 @@ int main (int argc, char **argv)
+ 	}
+ 
+ 	/* Enumerate devices */
+-	found = find_and_enumerate(ctx, &list, backend, use_serno, backend_str, 0, NUM_CLAIM_ATTEMPTS, &conn);
+	found = find_and_enumerate(&list, backend, use_serno, backend_str, 0, NUM_CLAIM_ATTEMPTS, &conn);
+ 
+ 	if (found == -1) {
+ 		ERROR("Printer open failure (No matching printers found!)\n");
+@@ -1572,7 +1569,7 @@ done:
+ 	if (list)
+ 		libusb_free_device_list(list, 1);
+ 
+-	libusb_exit(ctx);
+	libusb_exit(NULL);
+ 
+ 	return ret;
+ }
--- a/gutenprint-postscriptdriver.patch
+++ b/gutenprint-postscriptdriver.patch
@ -1,7 +1,7 @@
-diff -up gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver gutenprint-5.2.6/src/main/gutenprint-internal.h
--- gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver	2010-08-04 02:33:56.000000000 +0200
-+++ gutenprint-5.2.6/src/main/gutenprint-internal.h	2010-08-11 16:11:19.000000000 +0200
-@@ -56,6 +56,8 @@ extern void stpi_init_printer(void);
+diff -up gutenprint-5.3.3/src/main/gutenprint-internal.h.postscriptdriver gutenprint-5.3.3/src/main/gutenprint-internal.h
+--- gutenprint-5.3.3/src/main/gutenprint-internal.h.postscriptdriver	2018-01-28 03:32:45.000000000 +0100
+++ gutenprint-5.3.3/src/main/gutenprint-internal.h	2019-11-06 12:13:29.936061606 +0100
+@@ -54,6 +54,8 @@ extern void stpi_init_printer(void);
 #define BUFFER_FLAG_FLIP_X	0x1
 #define BUFFER_FLAG_FLIP_Y	0x2
 extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags);
@ -10,10 +10,10 @@ diff -up gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver gutenp
 
 #define STPI_ASSERT(x,v)						\
 do									\
-diff -up gutenprint-5.2.6/src/main/module.c.postscriptdriver gutenprint-5.2.6/src/main/module.c
--- gutenprint-5.2.6/src/main/module.c.postscriptdriver	2006-09-30 17:02:59.000000000 +0200
-+++ gutenprint-5.2.6/src/main/module.c	2010-08-11 16:13:43.000000000 +0200
-@@ -151,12 +151,20 @@ int stp_module_load(void)
+diff -up gutenprint-5.3.3/src/main/module.c.postscriptdriver gutenprint-5.3.3/src/main/module.c
+--- gutenprint-5.3.3/src/main/module.c.postscriptdriver	2019-05-25 16:34:21.000000000 +0200
+++ gutenprint-5.3.3/src/main/module.c	2019-11-06 12:13:29.936061606 +0100
+@@ -159,12 +159,20 @@ int stp_module_load(void)
     }
   else
     {
@ -34,29 +34,28 @@ diff -up gutenprint-5.2.6/src/main/module.c.postscriptdriver gutenprint-5.2.6/sr
     }
 #ifdef USE_LTDL
   file_list = stp_path_search(dir_list, ".la");
-diff -up gutenprint-5.2.6/src/main/path.c.postscriptdriver gutenprint-5.2.6/src/main/path.c
--- gutenprint-5.2.6/src/main/path.c.postscriptdriver	2008-06-01 16:41:18.000000000 +0200
-+++ gutenprint-5.2.6/src/main/path.c	2010-08-11 16:13:43.000000000 +0200
-@@ -158,7 +158,17 @@ stpi_data_path(void)
-   if (getenv("STP_DATA_PATH"))
-     stp_path_split(dir_list, getenv("STP_DATA_PATH"));
-   else
-    stp_path_split(dir_list, PKGXMLDATADIR);
+diff -up gutenprint-5.3.3/src/main/path.c.postscriptdriver gutenprint-5.3.3/src/main/path.c
+--- gutenprint-5.3.3/src/main/path.c.postscriptdriver	2019-05-25 16:34:21.000000000 +0200
+++ gutenprint-5.3.3/src/main/path.c	2019-11-06 12:29:30.709190171 +0100
+@@ -154,6 +154,17 @@ stp_generate_path(const char *path)
+     return NULL;
+   stp_list_set_freefunc(dir_list, stp_list_node_free_data);
+   stp_path_split(dir_list, path);
+  if (!strncmp(PKGXMLDATADIR, path, strlen(path)))
+  {
+    const char *prefix = getenv("DESTDIR");
+    if (prefix)
 +    {
-+      const char *prefix = getenv("DESTDIR");
-+      stp_path_split(dir_list, PKGXMLDATADIR);
-+      if (prefix)
-+	{
-+	  stp_list_t *prefix_list;
-+	  prefix_list = stp_paths_copy_with_prefix(dir_list, prefix);
-+	  stp_list_destroy(dir_list);
-+	  dir_list = prefix_list;
-+	}
+      stp_list_t *prefix_list;
+      prefix_list = stp_paths_copy_with_prefix(dir_list, prefix);
+      stp_list_destroy(dir_list);
+      dir_list = prefix_list;
 +    }
+  }
   return dir_list;
 }
 
-@@ -226,6 +236,40 @@ stp_path_split(stp_list_t *list, /* List
+@@ -262,6 +273,40 @@ stp_path_split(stp_list_t *list, /* List
     }
 }
 
@ -72,7 +71,7 @@ diff -up gutenprint-5.2.6/src/main/path.c.postscriptdriver gutenprint-5.2.6/src/
 +  stp_list_item_t *item;
 +  int prefixlen = strlen (prefix);
 +  if (!(new_list = stp_list_create()))
-+    return;
+    return NULL;
 +
 +  item = stp_list_get_start (list);
 +  while (item)
--- a/gutenprint-python36syntax.patch
+++ b/gutenprint-python36syntax.patch
@ -1,7 +1,7 @@
 --- gutenprint-5.2.12/src/cups/cups-genppdupdate.in.python36syntax	
 +++ gutenprint-5.2.12/src/cups/cups-genppdupdate.in	
@@ -287,7 +287,7 @@ def update_ppd (ppd_source_filename):
-     for line in orig.readlines ():
+     for line in orig_lines:
         line.rstrip ()
         if line.find ("*StpLocale:") != -1:
 -            match = re.search ("\*StpLocale:\s*\"(.*)\"$", line)
--- a/gutenprint-xmlfixes.patch
+++ b/gutenprint-xmlfixes.patch
@ -0,0 +1,107 @@
+diff --git a/src/xml/escp2/inks/claria_xp.xml b/src/xml/escp2/inks/claria_xp.xml
+index 44d38b5..693c2b1 100644
+--- a/src/xml/escp2/inks/claria_xp.xml
+++ b/src/xml/escp2/inks/claria_xp.xml
+@@ -78,7 +78,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  <InkName translate="text" name="CMYKk" text="Six Color Photo" InkID="OTHER">
+   <Channels>
+    <channel name="claria_photo_black" index="0">
+-    <subchannel color="0" subchannel="0" subchannel="0" name="Black" text="Black" translate="text">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+      <ChannelDensityParam name="BlackDensity"/>
+      <SubchannelTransitionParam name="LightBlackTrans"/>
+     </subchannel>
+diff --git a/src/xml/escp2/inputslots/standard_roll_feed.xml b/src/xml/escp2/inputslots/standard_roll_feed.xml
+index 1422d39..16316c8 100644
+--- a/src/xml/escp2/inputslots/standard_roll_feed.xml
+++ b/src/xml/escp2/inputslots/standard_roll_feed.xml
+@@ -1,4 +1,4 @@
+- <?xml version="1.0"?>
+<?xml version="1.0"?>
+ 
+ <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+diff --git a/src/xml/escp2/media/artisan.xml b/src/xml/escp2/media/artisan.xml
+index 6e567ee..362759e 100644
+--- a/src/xml/escp2/media/artisan.xml
+++ b/src/xml/escp2/media/artisan.xml
+@@ -1125,7 +1125,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ 
+diff --git a/src/xml/escp2/media/claria.xml b/src/xml/escp2/media/claria.xml
+index ce894f5..5b6be23 100644
+--- a/src/xml/escp2/media/claria.xml
+++ b/src/xml/escp2/media/claria.xml
+@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ 
+diff --git a/src/xml/escp2/media/claria1400.xml b/src/xml/escp2/media/claria1400.xml
+index a9b36e5..6a5deb7 100644
+--- a/src/xml/escp2/media/claria1400.xml
+++ b/src/xml/escp2/media/claria1400.xml
+@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ 
+diff --git a/src/xml/escp2/media/claria_xp.xml b/src/xml/escp2/media/claria_xp.xml
+index 32759b5..79f43c3 100644
+--- a/src/xml/escp2/media/claria_xp.xml
+++ b/src/xml/escp2/media/claria_xp.xml
+@@ -2037,7 +2037,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ 
+diff --git a/src/xml/escp2/weaves/standard.xml b/src/xml/escp2/weaves/standard.xml
+index d9176db..efc89de 100644
+--- a/src/xml/escp2/weaves/standard.xml
+++ b/src/xml/escp2/weaves/standard.xml
+@@ -1,4 +1,4 @@
+- <?xml version="1.0"?>
+<?xml version="1.0"?>
+ 
+ <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+diff --git a/src/xml/printers/dyesub.xml b/src/xml/printers/dyesub.xml
+index 1bd62e6..aa7985d 100644
+--- a/src/xml/printers/dyesub.xml
+++ b/src/xml/printers/dyesub.xml
+@@ -95,7 +95,7 @@
+       <printer translate="name" name="Citizen CW-02" driver="citizen-cw-02" manufacturer="Citizen" model="6000" />
+       <printer translate="name" name="Citizen CX" driver="citizen-cx" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX;" manufacturer="Citizen" model="6000" />
+       <printer translate="name" name="Citizen CX-02" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02;" driver="citizen-cx-02" manufacturer="Citizen" model="6003" />
+-      <printer translate="name" name="Citizen CX-02W" "MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
+      <printer translate="name" name="Citizen CX-02W" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
+       <printer translate="name" name="Citizen CX-W" driver="citizen-cx-w" manufacturer="Citizen" model="6001" />
+       <printer translate="name" name="Citizen CY" driver="citizen-cy" manufacturer="Citizen" model="6002" />
+       <printer translate="name" name="Citizen CY-02" driver="citizen-cy-02" manufacturer="Citizen" model="6002" />
+@@ -127,7 +127,7 @@
+       <printer translate="name" name="Kodak 1400" deviceid="MFG:Eastman Kodak Company;CMD:EK1;MDL: 1400 Printer;CLS:Printer;DES:Kodak 1400 Printer;`" driver="kodak-1400" manufacturer="Kodak" model="4004" />
+       <printer translate="name" name="Kodak 6800" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6800;CLS:PRINTER;DES:KODAK Photo Printer 6800;" driver="kodak-6800" manufacturer="Kodak" model="4001" />
+       <printer translate="name" name="Kodak 6850" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6850;CLS:PRINTER;DES:KODAK Photo Printer 6850;" driver="kodak-6850" manufacturer="Kodak" model="4002" />
+-      <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;"driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
+      <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;" driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
+       <printer translate="name" name="Kodak 7000" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7000 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7000" manufacturer="Kodak" model="4008" />
+       <printer translate="name" name="Kodak 7010" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7010 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7010" manufacturer="Kodak" model="4008">EXPERIMENTAL</printer>
+       <printer translate="name" name="Kodak 7015" driver="kodak-7015" manufacturer="Kodak" model="4009">EXPERIMENTAL</printer>
--- a/gutenprint.spec
+++ b/gutenprint.spec
@ -1,48 +1,96 @@
 #%%global prever pre2
 #%%global ver %%{version}-%%{prever}

+# change with every change of major or minor version number
+#%%global majminver 5.3
+%global majminver $(echo %{version} | sed -E 's/\.[0-9]+$//')
+
+%if 0%{?rhel} <= 8 || 0%{?fedora}
+%bcond_without plugin
+%else
+%bcond_with plugin
+%endif
+
+%if 0%{?rhel} <= 9 || 0%{?fedora}
+%bcond_without gtk2
+%else
+%bcond_with gtk2
+%endif
+
+# added in cups-1:2.4.7-3 - remove once F40 is EOL and C10S is released
+# (that's the safe bet for versions where macros will be always available)
+%{!?_cups_datadir:%global _cups_datadir %(/usr/bin/pkg-config --variable=cups_datadir cups)}
+%{!?_cups_serverroot:%global _cups_serverroot %(/usr/bin/pkg-config --variable=cups_serverroot cups)}
+
 Name:           gutenprint
 Summary:        Printer Drivers Package
-Version:        5.2.14
-Release:        3%{?dist}
+Version:        5.3.4
+Release:        18%{?dist}
 URL:            http://gimp-print.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.xz
 # Post-install script to update CUPS native PPDs.
 Source1:        cups-genppdupdate.py.in
 # ported from old gimp-print package - fix for a menu in gimp gutenprint plugin
 Patch0:         gutenprint-menu.patch
-Patch1:         gutenprint-O6.patch
-Patch3:         gutenprint-postscriptdriver.patch
-Patch4:         gutenprint-yyin.patch
-Patch5:         gutenprint-manpage.patch
-Patch6:         gutenprint-python36syntax.patch
-License:        GPLv2+
+Patch1:         gutenprint-postscriptdriver.patch
+Patch2:         gutenprint-yyin.patch
+Patch3:         gutenprint-manpage.patch
+Patch4:         gutenprint-python36syntax.patch
+Patch5:         gutenprint-xmlfixes.patch
+Patch6:         gutenprint-libusb-crash.patch
+Patch7:         gutenprint-c99.patch
+License:        GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT AND GPL-3.0-or-later WITH Bison-exception-2.2

-#### removed patches, because the seems useless
-# I'll leave them here, in case its removal will break something
-#Patch2: gutenprint-selinux.patch

 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

-# gcc is no longer in buildroot by default
-BuildRequires:  gcc
-BuildRequires:  cups-libs, cups-devel, cups
-BuildRequires:  gettext-devel,pkgconfig
-BuildRequires:  libtiff-devel,libjpeg-devel,libpng-devel
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(gimpui-2.0)
-BuildRequires:  gimp
-BuildRequires:  chrpath
-
-# Make sure we get postscriptdriver tags.
-BuildRequires:  python3-cups
-
 # autoreconf
-BuildRequires: autoconf automake libtool
-
-# needed for defining %%{__python3} macro in prep phase
+BuildRequires: autoconf
+BuildRequires: automake
+# we remove rpath during %%install
+BuildRequires: chrpath
+# we use CUPS functions in CUPS driver
+BuildRequires: cups
+BuildRequires: cups-devel
+BuildRequires: cups-libs
+# gcc is no longer in buildroot by default
+BuildRequires: gcc
+# for language support
+BuildRequires: gettext-devel
+# for JPEG, PNG and TIFF file format support
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+# for autoreconf
+BuildRequires: libtool
+# uses make
+BuildRequires: make
+# we use pkgconfig in spec file to get correct devel packages
+BuildRequires: pkgconfig
+# for gutenprint usb backend gutenprintMAJMIN+usb
+BuildRequires: pkgconfig(libusb-1.0)
+# Make sure we get postscriptdriver tags - for automatic driver installation
+# via PackageKit.
+BuildRequires:  python3-cups
+# needed for defining %%{__python3} macro for prep phase
 BuildRequires: python3-devel
+# we use sed in spec file to get majorver.minver string, which is used in directory
+# structure
+BuildRequires: sed
+
+# the plugin is built only in Fedora, so
+# no need gimp devel files for its ui
+%if %{with plugin}
+BuildRequires:  pkgconfig(gimpui-2.0)
+%endif
+
+%if %{with gtk2}
+# gutenprint library uses functions from GTK2 for gutenprint UI library
+BuildRequires: pkgconfig(gtk+-2.0)
+%endif
+
+# escputil uses lp for sending raw print commands to the printer...
+Requires:      cups-client%{?_isa}

 ## NOTE ##
 # The README file in this package contains suggestions from upstream
@ -66,23 +114,30 @@ Summary:       libgutenprint library
 %description libs
 This package includes libgutenprint library, necessary to run gutenprint.

+%if %{with gtk2}
 %package libs-ui
 Summary:       libgutenprintui2 library
 Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
+# function in the library tries to figure out local printing system by checking for lp binary
+Requires:      cups-client%{?_isa}

 %description libs-ui
 This package includes libgutenprintui2 library, which contains
 GTK+ widgets, which may be used for print dialogs etc.
+%endif

 %package devel
 Summary:        Library development files for gutenprint
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+%if %{with gtk2}
 Requires:       gtk2-devel
+%endif

 %description devel
 This package contains headers and libraries required to build applications that
 uses gutenprint package.

+%if %{with plugin}
 %package plugin
 Summary:        GIMP plug-in for gutenprint
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@ -98,11 +153,15 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description extras
 This package contains test pattern generator and the sample test pattern
 that is used by gutenprint-devel package.
+%endif

 %package cups
 Summary:        CUPS drivers for Canon, Epson, HP and compatible printers
 Requires:       cups
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+# for cups-genppdupdate python script
+Requires:       python3
+Requires:       python3-charset-normalizer

 %description cups
 This package contains native CUPS support for a wide range of Canon,
@ -111,18 +170,13 @@ Epson, HP and compatible printers.
 %prep
 %setup -q -n %{name}-%{version}
 # Fix menu placement of GIMP plugin.
-%patch0 -p1 -b .menu
-# Don't use -O6 compiler option.
-%patch1 -p1 -b .O6
-# Restore file contexts when updating PPDs.
-#%%patch2 -p1 -b .selinux
+%patch -P 0 -p1 -b .menu
 # Allow the CUPS dynamic driver to run inside a build root.
-%patch3 -p1 -b .postscriptdriver
+%patch -P 1 -p1 -b .postscriptdriver
 # Don't export yy* symbols (bug #882194).
-%patch4 -p1 -b .yyin
-
+%patch -P 2 -p1 -b .yyin
 # Added some escputil options to the manpage (bug #979064).
-%patch5 -p1 -b .manpage
+%patch -P 3 -p1 -b .manpage

 cp %{SOURCE1} src/cups/cups-genppdupdate.in

@ -130,21 +184,30 @@ cp %{SOURCE1} src/cups/cups-genppdupdate.in
 sed -i -e 's,^#!/usr/bin/python3,#!%{__python3},' src/cups/cups-genppdupdate.in

 # Python 3.6 invalid escape sequence deprecation fixes, COPYING as license (bug #1448303)
-%patch6 -p1 -b .python36syntax
+%patch -P 4 -p1 -b .python36syntax
+# fix xml error reported by rpminspect, sent upstream via email
+%patch -P 5 -p1 -b .xmlfixes
+# 2055504 - Set gutenprint53+usb backend to use the default USB context
+%patch -P 6 -p1 -b .crash
+
+%patch -P 7 -p1 -b .c99

 %build
 # Don't run the weave test as it takes a very long time.
 sed -i -e 's,^\(TESTS *=.*\) run-weavetest,\1,' test/Makefile.in

 %configure --disable-dependency-tracking \
-		--disable-static \
-		--enable-samples \
-		--enable-escputil \
-		--enable-test \
-		--disable-rpath \
-		--enable-cups-1_2-enhancements \
-		--disable-cups-ppds \
-		--enable-simplified-cups-ppds
+    --disable-static \
+    --enable-samples \
+    --enable-escputil \
+    --enable-test \
+    --disable-rpath \
+    --enable-cups-1_2-enhancements \
+    --disable-cups-ppds \
+%if %{without gtk2}
+    --disable-libgutenprintui2 \
+%endif
+    --enable-simplified-cups-ppds

 %make_build

@ -159,8 +222,9 @@ mkdir -p %{buildroot}%{_sbindir}

 rm -rf %{buildroot}%{_datadir}/gutenprint/doc
 rm -f %{buildroot}%{_datadir}/foomatic/kitload.log
-rm -rf %{buildroot}%{_libdir}/gutenprint/5.2/modules/*.la
-rm -f %{buildroot}%{_sysconfdir}/cups/command.types
+
+rm -rf %{buildroot}%{_libdir}/gutenprint/%{majminver}/modules/*.la
+rm -f %{buildroot}%{_cups_serverroot}/command.types

 %find_lang %{name}
 sed 's!%{_datadir}/locale/\([^/]*\)/LC_MESSAGES/gutenprint.mo!%{_datadir}/locale/\1/gutenprint_\1.po!g' %{name}.lang >%{name}-po.lang
@ -168,13 +232,15 @@ rm -f %{name}.lang
 %find_lang %{name} --all-name
 cat %{name}-po.lang >>%{name}.lang

-echo .so man8/cups-genppd.8 > %{buildroot}%{_mandir}/man8/cups-genppd.5.2.8
+#echo .so man8/cups-genppd.8 > %{buildroot}%{_mandir}/man8/cups-genppd.5.3.3

 # Fix up rpath.  If you can find a way to do this without resorting
 # to chrpath, please let me know!
 for file in \
-  %{buildroot}%{_sbindir}/cups-genppd.5.2 \
+  %{buildroot}%{_sbindir}/cups-genppd.%{majminver} \
+%if %{with plugin}
  %{buildroot}%{_libdir}/gimp/*/plug-ins/* \
+%endif
  %{buildroot}%{_libdir}/*.so.* \
  %{buildroot}%{_cups_serverbin}/driver/* \
  %{buildroot}%{_cups_serverbin}/filter/* \
@ -183,16 +249,16 @@ do
  chrpath --delete ${file}
 done

+%if %{without plugin}
+%{_bindir}/rm -f %{buildroot}%{_bindir}/testpattern \
+%endif

-%post libs -p /sbin/ldconfig
-%post libs-ui -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-%postun libs-ui -p /sbin/ldconfig
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets libs-ui

 %post cups
-/usr/sbin/cups-genppdupdate >/dev/null 2>&1 || :
-/sbin/service cups reload >/dev/null 2>&1 || :
+%{_sbindir}/cups-genppdupdate >/dev/null 2>&1 || :
+%{_bindir}/systemctl restart cups >/dev/null 2>&1 || :
 exit 0


@ -208,23 +274,29 @@ exit 0
 %license COPYING

 %files libs
-%{_libdir}/libgutenprint.so.2
-%{_libdir}/libgutenprint.so.2.7.0
+%{_libdir}/libgutenprint.so.9
+%{_libdir}/libgutenprint.so.9.5.0

+%if %{with gtk2}
 %files libs-ui
-%{_libdir}/libgutenprintui2.so.1
-%{_libdir}/libgutenprintui2.so.1.0.0
+%{_libdir}/libgutenprintui2.so.2
+%{_libdir}/libgutenprintui2.so.2.5.0
+%endif

 %files devel
 %doc ChangeLog doc/developer/reference-html doc/developer/gutenprint.pdf
-%doc doc/gutenprint doc/gutenprintui2
+%doc doc/gutenprint
 %{_includedir}/gutenprint/
-%{_includedir}/gutenprintui2/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/gutenprint.pc
-%{_libdir}/pkgconfig/gutenprintui2.pc
 %exclude %{_libdir}/*.la
+%if %{with gtk2}
+%doc doc/gutenprintui2
+%{_includedir}/gutenprintui2/
+%{_libdir}/pkgconfig/gutenprintui2.pc
+%endif

+%if %{with plugin}
 %files plugin
 %{_libdir}/gimp/*/plug-ins/gutenprint

@ -232,22 +304,116 @@ exit 0
 %doc
 %{_bindir}/testpattern
 %{_datadir}/gutenprint/samples/*
+%endif

 %files cups
 %doc
-%{_datadir}/cups/calibrate.ppm
-%{_datadir}/cups/usb/net.sf.gimp-print.usb-quirks
+%{_cups_datadir}/calibrate.ppm
+%{_cups_datadir}/usb/net.sf.gimp-print.usb-quirks
 %{_cups_serverbin}/filter/*
 %{_cups_serverbin}/driver/*
 %{_cups_serverbin}/backend/*
 %{_bindir}/cups-calibrate
 %{_sbindir}/cups-genppd*
 %{_mandir}/man8/cups-calibrate.8*
-%{_mandir}/man8/cups-genppd*.8*
+%{_mandir}/man8/cups-genppd*8*.gz

 %changelog
-* Wed Aug 15 2018 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-3
- rebuilt with fixed gimp module
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.3.4-18
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.3.4-17
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan 03 2024 Florian Weimer <fweimer@redhat.com> - 5.3.4-14
+- Backport upstream patch to fix C compatibility issue
+
+* Thu Nov 16 2023 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-13
+- make gutenprint and gutenprint-libs-ui dependant on cups-client - both checks for existence of lp
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 06 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.3.4-11
+- Replace python3-chardet with python3-charset-normalizer
+
+* Wed Apr 05 2023 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-11
+- GTK2 is not in CentOS Stream 10, dont ship libs-ui subpackage there
+- Add other licenses to License tag and use SPDX identifiers to comply with FPG
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Mar 28 2022 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-8
+- 2055504 - Set gutenprint53+usb backend to use the default USB context
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 11 2022 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-6
+- remove the static libraries which were shipped by mistake
+
+* Mon Nov 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-5
+- 2025107 - cups-genppdupdate needs python3-chardet
+
+* Wed Aug 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-4
+- fix xml errors reported by rpminspect
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 13 2021 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-1
+- 5.3.4
+
+* Fri Nov 06 2020 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-7
+- 1773690 - cups-genppdupdate doesnt work for non-utf-8 PPDs
+
+* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-6
+- make is no longer in buildroot by default
+
+* Wed Sep 30 2020 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-5
+- dont require the gimp package as build require, pkgconfig's gimpui-2.0 suffices
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Mar 25 2020 Tom Stellard <tstellar@redhat.com> - 5.3.3-3
+- Fix warning building with clang
+- non-void function 'stp_paths_copy_with_prefix' should return a value [-Wreturn-type]
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Nov 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-1
+- 5.3.3
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.14-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Apr 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-6
+- rebuilt again (because bodhi cannot release builds of unpushed updates)
+
+* Mon Apr 08 2019 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-5
+- rebuilt for gimp-2.10.10
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Wed Jul 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-2
 - use %%{__python3} macro
--- a/1
+++ b/1
@ -0,0 +1 @@
+gutenprint-libs-ui removed between C9S and C10S
--- a/plans.fmf
+++ b/plans.fmf
@ -0,0 +1,24 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/gutenprint.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/gutenprint.git
+      name: /plans/tier1/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/gutenprint.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/gutenprint.git
+      name: /plans/others/public
+
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (gutenprint-5.2.14.tar.bz2) = aeb06b4be45fcb67320b419b988ca59dbda51bb2c3ff4edd0f0757ac977565a6829f506ebea6872211c689a15925ad2119836424c3c9a97345a8cd506e9df9fd
+SHA512 (gutenprint-5.3.4.tar.xz) = 63de0b62edbe255a7efaaeab1dcd22577b7b46d7e0e48441b79977f19e76bf3862e4e8e18c55dd1f2e7392d555f9e8ee875ea53b90c689852d2343491a8fbcc8
				`@ -0,0 +1 @@`
				`gutenprint-libs-ui removed between C9S and C10S`