Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara (d76e1db288893fcdab401caf0feadb9199d51464)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara (d76e1db288893fcdab401caf0feadb9199d51464)
  • Date: Mon, 25 Apr 2011 19:14:54 -0500

GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara <hgr AT vabo.cz>:

dev/null |binary
gnome2-libs/clutter-gtk/DEPENDS | 2
gnome2-libs/clutter-gtk/DETAILS | 4
gnome2-libs/clutter-gtk/HISTORY | 7 +
gnome2-libs/clutter-gtk/PRE_BUILD | 7 -
gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig | 0
gnome2-libs/clutter-gtk/clutter-gtk-1.0.0.tar.bz2.sig |binary
gnome2-libs/clutter-gtk/fix-gir.patch | 93
-----------------
8 files changed, 10 insertions(+), 103 deletions(-)

New commits:
commit d76e1db288893fcdab401caf0feadb9199d51464
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

Revert "Revert "clutter-gtk: depends on gtk+3 instead of gtk+2""

This reverts commit cca0b967ab825e4ed302d656aded32ba2fb4ef95.

This shouldn't have been reverted in gnome-devel-3.0.0.

commit f81dad6e2ae9ec471b148d12ca15c8683809cfe7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

Revert "Revert "clutter-gtk 1.0.0""

This reverts commit 8073a7244ba7e37bd49f701f4afcd8f700c2da1e.

This shouldn't have been reverted in devel-gnome-3.0.0.

diff --git a/gnome2-libs/clutter-gtk/DEPENDS b/gnome2-libs/clutter-gtk/DEPENDS
index b14251b..87959da 100755
--- a/gnome2-libs/clutter-gtk/DEPENDS
+++ b/gnome2-libs/clutter-gtk/DEPENDS
@@ -1,5 +1,5 @@
depends glib2 &&
-depends gtk+2 &&
+depends gtk+3 &&
depends clutter &&

optional_depends gobject-introspection \
diff --git a/gnome2-libs/clutter-gtk/DETAILS b/gnome2-libs/clutter-gtk/DETAILS
index 82dfa1a..c00e448 100755
--- a/gnome2-libs/clutter-gtk/DETAILS
+++ b/gnome2-libs/clutter-gtk/DETAILS
@@ -1,7 +1,7 @@
SPELL=clutter-gtk
- VERSION=0.10.8
+ VERSION=1.0.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]=http://www.clutter-project.org/sources/${SPELL}/${VERSION:0:4}/${SOURCE}
+
SOURCE_URL[0]=http://www.clutter-project.org/sources/${SPELL}/${VERSION:0:3}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.clutter-project.org";
diff --git a/gnome2-libs/clutter-gtk/HISTORY b/gnome2-libs/clutter-gtk/HISTORY
index 9b8d85e..cb7784c 100644
--- a/gnome2-libs/clutter-gtk/HISTORY
+++ b/gnome2-libs/clutter-gtk/HISTORY
@@ -1,3 +1,10 @@
+2011-04-11 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: depends on gtk+3 instead of gtk+2
+
+2011-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.0
+ * PRE_BUILD, fix-gir.patch: removed
+
2010-11-04 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added optional on gtk-doc
* PRE_BUILD: added to apply patch and run autoreconf
diff --git a/gnome2-libs/clutter-gtk/PRE_BUILD
b/gnome2-libs/clutter-gtk/PRE_BUILD
deleted file mode 100755
index 6c1bf05..0000000
--- a/gnome2-libs/clutter-gtk/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SCRIPT_DIRECTORY/fix-gir.patch &&
-
-autoreconf -vi
-
diff --git a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig
b/gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig
deleted file mode 100644
index cd74a93..0000000
Binary files a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/clutter-gtk/clutter-gtk-1.0.0.tar.bz2.sig
b/gnome2-libs/clutter-gtk/clutter-gtk-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000..04418e5
Binary files /dev/null and
b/gnome2-libs/clutter-gtk/clutter-gtk-1.0.0.tar.bz2.sig differ
diff --git a/gnome2-libs/clutter-gtk/fix-gir.patch
b/gnome2-libs/clutter-gtk/fix-gir.patch
deleted file mode 100644
index 54935ae..0000000
--- a/gnome2-libs/clutter-gtk/fix-gir.patch
+++ /dev/null
@@ -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-@CLUTTER_GTK_API_VERSION@.la
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS)
$(GTK_LIBS)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
--libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS)
$(GTK_CFLAGS) $(CLUTTER_CFLAGS)
-+libclutter_gtk_@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-@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



  • [SM-Commit] GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara (d76e1db288893fcdab401caf0feadb9199d51464), Ladislav Hagara, 04/25/2011

Archive powered by MHonArc 2.6.24.

Top of Page