[arch-commits] Commit in epiphany-extensions/trunk (PKGBUILD rss-link-dbus-glib.patch)

[Jan Steffens]

    Date: Friday, March 30, 2012 @ 09:19:21
  Author: heftig
Revision: 154628

3.4.0

Modified:
  epiphany-extensions/trunk/PKGBUILD
Deleted:
  epiphany-extensions/trunk/rss-link-dbus-glib.patch

--------------------------+
 PKGBUILD                 |   25 +++++++++----------------
 rss-link-dbus-glib.patch |   29 -----------------------------
 2 files changed, 9 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-30 13:18:39 UTC (rev 154627)
+++ PKGBUILD	2012-03-30 13:19:21 UTC (rev 154628)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=epiphany-extensions
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 url="http://www.gnome.org/projects/epiphany/"
 pkgdesc="Various extentions for the Epiphany web browser"
 arch=('i686' 'x86_64')
@@ -12,24 +13,16 @@
 makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=epiphany-extensions.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        rss-link-dbus-glib.patch)
-sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae'
-            '6e1ba177e8480984b4c5447aca5e7cf8bcfacbb90bcf041fa1b6d2a4dc3e818b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/rss-link-dbus-glib.patch"
-  autoreconf -fi
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }

Deleted: rss-link-dbus-glib.patch
===================================================================
--- rss-link-dbus-glib.patch	2012-03-30 13:18:39 UTC (rev 154627)
+++ rss-link-dbus-glib.patch	2012-03-30 13:19:21 UTC (rev 154628)
@@ -1,29 +0,0 @@
-From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino at gentoo.org>
-Date: Sat, 19 Nov 2011 01:01:12 -0500
-Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD
-
-Otherwise, epiphany-3.2 crashes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664369
----
- extensions/rss/Makefile.am |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am
-index ed6962f..da669c8 100644
---- a/extensions/rss/Makefile.am
-+++ b/extensions/rss/Makefile.am
-@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \
- 	-export-symbols $(top_srcdir)/ephy-extension.symbols \
- 	$(AM_LDFLAGS)
- 
-+librssextension_la_LIBADD = \
-+	$(DBUS_LIBS)
-+
- uidir = $(pkgdatadir)/ui
- ui_DATA = rss-ui.ui
- 
--- 
-1.7.8.rc3
-