Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (815b5015005237beb9eb8ada0f93f74cc42faebb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (815b5015005237beb9eb8ada0f93f74cc42faebb)
  • Date: Thu, 13 Nov 2008 08:49:16 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

dev/null |binary
news/liferea/BUILD | 10 ++++------
news/liferea/DEPENDS | 2 +-
news/liferea/DETAILS | 2 +-
news/liferea/HISTORY | 7 +++++++
news/liferea/PRE_BUILD | 5 +++++
news/liferea/liferea-1.4.20.tar.gz.sig | 0
news/liferea/liferea-1.4.22c.tar.gz.sig |binary
news/liferea/liferea-xulrunner.patch | 13 +++++++++++++
9 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit 815b5015005237beb9eb8ada0f93f74cc42faebb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

liferea: Updated to version 1.4.22c. Added patch to build against
xulrunner. Removed firefox option.

diff --git a/news/liferea/BUILD b/news/liferea/BUILD
index c5a1b51..eff6045 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 65fecd1..3b05e2c 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 8e5ba8a..4527f6a 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 3fe2173..4b1f972 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,10 @@
+2008-11-13 George Sherwood <gsherwood AT 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 AT 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 0000000..89154bb
--- /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 291e960..0000000
Binary files a/news/liferea/liferea-1.4.20.tar.gz.sig and /dev/null differ
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 0000000..760fc00
Binary files /dev/null and b/news/liferea/liferea-1.4.22c.tar.gz.sig differ
diff --git a/news/liferea/liferea-xulrunner.patch
b/news/liferea/liferea-xulrunner.patch
new file mode 100644
index 0000000..277963a
--- /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. */
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (815b5015005237beb9eb8ada0f93f74cc42faebb), George Sherwood, 11/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page