[arch-commits] Commit in gnome-applets/repos (8 files)
Ionut Biru
ibiru at archlinux.org
Sun Mar 6 19:39:31 UTC 2011
Date: Sunday, March 6, 2011 @ 14:39:31
Author: ibiru
Revision: 112787
libnotify 0.7 rebuild
Added:
gnome-applets/repos/staging-i686/
gnome-applets/repos/staging-i686/add-dbus-glib.patch
gnome-applets/repos/staging-i686/gnome-applets-2.32.1.1-libnotify-0.7.patch
gnome-applets/repos/staging-x86_64/
gnome-applets/repos/staging-x86_64/add-dbus-glib.patch
gnome-applets/repos/staging-x86_64/gnome-applets-2.32.1.1-libnotify-0.7.patch
Modified:
gnome-applets/repos/staging-i686/PKGBUILD
gnome-applets/repos/staging-x86_64/PKGBUILD
-----------------------------------------------------------+
PKGBUILD | 40 +++++----
staging-i686/add-dbus-glib.patch | 28 ++++++
staging-i686/gnome-applets-2.32.1.1-libnotify-0.7.patch | 53 ++++++++++++
staging-x86_64/add-dbus-glib.patch | 28 ++++++
staging-x86_64/gnome-applets-2.32.1.1-libnotify-0.7.patch | 53 ++++++++++++
5 files changed, 188 insertions(+), 14 deletions(-)
Modified: staging-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-03-06 19:18:05 UTC (rev 112786)
+++ staging-i686/PKGBUILD 2011-03-06 19:39:31 UTC (rev 112787)
@@ -3,22 +3,29 @@
pkgname=gnome-applets
pkgver=2.32.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME Applets"
arch=(i686 x86_64)
license=('GPL')
-depends=('gstreamer0.10-base-plugins>=0.10.30' 'gnome-panel>=2.31.92' 'libgtop>=2.28.1' 'gucharmap>=2.32.0' 'libnotify>=0.4.5' 'cpufrequtils')
+depends=('gstreamer0.10-base-plugins>=0.10.30' 'gnome-panel>=2.31.92' 'libgtop>=2.28.1' 'gucharmap>=2.32.0' 'libnotify>=0.7.1' 'cpufrequtils')
makedepends=('gnome-doc-utils>=0.20.1' 'pkgconfig' 'gnome-settings-daemon>=2.31.92' 'intltool' 'gnome-icon-theme>=2.31.0' 'gnome-python-desktop>=2.31.1' 'networkmanager>=0.8')
optdepends=('python-gnomeapplet: invest-applet')
-options=(!emptydirs)
+options=('!emptydirs' '!libtool')
url="http://www.gnome.org"
groups=(gnome)
install=gnome-applets.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327')
-
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
+ gnome-applets-2.32.1.1-libnotify-0.7.patch
+ add-dbus-glib.patch)
+sha256sums=('2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327'
+ '1e0b1f9545029bda0f4aadc28ef6eba34a5dbd1c3d1e5cec45627be7b0c32eda'
+ '6c79b77aa731f82d9b7c9704e5c6d3cb06252eea3c2d21fa35245d2f02ca0346')
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/add-dbus-glib.patch"
+ patch -Np0 -i "${srcdir}/gnome-applets-2.32.1.1-libnotify-0.7.patch"
+ autoreconf -fi
PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-applets \
--localstatedir=/var --disable-static \
@@ -26,7 +33,6 @@
--disable-schemas-install --without-hal
make
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- rm -f ${pkgdir}/usr/lib/*.la
sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \
$pkgdir/usr/bin/invest-chart \
Added: staging-i686/add-dbus-glib.patch
===================================================================
--- staging-i686/add-dbus-glib.patch (rev 0)
+++ staging-i686/add-dbus-glib.patch 2011-03-06 19:39:31 UTC (rev 112787)
@@ -0,0 +1,28 @@
+From fe72f63c91a1458d97d455ab0078d042464366e7 Mon Sep 17 00:00:00 2001
+From: Enrico Minack <enrico-minack at gmx.de>
+Date: Mon, 03 Jan 2011 19:58:13 +0000
+Subject: gweather: fixes NetworkManager support to compile, see bug 636217
+
+---
+diff --git a/gweather/Makefile.am b/gweather/Makefile.am
+index ea6ac96..165efda 100644
+--- a/gweather/Makefile.am
++++ b/gweather/Makefile.am
+@@ -6,6 +6,7 @@ INCLUDES = \
+ -I$(srcdir) \
+ -I$(top_srcdir) \
+ -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
++ $(DBUS_CFLAGS) \
+ $(GNOME_APPLETS3_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(LIBGWEATHER_CFLAGS) \
+@@ -22,6 +23,7 @@ gweather_applet_2_SOURCES = \
+ gweather-applet.c gweather-applet.h
+
+ gweather_applet_2_LDADD = \
++ $(DBUS_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(GNOME_APPLETS3_LIBS) \
+ $(GNOME_LIBS2_LIBS) \
+--
+cgit v0.8.3.4
Added: staging-i686/gnome-applets-2.32.1.1-libnotify-0.7.patch
===================================================================
--- staging-i686/gnome-applets-2.32.1.1-libnotify-0.7.patch (rev 0)
+++ staging-i686/gnome-applets-2.32.1.1-libnotify-0.7.patch 2011-03-06 19:39:31 UTC (rev 112787)
@@ -0,0 +1,53 @@
+--- battstat/battstat_applet.c
++++ battstat/battstat_applet.c
+@@ -42,6 +42,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ #include "battstat.h"
+@@ -435,7 +438,12 @@
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
+
+- NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet);
++ NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , applet);
++#endif
+
+ /* XXX: it would be nice to pass this as a named icon */
+ notify_notification_set_icon_from_pixbuf (n, icon);
+--- gweather/gweather-applet.c
++++ gweather/gweather-applet.c
+@@ -30,6 +30,9 @@
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+ #include <libnotify/notification.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+@@ -471,8 +474,12 @@
+ if (icon == NULL)
+ icon = "stock-unknown";
+
+- n = notify_notification_new (message, detail, icon,
+- gw_applet->container);
++ n = notify_notification_new (message, detail, icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , gw_applet->container);
++#endif
+
+ notify_notification_show (n, &error);
+ if (error)
Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-03-06 19:18:05 UTC (rev 112786)
+++ staging-x86_64/PKGBUILD 2011-03-06 19:39:31 UTC (rev 112787)
@@ -3,22 +3,29 @@
pkgname=gnome-applets
pkgver=2.32.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME Applets"
arch=(i686 x86_64)
license=('GPL')
-depends=('gstreamer0.10-base-plugins>=0.10.30' 'gnome-panel>=2.31.92' 'libgtop>=2.28.1' 'gucharmap>=2.32.0' 'libnotify>=0.4.5' 'cpufrequtils')
+depends=('gstreamer0.10-base-plugins>=0.10.30' 'gnome-panel>=2.31.92' 'libgtop>=2.28.1' 'gucharmap>=2.32.0' 'libnotify>=0.7.1' 'cpufrequtils')
makedepends=('gnome-doc-utils>=0.20.1' 'pkgconfig' 'gnome-settings-daemon>=2.31.92' 'intltool' 'gnome-icon-theme>=2.31.0' 'gnome-python-desktop>=2.31.1' 'networkmanager>=0.8')
optdepends=('python-gnomeapplet: invest-applet')
-options=(!emptydirs)
+options=('!emptydirs' '!libtool')
url="http://www.gnome.org"
groups=(gnome)
install=gnome-applets.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327')
-
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
+ gnome-applets-2.32.1.1-libnotify-0.7.patch
+ add-dbus-glib.patch)
+sha256sums=('2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327'
+ '1e0b1f9545029bda0f4aadc28ef6eba34a5dbd1c3d1e5cec45627be7b0c32eda'
+ '6c79b77aa731f82d9b7c9704e5c6d3cb06252eea3c2d21fa35245d2f02ca0346')
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/add-dbus-glib.patch"
+ patch -Np0 -i "${srcdir}/gnome-applets-2.32.1.1-libnotify-0.7.patch"
+ autoreconf -fi
PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-applets \
--localstatedir=/var --disable-static \
@@ -26,7 +33,6 @@
--disable-schemas-install --without-hal
make
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- rm -f ${pkgdir}/usr/lib/*.la
sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \
$pkgdir/usr/bin/invest-chart \
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:39:31 UTC (rev 112787)
@@ -0,0 +1,28 @@
+From fe72f63c91a1458d97d455ab0078d042464366e7 Mon Sep 17 00:00:00 2001
+From: Enrico Minack <enrico-minack at gmx.de>
+Date: Mon, 03 Jan 2011 19:58:13 +0000
+Subject: gweather: fixes NetworkManager support to compile, see bug 636217
+
+---
+diff --git a/gweather/Makefile.am b/gweather/Makefile.am
+index ea6ac96..165efda 100644
+--- a/gweather/Makefile.am
++++ b/gweather/Makefile.am
+@@ -6,6 +6,7 @@ INCLUDES = \
+ -I$(srcdir) \
+ -I$(top_srcdir) \
+ -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
++ $(DBUS_CFLAGS) \
+ $(GNOME_APPLETS3_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(LIBGWEATHER_CFLAGS) \
+@@ -22,6 +23,7 @@ gweather_applet_2_SOURCES = \
+ gweather-applet.c gweather-applet.h
+
+ gweather_applet_2_LDADD = \
++ $(DBUS_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(GNOME_APPLETS3_LIBS) \
+ $(GNOME_LIBS2_LIBS) \
+--
+cgit v0.8.3.4
Added: staging-x86_64/gnome-applets-2.32.1.1-libnotify-0.7.patch
===================================================================
--- staging-x86_64/gnome-applets-2.32.1.1-libnotify-0.7.patch (rev 0)
+++ staging-x86_64/gnome-applets-2.32.1.1-libnotify-0.7.patch 2011-03-06 19:39:31 UTC (rev 112787)
@@ -0,0 +1,53 @@
+--- battstat/battstat_applet.c
++++ battstat/battstat_applet.c
+@@ -42,6 +42,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ #include "battstat.h"
+@@ -435,7 +438,12 @@
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
+
+- NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet);
++ NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , applet);
++#endif
+
+ /* XXX: it would be nice to pass this as a named icon */
+ notify_notification_set_icon_from_pixbuf (n, icon);
+--- gweather/gweather-applet.c
++++ gweather/gweather-applet.c
+@@ -30,6 +30,9 @@
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+ #include <libnotify/notification.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+@@ -471,8 +474,12 @@
+ if (icon == NULL)
+ icon = "stock-unknown";
+
+- n = notify_notification_new (message, detail, icon,
+- gw_applet->container);
++ n = notify_notification_new (message, detail, icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , gw_applet->container);
++#endif
+
+ notify_notification_show (n, &error);
+ if (error)
More information about the arch-commits
mailing list