diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
commit | 8e40bdbb2496be15fdba2e683af427bc2333be42 (patch) | |
tree | 03ace0b9a2ffc12133cb0357fee75079c964f67a /extra/clutter-gtk2 | |
parent | 33fcf0e7b95e530b849e59e90fdea4001e01283d (diff) | |
parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libvisual-projectm/PKGBUILD
community/python-memcached/PKGBUILD
community/python-mpi4py/PKGBUILD
core/sqlite3/PKGBUILD
core/udev/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/pixman/PKGBUILD
extra/sg3_utils/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-udev/PKGBUILD
Diffstat (limited to 'extra/clutter-gtk2')
-rw-r--r-- | extra/clutter-gtk2/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/clutter-gtk2/libm.patch | 39 |
2 files changed, 46 insertions, 4 deletions
diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD index 3ba9ffa2d..9ed47fd9e 100644 --- a/extra/clutter-gtk2/PKGBUILD +++ b/extra/clutter-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 113313 2011-03-08 12:29:48Z heftig $ +# $Id: PKGBUILD 147074 2012-01-21 15:12:46Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gtk2 _pkgbasename=clutter-gtk pkgver=0.10.8 -pkgrel=1 +pkgrel=2 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" @@ -13,13 +13,16 @@ 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) + gir.patch + libm.patch) sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814' - 'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66') + '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 diff --git a/extra/clutter-gtk2/libm.patch b/extra/clutter-gtk2/libm.patch new file mode 100644 index 000000000..17e47ef40 --- /dev/null +++ b/extra/clutter-gtk2/libm.patch @@ -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 |