[arch-commits] Commit in ekiga/repos (4 files)

Ionut Biru ibiru at archlinux.org
Sun Mar 6 16:43:00 UTC 2011


    Date: Sunday, March 6, 2011 @ 11:43:00
  Author: ibiru
Revision: 112772

libnotify 0.7 rebuild

Added:
  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
Modified:
  ekiga/repos/extra-i686/PKGBUILD
  ekiga/repos/extra-x86_64/PKGBUILD

----------------------------------------------+
 extra-i686/PKGBUILD                          |    9 ++-
 extra-i686/ekiga-3.2.7-libnotify-0.7.patch   |   62 +++++++++++++++++++++++++
 extra-x86_64/PKGBUILD                        |    9 ++-
 extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch |   62 +++++++++++++++++++++++++
 4 files changed, 136 insertions(+), 6 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-06 16:25:40 UTC (rev 112771)
+++ extra-i686/PKGBUILD	2011-03-06 16:43:00 UTC (rev 112772)
@@ -4,7 +4,7 @@
 
 pkgname=ekiga
 pkgver=3.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
@@ -16,11 +16,14 @@
 options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f')
+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')
 
 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

Added: extra-i686/ekiga-3.2.7-libnotify-0.7.patch
===================================================================
--- extra-i686/ekiga-3.2.7-libnotify-0.7.patch	                        (rev 0)
+++ extra-i686/ekiga-3.2.7-libnotify-0.7.patch	2011-03-06 16:43:00 UTC (rev 112772)
@@ -0,0 +1,62 @@
+--- 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:25:40 UTC (rev 112771)
+++ extra-x86_64/PKGBUILD	2011-03-06 16:43:00 UTC (rev 112772)
@@ -4,7 +4,7 @@
 
 pkgname=ekiga
 pkgver=3.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
@@ -16,11 +16,14 @@
 options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f')
+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')
 
 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

Added: extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch
===================================================================
--- extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch	                        (rev 0)
+++ extra-x86_64/ekiga-3.2.7-libnotify-0.7.patch	2011-03-06 16:43:00 UTC (rev 112772)
@@ -0,0 +1,62 @@
+--- 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);
+   }




More information about the arch-commits mailing list