[arch-commits] Commit in clutter-gtk2/repos (12 files)
Ionut Biru
ibiru at archlinux.org
Fri Jun 1 15:37:09 UTC 2012
Date: Friday, June 1, 2012 @ 11:37:09
Author: ibiru
Revision: 160400
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
clutter-gtk2/repos/extra-i686/PKGBUILD
(from rev 160399, clutter-gtk2/trunk/PKGBUILD)
clutter-gtk2/repos/extra-i686/gir.patch
(from rev 160399, clutter-gtk2/trunk/gir.patch)
clutter-gtk2/repos/extra-i686/libm.patch
(from rev 160399, clutter-gtk2/trunk/libm.patch)
clutter-gtk2/repos/extra-x86_64/PKGBUILD
(from rev 160399, clutter-gtk2/trunk/PKGBUILD)
clutter-gtk2/repos/extra-x86_64/gir.patch
(from rev 160399, clutter-gtk2/trunk/gir.patch)
clutter-gtk2/repos/extra-x86_64/libm.patch
(from rev 160399, clutter-gtk2/trunk/libm.patch)
Deleted:
clutter-gtk2/repos/extra-i686/PKGBUILD
clutter-gtk2/repos/extra-i686/gir.patch
clutter-gtk2/repos/extra-i686/libm.patch
clutter-gtk2/repos/extra-x86_64/PKGBUILD
clutter-gtk2/repos/extra-x86_64/gir.patch
clutter-gtk2/repos/extra-x86_64/libm.patch
-------------------------+
extra-i686/PKGBUILD | 73 +++++++++++++++++++++----------------------
extra-i686/gir.patch | 78 +++++++++++++++++++++++-----------------------
extra-i686/libm.patch | 78 +++++++++++++++++++++++-----------------------
extra-x86_64/PKGBUILD | 73 +++++++++++++++++++++----------------------
extra-x86_64/gir.patch | 78 +++++++++++++++++++++++-----------------------
extra-x86_64/libm.patch | 78 +++++++++++++++++++++++-----------------------
6 files changed, 230 insertions(+), 228 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-06-01 15:35:18 UTC (rev 160399)
+++ extra-i686/PKGBUILD 2012-06-01 15:37:09 UTC (rev 160400)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-
-pkgname=clutter-gtk2
-_pkgbasename=clutter-gtk
-pkgver=0.10.8
-pkgrel=2
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk2')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
- gir.patch
- libm.patch)
-sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
- 'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66'
- '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- patch -Np1 -i "$srcdir/gir.patch"
- patch -Np1 -i "$srcdir/libm.patch"
- autoreconf -i
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -r "$pkgdir/usr/share/gtk-doc"
-}
Copied: clutter-gtk2/repos/extra-i686/PKGBUILD (from rev 160399, clutter-gtk2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-06-01 15:37:09 UTC (rev 160400)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+
+pkgname=clutter-gtk2
+_pkgbasename=clutter-gtk
+pkgver=0.10.8
+pkgrel=3
+pkgdesc="GTK clutter widget"
+arch=('i686' 'x86_64')
+url="http://clutter-project.org/"
+options=('!libtool')
+license=('LGPL')
+depends=('clutter' 'gtk2')
+makedepends=('gobject-introspection' 'gtk-doc')
+source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
+ gir.patch
+ libm.patch)
+sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
+ 'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66'
+ '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef')
+
+build() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+ patch -Np1 -i "$srcdir/gir.patch"
+ patch -Np1 -i "$srcdir/libm.patch"
+ autoreconf -i
+ export CFLAGS+=" -lgthread-2.0"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ rm -r "$pkgdir/usr/share/gtk-doc"
+}
Deleted: extra-i686/gir.patch
===================================================================
--- extra-i686/gir.patch 2012-06-01 15:35:18 UTC (rev 160399)
+++ extra-i686/gir.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -1,39 +0,0 @@
-From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi at linux.intel.com>
-Date: Tue, 28 Sep 2010 13:52:25 +0000
-Subject: build: Add common CFLAGS to the introspection scanner
-
----
-diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
-index 6e267b4..cec5cce 100644
---- a/clutter-gtk/Makefile.am
-+++ b/clutter-gtk/Makefile.am
-@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
- -DCLUTTER_DISABLE_DEPRECATED \
- $(CLUTTER_GTK_DEBUG_CFLAGS)
-
-+common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
-+
- # please, keep these lists sorted alphabetically
- sources_c = \
- $(srcdir)/gtk-clutter-embed.c \
-@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk- at CLUTTER_GTK_API_VERSION@.la
- libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
- libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
- libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
--libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
-+libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
-
- cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
- cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
-@@ -48,7 +50,7 @@ GtkClutter- at CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
- $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
- --strip-prefix=GtkClutter \
-- $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
- --add-include-path=$(srcdir) --add-include=path=. \
- --include=Clutter-1.0 \
- --include=GdkPixbuf-2.0 \
---
-cgit v0.8.3.1-30-gff3a
Copied: clutter-gtk2/repos/extra-i686/gir.patch (from rev 160399, clutter-gtk2/trunk/gir.patch)
===================================================================
--- extra-i686/gir.patch (rev 0)
+++ extra-i686/gir.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -0,0 +1,39 @@
+From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at linux.intel.com>
+Date: Tue, 28 Sep 2010 13:52:25 +0000
+Subject: build: Add common CFLAGS to the introspection scanner
+
+---
+diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
+index 6e267b4..cec5cce 100644
+--- a/clutter-gtk/Makefile.am
++++ b/clutter-gtk/Makefile.am
+@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
+ -DCLUTTER_DISABLE_DEPRECATED \
+ $(CLUTTER_GTK_DEBUG_CFLAGS)
+
++common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
++
+ # please, keep these lists sorted alphabetically
+ sources_c = \
+ $(srcdir)/gtk-clutter-embed.c \
+@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk- at CLUTTER_GTK_API_VERSION@.la
+ libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
+ libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+ libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+-libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
++libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
+
+ cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
+ cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
+@@ -48,7 +50,7 @@ GtkClutter- at CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
+ $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
+ --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
+ --strip-prefix=GtkClutter \
+- $(INCLUDES) $(AM_CPPFLAGS) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
+ --add-include-path=$(srcdir) --add-include=path=. \
+ --include=Clutter-1.0 \
+ --include=GdkPixbuf-2.0 \
+--
+cgit v0.8.3.1-30-gff3a
Deleted: extra-i686/libm.patch
===================================================================
--- extra-i686/libm.patch 2012-06-01 15:35:18 UTC (rev 160399)
+++ extra-i686/libm.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -1,39 +0,0 @@
-diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac
---- clutter-gtk-0.10.8.orig/configure.ac 2012-01-21 14:52:17.627228994 +0000
-+++ clutter-gtk-0.10.8/configure.ac 2012-01-21 15:04:37.317308303 +0000
-@@ -57,6 +57,9 @@
- LT_PREREQ([2.2.6])
- LT_INIT([disable-static])
-
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- m4_define([clutter_req_version], [1.2.0])
- m4_define([gtk_req_version], [2.19.5])
- m4_define([flavour_default], [x11])
-diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am
---- clutter-gtk-0.10.8.orig/examples/Makefile.am 2012-01-21 14:52:17.600561077 +0000
-+++ clutter-gtk-0.10.8/examples/Makefile.am 2012-01-21 15:00:04.549770032 +0000
-@@ -22,18 +22,18 @@
-
- gtk_clutter_test_SOURCES = gtk-clutter-test.c
- gtk_clutter_test_DEPENDENCIES = $(common_deps)
--gtk_clutter_test_LDADD = $(common_ldadd)
-+gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM)
-
- gtk_clutter_events_SOURCES = gtk-clutter-events.c
- gtk_clutter_events_DEPENDENCIES = $(common_deps)
--gtk_clutter_events_LDADD = $(common_ldadd)
-+gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM)
-
- gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c
- gtk_clutter_multistage_DEPENDENCIES = $(common_deps)
--gtk_clutter_multistage_LDADD = $(common_ldadd)
-+gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM)
-
- gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c
- gtk_clutter_viewport_DEPENDENCIES = $(common_deps)
--gtk_clutter_viewport_LDADD = $(common_ldadd)
-+gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM)
-
- EXTRA_DIST = redhand.png
Copied: clutter-gtk2/repos/extra-i686/libm.patch (from rev 160399, clutter-gtk2/trunk/libm.patch)
===================================================================
--- extra-i686/libm.patch (rev 0)
+++ extra-i686/libm.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -0,0 +1,39 @@
+diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac
+--- clutter-gtk-0.10.8.orig/configure.ac 2012-01-21 14:52:17.627228994 +0000
++++ clutter-gtk-0.10.8/configure.ac 2012-01-21 15:04:37.317308303 +0000
+@@ -57,6 +57,9 @@
+ LT_PREREQ([2.2.6])
+ LT_INIT([disable-static])
+
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ m4_define([clutter_req_version], [1.2.0])
+ m4_define([gtk_req_version], [2.19.5])
+ m4_define([flavour_default], [x11])
+diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am
+--- clutter-gtk-0.10.8.orig/examples/Makefile.am 2012-01-21 14:52:17.600561077 +0000
++++ clutter-gtk-0.10.8/examples/Makefile.am 2012-01-21 15:00:04.549770032 +0000
+@@ -22,18 +22,18 @@
+
+ gtk_clutter_test_SOURCES = gtk-clutter-test.c
+ gtk_clutter_test_DEPENDENCIES = $(common_deps)
+-gtk_clutter_test_LDADD = $(common_ldadd)
++gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM)
+
+ gtk_clutter_events_SOURCES = gtk-clutter-events.c
+ gtk_clutter_events_DEPENDENCIES = $(common_deps)
+-gtk_clutter_events_LDADD = $(common_ldadd)
++gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM)
+
+ gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c
+ gtk_clutter_multistage_DEPENDENCIES = $(common_deps)
+-gtk_clutter_multistage_LDADD = $(common_ldadd)
++gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM)
+
+ gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c
+ gtk_clutter_viewport_DEPENDENCIES = $(common_deps)
+-gtk_clutter_viewport_LDADD = $(common_ldadd)
++gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM)
+
+ EXTRA_DIST = redhand.png
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-06-01 15:35:18 UTC (rev 160399)
+++ extra-x86_64/PKGBUILD 2012-06-01 15:37:09 UTC (rev 160400)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-
-pkgname=clutter-gtk2
-_pkgbasename=clutter-gtk
-pkgver=0.10.8
-pkgrel=2
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk2')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
- gir.patch
- libm.patch)
-sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
- 'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66'
- '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- patch -Np1 -i "$srcdir/gir.patch"
- patch -Np1 -i "$srcdir/libm.patch"
- autoreconf -i
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -r "$pkgdir/usr/share/gtk-doc"
-}
Copied: clutter-gtk2/repos/extra-x86_64/PKGBUILD (from rev 160399, clutter-gtk2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-06-01 15:37:09 UTC (rev 160400)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+
+pkgname=clutter-gtk2
+_pkgbasename=clutter-gtk
+pkgver=0.10.8
+pkgrel=3
+pkgdesc="GTK clutter widget"
+arch=('i686' 'x86_64')
+url="http://clutter-project.org/"
+options=('!libtool')
+license=('LGPL')
+depends=('clutter' 'gtk2')
+makedepends=('gobject-introspection' 'gtk-doc')
+source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
+ gir.patch
+ libm.patch)
+sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
+ 'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66'
+ '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef')
+
+build() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+ patch -Np1 -i "$srcdir/gir.patch"
+ patch -Np1 -i "$srcdir/libm.patch"
+ autoreconf -i
+ export CFLAGS+=" -lgthread-2.0"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ rm -r "$pkgdir/usr/share/gtk-doc"
+}
Deleted: extra-x86_64/gir.patch
===================================================================
--- extra-x86_64/gir.patch 2012-06-01 15:35:18 UTC (rev 160399)
+++ extra-x86_64/gir.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -1,39 +0,0 @@
-From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi at linux.intel.com>
-Date: Tue, 28 Sep 2010 13:52:25 +0000
-Subject: build: Add common CFLAGS to the introspection scanner
-
----
-diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
-index 6e267b4..cec5cce 100644
---- a/clutter-gtk/Makefile.am
-+++ b/clutter-gtk/Makefile.am
-@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
- -DCLUTTER_DISABLE_DEPRECATED \
- $(CLUTTER_GTK_DEBUG_CFLAGS)
-
-+common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
-+
- # please, keep these lists sorted alphabetically
- sources_c = \
- $(srcdir)/gtk-clutter-embed.c \
-@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk- at CLUTTER_GTK_API_VERSION@.la
- libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
- libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
- libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
--libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
-+libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
-
- cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
- cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
-@@ -48,7 +50,7 @@ GtkClutter- at CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
- $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
- --strip-prefix=GtkClutter \
-- $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
- --add-include-path=$(srcdir) --add-include=path=. \
- --include=Clutter-1.0 \
- --include=GdkPixbuf-2.0 \
---
-cgit v0.8.3.1-30-gff3a
Copied: clutter-gtk2/repos/extra-x86_64/gir.patch (from rev 160399, clutter-gtk2/trunk/gir.patch)
===================================================================
--- extra-x86_64/gir.patch (rev 0)
+++ extra-x86_64/gir.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -0,0 +1,39 @@
+From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at linux.intel.com>
+Date: Tue, 28 Sep 2010 13:52:25 +0000
+Subject: build: Add common CFLAGS to the introspection scanner
+
+---
+diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
+index 6e267b4..cec5cce 100644
+--- a/clutter-gtk/Makefile.am
++++ b/clutter-gtk/Makefile.am
+@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
+ -DCLUTTER_DISABLE_DEPRECATED \
+ $(CLUTTER_GTK_DEBUG_CFLAGS)
+
++common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
++
+ # please, keep these lists sorted alphabetically
+ sources_c = \
+ $(srcdir)/gtk-clutter-embed.c \
+@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk- at CLUTTER_GTK_API_VERSION@.la
+ libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
+ libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+ libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+-libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
++libclutter_gtk_ at CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
+
+ cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
+ cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
+@@ -48,7 +50,7 @@ GtkClutter- at CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
+ $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
+ --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
+ --strip-prefix=GtkClutter \
+- $(INCLUDES) $(AM_CPPFLAGS) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
+ --add-include-path=$(srcdir) --add-include=path=. \
+ --include=Clutter-1.0 \
+ --include=GdkPixbuf-2.0 \
+--
+cgit v0.8.3.1-30-gff3a
Deleted: extra-x86_64/libm.patch
===================================================================
--- extra-x86_64/libm.patch 2012-06-01 15:35:18 UTC (rev 160399)
+++ extra-x86_64/libm.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -1,39 +0,0 @@
-diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac
---- clutter-gtk-0.10.8.orig/configure.ac 2012-01-21 14:52:17.627228994 +0000
-+++ clutter-gtk-0.10.8/configure.ac 2012-01-21 15:04:37.317308303 +0000
-@@ -57,6 +57,9 @@
- LT_PREREQ([2.2.6])
- LT_INIT([disable-static])
-
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- m4_define([clutter_req_version], [1.2.0])
- m4_define([gtk_req_version], [2.19.5])
- m4_define([flavour_default], [x11])
-diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am
---- clutter-gtk-0.10.8.orig/examples/Makefile.am 2012-01-21 14:52:17.600561077 +0000
-+++ clutter-gtk-0.10.8/examples/Makefile.am 2012-01-21 15:00:04.549770032 +0000
-@@ -22,18 +22,18 @@
-
- gtk_clutter_test_SOURCES = gtk-clutter-test.c
- gtk_clutter_test_DEPENDENCIES = $(common_deps)
--gtk_clutter_test_LDADD = $(common_ldadd)
-+gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM)
-
- gtk_clutter_events_SOURCES = gtk-clutter-events.c
- gtk_clutter_events_DEPENDENCIES = $(common_deps)
--gtk_clutter_events_LDADD = $(common_ldadd)
-+gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM)
-
- gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c
- gtk_clutter_multistage_DEPENDENCIES = $(common_deps)
--gtk_clutter_multistage_LDADD = $(common_ldadd)
-+gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM)
-
- gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c
- gtk_clutter_viewport_DEPENDENCIES = $(common_deps)
--gtk_clutter_viewport_LDADD = $(common_ldadd)
-+gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM)
-
- EXTRA_DIST = redhand.png
Copied: clutter-gtk2/repos/extra-x86_64/libm.patch (from rev 160399, clutter-gtk2/trunk/libm.patch)
===================================================================
--- extra-x86_64/libm.patch (rev 0)
+++ extra-x86_64/libm.patch 2012-06-01 15:37:09 UTC (rev 160400)
@@ -0,0 +1,39 @@
+diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac
+--- clutter-gtk-0.10.8.orig/configure.ac 2012-01-21 14:52:17.627228994 +0000
++++ clutter-gtk-0.10.8/configure.ac 2012-01-21 15:04:37.317308303 +0000
+@@ -57,6 +57,9 @@
+ LT_PREREQ([2.2.6])
+ LT_INIT([disable-static])
+
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ m4_define([clutter_req_version], [1.2.0])
+ m4_define([gtk_req_version], [2.19.5])
+ m4_define([flavour_default], [x11])
+diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am
+--- clutter-gtk-0.10.8.orig/examples/Makefile.am 2012-01-21 14:52:17.600561077 +0000
++++ clutter-gtk-0.10.8/examples/Makefile.am 2012-01-21 15:00:04.549770032 +0000
+@@ -22,18 +22,18 @@
+
+ gtk_clutter_test_SOURCES = gtk-clutter-test.c
+ gtk_clutter_test_DEPENDENCIES = $(common_deps)
+-gtk_clutter_test_LDADD = $(common_ldadd)
++gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM)
+
+ gtk_clutter_events_SOURCES = gtk-clutter-events.c
+ gtk_clutter_events_DEPENDENCIES = $(common_deps)
+-gtk_clutter_events_LDADD = $(common_ldadd)
++gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM)
+
+ gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c
+ gtk_clutter_multistage_DEPENDENCIES = $(common_deps)
+-gtk_clutter_multistage_LDADD = $(common_ldadd)
++gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM)
+
+ gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c
+ gtk_clutter_viewport_DEPENDENCIES = $(common_deps)
+-gtk_clutter_viewport_LDADD = $(common_ldadd)
++gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM)
+
+ EXTRA_DIST = redhand.png
More information about the arch-commits
mailing list