r16040 - in /packages/experimental/devhelp/debian: changelog patches/02_gecko_1.9.patch patches/70_autoconf.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue May 27 11:24:34 UTC 2008
Author: joss
Date: Tue May 27 11:24:34 2008
New Revision: 16040
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16040
Log:
02_gecko_1.9.patch: fix build against gecko 1.8.
Modified:
packages/experimental/devhelp/debian/changelog
packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch
packages/experimental/devhelp/debian/patches/70_autoconf.patch
Modified: packages/experimental/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/changelog?rev=16040&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/changelog (original)
+++ packages/experimental/devhelp/debian/changelog Tue May 27 11:24:34 2008
@@ -1,6 +1,7 @@
devhelp (0.19.1-2) experimental; urgency=low
* New upstream bugfix release.
+ * 02_gecko_1.9.patch: fix build against gecko 1.8.
* 70_autoconf.patch: regenerated for new version.
-- Josselin Mouette <joss at debian.org> Tue, 27 May 2008 11:48:38 +0200
Modified: packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch?rev=16040&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch (original)
+++ packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch Tue May 27 11:24:34 2008
@@ -1,7 +1,7 @@
-Index: devhelp-0.19/m4/gecko.m4
+Index: devhelp-0.19.1/m4/gecko.m4
===================================================================
---- devhelp-0.19.orig/m4/gecko.m4 2008-05-12 19:13:42.760935965 +0200
-+++ devhelp-0.19/m4/gecko.m4 2008-05-12 19:13:52.504936081 +0200
+--- devhelp-0.19.1.orig/m4/gecko.m4 2008-05-25 18:55:36.000000000 +0200
++++ devhelp-0.19.1/m4/gecko.m4 2008-05-27 12:20:49.989150297 +0200
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License along
@@ -341,10 +341,10 @@
if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
fi
-Index: devhelp-0.19/configure.in
+Index: devhelp-0.19.1/configure.in
===================================================================
---- devhelp-0.19.orig/configure.in 2008-05-12 19:13:42.736936994 +0200
-+++ devhelp-0.19/configure.in 2008-05-12 20:16:12.220428557 +0200
+--- devhelp-0.19.1.orig/configure.in 2008-05-25 18:56:13.000000000 +0200
++++ devhelp-0.19.1/configure.in 2008-05-27 13:19:21.246154749 +0200
@@ -19,6 +19,8 @@ AM_PROG_LIBTOOL
AM_PATH_GLIB_2_0
@@ -370,7 +370,7 @@
case "$GECKO" in
mozilla) gecko_min_version=1.7 ;;
-@@ -80,9 +84,16 @@ seamonkey) gecko_min_version=1.0 ;;
+@@ -80,9 +84,18 @@ seamonkey) gecko_min_version=1.0 ;;
*firefox) gecko_min_version=1.0 ;;
*thunderbird) gecko_min_version=1.0 ;;
xulrunner) gecko_min_version=1.8 ;;
@@ -380,18 +380,20 @@
-PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
+if test $GECKO = libxul-embedding; then
-+ PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version])
++ GECKO_CFLAGS=`pkg-config --cflags libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
++ GECKO_LIBS=`pkg-config --libs libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
+else
-+ PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
++ GECKO_CFLAGS=`pkg-config --cflags ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
++ GECKO_LIBS=`pkg-config --libs ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
+fi
+
AC_SUBST([GECKO_CFLAGS])
AC_SUBST([GECKO_LIBS])
-Index: devhelp-0.19/src/Makefile.am
+Index: devhelp-0.19.1/src/Makefile.am
===================================================================
---- devhelp-0.19.orig/src/Makefile.am 2008-05-12 19:32:30.248429737 +0200
-+++ devhelp-0.19/src/Makefile.am 2008-05-12 21:23:23.404937427 +0200
+--- devhelp-0.19.1.orig/src/Makefile.am 2008-05-25 18:55:37.000000000 +0200
++++ devhelp-0.19.1/src/Makefile.am 2008-05-27 12:20:50.001150076 +0200
@@ -25,17 +25,11 @@ devhelp_LDADD = \
$(DEVHELP_LIBS) \
libdevhelp-1.la
@@ -482,10 +484,10 @@
dh-marshal.h: dh-marshal.list
(cd $(srcdir) && \
-Index: devhelp-0.19/src/dh-gecko-utils.cpp
+Index: devhelp-0.19.1/src/dh-gecko-utils.cpp
===================================================================
---- devhelp-0.19.orig/src/dh-gecko-utils.cpp 2008-05-12 20:36:48.776432926 +0200
-+++ devhelp-0.19/src/dh-gecko-utils.cpp 2008-05-12 20:36:52.944931316 +0200
+--- devhelp-0.19.1.orig/src/dh-gecko-utils.cpp 2008-05-25 18:55:37.000000000 +0200
++++ devhelp-0.19.1/src/dh-gecko-utils.cpp 2008-05-27 12:20:50.001150076 +0200
@@ -21,6 +21,9 @@
*/
@@ -590,10 +592,10 @@
gecko_utils_init_chrome ();
#endif
}
-Index: devhelp-0.19/src/default-prefs-gecko-1-9.js
+Index: devhelp-0.19.1/src/default-prefs-gecko-1-9.js
===================================================================
---- devhelp-0.19.orig/src/default-prefs-gecko-1-9.js 2008-05-12 21:30:08.904428349 +0200
-+++ devhelp-0.19/src/default-prefs-gecko-1-9.js 2008-05-12 21:30:16.452433177 +0200
+--- devhelp-0.19.1.orig/src/default-prefs-gecko-1-9.js 2008-05-25 18:55:37.000000000 +0200
++++ devhelp-0.19.1/src/default-prefs-gecko-1-9.js 2008-05-27 12:20:50.001150076 +0200
@@ -1,2 +1,2 @@
-pref("browser.display.use_document_colors", false);
+pref("browser.display.use_document_colors", true);
Modified: packages/experimental/devhelp/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/70_autoconf.patch?rev=16040&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/70_autoconf.patch (original)
+++ packages/experimental/devhelp/debian/patches/70_autoconf.patch Tue May 27 11:24:34 2008
@@ -4,8 +4,8 @@
Index: devhelp-0.19.1/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/Makefile.in 2008-05-25 18:56:31.000000000 +0200
-+++ devhelp-0.19.1/Makefile.in 2008-05-27 12:21:10.793150317 +0200
+--- devhelp-0.19.1.orig/Makefile.in 2008-05-27 13:17:14.145154342 +0200
++++ devhelp-0.19.1/Makefile.in 2008-05-27 13:19:25.457151329 +0200
@@ -124,6 +124,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -27,8 +27,8 @@
$(am__remove_distdir)
Index: devhelp-0.19.1/aclocal.m4
===================================================================
---- devhelp-0.19.1.orig/aclocal.m4 2008-05-25 18:56:24.000000000 +0200
-+++ devhelp-0.19.1/aclocal.m4 2008-05-27 12:21:20.681651928 +0200
+--- devhelp-0.19.1.orig/aclocal.m4 2008-05-27 13:17:14.109155492 +0200
++++ devhelp-0.19.1/aclocal.m4 2008-05-27 13:19:25.461152396 +0200
@@ -706,7 +706,7 @@ fi])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -81,8 +81,8 @@
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
Index: devhelp-0.19.1/configure
===================================================================
---- devhelp-0.19.1.orig/configure 2008-05-25 18:56:28.000000000 +0200
-+++ devhelp-0.19.1/configure 2008-05-27 12:21:25.693651009 +0200
+--- devhelp-0.19.1.orig/configure 2008-05-27 13:17:14.081152422 +0200
++++ devhelp-0.19.1/configure 2008-05-27 13:19:30.765648846 +0200
@@ -939,12 +939,17 @@ HAVE_GECKO_1_8_1_TRUE
HAVE_GECKO_1_8_1_FALSE
HAVE_GECKO_1_9_TRUE
@@ -101,7 +101,18 @@
GECKO_CFLAGS
GECKO_LIBS
GECKO_WARN_CXXFLAGS
-@@ -1600,9 +1605,11 @@ Optional Packages:
+@@ -995,9 +1000,7 @@ PKG_CONFIG
+ DEVHELP_CFLAGS
+ DEVHELP_LIBS
+ LIBDEVHELP_CFLAGS
+-LIBDEVHELP_LIBS
+-GECKO_CFLAGS
+-GECKO_LIBS'
++LIBDEVHELP_LIBS'
+
+
+ # Initialize some variables set by options.
+@@ -1600,9 +1603,11 @@ Optional Packages:
--with-gconf-source=sourceaddress Config database for installing schema files.
--with-gconf-schema-file-dir=dir Directory for installing schema files.
--with-compile-warnings=no/yes/error Compiler warnings
@@ -114,174 +125,184 @@
--with-zlib=DIR use libz in DIR
Some influential environment variables:
-@@ -5480,7 +5487,7 @@ ia64-*-hpux*)
+@@ -1628,9 +1633,6 @@ Some influential environment variables:
+ C compiler flags for LIBDEVHELP, overriding pkg-config
+ LIBDEVHELP_LIBS
+ linker flags for LIBDEVHELP, overriding pkg-config
+- GECKO_CFLAGS
+- C compiler flags for GECKO, overriding pkg-config
+- GECKO_LIBS linker flags for GECKO, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -5480,7 +5482,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5483 "configure"' > conftest.$ac_ext
-+ echo '#line 5490 "configure"' > conftest.$ac_ext
++ echo '#line 5485 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7660,11 +7667,11 @@ else
+@@ -7660,11 +7662,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7663: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7670: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7665: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7667: \$? = $ac_status" >&5
-+ echo "$as_me:7674: \$? = $ac_status" >&5
++ echo "$as_me:7669: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -7950,11 +7957,11 @@ else
+@@ -7950,11 +7952,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7953: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7960: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7955: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7957: \$? = $ac_status" >&5
-+ echo "$as_me:7964: \$? = $ac_status" >&5
++ echo "$as_me:7959: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8054,11 +8061,11 @@ else
+@@ -8054,11 +8056,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8057: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8064: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8059: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8061: \$? = $ac_status" >&5
-+ echo "$as_me:8068: \$? = $ac_status" >&5
++ echo "$as_me:8063: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10431,7 +10438,7 @@ else
+@@ -10431,7 +10433,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10434 "configure"
-+#line 10441 "configure"
++#line 10436 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10531,7 +10538,7 @@ else
+@@ -10531,7 +10533,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10534 "configure"
-+#line 10541 "configure"
++#line 10536 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12932,11 +12939,11 @@ else
+@@ -12932,11 +12934,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12935: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12942: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12937: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12939: \$? = $ac_status" >&5
-+ echo "$as_me:12946: \$? = $ac_status" >&5
++ echo "$as_me:12941: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13036,11 +13043,11 @@ else
+@@ -13036,11 +13038,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13039: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13046: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13041: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13043: \$? = $ac_status" >&5
-+ echo "$as_me:13050: \$? = $ac_status" >&5
++ echo "$as_me:13045: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14634,11 +14641,11 @@ else
+@@ -14634,11 +14636,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14637: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14644: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14639: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14641: \$? = $ac_status" >&5
-+ echo "$as_me:14648: \$? = $ac_status" >&5
++ echo "$as_me:14643: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -14738,11 +14745,11 @@ else
+@@ -14738,11 +14740,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14741: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14748: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14743: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14745: \$? = $ac_status" >&5
-+ echo "$as_me:14752: \$? = $ac_status" >&5
++ echo "$as_me:14747: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16958,11 +16965,11 @@ else
+@@ -16958,11 +16960,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16961: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16968: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16965: \$? = $ac_status" >&5
-+ echo "$as_me:16972: \$? = $ac_status" >&5
++ echo "$as_me:16967: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17248,11 +17255,11 @@ else
+@@ -17248,11 +17250,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17251: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17258: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17253: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17255: \$? = $ac_status" >&5
-+ echo "$as_me:17262: \$? = $ac_status" >&5
++ echo "$as_me:17257: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17352,11 +17359,11 @@ else
+@@ -17352,11 +17354,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17355: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17362: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17357: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17359: \$? = $ac_status" >&5
-+ echo "$as_me:17366: \$? = $ac_status" >&5
++ echo "$as_me:17361: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -20450,6 +20457,133 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -20450,6 +20452,133 @@ rm -f core conftest.err conftest.$ac_obj
rm -f conf.glibtest
@@ -415,7 +436,7 @@
case "$am__api_version" in
1.01234)
-@@ -21577,12 +21711,15 @@ fi
+@@ -21577,12 +21706,15 @@ fi
gecko_cv_gecko=$with_gecko
# Autodetect gecko
@@ -432,7 +453,7 @@
fi
done
fi
-@@ -21604,6 +21741,18 @@ else
+@@ -21604,6 +21736,18 @@ else
gecko_cv_have_gecko=yes
fi
@@ -451,7 +472,7 @@
# ****************
# Define variables
# ****************
-@@ -21615,13 +21764,24 @@ mozilla) gecko_cv_gecko_flavour=mozilla
+@@ -21615,13 +21759,24 @@ mozilla) gecko_cv_gecko_flavour=mozilla
seamonkey) gecko_cv_gecko_flavour=mozilla ;;
*firefox) gecko_cv_gecko_flavour=toolkit ;;
xulrunner) gecko_cv_gecko_flavour=toolkit ;;
@@ -481,7 +502,7 @@
fi # if gecko_cv_have_gecko
if test "$gecko_cv_gecko_flavour" = "toolkit"; then
-@@ -21632,21 +21792,14 @@ _ACEOF
+@@ -21632,21 +21787,14 @@ _ACEOF
fi
@@ -505,7 +526,7 @@
# **************************************************************
# This is really gcc-only
-@@ -21783,7 +21936,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -21783,7 +21931,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
_SAVE_CPPFLAGS="$CPPFLAGS"
@@ -514,7 +535,7 @@
{ echo "$as_me:$LINENO: checking whether we have a gtk 2 gecko build" >&5
echo $ECHO_N "checking whether we have a gtk 2 gecko build... $ECHO_C" >&6; }
-@@ -21889,6 +22042,49 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -21889,6 +22037,49 @@ rm -f core conftest.err conftest.$ac_obj
{ echo "$as_me:$LINENO: result: $gecko_cv_have_debug" >&5
echo "${ECHO_T}$gecko_cv_have_debug" >&6; }
@@ -564,7 +585,7 @@
CPPFLAGS="$_SAVE_CPPFLAGS"
ac_ext=c
-@@ -21909,16 +22105,15 @@ _ACEOF
+@@ -21909,16 +22100,15 @@ _ACEOF
fi
@@ -587,7 +608,7 @@
# ***********************
# Check for gecko version
-@@ -21934,7 +22129,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -21934,7 +22124,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
_SAVE_CPPFLAGS="$CPPFLAGS"
@@ -596,7 +617,7 @@
{ echo "$as_me:$LINENO: checking for gecko version" >&5
echo $ECHO_N "checking for gecko version... $ECHO_C" >&6; }
-@@ -22083,7 +22278,54 @@ fi
+@@ -22083,7 +22273,54 @@ fi
fi # if gecko_cv_have_gecko
@@ -652,7 +673,7 @@
HAVE_GECKO_1_7_TRUE=
HAVE_GECKO_1_7_FALSE='#'
else
-@@ -22091,7 +22333,7 @@ else
+@@ -22091,7 +22328,7 @@ else
HAVE_GECKO_1_7_FALSE=
fi
@@ -661,7 +682,7 @@
HAVE_GECKO_1_8_TRUE=
HAVE_GECKO_1_8_FALSE='#'
else
-@@ -22099,7 +22341,7 @@ else
+@@ -22099,7 +22336,7 @@ else
HAVE_GECKO_1_8_FALSE=
fi
@@ -670,7 +691,7 @@
HAVE_GECKO_1_8_1_TRUE=
HAVE_GECKO_1_8_1_FALSE='#'
else
-@@ -22107,7 +22349,7 @@ else
+@@ -22107,7 +22344,7 @@ else
HAVE_GECKO_1_8_1_FALSE=
fi
@@ -679,7 +700,7 @@
HAVE_GECKO_1_9_TRUE=
HAVE_GECKO_1_9_FALSE='#'
else
-@@ -22115,28 +22357,30 @@ else
+@@ -22115,28 +22352,30 @@ else
HAVE_GECKO_1_9_FALSE=
fi
@@ -727,7 +748,7 @@
-@@ -22153,8 +22397,125 @@ seamonkey) gecko_min_version=1.0 ;;
+@@ -22153,119 +22392,20 @@ seamonkey) gecko_min_version=1.0 ;;
*firefox) gecko_min_version=1.0 ;;
*thunderbird) gecko_min_version=1.0 ;;
xulrunner) gecko_min_version=1.8 ;;
@@ -737,132 +758,126 @@
+ { (exit 1); exit 1; }; }
esac
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for GECKO" >&5
+-echo $ECHO_N "checking for GECKO... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GECKO_CFLAGS"; then
+- pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO-xpcom >= \$gecko_min_version\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GECKO_LIBS"; then
+- pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO-xpcom >= \$gecko_min_version\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+if test $GECKO = libxul-embedding; then
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GECKO" >&5
-+echo $ECHO_N "checking for GECKO... $ECHO_C" >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GECKO_CFLAGS"; then
-+ pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul-embedding \$gecko_cv_extra_pkg_dependencies >= \$gecko_min_version\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GECKO_LIBS"; then
-+ pkg_cv_GECKO_LIBS="$GECKO_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul-embedding \$gecko_cv_extra_pkg_dependencies >= \$gecko_min_version\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version"`
-+ else
-+ GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GECKO_PKG_ERRORS" >&5
-+
-+ { { echo "$as_me:$LINENO: error: Package requirements (libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version) were not met:
-+
-+$GECKO_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GECKO_CFLAGS
-+and GECKO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (libxul-embedding $gecko_cv_extra_pkg_dependencies >= $gecko_min_version) were not met:
-+
-+$GECKO_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GECKO_CFLAGS
-+and GECKO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GECKO_CFLAGS
-+and GECKO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GECKO_CFLAGS
-+and GECKO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
-+ GECKO_LIBS=$pkg_cv_GECKO_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-+else
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GECKO" >&5
-@@ -22266,6 +22627,8 @@ else
- echo "${ECHO_T}yes" >&6; }
- :
++ GECKO_CFLAGS=`pkg-config --cflags libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
++ GECKO_LIBS=`pkg-config --libs libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
+ else
+- _pkg_short_errors_supported=no
++ GECKO_CFLAGS=`pkg-config --cflags ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
++ GECKO_LIBS=`pkg-config --libs ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
fi
-+fi
-+
-
-
-
-@@ -22299,10 +22662,20 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
+- if test $_pkg_short_errors_supported = yes; then
+- GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"`
+- else
+- GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GECKO_PKG_ERRORS" >&5
+-
+- { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met:
+-
+-$GECKO_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GECKO_CFLAGS
+-and GECKO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met:
+-
+-$GECKO_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GECKO_CFLAGS
+-and GECKO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GECKO_CFLAGS
+-and GECKO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+
+-Alternatively, you may set the environment variables GECKO_CFLAGS
+-and GECKO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+- GECKO_LIBS=$pkg_cv_GECKO_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+
+
+
+@@ -22299,10 +22439,20 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
@@ -887,7 +902,7 @@
_GECKO_DISPATCH_INCLUDEDIRS="content"
-@@ -22311,9 +22684,11 @@ _GECKO_DISPATCH_INCLUDEDIRS="content"
+@@ -22311,9 +22461,11 @@ _GECKO_DISPATCH_INCLUDEDIRS="content"
# Mind you, it's useful to be able to test against uninstalled mozilla builds...
_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
@@ -901,7 +916,7 @@
done
cat >conftest.$ac_ext <<_ACEOF
-@@ -22406,10 +22781,20 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -22406,10 +22558,20 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
@@ -926,7 +941,7 @@
_GECKO_DISPATCH_INCLUDEDIRS=""
-@@ -22418,9 +22803,11 @@ _GECKO_DISPATCH_INCLUDEDIRS=""
+@@ -22418,9 +22580,11 @@ _GECKO_DISPATCH_INCLUDEDIRS=""
# Mind you, it's useful to be able to test against uninstalled mozilla builds...
_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
@@ -940,7 +955,7 @@
done
-@@ -24811,6 +25198,27 @@ echo "$as_me: error: conditional \"HAVE_
+@@ -24811,6 +24975,27 @@ echo "$as_me: error: conditional \"HAVE_
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -968,7 +983,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
-@@ -25573,12 +25981,17 @@ HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_
+@@ -25573,12 +25758,17 @@ HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_
HAVE_GECKO_1_8_1_FALSE!$HAVE_GECKO_1_8_1_FALSE$ac_delim
HAVE_GECKO_1_9_TRUE!$HAVE_GECKO_1_9_TRUE$ac_delim
HAVE_GECKO_1_9_FALSE!$HAVE_GECKO_1_9_FALSE$ac_delim
@@ -986,7 +1001,7 @@
GECKO_CFLAGS!$GECKO_CFLAGS$ac_delim
GECKO_LIBS!$GECKO_LIBS$ac_delim
GECKO_WARN_CXXFLAGS!$GECKO_WARN_CXXFLAGS$ac_delim
-@@ -25592,11 +26005,6 @@ CATALOGS!$CATALOGS$ac_delim
+@@ -25592,11 +25782,6 @@ CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
INSTOBJEXT!$INSTOBJEXT$ac_delim
@@ -998,7 +1013,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -25638,6 +26046,11 @@ _ACEOF
+@@ -25638,6 +25823,11 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -1010,7 +1025,7 @@
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
PYTHON!$PYTHON$ac_delim
PYTHON_VERSION!$PYTHON_VERSION$ac_delim
-@@ -25652,7 +26065,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -25652,7 +25842,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -1021,8 +1036,8 @@
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: devhelp-0.19.1/contrib/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/contrib/Makefile.in 2008-05-25 18:56:29.000000000 +0200
-+++ devhelp-0.19.1/contrib/Makefile.in 2008-05-27 12:21:11.057148883 +0200
+--- devhelp-0.19.1.orig/contrib/Makefile.in 2008-05-27 13:17:14.057152864 +0200
++++ devhelp-0.19.1/contrib/Makefile.in 2008-05-27 13:19:25.469151108 +0200
@@ -86,6 +86,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1033,8 +1048,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/data/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/data/Makefile.in 2008-05-25 18:56:29.000000000 +0200
-+++ devhelp-0.19.1/data/Makefile.in 2008-05-27 12:21:11.061148972 +0200
+--- devhelp-0.19.1.orig/data/Makefile.in 2008-05-27 13:17:13.981159476 +0200
++++ devhelp-0.19.1/data/Makefile.in 2008-05-27 13:19:25.469151108 +0200
@@ -110,6 +110,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1045,8 +1060,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/data/dtd/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/data/dtd/Makefile.in 2008-05-25 18:56:30.000000000 +0200
-+++ devhelp-0.19.1/data/dtd/Makefile.in 2008-05-27 12:21:11.061148972 +0200
+--- devhelp-0.19.1.orig/data/dtd/Makefile.in 2008-05-27 13:17:13.957165785 +0200
++++ devhelp-0.19.1/data/dtd/Makefile.in 2008-05-27 13:19:25.469151108 +0200
@@ -96,6 +96,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1057,8 +1072,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/data/icons/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/data/icons/Makefile.in 2008-05-25 18:56:30.000000000 +0200
-+++ devhelp-0.19.1/data/icons/Makefile.in 2008-05-27 12:21:11.061148972 +0200
+--- devhelp-0.19.1.orig/data/icons/Makefile.in 2008-05-27 13:17:13.933156448 +0200
++++ devhelp-0.19.1/data/icons/Makefile.in 2008-05-27 13:19:25.469151108 +0200
@@ -104,6 +104,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1069,8 +1084,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/data/ui/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/data/ui/Makefile.in 2008-05-25 18:56:30.000000000 +0200
-+++ devhelp-0.19.1/data/ui/Makefile.in 2008-05-27 12:21:11.081147952 +0200
+--- devhelp-0.19.1.orig/data/ui/Makefile.in 2008-05-27 13:17:13.905153378 +0200
++++ devhelp-0.19.1/data/ui/Makefile.in 2008-05-27 13:19:25.469151108 +0200
@@ -99,6 +99,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1081,8 +1096,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/misc/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/misc/Makefile.in 2008-05-25 18:56:30.000000000 +0200
-+++ devhelp-0.19.1/misc/Makefile.in 2008-05-27 12:21:11.081147952 +0200
+--- devhelp-0.19.1.orig/misc/Makefile.in 2008-05-27 13:17:13.881155286 +0200
++++ devhelp-0.19.1/misc/Makefile.in 2008-05-27 13:19:25.469151108 +0200
@@ -98,6 +98,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1093,8 +1108,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/misc/gedit-plugin/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/misc/gedit-plugin/Makefile.in 2008-05-25 18:56:30.000000000 +0200
-+++ devhelp-0.19.1/misc/gedit-plugin/Makefile.in 2008-05-27 12:21:11.085149020 +0200
+--- devhelp-0.19.1.orig/misc/gedit-plugin/Makefile.in 2008-05-27 13:17:13.825151101 +0200
++++ devhelp-0.19.1/misc/gedit-plugin/Makefile.in 2008-05-27 13:19:25.473150708 +0200
@@ -108,6 +108,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1105,8 +1120,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/misc/gedit-plugin/devhelp/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/misc/gedit-plugin/devhelp/Makefile.in 2008-05-25 18:56:30.000000000 +0200
-+++ devhelp-0.19.1/misc/gedit-plugin/devhelp/Makefile.in 2008-05-27 12:21:11.085149020 +0200
+--- devhelp-0.19.1.orig/misc/gedit-plugin/devhelp/Makefile.in 2008-05-27 13:17:13.801152521 +0200
++++ devhelp-0.19.1/misc/gedit-plugin/devhelp/Makefile.in 2008-05-27 13:19:25.473150708 +0200
@@ -96,6 +96,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
@@ -1117,8 +1132,8 @@
GECKO_LIBS = @GECKO_LIBS@
Index: devhelp-0.19.1/src/Makefile.in
===================================================================
---- devhelp-0.19.1.orig/src/Makefile.in 2008-05-25 18:56:30.000000000 +0200
-+++ devhelp-0.19.1/src/Makefile.in 2008-05-27 12:21:11.089151553 +0200
+--- devhelp-0.19.1.orig/src/Makefile.in 2008-05-27 13:17:13.745159091 +0200
++++ devhelp-0.19.1/src/Makefile.in 2008-05-27 13:19:25.473150708 +0200
@@ -36,8 +36,10 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
More information about the pkg-gnome-commits
mailing list