[arch-commits] Commit in liferea/trunk (3 files)

[Eric Bélanger]

    Date: Friday, November 14, 2008 @ 00:39:01
  Author: eric
Revision: 19024

upgpkg: liferea 1.4.22d-1
    Upstream update, removed old patch

Modified:
  liferea/trunk/ChangeLog
  liferea/trunk/PKGBUILD
Deleted:
  liferea/trunk/liferea-1.4.17-xulrunner-1.9.patch

------------------------------------+
 ChangeLog                          |    5 ++
 PKGBUILD                           |   17 +++-----
 liferea-1.4.17-xulrunner-1.9.patch |   67 -----------------------------------
 3 files changed, 12 insertions(+), 77 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-11-14 05:37:24 UTC (rev 19023)
+++ ChangeLog	2008-11-14 05:39:01 UTC (rev 19024)
@@ -1,3 +1,8 @@
+2008-11-14  Eric Belanger  <eric at archlinux.org>
+
+	* liferea 1.4.22d-1
+	* Upstream update
+
 2008-10-27  Eric Belanger  <eric at archlinux.org>
 
 	* liferea 1.4.20-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-11-14 05:37:24 UTC (rev 19023)
+++ PKGBUILD	2008-11-14 05:39:01 UTC (rev 19024)
@@ -3,7 +3,7 @@
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=liferea
-pkgver=1.4.20
+pkgver=1.4.22d
 pkgrel=1
 pkgdesc="A GTK desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -12,20 +12,17 @@
 depends=('gconf>=2.22.0' 'xulrunner>=1.9' 'libnotify>=0.4.4' 'libnetworkmanager' 'libxslt>=1.1.20' \
          'libglade>=2.6.2' 'sqlite3' 'gnutls>=2.4.1')
 makedepends=('perlxml' 'pkgconfig' 'diffutils' 'intltool')
-options=('!libtool' '!emptydirs' 'force')
+options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz liferea-1.4.17-xulrunner-1.9.patch)
-md5sums=('c52212f73276aecd3293fb9d8e232d28' '1384062e8e10e79cee0bbf468cf4497b')
-sha1sums=('794e52e692c135b52b28c6f2c6cc8bba2db4f078'
-          '17eb5ee13f8e56e1437ba44920db821b5a4316d0')
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz)
+md5sums=('0a942170ee16a61330982a1cbc7f936f')
+sha1sums=('3af75b48fc3e68e233aee6c0d93012db5d69815c')
 
 build() {
   cd ${srcdir}/liferea-${pkgver}
-  patch -Np1 -i ${srcdir}/liferea-1.4.17-xulrunner-1.9.patch || return 1
-  autoconf || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --enable-xulrunner --disable-gtkhtml2 \
-	      --disable-webkit --disable-gecko || return 1
+              --with-gecko=libxul --disable-gtkhtml2 \
+	      --disable-webkit || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || return 1
   

Deleted: liferea-1.4.17-xulrunner-1.9.patch
===================================================================
--- liferea-1.4.17-xulrunner-1.9.patch	2008-11-14 05:37:24 UTC (rev 19023)
+++ liferea-1.4.17-xulrunner-1.9.patch	2008-11-14 05:39:01 UTC (rev 19024)
@@ -1,67 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.17.orig/configure.ac liferea-1.4.17/configure.ac
---- liferea-1.4.17.orig/configure.ac	2008-07-22 12:41:09.000000000 -0400
-+++ liferea-1.4.17/configure.ac	2008-07-25 10:21:52.000000000 -0400
-@@ -23,6 +23,8 @@ AC_ISC_POSIX
- AC_PROG_CC
- AM_PROG_CC_STDC
- AM_PROG_CC_C_O
-+dnl Mozilla needs C++; don't make conditional, or autoconf fails
-+AC_PROG_CXX
- AC_HEADER_STDC
- AC_PROG_INSTALL
- AC_PROG_LN_S
-@@ -168,7 +170,7 @@ dnl *********
- if test "x$enable_xulrunner" = "xyes" ; then
-  
-    AC_MSG_CHECKING([for XulRunner 1.9+ support])  
--   PKG_CHECK_MODULES(XULRUNNER, libxul-embedding, XULRUNNER_PROVIDER=libxul-embedding, XULRUNNER_PROVIDER=)
-+   PKG_CHECK_MODULES(XULRUNNER, libxul-embedding-unstable, XULRUNNER_PROVIDER=libxul-embedding-unstable, XULRUNNER_PROVIDER=)
-    
-    if test "x$XULRUNNER_PROVIDER" = "x" ; then
-       AC_MSG_CHECKING([for XulRunner 1.8 support])  
-@@ -181,6 +183,9 @@ if test "x$enable_xulrunner" = "xyes" ; 
-       enable_xulrunner=yes
-       
-       XULRUNNER_HOME="`$PKG_CONFIG --variable=libdir $XULRUNNER_PROVIDER`"
-+      if test "x$XULRUNNER_HOME" = "x" ; then
-+      	XULRUNNER_HOME="`$PKG_CONFIG --variable=sdkdir $XULRUNNER_PROVIDER`"
-+      fi
-       AC_SUBST([XULRUNNER_HOME])
-       AC_SUBST(XULRUNNER_CFLAGS)
-       AC_SUBST(XULRUNNER_LIBS)
-@@ -191,9 +196,6 @@ if test "x$enable_xulrunner" = "xyes" ; 
-       fi
- 
-       MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' |  cut -c 3-`
--   
--      dnl the Mozilla XPCOM access means C++
--      AC_PROG_CXX
-    fi
- fi
- 
-@@ -253,9 +255,6 @@ if test "x$enable_mozilla" = "xyes" ; th
- 
-    dnl AC_MSG_RESULT([$gecko_provider found!])
- 
--   dnl the Mozilla XPCOM access means C++
--   AC_PROG_CXX
--   
-    dnl Note: with the infos from mozilla-gtkmozembed.pc
-    dnl we got all includes and libraries for the C interface
-    dnl to Mozilla, but not the XPCOM headers we also need.
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.17.orig/src/mozilla/xulrunner.c liferea-1.4.17/src/mozilla/xulrunner.c
---- liferea-1.4.17.orig/src/mozilla/xulrunner.c	2008-07-01 13:04:55.000000000 -0400
-+++ liferea-1.4.17/src/mozilla/xulrunner.c	2008-07-25 10:21:00.000000000 -0400
-@@ -30,10 +30,12 @@
- 
- static void xulrunner_init(void) {
- 	
-+#ifndef XPCOM_GLUE
- 	/* gtk_moz_embed_set_comp_path() must not be called
- 	   without a component path for XulRunner. Passing
- 	   NULL will crash Liferea. */
- 	gtk_moz_embed_set_comp_path(XULRUNNER_HOME);
-+#endif
- 
- 	mozembed_init();	
- }