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

Jan de Groot jgc at archlinux.org
Sun Jun 22 13:38:20 UTC 2008


    Date: Sunday, June 22, 2008 @ 09:38:20
  Author: jgc
Revision: 3386

upgpkg: liferea 1.4.16b-2

Added:
  liferea/trunk/liferea-1.4.16b-xulrunner-1.9.patch
Modified:
  liferea/trunk/ChangeLog
  liferea/trunk/PKGBUILD

-------------------------------------+
 ChangeLog                           |    7 ++++
 PKGBUILD                            |   27 ++++++++-------
 liferea-1.4.16b-xulrunner-1.9.patch |   58 ++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 12 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-06-22 13:36:23 UTC (rev 3385)
+++ ChangeLog	2008-06-22 13:38:20 UTC (rev 3386)
@@ -1,3 +1,10 @@
+2008-06-22  Jan de Groot  <jgc at archlinux.org>
+	* liferea 1.4.16b-2
+	* Build with xulrunner 1.9
+	* Add patch from gentoo to fix xulrunner 1.9 support
+	* Make versioned dependencies more strict
+	* Drop dependencies covered by xulrunner 1.9
+
 2008-06-17  Eric Belanger  <eric at archlinux.org>
 
 	* liferea 1.4.16b-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-22 13:36:23 UTC (rev 3385)
+++ PKGBUILD	2008-06-22 13:38:20 UTC (rev 3386)
@@ -4,27 +4,30 @@
 
 pkgname=liferea
 pkgver=1.4.16b
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
 url="http://liferea.sourceforge.net/"
 license=('GPL')
-depends=('gtk2>=2.10.11' 'gconf>=2.18.0.1-4' 'xulrunner>=1.8.1.11' 'libnotify>=0.4.4' 'libnetworkmanager' 'libxslt>=1.1.20' 'libglade' 'sqlite3')
+depends=('gconf>=2.22.0' 'xulrunner>=1.9' 'libnotify>=0.4.4' 'libnetworkmanager' 'libxslt>=1.1.20' 'libglade>=2.6.2')
 makedepends=('perlxml' 'pkgconfig' 'diffutils')
-options=('!libtool' 'force')
+options=('!libtool' 'force' '!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz)
-md5sums=('b7d8ef4b5d054a7c57e53789d7259edb')
-sha1sums=('cf6264716c7c9a2eebfe776c4113bf2a1bf74f32')
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
+	liferea-1.4.16b-xulrunner-1.9.patch)
+md5sums=('b7d8ef4b5d054a7c57e53789d7259edb'
+	 '8acce1acf4d2840b4ff2be918be62772')
+sha1sums=('cf6264716c7c9a2eebfe776c4113bf2a1bf74f32'
+	  '6adc9d8e4fdf0597631affeafbd21b06606595d5')
 
 build() {
-  [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-
   cd ${srcdir}/liferea-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-gtkhtml2 || return 1
-  make LDFLAGS+="-R/usr/lib/xulrunner" || return 1
+  patch -Np1 -i ${startdir}/src/liferea-1.4.16b-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
+  make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || return 1
   
   mkdir -p ${pkgdir}/usr/share/gconf/schemas

Added: liferea-1.4.16b-xulrunner-1.9.patch
===================================================================
--- liferea-1.4.16b-xulrunner-1.9.patch	                        (rev 0)
+++ liferea-1.4.16b-xulrunner-1.9.patch	2008-06-22 13:38:20 UTC (rev 3386)
@@ -0,0 +1,58 @@
+Files liferea-1.4.16b.orig/.aclocal.m4.swp and liferea-1.4.16b/.aclocal.m4.swp differ
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.16b.orig/configure.ac liferea-1.4.16b/configure.ac
+--- liferea-1.4.16b.orig/configure.ac	2008-06-11 18:08:41.000000000 -0400
++++ liferea-1.4.16b/configure.ac	2008-06-20 10:59:28.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])  
+@@ -186,9 +188,6 @@ if test "x$enable_xulrunner" = "xyes" ; 
+       AC_SUBST(XULRUNNER_LIBS)
+ 
+       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
+ 
+@@ -248,9 +247,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.16b.orig/src/mozilla/xulrunner.c liferea-1.4.16b/src/mozilla/xulrunner.c
+--- liferea-1.4.16b.orig/src/mozilla/xulrunner.c	2007-07-23 13:56:53.000000000 -0400
++++ liferea-1.4.16b/src/mozilla/xulrunner.c	2008-06-20 10:50:59.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();	
+ }





More information about the arch-commits mailing list