- added gegl patch (adjust headers for mrg 201909+); release 3

diff --git a/gegl-mrg.patch b/gegl-mrg.patch
new file mode 100644 (file)
index 0000000..a7725f2
--- /dev/null
+++ b/gegl-mrg.patch
@@ -0,0 +1,63 @@
+--- gegl-0.4.18/bin/argvs.c.orig       2019-10-27 01:01:07.000000000 +0200
++++ gegl-0.4.18/bin/argvs.c    2019-12-01 20:46:00.605726065 +0100
+@@ -25,8 +25,8 @@
+ 
+ 
+ #ifdef MRG_PRINTF
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ extern Mrg *mrg;
+ extern MrgList *scrollback;
+ extern int use_ui;
+--- gegl-0.4.18/bin/mrg-gegl.c.orig    2019-10-27 01:01:07.000000000 +0200
++++ gegl-0.4.18/bin/mrg-gegl.c 2019-12-01 20:53:41.246563892 +0100
+@@ -36,7 +36,7 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
++#include <mrg/mrg.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>
+--- gegl-0.4.18/bin/ui-collection.c.orig       2019-10-27 01:01:07.000000000 +0200
++++ gegl-0.4.18/bin/ui-collection.c    2019-12-01 20:53:51.686507334 +0100
+@@ -25,8 +25,8 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>
+--- gegl-0.4.18/bin/ui-core.c.orig     2019-10-27 01:01:07.000000000 +0200
++++ gegl-0.4.18/bin/ui-core.c  2019-12-01 20:53:58.173138860 +0100
+@@ -107,8 +107,8 @@ const char *css =
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>
+--- gegl-0.4.18/bin/ui-viewer.c.orig   2019-10-27 01:01:07.000000000 +0200
++++ gegl-0.4.18/bin/ui-viewer.c        2019-12-01 20:54:06.116429161 +0100
+@@ -24,8 +24,8 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>

diff --git a/gegl.spec b/gegl.spec
index 1b7b141daf163a277f0eae4e1c4385db5b2d14c3..63098fe00bfaa84ffbb8827b4b4f34fcab4623c5 100644 (file)
--- a/gegl.spec
+++ b/gegl.spec
@@ -21,11 +21,12 @@ Summary:    Generic image processing library
 Summary(pl.UTF-8):     Ogólna biblioteka przetwarzania obrazu
 Name:          gegl
 Version:       0.4.18
-Release:       2
+Release:       3
 License:       LGPL v3+/GPL v3+
 Group:         Libraries
 Source0:       https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.xz
 # Source0-md5: 567f9e6c0a0a1a4145a1a1b254ca9ac5
+Patch0:                %{name}-mrg.patch
 Patch1:                %{name}-ruby1.9.patch
 Patch2:                %{name}-build.patch
 Patch3:                umfpack.patch
@@ -184,6 +185,7 @@ API języka Vala dla biblioteki gegl.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1