Date: Sunday, March 6, 2011 @ 11:49:19 Author: ibiru Revision: 112774
libnotify 0.7 shouldn't be in extra Modified: ekiga/repos/extra-i686/PKGBUILD ekiga/repos/extra-x86_64/PKGBUILD Deleted: ekiga/repos/extra-i686/ekiga-3.2.7-libnotify-0.7.patch ekiga/repos/extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch ----------------------------------------------+ extra-i686/PKGBUILD | 19 +++---- extra-i686/ekiga-3.2.7-libnotify-0.7.patch | 62 ------------------------- extra-x86_64/PKGBUILD | 19 +++---- extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch | 62 ------------------------- 4 files changed, 16 insertions(+), 146 deletions(-) Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-03-06 16:47:48 UTC (rev 112773) +++ extra-i686/PKGBUILD 2011-03-06 16:49:19 UTC (rev 112774) @@ -4,33 +4,30 @@ pkgname=ekiga pkgver=3.2.7 -pkgrel=4 +pkgrel=2 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org"; license=(GPL) arch=(i686 x86_64) -depends=('opal=3.6.8' 'evolution-data-server>=2.32.0' 'libsigc++>=2.2.8' 'libxv' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'avahi>=0.6.27') +depends=('opal=3.6.8' 'evolution-data-server>=2.30.2.1' 'libsigc++>=2.2.8' 'libxv' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'avahi>=0.6.25') makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils>=0.20.0') provides=('gnomemeeting') replaces=('gnomemeeting') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2 - ekiga-3.2.7-libnotify-0.7.patch) -sha256sums=('f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f' - 'ad850d4e81a958081220f450a49ba9c10209d03f066f6afee99477c815c23daf') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/ekiga-3.2.7-libnotify-0.7.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ - --disable-scrollkeeper --enable-dbus - make - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + --disable-scrollkeeper --enable-dbus || return 1 + make || return 1 + make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install || return 1 install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Deleted: extra-i686/ekiga-3.2.7-libnotify-0.7.patch =================================================================== --- extra-i686/ekiga-3.2.7-libnotify-0.7.patch 2011-03-06 16:47:48 UTC (rev 112773) +++ extra-i686/ekiga-3.2.7-libnotify-0.7.patch 2011-03-06 16:49:19 UTC (rev 112774) @@ -1,62 +0,0 @@ ---- lib/engine/components/libnotify/libnotify-main.cpp -+++ lib/engine/components/libnotify/libnotify-main.cpp -@@ -40,6 +40,10 @@ - - #include <libnotify/notify.h> - -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - #include "services.h" - #include "notification-core.h" - -@@ -158,7 +162,12 @@ - - notif = notify_notification_new (notification->get_title ().c_str (), - notification->get_body ().c_str (), -- urgency, NULL); -+ urgency -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); -+#endif - - g_signal_connect (notif, "closed", - G_CALLBACK (on_notif_closed), notification.get ()); ---- src/gui/main.cpp -+++ src/gui/main.cpp -@@ -84,6 +84,9 @@ - - #ifdef HAVE_NOTIFY - #include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #if defined(P_FREEBSD) || defined (P_MACOSX) -@@ -2820,12 +2823,21 @@ - - body = g_strdup_printf ("%s\n%s\n%s", uri, app, account); - -- notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL); -+ notify = notify_notification_new (title, body, GM_ICON_LOGO -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); -+#endif - notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL); - notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL); - notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER); - notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL); -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ // notify_notification_attach_to_status_icon was removed -+#else - notify_notification_attach_to_status_icon (notify, statusicon); -+#endif - if (!notify_notification_show (notify, NULL)) { - ekiga_main_window_incoming_call_dialog_show (mw, call); - } Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-03-06 16:47:48 UTC (rev 112773) +++ extra-x86_64/PKGBUILD 2011-03-06 16:49:19 UTC (rev 112774) @@ -4,33 +4,30 @@ pkgname=ekiga pkgver=3.2.7 -pkgrel=4 +pkgrel=2 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org"; license=(GPL) arch=(i686 x86_64) -depends=('opal=3.6.8' 'evolution-data-server>=2.32.0' 'libsigc++>=2.2.8' 'libxv' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'avahi>=0.6.27') +depends=('opal=3.6.8' 'evolution-data-server>=2.30.2.1' 'libsigc++>=2.2.8' 'libxv' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'avahi>=0.6.25') makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils>=0.20.0') provides=('gnomemeeting') replaces=('gnomemeeting') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2 - ekiga-3.2.7-libnotify-0.7.patch) -sha256sums=('f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f' - 'ad850d4e81a958081220f450a49ba9c10209d03f066f6afee99477c815c23daf') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/ekiga-3.2.7-libnotify-0.7.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ - --disable-scrollkeeper --enable-dbus - make - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + --disable-scrollkeeper --enable-dbus || return 1 + make || return 1 + make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install || return 1 install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Deleted: extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch =================================================================== --- extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch 2011-03-06 16:47:48 UTC (rev 112773) +++ extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch 2011-03-06 16:49:19 UTC (rev 112774) @@ -1,62 +0,0 @@ ---- lib/engine/components/libnotify/libnotify-main.cpp -+++ lib/engine/components/libnotify/libnotify-main.cpp -@@ -40,6 +40,10 @@ - - #include <libnotify/notify.h> - -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - #include "services.h" - #include "notification-core.h" - -@@ -158,7 +162,12 @@ - - notif = notify_notification_new (notification->get_title ().c_str (), - notification->get_body ().c_str (), -- urgency, NULL); -+ urgency -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); -+#endif - - g_signal_connect (notif, "closed", - G_CALLBACK (on_notif_closed), notification.get ()); ---- src/gui/main.cpp -+++ src/gui/main.cpp -@@ -84,6 +84,9 @@ - - #ifdef HAVE_NOTIFY - #include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #if defined(P_FREEBSD) || defined (P_MACOSX) -@@ -2820,12 +2823,21 @@ - - body = g_strdup_printf ("%s\n%s\n%s", uri, app, account); - -- notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL); -+ notify = notify_notification_new (title, body, GM_ICON_LOGO -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); -+#endif - notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL); - notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL); - notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER); - notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL); -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ // notify_notification_attach_to_status_icon was removed -+#else - notify_notification_attach_to_status_icon (notify, statusicon); -+#endif - if (!notify_notification_show (notify, NULL)) { - ekiga_main_window_incoming_call_dialog_show (mw, call); - }
