r18925 - in /packages/unstable/gnome-python-extras/debian/patches: 01_xul19.patch 70_autotools.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Mar 9 16:46:43 UTC 2009
Author: joss
Date: Mon Mar 9 16:46:43 2009
New Revision: 18925
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18925
Log:
Add missing gtk+ includes in the patch
Modified:
packages/unstable/gnome-python-extras/debian/patches/01_xul19.patch
packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch
Modified: packages/unstable/gnome-python-extras/debian/patches/01_xul19.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-python-extras/debian/patches/01_xul19.patch?rev=18925&op=diff
==============================================================================
--- packages/unstable/gnome-python-extras/debian/patches/01_xul19.patch (original)
+++ packages/unstable/gnome-python-extras/debian/patches/01_xul19.patch Mon Mar 9 16:46:43 2009
@@ -1,7 +1,7 @@
Index: gnome-python-extras-2.25.3/configure.ac
===================================================================
--- gnome-python-extras-2.25.3.orig/configure.ac 2009-02-15 23:20:23.000000000 +0100
-+++ gnome-python-extras-2.25.3/configure.ac 2009-03-09 17:10:35.151274702 +0100
++++ gnome-python-extras-2.25.3/configure.ac 2009-03-09 17:43:01.417674203 +0100
@@ -19,6 +19,7 @@ m4_define(gtkhtml2_required_version,
m4_define(mozilla_required_version, 1.2b)
m4_define(firefox_required_version, 1.0)
@@ -87,7 +87,7 @@
-fi
-AC_SUBST(MOZILLA_HOME)
+if test $mozpackage = xulrunner-1.9; then
-+ GTKMOZEMBED_CFLAGS="$(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
++ GTKMOZEMBED_CFLAGS="$(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding gtk+-2.0)"
+else
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+ if test -z "$MOZILLA_HOME"; then
Modified: packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch?rev=18925&op=diff
==============================================================================
--- packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch (original)
+++ packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch Mon Mar 9 16:46:43 2009
@@ -4,8 +4,8 @@
Index: gnome-python-extras-2.25.3/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/Makefile.in 2009-02-15 23:21:03.000000000 +0100
-+++ gnome-python-extras-2.25.3/Makefile.in 2009-03-09 17:14:48.785673487 +0100
+--- gnome-python-extras-2.25.3.orig/Makefile.in 2009-03-09 17:42:08.729674890 +0100
++++ gnome-python-extras-2.25.3/Makefile.in 2009-03-09 17:43:11.585176428 +0100
@@ -167,6 +167,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -63,8 +63,8 @@
touch $@
Index: gnome-python-extras-2.25.3/aclocal.m4
===================================================================
---- gnome-python-extras-2.25.3.orig/aclocal.m4 2009-02-15 23:20:58.000000000 +0100
-+++ gnome-python-extras-2.25.3/aclocal.m4 2009-03-09 17:14:34.825180603 +0100
+--- gnome-python-extras-2.25.3.orig/aclocal.m4 2009-03-09 17:42:08.709676887 +0100
++++ gnome-python-extras-2.25.3/aclocal.m4 2009-03-09 17:43:11.617173232 +0100
@@ -13,6137 +13,5105 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -14644,8 +14644,8 @@
m4_include([acinclude.m4])
Index: gnome-python-extras-2.25.3/configure
===================================================================
---- gnome-python-extras-2.25.3.orig/configure 2009-02-15 23:21:00.000000000 +0100
-+++ gnome-python-extras-2.25.3/configure 2009-03-09 17:14:53.753172429 +0100
+--- gnome-python-extras-2.25.3.orig/configure 2009-03-09 17:42:08.689674973 +0100
++++ gnome-python-extras-2.25.3/configure 2009-03-09 17:43:16.729672725 +0100
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -24802,7 +24802,7 @@
- MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
-fi
+if test $mozpackage = xulrunner-1.9; then
-+ GTKMOZEMBED_CFLAGS="$(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
++ GTKMOZEMBED_CFLAGS="$(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding gtk+-2.0)"
+else
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+ if test -z "$MOZILLA_HOME"; then
@@ -27268,8 +27268,8 @@
echo
Index: gnome-python-extras-2.25.3/docs/gtkmozembed/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/docs/gtkmozembed/Makefile.in 2009-02-15 23:21:01.000000000 +0100
-+++ gnome-python-extras-2.25.3/docs/gtkmozembed/Makefile.in 2009-03-09 17:14:47.241672713 +0100
+--- gnome-python-extras-2.25.3.orig/docs/gtkmozembed/Makefile.in 2009-03-09 17:42:08.669674527 +0100
++++ gnome-python-extras-2.25.3/docs/gtkmozembed/Makefile.in 2009-03-09 17:43:11.661173237 +0100
@@ -129,6 +129,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27318,8 +27318,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Index: gnome-python-extras-2.25.3/docs/gtkspell/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/docs/gtkspell/Makefile.in 2009-02-15 23:21:01.000000000 +0100
-+++ gnome-python-extras-2.25.3/docs/gtkspell/Makefile.in 2009-03-09 17:14:47.321673524 +0100
+--- gnome-python-extras-2.25.3.orig/docs/gtkspell/Makefile.in 2009-03-09 17:42:08.641678301 +0100
++++ gnome-python-extras-2.25.3/docs/gtkspell/Makefile.in 2009-03-09 17:43:11.661173237 +0100
@@ -129,6 +129,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27368,8 +27368,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Index: gnome-python-extras-2.25.3/egg/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/egg/Makefile.in 2009-02-15 23:21:01.000000000 +0100
-+++ gnome-python-extras-2.25.3/egg/Makefile.in 2009-03-09 17:14:47.433672605 +0100
+--- gnome-python-extras-2.25.3.orig/egg/Makefile.in 2009-03-09 17:42:08.617677276 +0100
++++ gnome-python-extras-2.25.3/egg/Makefile.in 2009-03-09 17:43:11.665172838 +0100
@@ -141,6 +141,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27418,8 +27418,8 @@
mostlyclean-libtool:
Index: gnome-python-extras-2.25.3/egg/recent/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/egg/recent/Makefile.in 2009-02-15 23:21:01.000000000 +0100
-+++ gnome-python-extras-2.25.3/egg/recent/Makefile.in 2009-03-09 17:14:47.617673295 +0100
+--- gnome-python-extras-2.25.3.orig/egg/recent/Makefile.in 2009-03-09 17:42:08.597677318 +0100
++++ gnome-python-extras-2.25.3/egg/recent/Makefile.in 2009-03-09 17:43:11.665172838 +0100
@@ -164,6 +164,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27468,8 +27468,8 @@
clean-noinstLTLIBRARIES:
Index: gnome-python-extras-2.25.3/egg/tray/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/egg/tray/Makefile.in 2009-02-15 23:21:01.000000000 +0100
-+++ gnome-python-extras-2.25.3/egg/tray/Makefile.in 2009-03-09 17:14:47.729672376 +0100
+--- gnome-python-extras-2.25.3.orig/egg/tray/Makefile.in 2009-03-09 17:42:08.573678737 +0100
++++ gnome-python-extras-2.25.3/egg/tray/Makefile.in 2009-03-09 17:43:11.665172838 +0100
@@ -154,6 +154,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27518,8 +27518,8 @@
@$(NORMAL_INSTALL)
Index: gnome-python-extras-2.25.3/gda/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/gda/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/gda/Makefile.in 2009-03-09 17:14:47.865672483 +0100
+--- gnome-python-extras-2.25.3.orig/gda/Makefile.in 2009-03-09 17:42:08.549677223 +0100
++++ gnome-python-extras-2.25.3/gda/Makefile.in 2009-03-09 17:43:11.665172838 +0100
@@ -166,6 +166,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27568,8 +27568,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Index: gnome-python-extras-2.25.3/gdl/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/gdl/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/gdl/Makefile.in 2009-03-09 17:14:47.961672672 +0100
+--- gnome-python-extras-2.25.3.orig/gdl/Makefile.in 2009-03-09 17:42:08.529677754 +0100
++++ gnome-python-extras-2.25.3/gdl/Makefile.in 2009-03-09 17:43:11.665172838 +0100
@@ -149,6 +149,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27618,8 +27618,8 @@
@$(NORMAL_INSTALL)
Index: gnome-python-extras-2.25.3/gksu/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/gksu/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/gksu/Makefile.in 2009-03-09 17:14:48.093672688 +0100
+--- gnome-python-extras-2.25.3.orig/gksu/Makefile.in 2009-03-09 17:42:08.505678195 +0100
++++ gnome-python-extras-2.25.3/gksu/Makefile.in 2009-03-09 17:43:11.669173416 +0100
@@ -164,6 +164,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27668,8 +27668,8 @@
@$(NORMAL_INSTALL)
Index: gnome-python-extras-2.25.3/gksu2/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/gksu2/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/gksu2/Makefile.in 2009-03-09 17:14:48.213672437 +0100
+--- gnome-python-extras-2.25.3.orig/gksu2/Makefile.in 2009-03-09 17:42:08.481676681 +0100
++++ gnome-python-extras-2.25.3/gksu2/Makefile.in 2009-03-09 17:43:11.669173416 +0100
@@ -155,6 +155,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27718,8 +27718,8 @@
@$(NORMAL_INSTALL)
Index: gnome-python-extras-2.25.3/gtkhtml2/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/gtkhtml2/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/gtkhtml2/Makefile.in 2009-03-09 17:14:48.325674451 +0100
+--- gnome-python-extras-2.25.3.orig/gtkhtml2/Makefile.in 2009-03-09 17:42:08.461677212 +0100
++++ gnome-python-extras-2.25.3/gtkhtml2/Makefile.in 2009-03-09 17:43:11.669173416 +0100
@@ -154,6 +154,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27768,8 +27768,8 @@
@$(NORMAL_INSTALL)
Index: gnome-python-extras-2.25.3/gtkmozembed/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/gtkmozembed/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/gtkmozembed/Makefile.in 2009-03-09 17:14:48.437672554 +0100
+--- gnome-python-extras-2.25.3.orig/gtkmozembed/Makefile.in 2009-03-09 17:42:08.437680098 +0100
++++ gnome-python-extras-2.25.3/gtkmozembed/Makefile.in 2009-03-09 17:43:11.669173416 +0100
@@ -58,9 +58,9 @@ am_gtkmozembed_la_OBJECTS = gtkmozembedm
nodist_gtkmozembed_la_OBJECTS = gtkmozembed.lo
gtkmozembed_la_OBJECTS = $(am_gtkmozembed_la_OBJECTS) \
@@ -27899,8 +27899,8 @@
.defs.c:
Index: gnome-python-extras-2.25.3/gtkspell/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/gtkspell/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/gtkspell/Makefile.in 2009-03-09 17:14:48.545673012 +0100
+--- gnome-python-extras-2.25.3.orig/gtkspell/Makefile.in 2009-03-09 17:42:08.413676140 +0100
++++ gnome-python-extras-2.25.3/gtkspell/Makefile.in 2009-03-09 17:43:11.669173416 +0100
@@ -147,6 +147,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27949,8 +27949,8 @@
@$(NORMAL_INSTALL)
Index: gnome-python-extras-2.25.3/tests/Makefile.in
===================================================================
---- gnome-python-extras-2.25.3.orig/tests/Makefile.in 2009-02-15 23:21:02.000000000 +0100
-+++ gnome-python-extras-2.25.3/tests/Makefile.in 2009-03-09 17:14:48.625672356 +0100
+--- gnome-python-extras-2.25.3.orig/tests/Makefile.in 2009-03-09 17:42:08.393679115 +0100
++++ gnome-python-extras-2.25.3/tests/Makefile.in 2009-03-09 17:43:11.669173416 +0100
@@ -117,6 +117,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -27999,8 +27999,8 @@
mostlyclean-libtool:
Index: gnome-python-extras-2.25.3/config.h.in
===================================================================
---- gnome-python-extras-2.25.3.orig/config.h.in 2009-02-15 23:21:00.000000000 +0100
-+++ gnome-python-extras-2.25.3/config.h.in 2009-03-09 17:13:02.861173725 +0100
+--- gnome-python-extras-2.25.3.orig/config.h.in 2009-03-09 17:42:08.369677112 +0100
++++ gnome-python-extras-2.25.3/config.h.in 2009-03-09 17:43:11.669173416 +0100
@@ -42,6 +42,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
More information about the pkg-gnome-commits
mailing list