pkgsrc-WIP-changes archive

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

emacs-git: remove patch that was merged upstream



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Dec 7 22:05:12 2024 +0100
Changeset:	49c24d2d65aba9067e8d38b969e719dca3643e2d

Modified Files:
	emacs-git/distinfo
Removed Files:
	emacs-git/patches/patch-src_image.c

Log Message:
emacs-git: remove patch that was merged upstream

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

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

diffstat:
 emacs-git/distinfo                  |  1 -
 emacs-git/patches/patch-src_image.c | 49 -------------------------------------
 2 files changed, 50 deletions(-)

diffs:
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
index 82bbaf98e3..039d4f3fe7 100644
--- a/emacs-git/distinfo
+++ b/emacs-git/distinfo
@@ -1,4 +1,3 @@
 $NetBSD$
 
 SHA1 (patch-configure.ac) = fdf28fb6247c1f7bbdf2002e3af1bb6ec654c4a2
-SHA1 (patch-src_image.c) = f61ffb2ffe4f452ef1b89d80396051bbeb27277b
diff --git a/emacs-git/patches/patch-src_image.c b/emacs-git/patches/patch-src_image.c
deleted file mode 100644
index d13a19167b..0000000000
--- a/emacs-git/patches/patch-src_image.c
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
---- src/image.c.orig	2024-12-03 07:29:35.236430216 +0000
-+++ src/image.c
-@@ -11688,7 +11688,7 @@ DEF_DLL_FN (void, rsvg_handle_get_dimens
- DEF_DLL_FN (gboolean, rsvg_handle_set_stylesheet,
- 	    (RsvgHandle *, const guint8 *, gsize, GError **));
- #  endif
--#  if LIBRSVG_CHECK_VERSION (2, 58, 0)
-+#  if LIBRSVG_CHECK_VERSION (2, 58, 90)
- DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf_and_error, (RsvgHandle *, GError **));
- #  else
- DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *));
-@@ -11751,7 +11751,7 @@ init_svg_functions (void)
- #if LIBRSVG_CHECK_VERSION (2, 48, 0)
-   LOAD_DLL_FN (library, rsvg_handle_set_stylesheet);
- #endif
--#if LIBRSVG_CHECK_VERSION (2, 58, 0)
-+#if LIBRSVG_CHECK_VERSION (2, 58, 90)
-   LOAD_DLL_FN (library, rsvg_handle_get_pixbuf_and_error);
- #else
-   LOAD_DLL_FN (library, rsvg_handle_get_pixbuf);
-@@ -11800,7 +11800,7 @@ init_svg_functions (void)
- #  if LIBRSVG_CHECK_VERSION (2, 48, 0)
- #   undef rsvg_handle_set_stylesheet
- #  endif
--#  if LIBRSVG_CHECK_VERSION (2, 58, 0)
-+#  if LIBRSVG_CHECK_VERSION (2, 58, 90)
- #   undef rsvg_handle_get_pixbuf_and_error
- #  else
- #   undef rsvg_handle_get_pixbuf
-@@ -11845,7 +11845,7 @@ init_svg_functions (void)
- #  if LIBRSVG_CHECK_VERSION (2, 48, 0)
- #   define rsvg_handle_set_stylesheet fn_rsvg_handle_set_stylesheet
- #  endif
--#  if LIBRSVG_CHECK_VERSION (2, 58, 0)
-+#  if LIBRSVG_CHECK_VERSION (2, 58, 90)
- #   define rsvg_handle_get_pixbuf_and_error fn_rsvg_handle_get_pixbuf_and_error
- #  else
- #   define rsvg_handle_get_pixbuf fn_rsvg_handle_get_pixbuf
-@@ -12354,7 +12354,7 @@ svg_load_image (struct frame *f, struct 
- 
-   /* We can now get a valid pixel buffer from the svg file, if all
-      went ok.  */
--#if LIBRSVG_CHECK_VERSION (2, 58, 0)
-+#if LIBRSVG_CHECK_VERSION (2, 58, 90)
-   pixbuf = rsvg_handle_get_pixbuf_and_error (rsvg_handle, &err);
-   if (err) goto rsvg_error;
- #else


Home | Main Index | Thread Index | Old Index