desktop/awn-extras: Patched for libnotify-0.7 and glib-2.32

3 files changed, 245 insertions, 1 deletions

diff --git a/desktop/awn-extras/awn-extras.SlackBuild b/desktop/awn-extras/awn-extras.SlackBuild
index 71445238d6..9f1f30ac8e 100644
--- a/desktop/awn-extras/awn-extras.SlackBuild
+++ b/desktop/awn-extras/awn-extras.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=awn-extras
 VERSION=0.4.0
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,6 +70,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Starting with glib 2.32 it is now mandatory to
+# include glib.h instead of individual headers.
+patch -p1 -i $CWD/glib-single-include.patch
+
+# Fix for libnotify 0.7
+patch -p0 -i $CWD/libnotify-0.7.patch
+
 # Configure
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/awn-extras/glib-single-include.patch b/desktop/awn-extras/glib-single-include.patch
new file mode 100644
index 0000000000..bb2d339f17
--- /dev/null
+++ b/desktop/awn-extras/glib-single-include.patch
@@ -0,0 +1,226 @@
+Index: awn-extras-0.4.0/applets/maintained/awnterm/keybinder.h
+===================================================================
+--- awn-extras-0.4.0.orig/applets/maintained/awnterm/keybinder.h
++++ awn-extras-0.4.0/applets/maintained/awnterm/keybinder.h
+@@ -24,7 +24,7 @@
+ #ifndef __AWN_KEY_BINDER_H__
+ #define __AWN_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.h
+===================================================================
+--- awn-extras-0.4.0.orig/applets/maintained/notification-daemon/daemon.h
++++ awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.h
+@@ -31,8 +31,6 @@
+ 
+ #include <libawn/awn-applet.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-cairo-utils.h>
+Index: awn-extras-0.4.0/applets/maintained/notification-daemon/engines.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/maintained/notification-daemon/engines.c
++++ awn-extras-0.4.0/applets/maintained/notification-daemon/engines.c
+@@ -38,8 +38,7 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+@@ -50,7 +49,6 @@
+ 
+ #include <string.h>
+ #include <gtk/gtk.h>
+-#include <glib.h>
+ #ifndef HAVE_GTK_URL_LABEL
+ #include <libsexy/sexy-url-label.h>
+ #endif
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
+@@ -25,7 +25,7 @@
+ //#include <libawn/awn-title.h>
+ #include <libawn/awn-tooltip.h>
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibtop/cpu.h>
+ #include <gconf/gconf-client.h>
+ 
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
+@@ -43,13 +43,11 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ 
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/cpu_component.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/cpu_component.c
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/cpu_component.c
+@@ -18,13 +18,11 @@
+  */
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/cpumetergconf.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/cpumetergconf.c
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/cpumetergconf.c
+@@ -20,13 +20,10 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ #include <string.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include "cairo-utils.h"
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/dashboard.h
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/dashboard.h
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/dashboard.h
+@@ -23,13 +23,11 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include <glibtop/mem.h>
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/date_time_component.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/date_time_component.c
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/date_time_component.c
+@@ -19,13 +19,11 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/loadavg_component.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/loadavg_component.c
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/loadavg_component.c
+@@ -19,13 +19,11 @@
+ 
+ #include <glibtop/loadavg.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/sysmem_component.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/sysmem_component.c
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/sysmem_component.c
+@@ -19,13 +19,11 @@
+ 
+ #include <glibtop/mem.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+Index: awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/uptime_component.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/awnsystemmonitor/uptime_component.c
++++ awn-extras-0.4.0/applets/unmaintained/awnsystemmonitor/uptime_component.c
+@@ -1,12 +1,10 @@
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ 
+ #include <glibtop/uptime.h>
+ #include <glibtop/cpu.h>
+Index: awn-extras-0.4.0/applets/unmaintained/main-menu/applet.c
+===================================================================
+--- awn-extras-0.4.0.orig/applets/unmaintained/main-menu/applet.c
++++ awn-extras-0.4.0/applets/unmaintained/main-menu/applet.c
+@@ -23,8 +23,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <libdesktop-agnostic/fdo.h>
diff --git a/desktop/awn-extras/libnotify-0.7.patch b/desktop/awn-extras/libnotify-0.7.patch
new file mode 100644
index 0000000000..5171adeea7
--- /dev/null
+++ b/desktop/awn-extras/libnotify-0.7.patch
@@ -0,0 +1,11 @@
+--- applets/maintained/notification-daemon/daemon.c
++++ applets/maintained/notification-daemon/daemon.c
+@@ -1487,7 +1487,7 @@
+   if (fork() == 0)
+   {
+     notify_init("notify-send");
+-    notify = notify_notification_new(summary, body, icon_str, NULL);
++    notify = notify_notification_new(summary, body, icon_str);
+     notify_notification_set_category(notify, type);
+     notify_notification_set_urgency(notify, urgency);
+     notify_notification_set_timeout(notify, expire_timeout);