liferea: Updated to version 1.4.22c. Added patch to build against

xulrunner.  Removed firefox option.

8 files changed, 31 insertions, 8 deletions

diff --git a/news/liferea/BUILD b/news/liferea/BUILD
index c5a1b51361..eff6045057 100755
--- a/news/liferea/BUILD
+++ b/news/liferea/BUILD
@@ -1,10 +1,8 @@
-if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
-  OPTS="$OPTS --enable-gecko=firefox --disable-xulrunner"
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
-  OPTS="$OPTS --enable-gecko=seamonkey --disable-xulrunner"
+if test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
+  OPTS="$OPTS --with-gecko=seamonkey --disable-webkit"
 elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
-  OPTS="$OPTS --enable-xulrunner --disable-gecko"
+  OPTS="$OPTS --with-gecko=libxul-embedding --disable-webkit"
 elif test "$(get_spell_provider $SPELL GECKO)" = mozilla; then
-  OPTS="$OPTS --enable-gecko=mozilla --disable-xulrunner"
+  OPTS="$OPTS --with-gecko=mozilla --disable-webkit"
 fi  &&
 default_build
diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index 65fecd15be..3b05e2c232 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -17,7 +17,7 @@ optional_depends  libnotify                           \
                   "to build libnotify pluging"       &&
 optional_depends  GECKO                               \
                   ""                                  \
-                  "--disable-gecko --disable-xulrunner"  \
+                  "--disable-gecko"                   \
                   "for Mozilla (gecko) html display" &&
 optional_depends  webkitgtk                           \
                   ""                                  \
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index 8e5ba8a688..4527f6aad6 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -3,7 +3,7 @@ if [ "$LIFEREA_DEVEL" == "y" ]; then
          VERSION=1.5.5
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
-         VERSION=1.4.20
+         VERSION=1.4.22c
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 3fe2173ead..4b1f972d28 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,10 @@
+2008-11-13 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated stable to 1.4.22c
+	* DEPENDS: Updated options for webkit
+	* PRE_BUILD: Added to apply patch
+	* BUILD: Updated options and removed firefox
+	* liferea-xulrunner.patch: Added patch to fix compile with xulrunner
+
 2008-09-28 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated stable to 1.4.20
 
diff --git a/news/liferea/PRE_BUILD b/news/liferea/PRE_BUILD
new file mode 100755
index 0000000000..89154bb5a8
--- /dev/null
+++ b/news/liferea/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SCRIPT_DIRECTORY/liferea-xulrunner.patch
diff --git a/news/liferea/liferea-1.4.20.tar.gz.sig b/news/liferea/liferea-1.4.20.tar.gz.sig
deleted file mode 100644
index 291e9601a2..0000000000
--- a/news/liferea/liferea-1.4.20.tar.gz.sig
+++ /dev/null
diff --git a/news/liferea/liferea-1.4.22c.tar.gz.sig b/news/liferea/liferea-1.4.22c.tar.gz.sig
new file mode 100644
index 0000000000..760fc00014
--- /dev/null
+++ b/news/liferea/liferea-1.4.22c.tar.gz.sig
diff --git a/news/liferea/liferea-xulrunner.patch b/news/liferea/liferea-xulrunner.patch
new file mode 100644
index 0000000000..277963a930
--- /dev/null
+++ b/news/liferea/liferea-xulrunner.patch
@@ -0,0 +1,13 @@
+diff -ur src/mozilla/xulrunner.c src/mozilla/xulrunner.c
+--- src/mozilla/xulrunner.c	2008-11-13 07:44:29.731856409 -0500
++++ src/mozilla/xulrunner.c	2008-11-13 07:44:46.887913149 -0500
+@@ -30,7 +30,7 @@
+ 
+ static void xulrunner_init(void) {
+ 	
+-#ifndef XPCOM_CLUE
++#ifndef XPCOM_GLUE
+ 	/* gtk_moz_embed_set_comp_path() must not be called
+ 	   without a component path for XulRunner. Passing
+ 	   NULL will crash Liferea. */
+