[arch-commits] Commit in liferea/repos (5 files)
Eric Belanger
eric at archlinux.org
Tue Jul 29 00:51:42 UTC 2008
Date: Monday, July 28, 2008 @ 20:51:41
Author: eric
Revision: 7248
Merged revisions 3436-7247 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/liferea/trunk
........
r7247 | eric | 2008-07-28 20:51:30 -0400 (Mon, 28 Jul 2008) | 2 lines
upgpkg: liferea 1.4.18-1
Upstream update, Updated xulrunner 1.9 support patch, Added intltool makedepends, Removed force option
........
Added:
liferea/repos/extra-x86_64/liferea-1.4.17-xulrunner-1.9.patch
(from rev 7247, liferea/trunk/liferea-1.4.17-xulrunner-1.9.patch)
Modified:
liferea/repos/extra-x86_64/ (properties)
liferea/repos/extra-x86_64/ChangeLog
liferea/repos/extra-x86_64/PKGBUILD
Deleted:
liferea/repos/extra-x86_64/liferea-1.4.16b-xulrunner-1.9.patch
-------------------------------------+
ChangeLog | 9 ++++
PKGBUILD | 19 ++++-----
liferea-1.4.16b-xulrunner-1.9.patch | 58 -----------------------------
liferea-1.4.17-xulrunner-1.9.patch | 67 ++++++++++++++++++++++++++++++++++
4 files changed, 84 insertions(+), 69 deletions(-)
Property changes on: liferea/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /liferea/trunk:1-3435
+ /liferea/trunk:1-7247
Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2008-07-29 00:51:30 UTC (rev 7247)
+++ extra-x86_64/ChangeLog 2008-07-29 00:51:41 UTC (rev 7248)
@@ -1,4 +1,13 @@
+2008-07-28 Eric Belanger <eric at archlinux.org>
+
+ * liferea 1.4.18-1
+ * Upstream update
+ * Updated xulrunner 1.9 support patch
+ * Added intltool makedepends
+ * Removed force option
+
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
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-07-29 00:51:30 UTC (rev 7247)
+++ extra-x86_64/PKGBUILD 2008-07-29 00:51:41 UTC (rev 7248)
@@ -3,26 +3,23 @@
# Contributor: Ben <ben at benmazer.net>
pkgname=liferea
-pkgver=1.4.16b
-pkgrel=2
+pkgver=1.4.18
+pkgrel=1
pkgdesc="A GTK desktop news aggregator for online news feeds and weblogs"
arch=('i686' 'x86_64')
url="http://liferea.sourceforge.net/"
license=('GPL')
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' '!emptydirs')
+makedepends=('perlxml' 'pkgconfig' 'diffutils' 'intltool')
+options=('!libtool' '!emptydirs')
install=liferea.install
-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')
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz liferea-1.4.17-xulrunner-1.9.patch)
+md5sums=('e9888a3f871dc0eee3599d061b20a457' '1384062e8e10e79cee0bbf468cf4497b')
+sha1sums=('b122069ae838fde4968453b77e1c0b2927bb3bc7' '17eb5ee13f8e56e1437ba44920db821b5a4316d0')
build() {
cd ${srcdir}/liferea-${pkgver}
- patch -Np1 -i ${startdir}/src/liferea-1.4.16b-xulrunner-1.9.patch || return 1
+ 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 \
Deleted: extra-x86_64/liferea-1.4.16b-xulrunner-1.9.patch
===================================================================
--- extra-x86_64/liferea-1.4.16b-xulrunner-1.9.patch 2008-07-29 00:51:30 UTC (rev 7247)
+++ extra-x86_64/liferea-1.4.16b-xulrunner-1.9.patch 2008-07-29 00:51:41 UTC (rev 7248)
@@ -1,58 +0,0 @@
-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();
- }
Copied: liferea/repos/extra-x86_64/liferea-1.4.17-xulrunner-1.9.patch (from rev 7247, liferea/trunk/liferea-1.4.17-xulrunner-1.9.patch)
===================================================================
--- extra-x86_64/liferea-1.4.17-xulrunner-1.9.patch (rev 0)
+++ extra-x86_64/liferea-1.4.17-xulrunner-1.9.patch 2008-07-29 00:51:41 UTC (rev 7248)
@@ -0,0 +1,67 @@
+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();
+ }
More information about the arch-commits
mailing list