[arch-commits] Commit in clutter-gtk/trunk (PKGBUILD fix-gir.patch)
Jan Steffens
heftig at archlinux.org
Fri Feb 11 20:46:34 UTC 2011
Date: Friday, February 11, 2011 @ 15:46:33
Author: heftig
Revision: 109702
upgpkg: clutter-gtk 0.91.8-1
Update for gnome-unstable
Modified:
clutter-gtk/trunk/PKGBUILD
Deleted:
clutter-gtk/trunk/fix-gir.patch
---------------+
PKGBUILD | 19 +++++------
fix-gir.patch | 93 --------------------------------------------------------
2 files changed, 9 insertions(+), 103 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-02-11 20:27:08 UTC (rev 109701)
+++ PKGBUILD 2011-02-11 20:46:33 UTC (rev 109702)
@@ -2,26 +2,25 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=clutter-gtk
-pkgver=0.10.8
-pkgrel=2
+pkgver=0.91.8
+pkgrel=1
pkgdesc="GTK clutter widget"
arch=('i686' 'x86_64')
url="http://clutter-project.org/"
options=('!libtool')
license=('LGPL')
-depends=('clutter>=1.4.0' 'gtk2>=2.22.0')
+depends=('clutter' 'gtk3')
makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2
- fix-gir.patch)
-sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
- 'a134d7154f71c995ae09cd606dcf811e1d317818c13a1167b3850c3104dadbd4')
+source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('1516ac98b9f0436d7806f02153810fae31f961446311e06805f574ac1aaa969e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/fix-gir.patch"
- gtkdocize
- autoreconf -vi
./configure --prefix=/usr
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
Deleted: fix-gir.patch
===================================================================
--- fix-gir.patch 2011-02-11 20:27:08 UTC (rev 109701)
+++ fix-gir.patch 2011-02-11 20:46:33 UTC (rev 109702)
@@ -1,93 +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
-From 0d77c7c965dcebcec0dae6b6244c3a057b398b59 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi at linux.intel.com>
-Date: Tue, 28 Sep 2010 13:58:17 +0000
-Subject: Add introspection annotations for gtk_clutter_init*
-
----
-diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
-index 8cf4116..50bca6b 100644
---- a/clutter-gtk/gtk-clutter-util.c
-+++ b/clutter-gtk/gtk-clutter-util.c
-@@ -603,8 +603,9 @@ gtk_clutter_texture_set_from_icon_name (ClutterTexture *texture,
-
- /**
- * gtk_clutter_init:
-- * @argc: pointer to the arguments count, or %NULL
-- * @argv: pointer to the arguments vector, or %NULL
-+ * @argc: (inout): pointer to the arguments count, or %NULL
-+ * @argv: (array length=argc) (inout) (allow-none): pointer to the
-+ * arguments vector, or %NULL
- *
- * This function should be called instead of clutter_init() and
- * gtk_init().
-@@ -633,17 +634,18 @@ gtk_clutter_init (int *argc,
-
- /**
- * gtk_clutter_init_with_args:
-- * @argc: a pointer to the number of command line arguments.
-- * @argv: a pointer to the array of command line arguments.
-- * @parameter_string: a string which is displayed in
-- * the first line of <option>--help</option> output, after
-- * <literal><replaceable>programname</replaceable> [OPTION...]</literal>
-- * @entries: a %NULL-terminated array of #GOptionEntry<!-- -->s
-- * describing the options of your program
-- * @translation_domain: a translation domain to use for translating
-- * the <option>--help</option> output for the options in @entries
-- * with gettext(), or %NULL
-- * @error: a return location for errors
-+ * @argc: (inout): a pointer to the number of command line arguments.
-+ * @argv: (array length=argc) (inout) (allow-none): a pointer to the array
-+ * of command line arguments.
-+ * @parameter_string: (allow-none): a string which is displayed in
-+ * the first line of <option>--help</option> output, after
-+ * <literal><replaceable>programname</replaceable> [OPTION...]</literal>
-+ * @entries: (allow-none): a %NULL-terminated array of #GOptionEntry<!-- -->s
-+ * describing the options of your program, or %NULL
-+ * @translation_domain: (allow-none): a translation domain to use for
-+ * translating the <option>--help</option> output for the options
-+ * in @entries with gettext(), or %NULL
-+ * @error: (allow-none): a return location for errors, or %NULL
- *
- * This function should be called instead of clutter_init() and
- * gtk_init_with_args().
---
-cgit v0.8.3.1-30-gff3a
More information about the arch-commits
mailing list