[gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     3067c50bb68ed3a77aa41093812aaefae5c7dafb
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct  4 10:40:32 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3067c50b

media-gfx/inkscape: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27609
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/inkscape-1.1-poppler-21.11.0.patch       |  20 ---
 .../files/inkscape-1.1.2-automagic-libX11.patch    | 166 ---------------------
 .../files/inkscape-1.1.2-poppler-22.03.0.patch     |  38 -----
 3 files changed, 224 deletions(-)

diff --git a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
deleted file mode 100644
index 7b02253d5f9a..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
-GitLab

diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch b/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch
deleted file mode 100644
index fe104415fb89..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 6d0ace0518f0da18c7e81be1edecd50d997230b1 Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Tue, 11 May 2021 10:43:27 +0200
-Subject: [PATCH] CMake: Fix automagic dependency on X11
-
-Related: https://bugs.gentoo.org/768663
-Related: https://github.com/gentoo/gentoo/pull/20181
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,6 +36,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME inkscape) # needs to be before any inst
- 
- include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable
- include(CMakeScripts/ConfigPaths.cmake)
-+include(CMakeDependentOption)
- 
- set(PROJECT_NAME inkscape)
- 
-@@ -126,6 +127,7 @@ option(WITH_GSPELL "Compile with support of gspell" ON)
- option(WITH_NLS "Compile with Native Language Support (using gettext)" ON)
- option(WITH_JEMALLOC "Compile with JEMALLOC support" OFF)
- option(WITH_ASAN "Compile with Clang's AddressSanitizer (for debugging purposes)" OFF)
-+cmake_dependent_option(WITH_X11 "Compile with X11 support" ON "UNIX; NOT APPLE" OFF)
- option(WITH_INTERNAL_2GEOM "Prefer internal copy of lib2geom" OFF)
- 
- option(WITH_FUZZ "Compile for fuzzing purpose (use 'make fuzz' only)" OFF)
-@@ -285,6 +287,7 @@ message("WITH_LIBWPG:             ${WITH_LIBWPG}")
- message("WITH_NLS:                ${WITH_NLS}")
- message("WITH_OPENMP:             ${WITH_OPENMP}")
- message("WITH_JEMALLOC:           ${WITH_JEMALLOC}")
-+message("WITH_X11:                ${WITH_X11}")
- message("WITH_INTERNAL_2GEOM:     ${WITH_INTERNAL_2GEOM}")
- 
- message("WITH_PROFILING:          ${WITH_PROFILING}")
---- a/CMakeScripts/DefineDependsandFlags.cmake
-+++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -403,12 +403,17 @@ sanitize_ldflags_for_libs(SIGC++_LDFLAGS)
- list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
- list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
- 
--# Some linkers, like gold, don't find symbols recursively. So we have to link against X11 explicitly
--find_package(X11)
--if(X11_FOUND)
-+if(WITH_X11)
-+    find_package(X11 REQUIRED)
-     list(APPEND INKSCAPE_INCS_SYS ${X11_INCLUDE_DIRS})
-     list(APPEND INKSCAPE_LIBS ${X11_LIBRARIES})
--endif(X11_FOUND)
-+    add_definitions(-DHAVE_X11)
-+
-+    pkg_get_variable(GTK3_TARGETS gtk+-3.0 targets)
-+    if(NOT("${GTK3_TARGETS}" MATCHES "x11"))
-+        message(FATAL_ERROR "GTK+3 doesn't targets X11, this is required for WITH_X11")
-+    endif()
-+endif(WITH_X11)
- 
- # end Dependencies
- 
---- a/src/ege-color-prof-tracker.cpp
-+++ b/src/ege-color-prof-tracker.cpp
-@@ -46,11 +46,11 @@
- 
- #include <gtk/gtk.h>
- 
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- #include <X11/Xlib.h>
- 
- #include <gdk/gdkx.h>
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
- 
- #include "ege-color-prof-tracker.h"
- #include "helper/sp-marshal.h"
-@@ -69,24 +69,24 @@ static void ege_color_prof_tracker_dispose(GObject *);
- 
- class ScreenTrack {
-     public:
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
-     gboolean zeroSeen;
-     gboolean otherSeen;
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
-     std::vector<EgeColorProfTracker *> *trackers;
-     GPtrArray* profiles;
-     ~ScreenTrack(){ delete trackers; }
- };
- 
- 
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- GdkFilterReturn x11_win_filter(GdkXEvent *xevent, GdkEvent *event, gpointer data);
- void handle_property_change(GdkScreen* screen, const gchar* name);
- void add_x11_tracking_for_screen(GdkScreen* screen);
- static void fire(gint monitor);
- static void clear_profile( guint monitor );
- static void set_profile( guint monitor, const guint8* data, guint len );
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
- 
- static guint signals[LAST_SIGNAL] = {0};
- 
-@@ -323,10 +323,10 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
- 
-         int numMonitors = gdk_display_get_n_monitors(display);
- 
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
-         tracked_screen->zeroSeen = FALSE;
-         tracked_screen->otherSeen = FALSE;
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
-         tracked_screen->trackers= new std::vector<EgeColorProfTracker *>;
-         tracked_screen->trackers->push_back(tracker );
-         tracked_screen->profiles = g_ptr_array_new();
-@@ -336,14 +336,14 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
- 
-         g_signal_connect( G_OBJECT(screen), "size-changed", G_CALLBACK( screen_size_changed_cb ), tracker );
- 
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
-         if (GDK_IS_X11_DISPLAY (display) ) {
-             // printf( "track_screen: Display is using X11\n" );
-             add_x11_tracking_for_screen(screen);
-         } else {
-             // printf( "track_screen: Display is not using X11\n" );
-         }
--#endif // GDK_WINDOWING_X11
-+#endif // HAVE_X11
-     }
- }
- 
-@@ -411,13 +411,13 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
-         if ( numMonitors > (gint)tracked_screen->profiles->len ) {
-             for ( guint i = tracked_screen->profiles->len; i < (guint)numMonitors; i++ ) {
-                 g_ptr_array_add( tracked_screen->profiles, nullptr );
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
-                 if (GDK_IS_X11_DISPLAY (display) ) {
-                     gchar* name = g_strdup_printf( "_ICC_PROFILE_%d", i );
-                     handle_property_change( screen, name );
-                     g_free(name);
-                 }
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
-             }
-         } else if ( numMonitors < (gint)tracked_screen->profiles->len ) {
- /*             g_message("The count of monitors decreased, remove some"); */
-@@ -425,7 +425,7 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
-     }
- }
- 
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- GdkFilterReturn x11_win_filter(GdkXEvent *xevent,
-                                GdkEvent *event,
-                                gpointer data)
-@@ -618,7 +618,7 @@ static void set_profile( guint monitor, const guint8* data, guint len )
-         }
-     }
- }
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
- /*
-   Local Variables:
-   mode:c++

diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch
deleted file mode 100644
index 5ec18157384e..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 15ab83e02b07018c3ffd4952a2623393187659e0 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Wed, 2 Mar 2022 19:50:02 +0200
-Subject: [PATCH] Fix build with poppler 22.03.0
-
-PDFDoc's constructor now takes an std::unique_ptr as the filename and
-the rest of the parameters are std::optional and can be left out.
-
-Also, remove an obsolete comment regarding special handling on win32;
-the "ifndef _WIN32" it was referring to has been removed by commit
-ad8effaa6ec3 ("Fix PDF import with non-ASCII filename on Windows").
----
- src/extension/internal/pdfinput/pdf-input.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..63742d8c6d 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -686,10 +686,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
-     // PDFDoc is from poppler. PDFDoc is used for preview and for native import.
-     std::shared_ptr<PDFDoc> pdf_doc;
- 
--    // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
--    // glib gstdio.c
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+    pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)); // TODO: Could ask for password
-+#else
-     GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
-+#endif
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
--- 
-GitLab
-