wok-4.x rev 7638
Fixed clutter-gtk.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Mon Dec 13 18:45:20 2010 +0000 (2010-12-13) |
| parents | d6eb6e9dd3df |
| children | 8798c5f282bb |
| files | clutter-gtk-dev/receipt clutter-gtk/receipt clutter-gtk/stuff/fix-gir.patch |
line diff
1.1 --- a/clutter-gtk-dev/receipt Mon Dec 13 18:41:21 2010 +0000 1.2 +++ b/clutter-gtk-dev/receipt Mon Dec 13 18:45:20 2010 +0000 1.3 @@ -12,8 +12,9 @@ 1.4 # Rules to gen a SliTaz package suitable for Tazpkg. 1.5 genpkg_rules() 1.6 { 1.7 - mkdir -p $fs/usr/lib 1.8 + mkdir -p $fs/usr/lib $fs/usr/share 1.9 cp -a $_pkg/usr/lib/*.*a $fs/usr/lib 1.10 cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib 1.11 cp -a $_pkg/usr/include $fs/usr 1.12 + cp -a $_pkg/usr/share/gir-1.0 $fs/usr/share 1.13 }
2.1 --- a/clutter-gtk/receipt Mon Dec 13 18:41:21 2010 +0000 2.2 +++ b/clutter-gtk/receipt Mon Dec 13 18:45:20 2010 +0000 2.3 @@ -6,15 +6,16 @@ 2.4 SHORT_DESC="GTK+ libraries for Clutter." 2.5 MAINTAINER="pankso@slitaz.org" 2.6 DEPENDS="gtk+ clutter" 2.7 -BUILD_DEPENDS="gtk+-dev clutter-dev" 2.8 -TARBALL="$PACKAGE-$VERSION.tar.gz" 2.9 +BUILD_DEPENDS="gtk+-dev clutter-dev gobject-introspection-dev automake autoconf" 2.10 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.11 WEB_SITE="http://clutter-project.org/" 2.12 -WGET_URL="http://www.clutter-project.org/sources/clutter-gtk/0.10/$TARBALL" 2.13 +WGET_URL="http://www.clutter-project.org/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 2.14 2.15 # Rules to configure and make the package. 2.16 compile_rules() 2.17 { 2.18 cd $src 2.19 + patch -Np1 -i ../stuff/fix-gir.patch 2.20 sed -i -e 's/GTK_WIDGET_REALIZED/gtk_widget_get_realized/' \ 2.21 -e 's/GTK_WIDGET_VISIBLE/gtk_widget_get_visible/' \ 2.22 clutter-gtk/gtk-clutter-embed.c 2.23 @@ -30,4 +31,5 @@ 2.24 { 2.25 mkdir -p $fs/usr/lib 2.26 cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 2.27 + cp -a $_pkg/usr/lib/girepository-1.0 $fs/usr/lib 2.28 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/clutter-gtk/stuff/fix-gir.patch Mon Dec 13 18:45:20 2010 +0000 3.3 @@ -0,0 +1,93 @@ 3.4 +From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001 3.5 +From: Emmanuele Bassi <ebassi@linux.intel.com> 3.6 +Date: Tue, 28 Sep 2010 13:52:25 +0000 3.7 +Subject: build: Add common CFLAGS to the introspection scanner 3.8 + 3.9 +--- 3.10 +diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am 3.11 +index 6e267b4..cec5cce 100644 3.12 +--- a/clutter-gtk/Makefile.am 3.13 ++++ b/clutter-gtk/Makefile.am 3.14 +@@ -15,6 +15,8 @@ AM_CPPFLAGS = \ 3.15 + -DCLUTTER_DISABLE_DEPRECATED \ 3.16 + $(CLUTTER_GTK_DEBUG_CFLAGS) 3.17 + 3.18 ++common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS) 3.19 ++ 3.20 + # please, keep these lists sorted alphabetically 3.21 + sources_c = \ 3.22 + $(srcdir)/gtk-clutter-embed.c \ 3.23 +@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la 3.24 + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c) 3.25 + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS) 3.26 + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS) 3.27 +-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 3.28 ++libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS) 3.29 + 3.30 + cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk 3.31 + cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h 3.32 +@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc 3.33 + $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \ 3.34 + --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \ 3.35 + --strip-prefix=GtkClutter \ 3.36 +- $(INCLUDES) $(AM_CPPFLAGS) \ 3.37 ++ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \ 3.38 + --add-include-path=$(srcdir) --add-include=path=. \ 3.39 + --include=Clutter-1.0 \ 3.40 + --include=GdkPixbuf-2.0 \ 3.41 +-- 3.42 +cgit v0.8.3.1-30-gff3a 3.43 +From 0d77c7c965dcebcec0dae6b6244c3a057b398b59 Mon Sep 17 00:00:00 2001 3.44 +From: Emmanuele Bassi <ebassi@linux.intel.com> 3.45 +Date: Tue, 28 Sep 2010 13:58:17 +0000 3.46 +Subject: Add introspection annotations for gtk_clutter_init* 3.47 + 3.48 +--- 3.49 +diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c 3.50 +index 8cf4116..50bca6b 100644 3.51 +--- a/clutter-gtk/gtk-clutter-util.c 3.52 ++++ b/clutter-gtk/gtk-clutter-util.c 3.53 +@@ -603,8 +603,9 @@ gtk_clutter_texture_set_from_icon_name (ClutterTexture *texture, 3.54 + 3.55 + /** 3.56 + * gtk_clutter_init: 3.57 +- * @argc: pointer to the arguments count, or %NULL 3.58 +- * @argv: pointer to the arguments vector, or %NULL 3.59 ++ * @argc: (inout): pointer to the arguments count, or %NULL 3.60 ++ * @argv: (array length=argc) (inout) (allow-none): pointer to the 3.61 ++ * arguments vector, or %NULL 3.62 + * 3.63 + * This function should be called instead of clutter_init() and 3.64 + * gtk_init(). 3.65 +@@ -633,17 +634,18 @@ gtk_clutter_init (int *argc, 3.66 + 3.67 + /** 3.68 + * gtk_clutter_init_with_args: 3.69 +- * @argc: a pointer to the number of command line arguments. 3.70 +- * @argv: a pointer to the array of command line arguments. 3.71 +- * @parameter_string: a string which is displayed in 3.72 +- * the first line of <option>--help</option> output, after 3.73 +- * <literal><replaceable>programname</replaceable> [OPTION...]</literal> 3.74 +- * @entries: a %NULL-terminated array of #GOptionEntry<!-- -->s 3.75 +- * describing the options of your program 3.76 +- * @translation_domain: a translation domain to use for translating 3.77 +- * the <option>--help</option> output for the options in @entries 3.78 +- * with gettext(), or %NULL 3.79 +- * @error: a return location for errors 3.80 ++ * @argc: (inout): a pointer to the number of command line arguments. 3.81 ++ * @argv: (array length=argc) (inout) (allow-none): a pointer to the array 3.82 ++ * of command line arguments. 3.83 ++ * @parameter_string: (allow-none): a string which is displayed in 3.84 ++ * the first line of <option>--help</option> output, after 3.85 ++ * <literal><replaceable>programname</replaceable> [OPTION...]</literal> 3.86 ++ * @entries: (allow-none): a %NULL-terminated array of #GOptionEntry<!-- -->s 3.87 ++ * describing the options of your program, or %NULL 3.88 ++ * @translation_domain: (allow-none): a translation domain to use for 3.89 ++ * translating the <option>--help</option> output for the options 3.90 ++ * in @entries with gettext(), or %NULL 3.91 ++ * @error: (allow-none): a return location for errors, or %NULL 3.92 + * 3.93 + * This function should be called instead of clutter_init() and 3.94 + * gtk_init_with_args(). 3.95 +-- 3.96 +cgit v0.8.3.1-30-gff3a