pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cups-filters: removed patches, added todo



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Fri Apr 12 13:09:27 2024 -0400
Changeset:	de089f56e22441eb3f06bfc3a6ca4e9d66c04517

Added Files:
	cups-filters/TODO
Removed Files:
	cups-filters/opatches/patch-Makefile.in
	cups-filters/opatches/patch-filter_gstoraster.c
	cups-filters/opatches/patch-filter_mupdftoraster.c
	cups-filters/opatches/patch-fontembed_test__pdf.c
	cups-filters/opatches/patch-fontembed_test__ps.c
	cups-filters/opatches/patch-utils_cups-browsed.c

Log Message:
cups-filters: removed patches, added todo

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=de089f56e22441eb3f06bfc3a6ca4e9d66c04517

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cups-filters/TODO                                  |  2 ++
 cups-filters/opatches/patch-Makefile.in            | 16 -------------
 cups-filters/opatches/patch-filter_gstoraster.c    | 16 -------------
 cups-filters/opatches/patch-filter_mupdftoraster.c | 16 -------------
 cups-filters/opatches/patch-fontembed_test__pdf.c  | 24 --------------------
 cups-filters/opatches/patch-fontembed_test__ps.c   | 26 ----------------------
 cups-filters/opatches/patch-utils_cups-browsed.c   | 15 -------------
 7 files changed, 2 insertions(+), 113 deletions(-)

