Merge pull request msys2#17975 from lazka/inkscape-1.3

inkscape: Update to 1.3
stahta01 · Aug 6, 2023 · 3ad9a97 · 3ad9a97
2 parents ecb0d5e + ba7296d
commit 3ad9a97
Showing 1 changed file with 10 additions and 22 deletions.
diff --git a/mingw-w64-inkscape/PKGBUILD b/mingw-w64-inkscape/PKGBUILD
@@ -5,9 +5,9 @@
 _realname=inkscape
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.3beta0
-pkgrel=3
-_pkg_suffix=1.3-beta_2023-05-28_cedbd6c6ff
+pkgver=1.3
+pkgrel=1
+_pkg_suffix=1.3_2023-07-21_0e150ed6c4
 pkgdesc="Vector graphics editor using the SVG file format (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -16,9 +16,9 @@ license=("spdx:GPL-2.0-or-later")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cython"
-             "${MINGW_PACKAGE_PREFIX}-boost")
+             "${MINGW_PACKAGE_PREFIX}-cython")
 depends=("${MINGW_PACKAGE_PREFIX}-aspell"
+         "${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-double-conversion"
          "${MINGW_PACKAGE_PREFIX}-gc"
          "${MINGW_PACKAGE_PREFIX}-gdl"
@@ -53,15 +53,11 @@ optdepends=(#"${MINGW_PACKAGE_PREFIX}-pstoedit: latex formulas"
             )
 source=("https://media.inkscape.org/dl/resources/file/${_realname}-${pkgver}.tar.xz"
         inkscape-1.0.1-unbundle.patch
-        inkscape-1.0.1-install-layout.patch
-        https://gitlab.com/inkscape/inkscape/-/commit/1e80c0d03563ad112db8bc8c37e89d46d1561de1.patch
-        https://gitlab.com/inkscape/inkscape/-/merge_requests/5383.patch)
-sha256sums=('6850d40ed7a22b7355b09ee3ae8ea19517f317c0f70b57c75913839546de1222'
+        inkscape-1.0.1-install-layout.patch)
+sha256sums=('bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307'
             '92387251c1740f1a57cde9e587cc673ef1600813617bd2c9db65598c324a24d4'
-            '131b2e1190637df0554ef1ee8cf46440689584375c117d057ab47d5871c58128'
-            '968c646328f2dba77b9a4692f605fc5d2c157d3f9b5662398c35ca3244463bf0'
-            '9ef52f2605e22e2697bbc3fe5059c63f4ff81233852c3f1b2b75d5a87f27f883')
-# noextract=("${_realname}-${pkgver}.tar.xz")
+            '131b2e1190637df0554ef1ee8cf46440689584375c117d057ab47d5871c58128')
+noextract=("${_realname}-${pkgver}.tar.xz")
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -73,22 +69,14 @@ apply_patch_with_msg() {
 
 prepare() {
   # Symlinks only in packaging/macos and src/3rdparty/cairo folders
-  # tar -xf ${_realname}-${pkgver}.tar.xz || true
+  tar -xf ${_realname}-${pkgver}.tar.xz || true
 
   mv "${srcdir}"/${_realname}-${_pkg_suffix} "${srcdir}"/${_realname}-${pkgver}
   cd "${srcdir}"/${_realname}-${pkgver}
 
   apply_patch_with_msg \
     inkscape-1.0.1-unbundle.patch \
     inkscape-1.0.1-install-layout.patch
-
-  # https://gitlab.com/inkscape/inbox/-/issues/8647
-  apply_patch_with_msg \
-    1e80c0d03563ad112db8bc8c37e89d46d1561de1.patch
-
-  # https://gitlab.com/inkscape/inkscape/-/merge_requests/5383
-  apply_patch_with_msg \
-    5383.patch
 }
 
 build() {