tombriden/hasufell-repository
1
1
Fork 0
forked from hasufell/hasufell-repository
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'kapsh/pinta' into master

Browse Source
This commit is contained in:
Julian Ospald 2020-09-13 14:50:05 +02:00
commit 1a2e490361
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
4 changed files with 2 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
packages/media-gfx/pinta/files/pinta-1.6-mono-4.patch
View File

@ -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 @@
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Package>gtk-sharp-2.0</Package>
</Reference>
- <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
+ <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Package>gtk-sharp-2.0</Package>
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 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
+ <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System.Core" />
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 @@
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
+ <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core">
</Reference>
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 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
+ <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<!-- Set some paths -->
<PropertyGroup>
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 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
+ <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />

32
packages/media-gfx/pinta/files/pinta-1.6-pkg-config.patch
View File

@ -1,32 +0,0 @@
From 2dfeb6f3fcec7d620a5a5a6f0d6d437c55bd3109 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
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: <arch>-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

5
packages/media-gfx/pinta/pinta-1.6-r1.exheres-0 → packages/media-gfx/pinta/pinta-1.7.exheres-0
View File

@ -17,8 +17,3 @@ DEPENDENCIES="
gnome-bindings/gtk-sharp:2 gnome-bindings/gtk-sharp:2
" "
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/pinta-1.6-pkg-config.patch
"${FILES}"/pinta-1.6-mono-4.patch
)

6
packages/media-gfx/pinta/pinta.exlib
View File

@ -1,9 +1,9 @@
# Copyright 2016 Julian Ospald <hasufell@posteo.de> # Copyright 2016 Julian Ospald <hasufell@posteo.de>
# Distributed under the terms of the GNU General Public License v2 # 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 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 export_exlib_phases src_prepare pkg_postinst pkg_postrm
@ -23,13 +23,11 @@ pinta_src_prepare() {
} }
pinta_pkg_postinst() { pinta_pkg_postinst() {
freedesktop-mime_pkg_postinst
freedesktop-desktop_pkg_postinst freedesktop-desktop_pkg_postinst
gtk-icon-cache_pkg_postinst gtk-icon-cache_pkg_postinst
} }
pinta_pkg_postrm() { pinta_pkg_postrm() {
freedesktop-mime_pkg_postrm
freedesktop-desktop_pkg_postrm freedesktop-desktop_pkg_postrm
gtk-icon-cache_pkg_postrm gtk-icon-cache_pkg_postrm
} }