gentoo resync : 29.12.2022

1 files changed, 0 insertions, 54 deletions

diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
deleted file mode 100644
index 8e5510db04d5..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001
-From: Heinz Wiesinger <pprkut@liwjatan.org>
-Date: Thu, 26 Aug 2021 16:07:25 +0200
-Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape
-
-Signed-off-by: Heinz Wiesinger <pprkut@liwjatan.org>
----
- src/gui/CMakeLists.txt | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 970d2fc165..efe1b1c349 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
- endif()
- 
- # Generate png icons from svg
--find_program(INKSCAPE
--  NAMES inkscape inkscape.exe
-+find_program(SVG_CONVERTER
-+  NAMES inkscape inkscape.exe rsvg-convert
-   REQUIRED
--  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
-+  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR)
- # REQUIRED keyword is only supported on CMake 3.18 and above
--if (NOT INKSCAPE)
--  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
-+if (NOT SVG_CONVERTER)
-+  message(FATAL_ERROR "Could not find a suitable svg converter. Set SVG_CONVERTER_DIR to the path of either the inkscape or rsvg-convert executable.")
- endif()
- 
- function(generate_sized_png_from_svg icon_path size)
-@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size)
-   set(icon_output_name "${size}-${icon_name_wle}.png")
-   message(STATUS "Generate ${icon_output_name}")
-   execute_process(COMMAND
--    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
-+    "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
-     WORKING_DIRECTORY "${icon_name_dir}"
-     RESULT_VARIABLE
--    INKSCAPE_SIDEBAR_ERROR
-+    SVG_CONVERTER_SIDEBAR_ERROR
-     OUTPUT_QUIET
-     ERROR_QUIET)
- 
--  if (INKSCAPE_SIDEBAR_ERROR)
-+  if (SVG_CONVERTER_SIDEBAR_ERROR)
-     message(FATAL_ERROR
--      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
-+      "${SVG_CONVERTER} could not generate icon: ${SVG_CONVERTER_SIDEBAR_ERROR}")
-   else()
-   endif()
- endfunction()