Follow Arch community PKGBUILD

Patch adapted without testing. So be warned

1 files changed, 27 insertions, 35 deletions

diff --git a/keybinder.patch b/keybinder.patch
index d9d80d017162..b75a24b7abf3 100644
--- a/keybinder.patch
+++ b/keybinder.patch
@@ -1,21 +1,18 @@
-diff --git a/./Makefile.in b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/Makefile.in
-index 40aa4a7..5dbc91d 100644
---- a/./Makefile.in
-+++ b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/Makefile.in
-@@ -522,7 +522,8 @@ common_ldadd = \
+--- xfce4-notifyd-0.4.4/Makefile.in
++++ xfce4-notifyd-0.4.4/Makefile.in
+@@ -634,7 +634,8 @@
  	$(LIBXFCE4UTIL_LIBS) \
+ 	$(XFCONF_LIBS) \
  	$(LIBXFCE4UI_LIBS) \
- 	$(DBUS_GLIB_LIBS) \
--	$(XFCONF_LIBS)
-+	$(XFCONF_LIBS) \
+-	$(GTK3_LIBS)
++	$(GTK3_LIBS) \
 +	-lkeybinder
  
  xfce4_notifyd_xfce4_notifyd_LDADD = \
  	$(common_ldadd) \
-diff --git a/./xfce4-notifyd/main.c b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/xfce4-notifyd/main.c
-index 8fab30a..2750c5f 100644
---- a/./xfce4-notifyd/main.c
-+++ b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/xfce4-notifyd/main.c
+
+--- xfce4-notifyd-0.4.4/xfce4-notifyd/main.c
++++ xfce4-notifyd-0.4.4/xfce4-notifyd/main.c
 @@ -32,6 +32,7 @@
  #include <xfconf/xfconf.h>
  #include <libxfce4util/libxfce4util.h>
@@ -24,20 +21,19 @@ index 8fab30a..2750c5f 100644
  
  #include "xfce-notify-daemon.h"
  
-@@ -67,6 +68,8 @@ main(int argc,
- 
+@@ -45,6 +46,8 @@
+     xfconf_init(NULL);
+  	
      gtk_init(&argc, &argv);
- 
-+    keybinder_init();
 +
++    keybinder_init();
+ 
      xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
  
-     if(argc > 1) {
-diff --git a/./xfce4-notifyd/xfce-notify-daemon.c b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/xfce4-notifyd/xfce-notify-daemon.c
-index ec2972a..c27057b 100644
---- a/./xfce4-notifyd/xfce-notify-daemon.c
-+++ b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/xfce4-notifyd/xfce-notify-daemon.c
-@@ -86,6 +86,33 @@ enum
+
+--- xfce4-notifyd-0.4.4/xfce4-notifyd/xfce-notify-daemon.c
++++ xfce4-notifyd-0.4.4/xfce4-notifyd/xfce-notify-daemon.c
+@@ -94,6 +94,32 @@
      URGENCY_CRITICAL,
  };
  
@@ -67,34 +63,31 @@ index ec2972a..c27057b 100644
 +    }
 +}
 +
-+
  static void xfce_notify_daemon_screen_changed(GdkScreen *screen,
                                                gpointer user_data);
  static void xfce_notify_daemon_update_reserved_rectangles(gpointer key,
-@@ -367,6 +394,9 @@ xfce_notify_daemon_finalize(GObject *obj)
-         dbus_g_connection_unref(xndaemon->dbus_conn);
+@@ -485,6 +511,8 @@
+         g_object_unref(xndaemon->settings);
  
      G_OBJECT_CLASS(xfce_notify_daemon_parent_class)->finalize(obj);
 +
 +    keybinder_unbind(EXAMPLE_KEY, handler);
-+
  }
  
  
-@@ -1239,6 +1269,8 @@ xfce_notify_daemon_start(XfceNotifyDaemon *xndaemon,
-                                         "/org/freedesktop/Notifications",
-                                         G_OBJECT(xndaemon));
+@@ -1578,6 +1606,8 @@
+                      G_CALLBACK(xfce_notify_daemon_settings_changed),
+                      xndaemon);
  
 +    keybinder_bind(EXAMPLE_KEY, handler, xndaemon);
 +
      return TRUE;
  }
  
-diff --git a/./xfce4-notifyd/xfce-notify-window.c b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/xfce4-notifyd/xfce-notify-window.c
-index 285a70e..773fa9e 100644
---- a/./xfce4-notifyd/xfce-notify-window.c
-+++ b/tmp/xfce4-notifyd.KEY/src/xfce4-notifyd-0.2.4/xfce4-notifyd/xfce-notify-window.c
-@@ -118,6 +118,14 @@ static guint signals[N_SIGS] = { 0, };
+
+--- xfce4-notifyd-0.4.4/xfce4-notifyd/xfce-notify-window.c
++++ xfce4-notifyd-0.4.4/xfce4-notifyd/xfce-notify-window.c
+@@ -121,6 +121,14 @@
  
  G_DEFINE_TYPE(XfceNotifyWindow, xfce_notify_window, GTK_TYPE_WINDOW)
  
@@ -109,4 +102,3 @@ index 285a70e..773fa9e 100644
  
  static void
  xfce_notify_window_class_init(XfceNotifyWindowClass *klass)
-