[libmx] fix GIR
Tom Callaway
spot at fedoraproject.org
Mon Aug 8 16:01:49 UTC 2011
commit a3412423f51c31e9180ee74f2bb1f170d2dab430
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Mon Aug 8 12:01:37 2011 -0400
fix GIR
mx-1.3.0-gdk-pixbuf.patch | 48 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 4 deletions(-)
---
diff --git a/mx-1.3.0-gdk-pixbuf.patch b/mx-1.3.0-gdk-pixbuf.patch
index ad7051f..3c00962 100644
--- a/mx-1.3.0-gdk-pixbuf.patch
+++ b/mx-1.3.0-gdk-pixbuf.patch
@@ -1,6 +1,6 @@
diff -up mx-1.3.0/mx/Makefile.am.gdk-pixbuf mx-1.3.0/mx/Makefile.am
---- mx-1.3.0/mx/Makefile.am.gdk-pixbuf 2011-08-08 11:43:55.405969573 -0400
-+++ mx-1.3.0/mx/Makefile.am 2011-08-08 11:44:53.042217305 -0400
+--- mx-1.3.0/mx/Makefile.am.gdk-pixbuf 2011-08-08 11:59:54.092814499 -0400
++++ mx-1.3.0/mx/Makefile.am 2011-08-08 11:59:34.799057774 -0400
@@ -251,6 +251,7 @@ libmx_ at MX_API_VERSION@_la_CFLAGS = \
-DG_LOG_DOMAIN=\"Mx\" \
$(MX_MAINTAINER_CFLAGS) \
@@ -18,9 +18,49 @@ diff -up mx-1.3.0/mx/Makefile.am.gdk-pixbuf mx-1.3.0/mx/Makefile.am
if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
+@@ -286,8 +287,8 @@ Mx_ at MX_API_VERSION_AM@_gir_FILES = \
+ $(top_builddir)/mx/mx-version.h \
+ $(top_builddir)/mx/mx-enum-types.h \
+ $(source_c)
+-Mx_ at MX_API_VERSION_AM@_gir_CFLAGS = $(common_includes)
+-Mx_ at MX_API_VERSION_AM@_gir_INCLUDES = Clutter-1.0
++Mx_ at MX_API_VERSION_AM@_gir_CFLAGS = $(common_includes) $(MX_IMAGE_CACHE_CFLAGS)
++Mx_ at MX_API_VERSION_AM@_gir_INCLUDES = Clutter-1.0 GdkPixbuf-2.0
+ Mx_ at MX_API_VERSION_AM@_gir_SCANNERFLAGS = \
+ --warn-all \
+ --c-include='mx/mx.h' \
+diff -up mx-1.3.0/mx/Makefile.in.gdk-pixbuf mx-1.3.0/mx/Makefile.in
+--- mx-1.3.0/mx/Makefile.in.gdk-pixbuf 2011-08-08 11:57:21.642736784 -0400
++++ mx-1.3.0/mx/Makefile.in 2011-08-08 12:01:12.412826975 -0400
+@@ -704,6 +704,7 @@ libmx_ at MX_API_VERSION@_la_CFLAGS = \
+ $(MX_MAINTAINER_CFLAGS) \
+ $(MX_DEBUG_CFLAGS) \
+ $(MX_CFLAGS) \
++ $(MX_IMAGE_CACHE_CFLAGS) \
+ $(NULL)
+
+ libmx_ at MX_API_VERSION@_la_LDFLAGS = $(MX_LT_LDFLAGS) $(common_ldflags)
+@@ -719,7 +720,7 @@ libmx_ at MX_API_VERSION@_la_SOURCES = \
+ $(top_srcdir)/mx/mx.h \
+ $(NULL)
+
+-libmx_ at MX_API_VERSION@_la_LIBADD = $(MX_LIBS)
++libmx_ at MX_API_VERSION@_la_LIBADD = $(MX_LIBS) $(MX_IMAGE_CACHE_LIBS)
+ @HAVE_INTROSPECTION_TRUE at INTROSPECTION_GIRS = Mx- at MX_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE at Mx_@MX_API_VERSION_AM at _gir_NAMESPACE = Mx
+ @HAVE_INTROSPECTION_TRUE at Mx_@MX_API_VERSION_AM at _gir_VERSION = @MX_API_VERSION@
+@@ -732,7 +733,7 @@ libmx_ at MX_API_VERSION@_la_LIBADD = $(MX_
+ @HAVE_INTROSPECTION_TRUE@ $(source_c)
+
+ @HAVE_INTROSPECTION_TRUE at Mx_@MX_API_VERSION_AM at _gir_CFLAGS = $(common_includes)
+- at HAVE_INTROSPECTION_TRUE@Mx_ at MX_API_VERSION_AM@_gir_INCLUDES = Clutter-1.0
++ at HAVE_INTROSPECTION_TRUE@Mx_ at MX_API_VERSION_AM@_gir_INCLUDES = Clutter-1.0 GdkPixbuf-2.0
+ @HAVE_INTROSPECTION_TRUE at Mx_@MX_API_VERSION_AM at _gir_SCANNERFLAGS = \
+ @HAVE_INTROSPECTION_TRUE@ --warn-all \
+ @HAVE_INTROSPECTION_TRUE@ --c-include='mx/mx.h' \
diff -up mx-1.3.0/mx.pc.in.gdk-pixbuf mx-1.3.0/mx.pc.in
---- mx-1.3.0/mx.pc.in.gdk-pixbuf 2011-08-05 17:10:30.753365414 -0400
-+++ mx-1.3.0/mx.pc.in 2011-08-05 17:10:44.215190242 -0400
+--- mx-1.3.0/mx.pc.in.gdk-pixbuf 2011-05-19 07:07:41.000000000 -0400
++++ mx-1.3.0/mx.pc.in 2011-08-08 11:56:58.507028519 -0400
@@ -8,4 +8,4 @@ Description: An experimental toolkit for
Version: @VERSION@
Libs: -L${libdir} -lmx- at MX_API_VERSION@
More information about the scm-commits
mailing list