Skip to Content.
Sympa Menu

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

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 (de3ccfed4b52a7f6461b0dc8088392f597093041)
  • Date: Thu, 13 Nov 2008 21:39:21 -0600

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

dev/null |binary
news/liferea/BUILD | 6 +++---
news/liferea/CONFIGURE | 1 +
news/liferea/DEPENDS | 22 +++++++++-------------
news/liferea/DETAILS | 2 +-
news/liferea/HISTORY | 8 ++++++++
news/liferea/PRE_BUILD | 5 -----
news/liferea/liferea-1.4.22c.tar.gz.sig | 0
news/liferea/liferea-1.4.22d.tar.gz.sig |binary
news/liferea/liferea-xulrunner.patch | 13 -------------
10 files changed, 22 insertions(+), 35 deletions(-)

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

liferea: Updated to version 1.4.22d. Added query to select only one
http backend. Adjusted DEPENDS and BUILD. Removed incorporated
upstream patch.

diff --git a/news/liferea/BUILD b/news/liferea/BUILD
index eff6045..6e5b1f3 100755
--- a/news/liferea/BUILD
+++ b/news/liferea/BUILD
@@ -1,8 +1,8 @@
if test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
- OPTS="$OPTS --with-gecko=seamonkey --disable-webkit"
+ OPTS="$OPTS --with-gecko=seamonkey"
elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="$OPTS --with-gecko=libxul-embedding --disable-webkit"
+ OPTS="$OPTS --with-gecko=libxul-embedding"
elif test "$(get_spell_provider $SPELL GECKO)" = mozilla; then
- OPTS="$OPTS --with-gecko=mozilla --disable-webkit"
+ OPTS="$OPTS --with-gecko=mozilla"
fi &&
default_build
diff --git a/news/liferea/CONFIGURE b/news/liferea/CONFIGURE
new file mode 100755
index 0000000..6734c0d
--- /dev/null
+++ b/news/liferea/CONFIGURE
@@ -0,0 +1 @@
+config_query_list LIFEREA_HTTP_BE "Select http backend" gecko webkit gtkhtml
diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index 3b05e2c..22c7e46 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -3,10 +3,15 @@ depends gconf2 &&
depends libxml2 &&
depends sqlite &&
depends libglade2 &&
-optional_depends libgtkhtml \
- "--enable-gtkhtml2" \
- "" \
- "for display using gtkhtml2" &&
+
+if [[ $LIFEREA_HTTP_BE == gecko ]]; then
+ depends GECKO "--disable-gtkhtml2 --disable-webkit"
+elif [[ $LIFEREA_HTTP_BE == webkit ]]; then
+ depends webkitgtk "--disable-gecko --disable-gtkhtml2"
+elif [[ $LIFEREA_HTTP_BE == gtkhtml ]]; then
+ depends libgtkhtml "--disable-webkit --disable-gecko"
+fi &&
+
optional_depends gnutls \
"--enable-gnutls" \
"--disable-gnutls" \
@@ -15,14 +20,6 @@ optional_depends libnotify \
"" \
"--disable-libnotify" \
"to build libnotify pluging" &&
-optional_depends GECKO \
- "" \
- "--disable-gecko" \
- "for Mozilla (gecko) html display" &&
-optional_depends webkitgtk \
- "" \
- "--disable-webkit" \
- "for WebKitGtk html display" &&
optional_depends lua \
"" \
"--disable-lua" \
@@ -31,4 +28,3 @@ optional_depends dbus \
"" \
"--disable-dbus" \
"for dbus support"
-
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index 4527f6a..3c765b3 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.22c
+ VERSION=1.4.22d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 4b1f972..0af7f95 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,11 @@
+2008-11-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.4.22d
+ * CONFIGURE: Added query for http backend
+ * DEPENDS: depends on selected http backend
+ * BUILD: Modified BUILD options for GECKO
+ * PRE_BUILD: Removed.
+ * liferea-xulrunner.patch: Removed incorporated patch
+
2008-11-13 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 1.4.22c
* DEPENDS: Updated options for webkit
diff --git a/news/liferea/PRE_BUILD b/news/liferea/PRE_BUILD
deleted file mode 100755
index 89154bb..0000000
--- a/news/liferea/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-patch -p0 < $SCRIPT_DIRECTORY/liferea-xulrunner.patch
diff --git a/news/liferea/liferea-1.4.22c.tar.gz.sig
b/news/liferea/liferea-1.4.22c.tar.gz.sig
deleted file mode 100644
index 760fc00..0000000
Binary files a/news/liferea/liferea-1.4.22c.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.4.22d.tar.gz.sig
b/news/liferea/liferea-1.4.22d.tar.gz.sig
new file mode 100644
index 0000000..c9a12db
Binary files /dev/null and b/news/liferea/liferea-1.4.22d.tar.gz.sig differ
diff --git a/news/liferea/liferea-xulrunner.patch
b/news/liferea/liferea-xulrunner.patch
deleted file mode 100644
index 277963a..0000000
--- a/news/liferea/liferea-xulrunner.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 (de3ccfed4b52a7f6461b0dc8088392f597093041), George Sherwood, 11/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page