version 0.3.1-16

3 files changed, 50 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 341f94092c39..6a123d2bb246 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cairo-compmgr
 	pkgdesc = A Cairo based composite manager
 	pkgver = 0.3.1
-	pkgrel = 15
+	pkgrel = 16
 	epoch = 2
 	url = https://github.com/gandalfn/Cairo-Composite-Manager
 	arch = i686
@@ -18,7 +18,7 @@ pkgbase = cairo-compmgr
 	depends = gconf
 	options = !libtool
 	source = https://github.com/downloads/gandalfn/Cairo-Composite-Manager/cairo-compmgr-0.3.1.tar.bz2
-	source = https://github.com/gandalfn/Cairo-Composite-Manager/pull/4.diff
+	source = 4.diff
 	source = bfd_ansidecl.patch
 	md5sums = 4ef285e0735b1a61b5db2205a2d8f8b3
 	md5sums = 011074cd9687475ebf9ac93fc1f535aa
diff --git a/4.diff b/4.diff
new file mode 100644
index 000000000000..33d25703ff2c
--- /dev/null
+++ b/4.diff
@@ -0,0 +1,46 @@
+diff --git a/src/ccm-debug.c b/src/ccm-debug.c
+index 1b4d3d7..bca7c35 100644
+--- a/src/ccm-debug.c
++++ b/src/ccm-debug.c
+@@ -56,7 +56,7 @@
+ #include <stdlib.h>
+ #include <execinfo.h>
+ #include <bfd.h>
+-#include <libiberty.h>
++#include <libiberty/libiberty.h>
+ #include <dlfcn.h>
+ #include <link.h>
+ #endif /* HAVE_EDEBUG */
+diff --git a/vapi/cairo-compmgr.vapi b/vapi/cairo-compmgr.vapi
+index c196f7b..94d2235 100644
+--- a/vapi/cairo-compmgr.vapi
++++ b/vapi/cairo-compmgr.vapi
+@@ -270,8 +270,8 @@ namespace CCM
+         public unowned CCM.Region get_geometry ();
+         public unowned CCM.Region get_primary_geometry ();
+ 
+-        public bool add_window (CCM.Window window);
+-        public void remove_window (CCM.Window window);
++        public bool add_window (CCM.Screen screen, CCM.Window window);
++        public void remove_window (CCM.Screen screen, CCM.Window window);
+         public unowned CCM.Window? find_window (X.Window xwindow);
+         public unowned CCM.Window? find_window_or_child (X.Window xwindow);
+         public unowned CCM.Window? find_window_at_pos(int x, int y);
+@@ -481,7 +481,7 @@ namespace CCM
+         public void query_frame_extends ();
+         public void query_hint_type ();
+         public void query_mwm_hints ();
+-        public void query_opacity (bool deleted);
++        public void query_opacity (CCM.Window window);
+         public void query_state ();
+         public void query_transient_for ();
+         public void query_wm_hints ();
+@@ -491,7 +491,7 @@ namespace CCM
+         public void set_alpha ();
+         public void set_opacity (float opacity);
+         public void set_opaque ();
+-        public void set_opaque_region (CCM.Region region);
++        public void set_opaque_region (CCM.Window window, CCM.Region region);
+         public bool set_state (X.Atom state_atom);
+         public bool skip_pager ();
+         public bool skip_taskbar ();
diff --git a/PKGBUILD b/PKGBUILD
index d4493fe7c158..79ea10a9a7e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=cairo-compmgr
 pkgver=0.3.1
-pkgrel=15
+pkgrel=16
 epoch=2
 pkgdesc="A Cairo based composite manager"
 arch=(i686 x86_64)
@@ -21,7 +21,7 @@ makedepends=(gettext gtk-doc "intltool>=0.41" git)
 depends=("gtk2>=2.16.0" "vala>=0.28" libsm libgl gconf)
 options=(!libtool)
 source=(https://github.com/downloads/gandalfn/Cairo-Composite-Manager/$pkgname-$pkgver.tar.bz2
-        'https://github.com/gandalfn/Cairo-Composite-Manager/pull/4.diff'
+        '4.diff'
         'bfd_ansidecl.patch'
 )
 md5sums=('4ef285e0735b1a61b5db2205a2d8f8b3'