From d2cf4b374d09fcdb2a778fad4c5bcac50b8fdc91 Mon Sep 17 00:00:00 2001 From: Alexander Kapshuna Date: Sun, 13 Sep 2020 10:47:41 +0300 Subject: [PATCH] pinta: version bump to 1.7 --- .../pinta/files/pinta-1.6-mono-4.patch | 74 ------------------- .../pinta/files/pinta-1.6-pkg-config.patch | 32 -------- ...a-1.6-r1.exheres-0 => pinta-1.7.exheres-0} | 5 -- packages/media-gfx/pinta/pinta.exlib | 6 +- 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 packages/media-gfx/pinta/files/pinta-1.6-mono-4.patch delete mode 100644 packages/media-gfx/pinta/files/pinta-1.6-pkg-config.patch rename packages/media-gfx/pinta/{pinta-1.6-r1.exheres-0 => pinta-1.7.exheres-0} (77%) diff --git a/packages/media-gfx/pinta/files/pinta-1.6-mono-4.patch b/packages/media-gfx/pinta/files/pinta-1.6-mono-4.patch deleted file mode 100644 index f841af71..00000000 --- a/packages/media-gfx/pinta/files/pinta-1.6-mono-4.patch +++ /dev/null @@ -1,74 +0,0 @@ -Source: Gentoo -Reason: fix build with mono-4 -Upstream: just a simple backport of a series of more complicated fixes - -diff -Naur pinta-1.6_orig/Pinta/Pinta.csproj pinta-1.6/Pinta/Pinta.csproj ---- pinta-1.6_orig/Pinta/Pinta.csproj 2015-03-01 23:07:57.000000000 +0100 -+++ pinta-1.6/Pinta/Pinta.csproj 2015-12-12 15:02:28.796155090 +0100 -@@ -80,7 +80,7 @@ - - gtk-sharp-2.0 - -- -+ - - - gtk-sharp-2.0 -diff -Naur pinta-1.6_orig/Pinta.Core/Pinta.Core.csproj pinta-1.6/Pinta.Core/Pinta.Core.csproj ---- pinta-1.6_orig/Pinta.Core/Pinta.Core.csproj 2015-03-01 23:07:57.000000000 +0100 -+++ pinta-1.6/Pinta.Core/Pinta.Core.csproj 2015-12-12 15:02:28.798155090 +0100 -@@ -55,7 +55,7 @@ - AllRules.ruleset - - -- -+ - - - -diff -Naur pinta-1.6_orig/Pinta.Effects/Pinta.Effects.csproj pinta-1.6/Pinta.Effects/Pinta.Effects.csproj ---- pinta-1.6_orig/Pinta.Effects/Pinta.Effects.csproj 2015-03-01 23:07:57.000000000 +0100 -+++ pinta-1.6/Pinta.Effects/Pinta.Effects.csproj 2015-12-12 15:02:28.797155090 +0100 -@@ -58,7 +58,7 @@ - - - -- -+ - - - -diff -Naur pinta-1.6_orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj pinta-1.6/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj ---- pinta-1.6_orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj 2015-03-01 23:07:57.000000000 +0100 -+++ pinta-1.6/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj 2015-12-12 15:02:28.797155090 +0100 -@@ -54,7 +54,7 @@ - AllRules.ruleset - - -- -+ - - - -diff -Naur pinta-1.6_orig/Pinta.Install.proj pinta-1.6/Pinta.Install.proj ---- pinta-1.6_orig/Pinta.Install.proj 2015-03-01 23:14:37.000000000 +0100 -+++ pinta-1.6/Pinta.Install.proj 2015-12-12 15:05:20.974156635 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -Naur pinta-1.6_orig/Pinta.Tools/Pinta.Tools.csproj pinta-1.6/Pinta.Tools/Pinta.Tools.csproj ---- pinta-1.6_orig/Pinta.Tools/Pinta.Tools.csproj 2015-03-01 23:07:57.000000000 +0100 -+++ pinta-1.6/Pinta.Tools/Pinta.Tools.csproj 2015-12-12 15:02:28.795155090 +0100 -@@ -54,7 +54,7 @@ - AllRules.ruleset - - -- -+ - - - diff --git a/packages/media-gfx/pinta/files/pinta-1.6-pkg-config.patch b/packages/media-gfx/pinta/files/pinta-1.6-pkg-config.patch deleted file mode 100644 index 2896f7ad..00000000 --- a/packages/media-gfx/pinta/files/pinta-1.6-pkg-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2dfeb6f3fcec7d620a5a5a6f0d6d437c55bd3109 Mon Sep 17 00:00:00 2001 -From: Julian Ospald -Date: Sun, 5 Jun 2016 19:26:37 +0200 -Subject: [PATCH] Use PKG_PROG_PKG_CONFIG macro to check for pkg-config -Upstream: submitted, https://github.com/PintaProject/Pinta/pull/120 - -Using AC_PATH_PROG isn't the standard way and breaks if -the distribution provides only prefixed (as in: -pkg-config) -versions. ---- - configure.ac | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 18b7199..7eb3f93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,10 +7,7 @@ YELP_HELP_INIT - AC_PROG_INSTALL - - dnl pkg-config --AC_PATH_PROG(PKG_CONFIG, pkg-config, no) --if test "x$PKG_CONFIG" = "xno"; then -- AC_MSG_ERROR([You need to install pkg-config]) --fi -+PKG_PROG_PKG_CONFIG([0.20]) - - AC_PATH_PROG(XBUILD, xbuild, no) - AC_PATH_PROG(MONO, mono, no) --- -2.8.3 - diff --git a/packages/media-gfx/pinta/pinta-1.6-r1.exheres-0 b/packages/media-gfx/pinta/pinta-1.7.exheres-0 similarity index 77% rename from packages/media-gfx/pinta/pinta-1.6-r1.exheres-0 rename to packages/media-gfx/pinta/pinta-1.7.exheres-0 index cef3c12a..32bb6699 100644 --- a/packages/media-gfx/pinta/pinta-1.6-r1.exheres-0 +++ b/packages/media-gfx/pinta/pinta-1.7.exheres-0 @@ -17,8 +17,3 @@ DEPENDENCIES=" gnome-bindings/gtk-sharp:2 " -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/pinta-1.6-pkg-config.patch - "${FILES}"/pinta-1.6-mono-4.patch -) - diff --git a/packages/media-gfx/pinta/pinta.exlib b/packages/media-gfx/pinta/pinta.exlib index 5c017373..e8f01600 100644 --- a/packages/media-gfx/pinta/pinta.exlib +++ b/packages/media-gfx/pinta/pinta.exlib @@ -1,9 +1,9 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ] +require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ] require github [ user=PintaProject project=Pinta ] -require gtk-icon-cache freedesktop-desktop freedesktop-mime +require gtk-icon-cache freedesktop-desktop export_exlib_phases src_prepare pkg_postinst pkg_postrm @@ -23,13 +23,11 @@ pinta_src_prepare() { } pinta_pkg_postinst() { - freedesktop-mime_pkg_postinst freedesktop-desktop_pkg_postinst gtk-icon-cache_pkg_postinst } pinta_pkg_postrm() { - freedesktop-mime_pkg_postrm freedesktop-desktop_pkg_postrm gtk-icon-cache_pkg_postrm }