Inkscape: bump version

media-gfx/inkscape/inkscape-1.2.1.recipe

@@ -7,12 +7,12 @@ unlimited resolution and is not bound to a fixed number of pixels like raster \
 graphics. Inkscape uses the standardized SVG file format as its main format, \
 which is supported by many other applications including web browsers."
 HOMEPAGE="https://inkscape.org/"
-COPYRIGHT="2021 Inkscape Developers"
+COPYRIGHT="2022 Inkscape Developers"
 LICENSE="GNU GPL v2"
 REVISION="2"
-SOURCE_URI="https://inkscape.org/gallery/item/29255/inkscape-$portVersion.tar.xz"
+SOURCE_URI="https://inkscape.org/gallery/item/34673/inkscape-$portVersion.tar.xz"
-CHECKSUM_SHA256="aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af"
+CHECKSUM_SHA256="46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b"
-SOURCE_DIR="inkscape-1.1.1_2021-09-20_3bf5ae0d25"
+SOURCE_DIR="inkscape-${portVersion}_2022-07-14_9c6d41e410"
 PATCHES="inkscape-$portVersion.patchset"
 ADDITIONAL_FILES="
 	inkscape.rdef.in
@@ -20,7 +20,7 @@ ADDITIONAL_FILES="
 	"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	inkscape$secondaryArchSuffix = $portVersion
@@ -66,7 +66,6 @@ REQUIRES="
 	lib:libvisio_0.1$secondaryArchSuffix
 	lib:libwpd_0.10$secondaryArchSuffix
 	lib:libwpg_0.3$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -114,7 +113,8 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DSHARE_INSTALL=$dataDir \
 		-DINKSCAPE_DATADIR=$dataDir \
-		-DPACKAGE_LOCALE_DIR=$dataDir/locale
+		-DPACKAGE_LOCALE_DIR=$dataDir/locale \
+		-DWITH_X11=OFF
 
 	# otherwise it runs out of memory, unfortunately
 	ninja -j1

media-gfx/inkscape/patches/inkscape-1.2.1.patchset

@@ -1,14 +1,14 @@
-From e052477f15c3e413b6c4c56968da0b7d21e657e1 Mon Sep 17 00:00:00 2001
+From 6d85ccb6890dd3c732d24af48a6658b69813d3ee Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Mon, 24 Jan 2022 17:27:43 -0500
 Subject: Fix build without Poppler.
 
 
 diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
-index 4d77e4d..c1e33a5 100644
+index b42c0aa..59da925 100644
 --- a/CMakeScripts/DefineDependsandFlags.cmake
 +++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -179,9 +179,11 @@ else()
+@@ -189,9 +189,11 @@ else()
      set(ENABLE_POPPLER_CAIRO OFF)
  endif()
  
@@ -24,22 +24,22 @@ index 4d77e4d..c1e33a5 100644
  if(WITH_LIBWPG)
      pkg_check_modules(LIBWPG libwpg-0.3 librevenge-0.0 librevenge-stream-0.0)
 -- 
-2.30.2
+2.37.3
 
 
-From 28b1c87d4b61f2bf721415361686b59413b30c12 Mon Sep 17 00:00:00 2001
+From 1f98b8cddf38321d681609db23023c6e5d46947d Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Mon, 24 Jan 2022 20:07:10 -0500
 Subject: tracedialog: Fix build under Haiku.
 
 
 diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
-index 869510d..05f446d 100644
+index 114e341..29a6b8b 100644
 --- a/src/ui/dialog/tracedialog.cpp
 +++ b/src/ui/dialog/tracedialog.cpp
-@@ -33,6 +33,10 @@
+@@ -32,6 +32,10 @@
  #include "trace/potrace/inkscape-potrace.h"
- #include "trace/depixelize/inkscape-depixelize.h"
+ #include "ui/util.h"
  
 +#ifdef __HAIKU__
 +#undef B_OK
