r26990 - in /packages/unstable/seed/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Mar 20 16:29:17 UTC 2011
Author: pochu
Date: Sun Mar 20 16:29:12 2011
New Revision: 26990
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26990
Log:
- Add dh-autoreconf magic.
* d/p/0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch,
d/p/0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch:
- Patches from upstream git, fix FTBFS issues.
* debian/patches/10_no_m4_dir.patch:
- New patch. Fix running autoreconf.
Added:
packages/unstable/seed/debian/patches/
packages/unstable/seed/debian/patches/0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch
packages/unstable/seed/debian/patches/0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch
packages/unstable/seed/debian/patches/10_no_m4_dir.patch
packages/unstable/seed/debian/patches/series
Modified:
packages/unstable/seed/debian/changelog
packages/unstable/seed/debian/control
packages/unstable/seed/debian/control.in
packages/unstable/seed/debian/rules
Modified: packages/unstable/seed/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/changelog?rev=26990&op=diff
==============================================================================
--- packages/unstable/seed/debian/changelog [utf-8] (original)
+++ packages/unstable/seed/debian/changelog [utf-8] Sun Mar 20 16:29:12 2011
@@ -3,6 +3,12 @@
* debian/control.in,
debian/rules:
- No need to manually add quilt support with source format 3.0 (quilt).
+ - Add dh-autoreconf magic.
+ * d/p/0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch,
+ d/p/0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch:
+ - Patches from upstream git, fix FTBFS issues.
+ * debian/patches/10_no_m4_dir.patch:
+ - New patch. Fix running autoreconf.
-- Emilio Pozuelo Monfort <pochu at debian.org> Wed, 31 Mar 2010 19:06:47 +0200
Modified: packages/unstable/seed/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/control?rev=26990&op=diff
==============================================================================
--- packages/unstable/seed/debian/control [utf-8] (original)
+++ packages/unstable/seed/debian/control [utf-8] Sun Mar 20 16:29:12 2011
@@ -9,6 +9,7 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.4),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
libffi-dev (>= 3.0),
Modified: packages/unstable/seed/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/control.in?rev=26990&op=diff
==============================================================================
--- packages/unstable/seed/debian/control.in [utf-8] (original)
+++ packages/unstable/seed/debian/control.in [utf-8] Sun Mar 20 16:29:12 2011
@@ -4,6 +4,7 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.4),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
libffi-dev (>= 3.0),
Added: packages/unstable/seed/debian/patches/0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/patches/0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch?rev=26990&op=file
==============================================================================
--- packages/unstable/seed/debian/patches/0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch (added)
+++ packages/unstable/seed/debian/patches/0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch [utf-8] Sun Mar 20 16:29:12 2011
@@ -1,0 +1,42 @@
+From a228b4e86372d45f03ecd98aec0f9dcec0d5945b Mon Sep 17 00:00:00 2001
+From: Alan Knowles <alan at akkbhome.com>
+Date: Wed, 22 Sep 2010 08:01:45 +0800
+Subject: [PATCH] Fix Bug #623558 - DSO linking against libgthread
+
+It appears a few projects don't like implicit DSO linking...
+---
+ configure.ac | 3 +++
+ src/Makefile.am | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 22fcdac..e716a1b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,6 +120,9 @@ PKG_CHECK_MODULES(GNOME_JS, gnome-js-common)
+ GNOME_JS_DIR=`pkg-config --variable=moduledir gnome-js-common`
+ AC_SUBST(GNOME_JS_DIR)
+
++dnl ========================GThread============================================
++PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
++
+ dnl =============================Modules=======================================
+ dnl ==== canvas ====
+ AC_ARG_ENABLE(canvas-module,
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 04ee4c8..d67ba85 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -20,7 +20,8 @@ seed_LDFLAGS = \
+ $(SEED_PROFILE_LIBS) \
+ $(LIBFFI_LDFLAGS) \
+ $(GOBJECT_INTROSPECTION_LDFLAGS) \
+- $(WEBKIT_LDFLAGS)
++ $(WEBKIT_LDFLAGS) \
++ $(GTHREAD_LIBS)
+
+ seed_LDADD = \
+ ../libseed/libseed.la
+--
+1.7.4.1
+
Added: packages/unstable/seed/debian/patches/0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/patches/0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch?rev=26990&op=file
==============================================================================
--- packages/unstable/seed/debian/patches/0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch (added)
+++ packages/unstable/seed/debian/patches/0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch [utf-8] Sun Mar 20 16:29:12 2011
@@ -1,0 +1,165 @@
+From 689e8018c87c65c77a1e5e96acb30dab91bd05e5 Mon Sep 17 00:00:00 2001
+From: Tim Horton <hortont at gnome.org>
+Date: Sun, 11 Jul 2010 17:38:19 -0700
+Subject: [PATCH] Fix build with latest GI, where machine-dependent type tags were removed.
+
+---
+ libseed/seed-closure.c | 36 ------------------------------------
+ libseed/seed-types.c | 37 +------------------------------------
+ 2 files changed, 1 insertions(+), 72 deletions(-)
+
+diff --git a/libseed/seed-closure.c b/libseed/seed-closure.c
+index 36328bb..1ce4b6f 100644
+--- a/libseed/seed-closure.c
++++ b/libseed/seed-closure.c
+@@ -97,30 +97,12 @@ seed_handle_closure (ffi_cif * cif, void *result, void **args, void *userdata)
+ case GI_TYPE_TAG_UINT32:
+ arg->v_uint32 = *(guint32 *) args[i];
+ break;
+- case GI_TYPE_TAG_LONG:
+- arg->v_long = *(glong *) args[i];
+- break;
+ case GI_TYPE_TAG_INT64:
+ arg->v_int64 = *(gint64 *) args[i];
+ break;
+- case GI_TYPE_TAG_ULONG:
+- arg->v_ulong = *(gulong *) args[i];
+- break;
+ case GI_TYPE_TAG_UINT64:
+ arg->v_uint64 = *(guint64 *) args[i];
+ break;
+- case GI_TYPE_TAG_INT:
+- arg->v_int = *(gint *) args[i];
+- break;
+- case GI_TYPE_TAG_SSIZE:
+- arg->v_ssize = *(gssize *) args[i];
+- break;
+- case GI_TYPE_TAG_SIZE:
+- arg->v_size = *(gsize *) args[i];
+- break;
+- case GI_TYPE_TAG_UINT:
+- arg->v_uint = *(guint *) args[i];
+- break;
+ case GI_TYPE_TAG_FLOAT:
+ arg->v_float = *(gfloat *) args[i];
+ break;
+@@ -215,30 +197,12 @@ seed_handle_closure (ffi_cif * cif, void *result, void **args, void *userdata)
+ case GI_TYPE_TAG_UINT32:
+ *(guint32 *) result = return_arg.v_uint32;
+ break;
+- case GI_TYPE_TAG_LONG:
+- *(glong *) result = return_arg.v_long;
+- break;
+ case GI_TYPE_TAG_INT64:
+ *(gint64 *) result = return_arg.v_int64;
+ break;
+- case GI_TYPE_TAG_ULONG:
+- *(gulong *) result = return_arg.v_ulong;
+- break;
+ case GI_TYPE_TAG_UINT64:
+ *(guint64 *) result = return_arg.v_uint64;
+ break;
+- case GI_TYPE_TAG_INT:
+- *(gint *) result = return_arg.v_int;
+- break;
+- case GI_TYPE_TAG_SSIZE:
+- *(gssize *) result = return_arg.v_ssize;
+- break;
+- case GI_TYPE_TAG_SIZE:
+- *(gsize *) result = return_arg.v_size;
+- break;
+- case GI_TYPE_TAG_UINT:
+- *(guint *) result = return_arg.v_uint;
+- break;
+ case GI_TYPE_TAG_FLOAT:
+ *(gfloat *) result = return_arg.v_float;
+ break;
+diff --git a/libseed/seed-types.c b/libseed/seed-types.c
+index 67af39e..12ae227 100644
+--- a/libseed/seed-types.c
++++ b/libseed/seed-types.c
+@@ -389,7 +389,7 @@ seed_gi_make_array (JSContextRef ctx,
+ *array_p = dblresult;
+ }
+ break;
+- case GI_TYPE_TAG_INT:
++ case GI_TYPE_TAG_INT32:
+ {
+ gint *intresult;
+
+@@ -533,30 +533,12 @@ seed_gi_make_argument (JSContextRef ctx,
+ case GI_TYPE_TAG_UINT32:
+ arg->v_uint32 = seed_value_to_uint (ctx, value, exception);
+ break;
+- case GI_TYPE_TAG_LONG:
+- arg->v_long = seed_value_to_long (ctx, value, exception);
+- break;
+ case GI_TYPE_TAG_INT64:
+ arg->v_int64 = seed_value_to_int64 (ctx, value, exception);
+ break;
+- case GI_TYPE_TAG_ULONG:
+- arg->v_ulong = seed_value_to_ulong (ctx, value, exception);
+- break;
+ case GI_TYPE_TAG_UINT64:
+ arg->v_uint64 = seed_value_to_uint64 (ctx, value, exception);
+ break;
+- case GI_TYPE_TAG_INT:
+- arg->v_int = seed_value_to_int (ctx, value, exception);
+- break;
+- case GI_TYPE_TAG_UINT:
+- arg->v_uint = seed_value_to_uint (ctx, value, exception);
+- break;
+- case GI_TYPE_TAG_SIZE:
+- arg->v_size = seed_value_to_size (ctx, value, exception);
+- break;
+- case GI_TYPE_TAG_SSIZE:
+- arg->v_ssize = seed_value_to_ssize (ctx, value, exception);
+- break;
+ case GI_TYPE_TAG_FLOAT:
+ arg->v_float = seed_value_to_float (ctx, value, exception);
+ break;
+@@ -572,9 +554,6 @@ seed_gi_make_argument (JSContextRef ctx,
+ case GI_TYPE_TAG_GTYPE:
+ arg->v_int = seed_value_to_int (ctx, value, exception);
+ break;
+- case GI_TYPE_TAG_TIME_T:
+- arg->v_long = seed_value_to_time_t (ctx, value, exception);
+- break;
+ case GI_TYPE_TAG_INTERFACE:
+ {
+ GIBaseInfo *interface;
+@@ -815,22 +794,10 @@ seed_gi_argument_make_js (JSContextRef ctx,
+ return seed_value_from_int (ctx, arg->v_int32, exception);
+ case GI_TYPE_TAG_UINT32:
+ return seed_value_from_uint (ctx, arg->v_uint32, exception);
+- case GI_TYPE_TAG_LONG:
+- return seed_value_from_long (ctx, arg->v_long, exception);
+ case GI_TYPE_TAG_INT64:
+ return seed_value_from_int64 (ctx, arg->v_int64, exception);
+- case GI_TYPE_TAG_ULONG:
+- return seed_value_from_ulong (ctx, arg->v_ulong, exception);
+ case GI_TYPE_TAG_UINT64:
+ return seed_value_from_uint64 (ctx, arg->v_uint64, exception);
+- case GI_TYPE_TAG_INT:
+- return seed_value_from_int (ctx, arg->v_int32, exception);
+- case GI_TYPE_TAG_UINT:
+- return seed_value_from_uint (ctx, arg->v_uint32, exception);
+- case GI_TYPE_TAG_SSIZE:
+- return seed_value_from_ssize (ctx, arg->v_ssize, exception);
+- case GI_TYPE_TAG_SIZE:
+- return seed_value_from_size (ctx, arg->v_size, exception);
+ case GI_TYPE_TAG_FLOAT:
+ return seed_value_from_float (ctx, arg->v_float, exception);
+ case GI_TYPE_TAG_DOUBLE:
+@@ -841,8 +808,6 @@ seed_gi_argument_make_js (JSContextRef ctx,
+ return seed_value_from_filename (ctx, arg->v_string, exception);
+ case GI_TYPE_TAG_GTYPE:
+ return seed_value_from_int (ctx, arg->v_int, exception);
+- case GI_TYPE_TAG_TIME_T:
+- return seed_value_from_time_t (ctx, arg->v_long, exception);
+ case GI_TYPE_TAG_ARRAY:
+ {
+ GITypeInfo *param_type;
+--
+1.7.4.1
+
Added: packages/unstable/seed/debian/patches/10_no_m4_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/patches/10_no_m4_dir.patch?rev=26990&op=file
==============================================================================
--- packages/unstable/seed/debian/patches/10_no_m4_dir.patch (added)
+++ packages/unstable/seed/debian/patches/10_no_m4_dir.patch [utf-8] Sun Mar 20 16:29:12 2011
@@ -1,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+
+-ACLOCAL_AMFLAGS = -I m4
+-
+ SUBDIRS = po \
+ libseed \
+ src \
Added: packages/unstable/seed/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/patches/series?rev=26990&op=file
==============================================================================
--- packages/unstable/seed/debian/patches/series (added)
+++ packages/unstable/seed/debian/patches/series [utf-8] Sun Mar 20 16:29:12 2011
@@ -1,0 +1,3 @@
+0001-Fix-Bug-623558-DSO-linking-against-libgthread.patch
+0001-Fix-build-with-latest-GI-where-machine-dependent-typ.patch
+10_no_m4_dir.patch
Modified: packages/unstable/seed/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/seed/debian/rules?rev=26990&op=diff
==============================================================================
--- packages/unstable/seed/debian/rules [utf-8] (original)
+++ packages/unstable/seed/debian/rules [utf-8] Sun Mar 20 16:29:12 2011
@@ -1,10 +1,11 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_COMPRESS_EXCLUDE += js ui
More information about the pkg-gnome-commits
mailing list