[packages/gegl] - fix introspection build - rel 2
baggins
baggins at pld-linux.org
Wed Apr 26 22:14:15 CEST 2017
commit 2fd777c7f6540f11dd23a587239658650ddceb4d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Apr 26 22:13:54 2017 +0200
- fix introspection build
- rel 2
G_LOG_DOMAIN.patch | 39 +++++++++++++++++++++++++++++++++++++++
gegl.spec | 4 +++-
2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/gegl.spec b/gegl.spec
index 08c38ed..25597aa 100644
--- a/gegl.spec
+++ b/gegl.spec
@@ -20,7 +20,7 @@ Summary: Generic image processing library
Summary(pl.UTF-8): Ogólna biblioteka przetwarzania obrazu
Name: gegl
Version: 0.3.14
-Release: 1
+Release: 2
License: LGPL v3+
Group: Libraries
Source0: http://ftp.gimp.org/pub/gegl/0.3/%{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@ Source0: http://ftp.gimp.org/pub/gegl/0.3/%{name}-%{version}.tar.bz2
Patch2: %{name}-ruby1.9.patch
Patch3: %{name}-build.patch
Patch5: umfpack.patch
+Patch6: G_LOG_DOMAIN.patch
URL: http://www.gegl.org/
BuildRequires: OpenEXR-devel
BuildRequires: SDL-devel
@@ -163,6 +164,7 @@ API języka Vala dla biblioteki gegl.
%patch2 -p1
%patch3 -p1
%patch5 -p1
+%patch6 -p1
%build
%{__libtoolize}
diff --git a/G_LOG_DOMAIN.patch b/G_LOG_DOMAIN.patch
new file mode 100644
index 0000000..140ac32
--- /dev/null
+++ b/G_LOG_DOMAIN.patch
@@ -0,0 +1,39 @@
+commit 81fb956b221e4b1f919788d8a5f6a3a5462b86ae
+Author: Øyvind Kolås <pippin at gimp.org>
+Date: Thu Mar 23 14:59:28 2017 +0100
+
+ build: move G_LOG_DOMAIN define to a Makefile.am as suggested in glib docs...
+
+diff --git a/configure.ac b/configure.ac
+index 41ed17e1..36e8e2a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1269,8 +1269,6 @@ done
+ # We should support this at some point if possible
+ #LDFLAGS="-Wl,-z,defs"
+
+-CFLAGS="$CFLAGS -DG_LOG_DOMAIN=\\\"GEGL\\\""
+-
+ dnl bin/node-editors/Makefile
+ AC_CONFIG_FILES([
+ Makefile
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index 2030ebbe..b5f70d88 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -12,6 +12,7 @@ endif
+
+ SUBDIRS = buffer graph module operation process property-types opencl
+
++
+ CLEANFILES =
+
+ AM_CPPFLAGS = \
+@@ -31,6 +32,7 @@ AM_CPPFLAGS = \
+ -I$(top_builddir)/gegl/property-types \
+ -I$(top_srcdir)/gegl/property-types \
+ -DLIBDIR=\""$(libdir)"\" \
++ -DG_LOG_DOMAIN=\"GEGL\" \
+ -DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\"
+
+ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gegl.git/commitdiff/2fd777c7f6540f11dd23a587239658650ddceb4d
More information about the pld-cvs-commit
mailing list