r1091 - in /unstable/evolution-rss/debian: changelog patches/62_undef-gecko-home.patch patches/63_set-profile-path-after-init.patch
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Fri Jul 4 10:28:24 UTC 2008
Author: lool
Date: Fri Jul 4 10:28:24 2008
New Revision: 1091
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1091
Log:
* New patch, 62_undef-gecko-home. don't set GECKO_HOME when using XPCOM
glue.
* New patch, 63_set-profile-path-after-init, move profile path setup to
gecko_init() as it needs to happen after bootstrapping and before startup.
Added:
unstable/evolution-rss/debian/patches/62_undef-gecko-home.patch
unstable/evolution-rss/debian/patches/63_set-profile-path-after-init.patch
Modified:
unstable/evolution-rss/debian/changelog
Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=1091&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Fri Jul 4 10:28:24 2008
@@ -23,6 +23,10 @@
- New patch, 61_allow-libxul-embedding, allow this gecko (was already
ready to be enabled in a m4/gecko.m4 comment).
* New patch, 60_startup-glue, properly bootstrap xpcom glue.
+ * New patch, 62_undef-gecko-home. don't set GECKO_HOME when using XPCOM
+ glue.
+ * New patch, 63_set-profile-path-after-init, move profile path setup to
+ gecko_init() as it needs to happen after bootstrapping and before startup.
-- Loic Minier <lool at dooz.org> Fri, 04 Jul 2008 11:41:34 +0200
Added: unstable/evolution-rss/debian/patches/62_undef-gecko-home.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/62_undef-gecko-home.patch?rev=1091&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/62_undef-gecko-home.patch (added)
+++ unstable/evolution-rss/debian/patches/62_undef-gecko-home.patch Fri Jul 4 10:28:24 2008
@@ -1,0 +1,467 @@
+diff -Nur evolution-rss-0.1.0/configure evolution-rss-0.1.0.new/configure
+--- evolution-rss-0.1.0/configure 2008-07-04 12:09:28.000000000 +0200
++++ evolution-rss-0.1.0.new/configure 2008-07-04 12:10:26.000000000 +0200
+@@ -956,6 +956,8 @@
+ HAVE_BUGGY_GECKO
+ HAVE_XULRUNNER
+ HAVE_GECKO_1_9
++HAVE_XPCOM_GLUE_TRUE
++HAVE_XPCOM_GLUE_FALSE
+ WEBKIT_CFLAGS
+ WEBKIT_LIBS
+ WebKitGtk_CFLAGS
+@@ -6410,7 +6412,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6413 "configure"' > conftest.$ac_ext
++ echo '#line 6415 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9062,11 +9064,11 @@
+ -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:9065: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9067: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9069: \$? = $ac_status" >&5
++ echo "$as_me:9071: \$? = $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.
+@@ -9352,11 +9354,11 @@
+ -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:9355: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9357: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9359: \$? = $ac_status" >&5
++ echo "$as_me:9361: \$? = $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.
+@@ -9456,11 +9458,11 @@
+ -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:9459: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9461: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9463: \$? = $ac_status" >&5
++ echo "$as_me:9465: \$? = $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
+@@ -11833,7 +11835,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11836 "configure"
++#line 11838 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11933,7 +11935,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11936 "configure"
++#line 11938 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14334,11 +14336,11 @@
+ -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:14337: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14339: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14341: \$? = $ac_status" >&5
++ echo "$as_me:14343: \$? = $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.
+@@ -14438,11 +14440,11 @@
+ -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:14441: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14443: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14445: \$? = $ac_status" >&5
++ echo "$as_me:14447: \$? = $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
+@@ -16036,11 +16038,11 @@
+ -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:16039: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16041: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16043: \$? = $ac_status" >&5
++ echo "$as_me:16045: \$? = $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.
+@@ -16140,11 +16142,11 @@
+ -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:16143: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16145: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16147: \$? = $ac_status" >&5
++ echo "$as_me:16149: \$? = $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
+@@ -18360,11 +18362,11 @@
+ -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:18363: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18365: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18367: \$? = $ac_status" >&5
++ echo "$as_me:18369: \$? = $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.
+@@ -18650,11 +18652,11 @@
+ -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:18653: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18657: \$? = $ac_status" >&5
++ echo "$as_me:18659: \$? = $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.
+@@ -18754,11 +18756,11 @@
+ -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:18757: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18759: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18761: \$? = $ac_status" >&5
++ echo "$as_me:18763: \$? = $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
+@@ -23327,6 +23329,60 @@
+
+ fi
+ #fi
++ _SAVE_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $GECKO_CFLAGS"
++ { echo "$as_me:$LINENO: checking whether we have a xpcom glue" >&5
++echo $ECHO_N "checking whether we have a xpcom glue... $ECHO_C" >&6; }
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++ #ifndef XPCOM_GLUE
++ #error "no xpcom glue found"
++ #endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ gecko_cv_have_xpcom_glue=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ gecko_cv_have_xpcom_glue=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5
++echo "${ECHO_T}$gecko_cv_have_xpcom_glue" >&6; }
++ CPPFLAGS="$_SAVE_CPPFLAGS"
++ if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++ HAVE_XPCOM_GLUE_TRUE=
++ HAVE_XPCOM_GLUE_FALSE='#'
++else
++ HAVE_XPCOM_GLUE_TRUE='#'
++ HAVE_XPCOM_GLUE_FALSE=
++fi
++
++
+
+ # Check whether --with-primary-render was given.
+ if test "${with_primary_render+set}" = set; then
+@@ -25608,6 +25664,13 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_XPCOM_GLUE_TRUE}" && test -z "${HAVE_XPCOM_GLUE_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_XPCOM_GLUE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_XPCOM_GLUE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -26402,10 +26465,10 @@
+ HAVE_BUGGY_GECKO!$HAVE_BUGGY_GECKO$ac_delim
+ HAVE_XULRUNNER!$HAVE_XULRUNNER$ac_delim
+ HAVE_GECKO_1_9!$HAVE_GECKO_1_9$ac_delim
++HAVE_XPCOM_GLUE_TRUE!$HAVE_XPCOM_GLUE_TRUE$ac_delim
++HAVE_XPCOM_GLUE_FALSE!$HAVE_XPCOM_GLUE_FALSE$ac_delim
+ WEBKIT_CFLAGS!$WEBKIT_CFLAGS$ac_delim
+ WEBKIT_LIBS!$WEBKIT_LIBS$ac_delim
+-WebKitGtk_CFLAGS!$WebKitGtk_CFLAGS$ac_delim
+-WebKitGtk_LIBS!$WebKitGtk_LIBS$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -26447,6 +26510,8 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++WebKitGtk_CFLAGS!$WebKitGtk_CFLAGS$ac_delim
++WebKitGtk_LIBS!$WebKitGtk_LIBS$ac_delim
+ WEBKIT_UNSTD!$WEBKIT_UNSTD$ac_delim
+ HAVE_WEBKIT!$HAVE_WEBKIT$ac_delim
+ RENDER_CFLAGS!$RENDER_CFLAGS$ac_delim
+@@ -26488,7 +26553,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -Nur evolution-rss-0.1.0/configure.ac evolution-rss-0.1.0.new/configure.ac
+--- evolution-rss-0.1.0/configure.ac 2008-07-01 21:19:03.000000000 +0200
++++ evolution-rss-0.1.0.new/configure.ac 2008-07-04 12:10:16.000000000 +0200
+@@ -214,6 +214,22 @@
+ AC_SUBST(HAVE_GECKO_1_9)
+ fi
+ #fi
++ _SAVE_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $GECKO_CFLAGS"
++ AC_MSG_CHECKING([[whether we have a xpcom glue]])
++ AC_COMPILE_IFELSE(
++ [AC_LANG_SOURCE(
++ [[
++ #ifndef XPCOM_GLUE
++ #error "no xpcom glue found"
++ #endif]]
++ )],
++ [gecko_cv_have_xpcom_glue=yes],
++ [gecko_cv_have_xpcom_glue=no])
++ AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
++ CPPFLAGS="$_SAVE_CPPFLAGS"
++ AM_CONDITIONAL([HAVE_XPCOM_GLUE], [test "$gecko_cv_have_xpcom_glue" = "yes"])
++
+ AC_ARG_WITH([primary-render],
+ AS_HELP_STRING([--with-primary-render],[Forces Gecko to be the primary html renderer @<:@=gecko|webkit@:>@ (default:gtkHTML)]),
+ [RENDER=$with_primary_render], [RENDER=gtkhtml])
+diff -Nur evolution-rss-0.1.0/Makefile.in evolution-rss-0.1.0.new/Makefile.in
+--- evolution-rss-0.1.0/Makefile.in 2008-07-02 09:54:18.000000000 +0200
++++ evolution-rss-0.1.0.new/Makefile.in 2008-07-04 12:09:29.000000000 +0200
+@@ -100,6 +100,7 @@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -194,6 +195,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+diff -Nur evolution-rss-0.1.0/pixmaps/Makefile.in evolution-rss-0.1.0.new/pixmaps/Makefile.in
+--- evolution-rss-0.1.0/pixmaps/Makefile.in 2008-07-02 09:54:17.000000000 +0200
++++ evolution-rss-0.1.0.new/pixmaps/Makefile.in 2008-07-04 12:09:29.000000000 +0200
+@@ -81,6 +81,7 @@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -175,6 +176,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+diff -Nur evolution-rss-0.1.0/src/gecko-utils.cpp evolution-rss-0.1.0.new/src/gecko-utils.cpp
+--- evolution-rss-0.1.0/src/gecko-utils.cpp 2008-07-04 12:09:28.000000000 +0200
++++ evolution-rss-0.1.0.new/src/gecko-utils.cpp 2008-07-04 12:09:29.000000000 +0200
+@@ -120,11 +120,13 @@
+
+ gtk_moz_embed_set_path(xpcomLocation);
+ #else
++#ifdef GECKO_HOME
+ #ifdef HAVE_GECKO_1_9
+ gtk_moz_embed_set_path (GECKO_HOME);
+ #else
+ gtk_moz_embed_set_comp_path (GECKO_HOME);
+ #endif
++#endif
+ #endif /* XPCOM_GLUE */
+
+ gtk_moz_embed_push_startup ();
+diff -Nur evolution-rss-0.1.0/src/Makefile.am evolution-rss-0.1.0.new/src/Makefile.am
+--- evolution-rss-0.1.0/src/Makefile.am 2008-06-30 18:42:54.000000000 +0200
++++ evolution-rss-0.1.0.new/src/Makefile.am 2008-07-04 12:09:29.000000000 +0200
+@@ -12,13 +12,16 @@
+ -DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\" \
+ -DGTK_VERSION="$(GTK_VERSION)" \
+ -DLIBSOUP_VERSION="$(SOUP_VERSION)" \
+- -DGECKO_HOME=\""$(GECKO_HOME)"\" \
+ -DRENDER=\""$(RENDER)"\" \
+ -DRENDER_N=$(RENDER_N) \
+ -DHAVE_DBUS=$(DBD) \
+ -DDBUS_API_SUBJECT_TO_CHANGE \
+ $(EVOLUTION_RSS_EPLUGIN_CFLAGS)
+
++if ! HAVE_XPCOM_GLUE
++INCLUDES += -DGECKO_HOME=\""$(GECKO_HOME)"\"
++endif
++
+ RSS_MENU = \
+ <hook class=\"org.gnome.evolution.mail.bonobomenu:1.0\">\n \
+ <menu target=\"select\" id=\"org.gnome.evolution.mail.browser\">\n \
+diff -Nur evolution-rss-0.1.0/src/Makefile.in evolution-rss-0.1.0.new/src/Makefile.in
+--- evolution-rss-0.1.0/src/Makefile.in 2008-07-02 09:54:17.000000000 +0200
++++ evolution-rss-0.1.0.new/src/Makefile.in 2008-07-04 12:09:29.000000000 +0200
+@@ -34,6 +34,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
++ at HAVE_XPCOM_GLUE_FALSE@am__append_1 = -DGECKO_HOME=\""$(GECKO_HOME)"\"
+ @HAVE_DBUS_TRUE at bin_PROGRAMS = evolution-import-rss$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -135,6 +136,7 @@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -229,6 +231,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -316,26 +319,18 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-INCLUDES = \
+- -I$(EVOLUTION_SOURCE) \
+- -I$(top_srcdir) \
+- $(RENDER_CFLAGS) \
+- $(DBUS_CFLAGS) \
+- -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
+- -DLOCALEDIR="\"$(LOCALEDIR)\"" \
+- -DEVOLUTION_VERSION_STRING=\"$(EVOLUTION_EXEC_VERSION)\"\
+- -DEVOLUTION_VERSION=$(evolution_exec_int) \
+- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+- -DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\" \
+- -DGTK_VERSION="$(GTK_VERSION)" \
+- -DLIBSOUP_VERSION="$(SOUP_VERSION)" \
+- -DGECKO_HOME=\""$(GECKO_HOME)"\" \
+- -DRENDER=\""$(RENDER)"\" \
+- -DRENDER_N=$(RENDER_N) \
+- -DHAVE_DBUS=$(DBD) \
+- -DDBUS_API_SUBJECT_TO_CHANGE \
+- $(EVOLUTION_RSS_EPLUGIN_CFLAGS)
+-
++INCLUDES = -I$(EVOLUTION_SOURCE) -I$(top_srcdir) $(RENDER_CFLAGS) \
++ $(DBUS_CFLAGS) -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
++ -DLOCALEDIR="\"$(LOCALEDIR)\"" \
++ -DEVOLUTION_VERSION_STRING=\"$(EVOLUTION_EXEC_VERSION)\" \
++ -DEVOLUTION_VERSION=$(evolution_exec_int) \
++ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
++ -DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\" \
++ -DGTK_VERSION="$(GTK_VERSION)" \
++ -DLIBSOUP_VERSION="$(SOUP_VERSION)" -DRENDER=\""$(RENDER)"\" \
++ -DRENDER_N=$(RENDER_N) -DHAVE_DBUS=$(DBD) \
++ -DDBUS_API_SUBJECT_TO_CHANGE $(EVOLUTION_RSS_EPLUGIN_CFLAGS) \
++ $(am__append_1)
+ RSS_MENU = \
+ <hook class=\"org.gnome.evolution.mail.bonobomenu:1.0\">\n \
+ <menu target=\"select\" id=\"org.gnome.evolution.mail.browser\">\n \
+diff -Nur evolution-rss-0.1.0/src/rss.c evolution-rss-0.1.0.new/src/rss.c
+--- evolution-rss-0.1.0/src/rss.c 2008-07-01 21:18:55.000000000 +0200
++++ evolution-rss-0.1.0.new/src/rss.c 2008-07-04 12:09:29.000000000 +0200
+@@ -1574,7 +1574,9 @@
+ rss_mozilla_init(void)
+ {
+ GError *err = NULL;
+- g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
++#ifdef GECKO_HOME
++ g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
++#endif
+ g_unsetenv("MOZILLA_FIVE_HOME");
+
+
Added: unstable/evolution-rss/debian/patches/63_set-profile-path-after-init.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/63_set-profile-path-after-init.patch?rev=1091&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/63_set-profile-path-after-init.patch (added)
+++ unstable/evolution-rss/debian/patches/63_set-profile-path-after-init.patch Fri Jul 4 10:28:24 2008
@@ -1,0 +1,36 @@
+diff -Nur evolution-rss-0.1.0/src/gecko-utils.cpp evolution-rss-0.1.0.new/src/gecko-utils.cpp
+--- evolution-rss-0.1.0/src/gecko-utils.cpp 2008-07-04 12:20:33.000000000 +0200
++++ evolution-rss-0.1.0.new/src/gecko-utils.cpp 2008-07-04 12:21:39.000000000 +0200
+@@ -129,6 +129,15 @@
+ #endif
+ #endif /* XPCOM_GLUE */
+
++ gchar *profile_dir = g_build_filename (g_get_home_dir (),
++ ".evolution",
++ "mail",
++ "rss",
++ NULL);
++
++ gtk_moz_embed_set_profile_path (profile_dir, "mozembed-rss");
++ g_free (profile_dir);
++
+ gtk_moz_embed_push_startup ();
+
+ nsCOMPtr<nsIPrefService> prefService (do_GetService (NS_PREFSERVICE_CONTRACTID, &rv));
+diff -Nur evolution-rss-0.1.0/src/rss.c evolution-rss-0.1.0.new/src/rss.c
+--- evolution-rss-0.1.0/src/rss.c 2008-07-04 12:20:33.000000000 +0200
++++ evolution-rss-0.1.0.new/src/rss.c 2008-07-04 12:21:02.000000000 +0200
+@@ -1580,13 +1580,6 @@
+ g_unsetenv("MOZILLA_FIVE_HOME");
+
+
+- gchar *profile_dir = g_build_filename (g_get_home_dir (),
+- ".evolution",
+- "mail",
+- "rss", NULL);
+-
+- gtk_moz_embed_set_profile_path (profile_dir, "mozembed-rss");
+- g_free (profile_dir);
+ gecko_init();
+ }
+ #endif
More information about the pkg-evolution-commits
mailing list