gentoo resync : 03.11.2019

3 files changed, 93 insertions, 0 deletions

diff --git a/media-libs/gegl/files/gegl-0.4.18-arch.patch b/media-libs/gegl/files/gegl-0.4.18-arch.patch
new file mode 100644
index 000000000000..57bfaf4a6c73
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-arch.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -88,8 +88,6 @@
+   have_ppc = true
+   config.set10('ARCH_PPC',    true)
+   config.set10('ARCH_PPC64',  true)
+-else
+-  error('Unknown host architecture')
+ endif
+ 
+ ################################################################################
diff --git a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
new file mode 100644
index 000000000000..4be09057d896
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
@@ -0,0 +1,43 @@
+From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 27 Oct 2019 21:55:03 +0100
+Subject: [PATCH] Drop failing tests
+
+---
+ tests/compositions/meson.build | 2 ++
+ tests/python/meson.build       | 2 --
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build
+index 8699e7c..5e76e8c 100644
+--- a/tests/compositions/meson.build
++++ b/tests/compositions/meson.build
+@@ -87,6 +87,7 @@ test('compositions_with_opencl',
+ )
+ endif
+ 
++if false
+ test('compositions_without_opencl',
+   python,
+   args: [
+@@ -100,3 +101,4 @@ test('compositions_without_opencl',
+   suite: 'compositions',
+   is_parallel: false,
+ )
++endif
+diff --git a/tests/python/meson.build b/tests/python/meson.build
+index c6782e6..47a160b 100644
+--- a/tests/python/meson.build
++++ b/tests/python/meson.build
+@@ -2,8 +2,6 @@
+ testnames = [
+   'gegl-buffer',
+   'gegl-color',
+-  'gegl-format',
+-  'gegl-node',
+   'gegl',
+ ]
+ 
+-- 
+2.23.0
+
diff --git a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
new file mode 100644
index 000000000000..be4498ccee4a
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
@@ -0,0 +1,39 @@
+From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 27 Oct 2019 22:05:58 +0100
+Subject: [PATCH] Add suffix "-0.4" to installed programs
+
+---
+ bin/meson.build   | 2 +-
+ tools/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/meson.build b/bin/meson.build
+index 4daf6cb..b77b692 100644
+--- a/bin/meson.build
++++ b/bin/meson.build
+@@ -42,7 +42,7 @@ if libspiro.found()
+   gegl_deps += [ libspiro, ]
+ endif
+ 
+-gegl_bin = executable('gegl',
++gegl_bin = executable('gegl-0.4',
+   gegl_sources,
+   include_directories: [ rootInclude, geglInclude, ],
+   dependencies: gegl_deps,
+diff --git a/tools/meson.build b/tools/meson.build
+index 43c5495..c1b0d63 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -19,7 +19,7 @@ detect_opencl = executable(
+   install: false,
+ )
+ gegl_imgcmp = executable(
+-  'gegl-imgcmp',
++  'gegl-imgcmp-0.4',
+   'gegl-imgcmp.c',
+   include_directories: [ rootInclude, geglInclude, ],
+   dependencies: [ tools_deps, ],
+-- 
+2.23.0
+