@@ -49,51 +49,10 @@ index 869510d..05f446d 100644
  static const std::map<std::string, Inkscape::Trace::Potrace::TraceType> trace_types = {
      {"SS_BC", Inkscape::Trace::Potrace::TRACE_BRIGHTNESS},
 -- 
-2.30.2
+2.37.3
 
 
-From 128dc87b37403f22c6f4437d32f5aee7ee2f2ca8 Mon Sep 17 00:00:00 2001
+From 6113773bf22e1ae206134d46ae1db99224e2bc68 Mon Sep 17 00:00:00 2001
-From: Augustin Cavalier <waddlesplash@gmail.com>
-Date: Mon, 24 Jan 2022 21:57:22 -0500
-Subject: Another no-Poppler fix.
-
-
-diff --git a/src/inkscape-version-info.cpp b/src/inkscape-version-info.cpp
-index e02a575..d460ac1 100644
---- a/src/inkscape-version-info.cpp
-+++ b/src/inkscape-version-info.cpp
-@@ -21,7 +21,9 @@
- #include <gtkmm.h>
- #include <libxml2/libxml/xmlversion.h>
- #include <libxslt/xsltconfig.h>
-+#if 0
- #include <poppler-config.h>
-+#endif
- 
- #include "inkscape-version.h" // Inkscape version
- 
-@@ -91,7 +93,9 @@ std::string debug_info() {
-     ss << "    Cairo version:    " << cairo_version_string() << std::endl;
-     ss << "    Pango version:    " << pango_version_string() << std::endl;
-     ss << "    HarfBuzz version: " << hb_version_string() << std::endl;
-+#if 0
-     ss << "    Poppler version:  " << POPPLER_VERSION << std::endl;
-+#endif
-     ss << std::endl;
-     ss << "    OS version:       " << os_version();
- 
-@@ -110,4 +114,4 @@ std::string debug_info() {
-   fill-column:99
-   End:
- */
--// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99:
-\ No newline at end of file
-+// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99:
--- 
-2.30.2
-
-
-From fa5d76c4a094d2b8f85fd95c6fd685fbd0f9d1cb Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Wed, 26 Jan 2022 12:17:06 -0500
 Subject: Add mechanism to get the program path under Haiku.
@@ -132,10 +91,10 @@ index 1d61748..a8e8da1 100644
  #warning get_program_name() - no known way to obtain executable name on this platform
          g_info("get_program_name() - no known way to obtain executable name on this platform");
 -- 
-2.30.2
+2.37.3
 
 
-From a4c73b83baa32c3eaa0a9b6f213ac09a56118b56 Mon Sep 17 00:00:00 2001
+From 045d782d52ba864e5b3a352ee2d414b98360fcc9 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 28 Jan 2022 08:26:36 +1000
 Subject: Use glib for datadir
@@ -166,5 +125,51 @@ index 7ac16f8..a7445b2 100644
          // so we can just call it directly and modify XDG_DATA_DIRS later
          auto data_dirs = Glib::get_system_data_dirs();
 -- 
-2.30.2
+2.37.3
+
+
+From e606b4b0fe30a3b5c89dc89574edcec1bbc719e1 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Fri, 18 Nov 2022 22:06:30 +1000
+Subject: Dirty hack for XDG variables
+
+
+diff --git a/src/inkscape-main.cpp b/src/inkscape-main.cpp
+index a7445b2..6b76cbe 100644
+--- a/src/inkscape-main.cpp
++++ b/src/inkscape-main.cpp
+@@ -248,6 +248,12 @@ int main(int argc, char *argv[])
+             set_macos_app_bundle_env(program_dir);
+         }
+     }
++#elif defined __HAIKU__
++    g_setenv ("XDG_CONFIG_DIRS", "/boot/system/settings", FALSE);
++    g_setenv ("XDG_DATA_HOME", "/boot/home/config/non-packaged/data", FALSE);
++    g_setenv ("XDG_CONFIG_HOME", "/boot/home/config/settings", FALSE);
++    g_setenv ("XDG_CACHE_HOME", "/boot/home/config/cache", FALSE);
++    g_setenv ("XDG_DATA_DIRS", "/boot/system/non-packaged/data:/boot/system/data", FALSE);
+ #elif defined _WIN32
+     // temporarily switch console encoding to UTF8 while Inkscape runs
+     // as everything else is a mess and it seems to work just fine
+diff --git a/src/inkview-main.cpp b/src/inkview-main.cpp
+index 5d60945..61a9ae4 100644
+--- a/src/inkview-main.cpp
++++ b/src/inkview-main.cpp
+@@ -32,6 +32,14 @@ int main(int argc, char *argv[])
+     _setmode(_fileno(stdout), _O_BINARY); // binary mode seems required for this to work properly
+ #endif
+ 
++#ifdef __HAIKU__
++    g_setenv ("XDG_CONFIG_DIRS", "/boot/system/settings", FALSE);
++    g_setenv ("XDG_DATA_HOME", "/boot/home/config/non-packaged/data", FALSE);
++    g_setenv ("XDG_CONFIG_HOME", "/boot/home/config/settings", FALSE);
++    g_setenv ("XDG_CACHE_HOME", "/boot/home/config/cache", FALSE);
++    g_setenv ("XDG_DATA_DIRS", "/boot/system/non-packaged/data:/boot/system/data", FALSE);
++#endif
++
+     auto application = InkviewApplication::create();
+     int ret = application->run(argc, argv);
+ 
+-- 
+2.37.3