Date: Sunday, March 6, 2011 @ 14:17:28
Author: ibiru
Revision: 112785
libnotify 0.7 rebuild
Added:
epiphany/repos/staging-i686/
epiphany/repos/staging-x86_64/
epiphany/repos/staging-x86_64/add-dbus-glib.patch
epiphany/repos/staging-x86_64/epiphany-2.30.6-libnotify-0.7.patch
Modified:
epiphany/repos/staging-i686/PKGBUILD
epiphany/repos/staging-x86_64/PKGBUILD
----------------------------------------------------+
PKGBUILD | 36 ++++++++++++------
staging-x86_64/add-dbus-glib.patch | 20 ++++++++++
staging-x86_64/epiphany-2.30.6-libnotify-0.7.patch | 38 +++++++++++++++++++
3 files changed, 82 insertions(+), 12 deletions(-)
Modified: staging-i686/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-03-06 18:16:38 UTC (rev 112779)
+++ staging-i686/PKGBUILD 2011-03-06 19:17:28 UTC (rev 112785)
@@ -3,25 +3,31 @@
pkgname=epiphany
pkgver=2.30.6
-pkgrel=2
+pkgrel=3
install=epiphany.install
pkgdesc="A GNOME2 web browser based on the WebKit rendering engine."
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libwebkit>=1.2.4' 'iso-codes>=3.10.1' 'desktop-file-utils'
'libxslt>=1.1.24' 'libnotify>=0.4.5' 'avahi>=0.6.27' 'libsoup-gnome>=2.32.0'
'nss>=3.12.8' 'ca-certificates' 'gconf>=2.32.0' 'gobject-introspection>=0.9.8')
-makedepends=('gnome-doc-utils>=0.20.1' 'pkgconfig' 'networkmanager' 'intltool'
'startup-notification' 'gnome-common')
+depends=('libwebkit>=1.2.4' 'iso-codes>=3.10.1' 'desktop-file-utils'
'libxslt>=1.1.24' 'libnotify>=0.7.1' 'avahi>=0.6.27' 'libsoup-gnome>=2.32.0'
'nss>=3.12.8' 'ca-certificates' 'gconf>=2.32.0' 'gobject-introspection>=0.9.8'
'dbus-glib')
+makedepends=('gnome-doc-utils>=0.20.1' 'pkgconfig' 'networkmanager' 'intltool'
'startup-notification' 'gnome-common' 'gtk-doc')
options=('!libtool' '!emptydirs')
groups=('gnome')
url="http://www.gnome.org/projects/epiphany/";
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
- fix-introspection.patch)
+ fix-introspection.patch
+ epiphany-2.30.6-libnotify-0.7.patch
+ add-dbus-glib.patch)
sha256sums=('278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc'
- 'fed862407db7d971aa759168f889e68e914c4e6d80d7768f3db549bc36bd8dbf')
+ 'fed862407db7d971aa759168f889e68e914c4e6d80d7768f3db549bc36bd8dbf'
+ 'c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390'
+ '6a0d826767eeed02300b612e16af99a8f3840ce1f754d437a1ddd8da9d254e95')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/fix-introspection.patch"
- autoreconf
+ patch -Np1 -i "${srcdir}/add-dbus-glib.patch"
+ patch -Np0 -i "${srcdir}/epiphany-2.30.6-libnotify-0.7.patch"
+ ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
--disable-scrollkeeper \
Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-03-06 18:16:38 UTC (rev 112779)
+++ staging-x86_64/PKGBUILD 2011-03-06 19:17:28 UTC (rev 112785)
@@ -3,25 +3,31 @@
pkgname=epiphany
pkgver=2.30.6
-pkgrel=2
+pkgrel=3
install=epiphany.install
pkgdesc="A GNOME2 web browser based on the WebKit rendering engine."
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libwebkit>=1.2.4' 'iso-codes>=3.10.1' 'desktop-file-utils'
'libxslt>=1.1.24' 'libnotify>=0.4.5' 'avahi>=0.6.27' 'libsoup-gnome>=2.32.0'
'nss>=3.12.8' 'ca-certificates' 'gconf>=2.32.0' 'gobject-introspection>=0.9.8')
-makedepends=('gnome-doc-utils>=0.20.1' 'pkgconfig' 'networkmanager' 'intltool'
'startup-notification' 'gnome-common')
+depends=('libwebkit>=1.2.4' 'iso-codes>=3.10.1' 'desktop-file-utils'
'libxslt>=1.1.24' 'libnotify>=0.7.1' 'avahi>=0.6.27' 'libsoup-gnome>=2.32.0'
'nss>=3.12.8' 'ca-certificates' 'gconf>=2.32.0' 'gobject-introspection>=0.9.8'
'dbus-glib')
+makedepends=('gnome-doc-utils>=0.20.1' 'pkgconfig' 'networkmanager' 'intltool'
'startup-notification' 'gnome-common' 'gtk-doc')
options=('!libtool' '!emptydirs')
groups=('gnome')
url="http://www.gnome.org/projects/epiphany/";
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
- fix-introspection.patch)
+ fix-introspection.patch
+ epiphany-2.30.6-libnotify-0.7.patch
+ add-dbus-glib.patch)
sha256sums=('278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc'
- 'fed862407db7d971aa759168f889e68e914c4e6d80d7768f3db549bc36bd8dbf')
+ 'fed862407db7d971aa759168f889e68e914c4e6d80d7768f3db549bc36bd8dbf'
+ 'c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390'
+ '6a0d826767eeed02300b612e16af99a8f3840ce1f754d437a1ddd8da9d254e95')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/fix-introspection.patch"
- autoreconf
+ patch -Np1 -i "${srcdir}/add-dbus-glib.patch"
+ patch -Np0 -i "${srcdir}/epiphany-2.30.6-libnotify-0.7.patch"
+ ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
--disable-scrollkeeper \
Added: staging-x86_64/add-dbus-glib.patch
===================================================================
--- staging-x86_64/add-dbus-glib.patch (rev 0)
+++ staging-x86_64/add-dbus-glib.patch 2011-03-06 19:17:28 UTC (rev 112785)
@@ -0,0 +1,20 @@
+From 174a51819570a975cc61e642f7f26cb4bc2f9c57 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <descala...@igalia.com>
+Date: Mon, 01 Nov 2010 05:56:51 +0000
+Subject: tests: DBUS_LIBS is needed for libephymain.la
+
+---
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bd2c378..b973214 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -23,6 +23,7 @@ LDADD = \
+ $(top_builddir)/lib/widgets/libephywidgets.la \
+ $(top_builddir)/lib/libephymisc.la \
+ $(top_builddir)/lib/egg/libegg.la \
++ $(DBUS_LIBS) \
+ $(DEPENDENCIES_LIBS)
+
+ if ENABLE_NSS
+--
+cgit v0.8.3.4
Added: staging-x86_64/epiphany-2.30.6-libnotify-0.7.patch
===================================================================
--- staging-x86_64/epiphany-2.30.6-libnotify-0.7.patch
(rev 0)
+++ staging-x86_64/epiphany-2.30.6-libnotify-0.7.patch 2011-03-06 19:17:28 UTC
(rev 112785)
@@ -0,0 +1,38 @@
+--- embed/downloader-view.c
++++ embed/downloader-view.c
+@@ -36,6 +36,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ enum
+@@ -337,7 +340,12 @@
+ g_object_ref (dv);
+
+ notification = notify_notification_new (title, msg,
+- GTK_STOCK_INFO, NULL);
++ GTK_STOCK_INFO
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
++#endif
+
+ g_signal_connect_after (notification, "closed",
+ G_CALLBACK (notification_closed_cb), dv);
+@@ -346,7 +354,11 @@
+ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ /* notify_notification_attach_to_status_icon was removed */
++#else
+ notify_notification_attach_to_status_icon (notification, status_icon);
++#endif
+
+ /* There are some visual glitches when the notification is shown and
+ * the GtkStatusIcon is still not visible. To avoid that, we delay the
