Bump to 0.8.14

2 files changed, 42 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66a894006220..82042166c300 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jul 15 20:02:34 UTC 2016
+# Tue Apr 18 15:48:03 UTC 2017
 pkgbase = compiz-core
 	pkgdesc = This is the latest stable release of Compiz without DE deps
-	pkgver = 0.8.12.3
+	pkgver = 0.8.14
 	pkgrel = 3
 	url = https://github.com/compiz-reloaded/compiz/
 	arch = i686
@@ -23,12 +23,12 @@ pkgbase = compiz-core
 	depends = libxinerama
 	options = !libtool
 	options = !emptydirs
-	source = https://github.com/compiz-reloaded/compiz//releases/download/v0.8.12.3/compiz-0.8.12.3.tar.xz
-	sha256sums = 6fc5176e3af5d6f434f26d1b654460aeeb3faf723db37f0957b46c2c23955032
+	source = https://github.com/compiz-reloaded/compiz//releases/download/v0.8.14/compiz-0.8.14.tar.xz
+	sha256sums = f748b3a3c5a746d509925af72fd0cae6b69f880944ea6c1fa6e2eaf9425459b6
 
 pkgname = compiz-core
 	pkgdesc = This is the latest stable release of Compiz without DE deps (Core w/o decorator)
-	provides = compiz-core=0.8.12.3
+	provides = compiz-core=0.8.14
 	conflicts = compiz
 	conflicts = compiz-core-git
 	conflicts = compiz-git
@@ -44,6 +44,10 @@ pkgname = compiz-gtk
 	depends = libsm
 	depends = libxcomposite
 	depends = libxinerama
-	depends = gtk2
+	depends = compiz-core-git
+	depends = marco
+	depends = marco-gtk2
+	depends = libwnck3
+	depends = libwnck
 	conflicts = compiz-gtk-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6952342c4005..dbcfa9d6d0dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,16 @@
 # Maintainer:  Sapphira Armageddos <shadowkyogre.public@gmail.com>
 # Contributor: martadinata666 <martadinata666@gmail.com>
 
+# Flag for whether to use marco
 _use_marco=0
 
+# Flag for whether to use GTK+3
+# Autoset depending on marco option
+_use_gtk3=0
+
 _upstream="compiz"
-_pkgver=0.8.12
-_micro=.3
+_pkgver=0.8.14
+_micro=""
 
 pkgbase=compiz-core
 pkgname=(compiz-core compiz-gtk)
@@ -34,16 +39,25 @@ _configure_opts=(
 if (("${_use_marco}" == 1));then
   _configure_opts+=("--enable-marco")
   makedepends+=("marco")
-  msg "Marco theme support enabled"
+  _use_gtk3=1
+  msg "Marco theme support enabled with GTK+3"
 elif (("${_use_marco}" == 2));then
   _configure_opts+=("--enable-marco")
-  _configure_opts+=("--with-gtk=3.0")
-  makedepends+=("marco-gtk3")
-  msg "Marco theme support enabled with GTK+3"
+  makedepends+=("marco-gtk2")
+  _use_gtk3=0
+  msg "Marco theme support enabled with GTK+2"
 else
   _configure_opts+=("--disable-marco")
   msg "Marco theme support disabled, rebuild with _use_marco=1 in the PKGBUILD if you want it"
-  msg "Rebuild with _use_marco=2 in the PKGBUILD if you have marco-gtk3"
+  msg "Rebuild with _use_marco=2 in the PKGBUILD if you have marco-gtk2"
+fi
+
+if (("${_use_gtk3}" >= 1)); then
+	_configure_opts+=("--with-gtk=3.0")
+	msg "Using GTK+3 for gtk-window-decorator"
+else
+	_configure_opts+=("--with-gtk=2.0")
+	msg "Using GTK+2 for gtk-window-decorator"
 fi
 
 build()
@@ -87,17 +101,24 @@ package_compiz-core() {
 package_compiz-gtk()
 {
   #separating libmarco-private would be nice, but this is a workaround for now
+  depends+=('compiz-core-git')
+  #separating libmarco-private would be nice, but this is a workaround for now
   if (("${_use_marco}" == 1));then
     depends+=('marco')
   elif (("${_use_marco}" == 2));then
-    depends+=('marco-gtk3')
+    depends+=('marco-gtk2')
+  fi
+
+  if (( "${_use_gtk3}" >= 1 ));then
+    depends+=('libwnck3')
   else
-    depends+=('gtk2')
+    depends+=('libwnck')
   fi
+
   pkgdesc+=" (GTK+ window decorator)"
   conflicts=('compiz-gtk-git')
 
-  cd "${srcdir}/${_upstream}-${pkgver}/gtk"
+  cd "${srcdir}/${_upstream}-${pkgver}/gtk-window-decorator"
   make DESTDIR="${pkgdir}" install
 
   cd "${srcdir}/${_upstream}-${pkgver}/images"
@@ -117,4 +138,4 @@ package_compiz-gtk()
   done
 }
 
-sha256sums=('6fc5176e3af5d6f434f26d1b654460aeeb3faf723db37f0957b46c2c23955032')
+sha256sums=('f748b3a3c5a746d509925af72fd0cae6b69f880944ea6c1fa6e2eaf9425459b6')