[libmx/f16] 1.3.0 + gdk-pixuf fixes

Mon Aug 8 18:55:22 UTC 2011

commit 304de2cc113e77f527a506003f3e42cff8a65a72
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Aug 8 14:55:09 2011 -0400

    1.3.0 + gdk-pixuf fixes

 libmx.spec                |   24 +++++++++++----
 mx-1.3.0-gdk-pixbuf.patch |   69 +++++++++++++++++++++++++++++++++++++++++++++
 sources                   |    2 +-
 3 files changed, 87 insertions(+), 8 deletions(-)
---

diff --git a/libmx.spec b/libmx.spec
index 986f6da..58dc439 100644
--- a/libmx.spec
+++ b/libmx.spec
@@ -1,17 +1,18 @@
 Name:          libmx
-Version:       1.2.0
-Release:       1%{?dist}
+Version:       1.3.0
+Release:       2%{?dist}
 Summary:       A clutter widget toolkit
 
 Group:         System Environment/Libraries
 License:       LGPLv2
 URL:           http://www.clutter-project.org
-Source0:       http://source.clutter-project.org/sources/mx/1.2/mx-%{version}.tar.bz2
+Source0:       http://source.clutter-project.org/sources/mx/1.3/mx-%{version}.tar.xz
+Patch0:        mx-1.3.0-gdk-pixbuf.patch
 
-BuildRequires: clutter-imcontext-devel
-BuildRequires: clutter-gesture-devel
+BuildRequires: clutter-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gobject-introspection-devel
+BuildRequires: gdk-pixbuf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: pkgconfig
 BuildRequires: startup-notification-devel
@@ -29,7 +30,8 @@ currently used by Moblin to provide the user experience.
 %package devel
 Summary: Development package for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: clutter-devel, gdk-pixbuf2-devel
 Requires: pkgconfig
 
 %description devel
@@ -48,9 +50,10 @@ toolkit, currently used primarily by Moblin.
 
 %prep
 %setup -q -n mx-%{version}
+%patch0 -p1 -b .gdk-pixbuf
 
 %build
-%configure --disable-static --enable-introspection --enable-gtk-doc --with-clutter-imcontext --with-clutter-gesture
+%configure --disable-static --enable-introspection --enable-gtk-doc
 make %{?_smp_mflags} V=1
 
 %install
@@ -86,6 +89,13 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gtk-doc/html/mx-gtk
 
 %changelog
+* Fri Aug  5 2011 Tom Callaway <spot at fedoraproject.org> 1.3.0-2
+- fix .pc file to require gdk-pixbuf-2.0
+
+* Fri Aug  5 2011 Peter Robinson <pbrobinson at gmail.com> 1.3.0-1
+- 1.3.0
+- Drop clutter-gestures and clutter-imcontext as they're not well supported
+
 * Sun Jun  5 2011 Peter Robinson <pbrobinson at gmail.com> 1.2.0-1
 - 1.2.0
 
diff --git a/mx-1.3.0-gdk-pixbuf.patch b/mx-1.3.0-gdk-pixbuf.patch
new file mode 100644
index 0000000..3c00962
--- /dev/null
+++ b/mx-1.3.0-gdk-pixbuf.patch
@@ -0,0 +1,69 @@
+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: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)	\
+ 	$(MX_DEBUG_CFLAGS)		\
++	$(MX_IMAGE_CACHE_CFLAGS)	\
+ 	$(MX_CFLAGS)			\
+ 	$(NULL)
+ 
+@@ -268,7 +269,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)
+ 
+ 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-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@
+ Cflags: -I${includedir}/mx- at MX_API_VERSION@
+-Requires: clutter-1.0
++Requires: clutter-1.0 gdk-pixbuf-2.0
diff --git a/sources b/sources
index 6cd4e36..b8b0436 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52bf38db466925632074653f455b947c  mx-1.2.0.tar.bz2
+d77e076425382b05010e51af0e0b30e8  mx-1.3.0.tar.xz
