Backport libdecoration 0.9 autodetection

4 files changed, 62 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee8afcc29ac0..97363afd284f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Apr 11 20:06:04 UTC 2016
+# Tue Aug 23 17:29:01 UTC 2016
 pkgbase = emerald
 	pkgdesc = Emerald window decorator
 	pkgver = 0.8.12.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/compiz-reloaded/emerald/
 	install = emerald.install
 	arch = i686
@@ -26,7 +26,9 @@ pkgbase = emerald
 	conflicts = emerald0.9
 	options = !libtool
 	source = https://github.com/compiz-reloaded/emerald//releases/download/v0.8.12.4/emerald-0.8.12.4.tar.xz
+	source = detect_libdeco.patch
 	sha256sums = d5dd3be562b1fb4b1d5d620c43249cec82db58baef63f0a14ab08003daecdb6c
+	sha256sums = 7b62603680137426016f76baf81e7ed2781750b09bc356ae994e4388c2e63f97
 
 pkgname = emerald
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a5401c5d685d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg/
+src/
+*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index cf888d5f686e..fa8cc9c0efb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _micro=.4
 
 pkgname=emerald
 pkgver="${_pkgver}${_micro}"
-pkgrel=1
+pkgrel=2
 pkgdesc="Emerald window decorator"
 arch=('i686' 'x86_64')
 url="https://github.com/compiz-reloaded/${_upstream}/"
@@ -22,7 +22,16 @@ groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
 options=(!libtool)
 conflicts=('emerald0.9')
 install=emerald.install
-source=("${url}/releases/download/v${pkgver}/${_upstream}-${pkgver}.tar.xz")
+source=(
+  "${url}/releases/download/v${pkgver}/${_upstream}-${pkgver}.tar.xz"
+  "detect_libdeco.patch"
+)
+
+prepare() {
+  cd "${srcdir}/${_upstream}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/detect_libdeco.patch"
+}
 
 build() {
   cd "${srcdir}/${_upstream}-${pkgver}"
@@ -38,4 +47,5 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
-sha256sums=('d5dd3be562b1fb4b1d5d620c43249cec82db58baef63f0a14ab08003daecdb6c')
+sha256sums=('d5dd3be562b1fb4b1d5d620c43249cec82db58baef63f0a14ab08003daecdb6c'
+            '7b62603680137426016f76baf81e7ed2781750b09bc356ae994e4388c2e63f97')
diff --git a/detect_libdeco.patch b/detect_libdeco.patch
new file mode 100644
index 000000000000..cd6ac6bda13c
--- /dev/null
+++ b/detect_libdeco.patch
@@ -0,0 +1,42 @@
+diff -aur emerald-0.8.12.4/configure.ac emerald-0.8.12.4.mod/configure.ac
+--- emerald-0.8.12.4/configure.ac	2016-04-04 11:46:36.000000000 -0700
++++ emerald-0.8.12.4.mod/configure.ac	2016-08-23 10:16:49.870217173 -0700
+@@ -73,14 +73,30 @@
+ LIBS="$LIBS $EMERALD_LIBS -lm -ldl"
+ AC_CHECK_FUNCS(wnck_window_has_name)
+ 
+-AC_ARG_ENABLE(decor09,
+-  [  --enable-decor09        Use libdecoration 0.9.x support],
+-  [use_decor09=$enableval], [use_decor09=no])
+-
+-AM_CONDITIONAL(DECOR_INTERFACE_VERSION, test "x$use_decor09" = "xyes")
+-if test "$use_decor09" = yes; then
+-  AC_DEFINE(DECOR_INTERFACE_VERSION, 20110504, [Build with libdecoration 0.9.x support])
+-fi
++AC_RUN_IFELSE([
++  AC_LANG_SOURCE(
++    [
++#include <stdio.h>
++#include <decoration.h>
++int main() {
++    FILE *f = fopen("decor_ver.out", "w");
++    if (!f)
++        return 1;
++    fprintf(f, "%d\n", decor_version());
++    fclose(f);
++    return 0;
++}
++    ]
++  )],
++  [
++    AC_DEFINE_UNQUOTED(DECOR_INTERFACE_VERSION, `cat decor_ver.out`, [Decorator interface version])
++    AC_MSG_NOTICE([Using decorator interface version `cat decor_ver.out`])
++  ],
++  [
++    AC_DEFINE(DECOR_INTERFACE_VERSION, 0, [Decorator interface version])
++    AC_MSG_NOTICE([Using undefined decorator interface version])
++  ]
++)
+ 
+ AC_ARG_ENABLE(mime-update,
+ [  --enable-mime-update],