diffs:
diff --git a/cups-filters/TODO b/cups-filters/TODO
new file mode 100644
index 0000000000..dcad5b58b9
--- /dev/null
+++ b/cups-filters/TODO
@@ -0,0 +1,2 @@
+while everything compiles, I'm getting this error:
+cupsd: Undefined PLT symbol "__kevent100" (symnum = 296)
diff --git a/cups-filters/opatches/patch-Makefile.in b/cups-filters/opatches/patch-Makefile.in
deleted file mode 100644
index 6336910a5a..0000000000
--- a/cups-filters/opatches/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.8 2023/05/07 13:16:26 wiz Exp $
-
-Needs C++17
-https://github.com/OpenPrinting/cups-filters/issues/512
-
---- Makefile.in.orig	2022-08-24 12:40:10.000000000 +0000
-+++ Makefile.in
-@@ -1662,7 +1662,7 @@ pdftopdf_CFLAGS = \
- 	$(LIBQPDF_CFLAGS) \
- 	$(CUPS_CFLAGS)
- 
--pdftopdf_CXXFLAGS = -std=c++0x $(pdftopdf_CFLAGS)   # -std=c++11
-+pdftopdf_CXXFLAGS = $(pdftopdf_CFLAGS)
- pdftopdf_LDADD = \
- 	$(LIBQPDF_LIBS) \
- 	$(CUPS_LIBS)
diff --git a/cups-filters/opatches/patch-filter_gstoraster.c b/cups-filters/opatches/patch-filter_gstoraster.c
deleted file mode 100644
index 1f56d16b16..0000000000
--- a/cups-filters/opatches/patch-filter_gstoraster.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-filter_gstoraster.c,v 1.2 2018/02/27 17:48:20 leot Exp $
-
-execvpe(3) appeared only on NetBSD 8.0, use execve(3) instead (like
-cups-filters-1.11.4).
-
---- filter/gstoraster.c.orig	2018-02-07 22:08:42.000000000 +0000
-+++ filter/gstoraster.c
-@@ -503,7 +503,7 @@ gs_spawn (const char *filename,
-     }
- 
-     /* Execute Ghostscript command line ... */
--    execvpe(filename, gsargv, envp);
-+    execve(filename, gsargv, envp);
-     fprintf(stderr, "ERROR: Unable to launch Ghostscript: %s: %s\n", filename, strerror(errno));
-     goto out;
-   }
diff --git a/cups-filters/opatches/patch-filter_mupdftoraster.c b/cups-filters/opatches/patch-filter_mupdftoraster.c
deleted file mode 100644
index a743d70683..0000000000
--- a/cups-filters/opatches/patch-filter_mupdftoraster.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-filter_mupdftoraster.c,v 1.2 2019/06/01 17:39:05 leot Exp $
-
-execvpe(3) appeared only on NetBSD 8.0, use execve(3) instead (like
-cups-filters-1.11.4).
-
---- filter/mupdftoraster.c.orig	2019-05-16 13:02:29.000000000 +0000
-+++ filter/mupdftoraster.c
-@@ -202,7 +202,7 @@ mutool_spawn (const char *filename,
- 
-   if ((pid = fork()) == 0) {
-     /* Execute mutool command line ... */
--    execvpe(filename, mutoolargv, envp);
-+    execve(filename, mutoolargv, envp);
-     perror(filename);
-     goto out;
-   }
diff --git a/cups-filters/opatches/patch-fontembed_test__pdf.c b/cups-filters/opatches/patch-fontembed_test__pdf.c
deleted file mode 100644
index bbc886825d..0000000000
--- a/cups-filters/opatches/patch-fontembed_test__pdf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-fontembed_test__pdf.c,v 1.2 2018/12/05 18:49:39 leot Exp $
-
-`%m' is not supported in printf(3), use strerror(3).
-
---- fontembed/test_pdf.c.orig	2018-11-23 21:18:49.000000000 +0000
-+++ fontembed/test_pdf.c
-@@ -2,14 +2,16 @@
- #include "config.h"
- #include "sfnt.h"
- #include <assert.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- static void example_outfn(const char *buf,int len,void *context) // {{{
- {
-   FILE *f=(FILE *)context;
-   if (fwrite(buf,1,len,f)!=len) {
--    fprintf(stderr,"Short write: %m\n");
-+    fprintf(stderr,"Short write: %s\n", strerror(errno));
-     assert(0);
-     return;
-   }
diff --git a/cups-filters/opatches/patch-fontembed_test__ps.c b/cups-filters/opatches/patch-fontembed_test__ps.c
deleted file mode 100644
index 605b5da100..0000000000
--- a/cups-filters/opatches/patch-fontembed_test__ps.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-fontembed_test__ps.c,v 1.2 2018/12/05 18:49:39 leot Exp $
-
-`%m' is not supported in printf(3), use strerror(3).
-
---- fontembed/test_ps.c.orig	2018-11-23 21:18:49.000000000 +0000
-+++ fontembed/test_ps.c
-@@ -2,8 +2,10 @@
- #include "config.h"
- #include "sfnt.h"
- #include <assert.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- const char *emb_otf_get_fontname(OTF_FILE *otf); // TODO
- 
-@@ -11,7 +13,7 @@ static void example_outfn(const char *bu
- {
-   FILE *f=(FILE *)context;
-   if (fwrite(buf,1,len,f)!=len) {
--    fprintf(stderr,"Short write: %m\n");
-+    fprintf(stderr,"Short write: %s\n", strerror(errno));
-     assert(0);
-     return;
-   }
diff --git a/cups-filters/opatches/patch-utils_cups-browsed.c b/cups-filters/opatches/patch-utils_cups-browsed.c
deleted file mode 100644
index 6f04047956..0000000000
--- a/cups-filters/opatches/patch-utils_cups-browsed.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-utils_cups-browsed.c,v 1.7 2022/09/18 14:41:07 he Exp $
-
-Fix a rather obvious bug, should pass length of allocation...
-
---- utils/cups-browsed.c.orig	2022-04-11 19:56:40.000000000 +0000
-+++ utils/cups-browsed.c
-@@ -10242,7 +10242,7 @@ static void resolve_callback(AvahiServic
- 		   address->proto == AVAHI_PROTO_INET6 &&
- 		   interface != AVAHI_IF_UNSPEC &&
- 		   IPBasedDeviceURIs != IP_BASED_URIS_IPV4_ONLY) {
--	  strncpy(addrstr, "[v1.", sizeof(addrstr) - 1);
-+	  strncpy(addrstr, "[v1.", 255); /* size of allocation - 1 for null */
- 	  avahi_address_snprint(addrstr + 4, 256 - 6, address);
- 	  addrlen = strlen(addrstr + 4);
- 	  addr->sa_family = AF_INET6;


Home | Main Index | Thread Index | Old Index