From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/mypaint-1.1.0-build-env-vars.patch | 53 ++++++++++++++++++++++ .../mypaint/files/mypaint-1.1.0-desktop.patch | 24 ++++++++++ .../mypaint/files/mypaint-1.1.0-json-c-0.11.patch | 15 ++++++ 3 files changed, 92 insertions(+) create mode 100644 media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch create mode 100644 media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch create mode 100644 media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch (limited to 'media-gfx/mypaint/files') diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch new file mode 100644 index 000000000000..7d7ac3e36359 --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch @@ -0,0 +1,53 @@ +From 516d184b5db8ebdd8b184ef871050c3ab3f03fdf Mon Sep 17 00:00:00 2001 +From: Andrew Chadwick +Date: Sun, 21 Apr 2013 22:51:05 +0100 +Subject: [PATCH] SConstruct: support standard build environ vars + +Support the standard build environment vars CC, CXX, CFLAGS, CXXFLAGS, +CPPFLAGS, and LDFLAGS everywhere. + +Partially addresses https://gna.org/bugs/?20754 +--- + SConstruct | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/SConstruct b/SConstruct +index 0b55da1..ef39b9e 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1,6 +1,7 @@ + import os, sys + from os.path import join, basename + from SCons.Script.SConscript import SConsEnvironment ++import SCons.Util + + EnsureSConsVersion(1, 0) + +@@ -45,6 +46,24 @@ print('using %r (use scons python_config=xxx to change)' % env['python_config']) + if sys.platform == "win32": + # remove this mingw if trying VisualStudio + env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts) ++ ++# Respect some standard build environment stuff ++if os.environ.has_key('CC'): ++ env['CC'] = os.environ['CC'] ++if os.environ.has_key('CFLAGS'): ++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) ++if os.environ.has_key('CXX'): ++ env['CXX'] = os.environ['CXX'] ++if os.environ.has_key('CXXFLAGS'): ++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) ++if os.environ.has_key('CPPFLAGS'): ++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) ++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) ++if os.environ.has_key('LDFLAGS'): ++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) ++if "$CCFLAGS" in env['CXXCOM']: ++ env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","") ++ + opts.Update(env) + + env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings') +-- +1.7.10.4 + diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch new file mode 100644 index 000000000000..b992131bf29e --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch @@ -0,0 +1,24 @@ +From: Andrew Chadwick +Date: Tue, 8 Jan 2013 13:53:01 +0000 +Subject: desktop: remove deprecated Encoding key + +The Encoding key is deprecated as of 1.0 of the Desktop Entry Specification +(8 Jan 2012) + +http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html +--- + desktop/mypaint.desktop | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/desktop/mypaint.desktop b/desktop/mypaint.desktop +index 9850b54..24383db 100644 +--- a/desktop/mypaint.desktop ++++ b/desktop/mypaint.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=MyPaint + TryExec=mypaint + Exec=mypaint %f +-- diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch new file mode 100644 index 000000000000..f2aa9b9a0edf --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/show_bug.cgi?id=467322 +Patch-by: Helmut Jarausch +Fixes pkgconfig name for new json-c (since 0.11) + +--- brushlib/SConscript.ORIG 2012-12-31 18:03:38.000000000 +0100 ++++ brushlib/SConscript 2013-04-26 11:47:27.008232199 +0200 +@@ -73,7 +73,7 @@ + + env.Append(CPPPATH='./') + +-pkg_deps = ['json'] ++pkg_deps = ['json-c'] + libs = ['m'] + linkflags = [] + -- cgit v1.2.3