summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShadowKyogre2016-07-15 13:18:06 -0700
committerShadowKyogre2016-07-15 13:18:06 -0700
commit463b042c884111eafb28ac9963aaffd2f89956cb (patch)
tree90e5d4bb7b599107bf4ad0c94a5253adce5b1676
parent6864a581220188d198b78c549bfaf9db51f2ccd0 (diff)
downloadaur-463b042c884111eafb28ac9963aaffd2f89956cb.tar.gz
Add a configure option for marco-gtk3
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD21
2 files changed, 17 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0188265bf91..0c2184c0e47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jun 1 15:55:10 UTC 2016
+# Fri Jul 15 20:16:14 UTC 2016
pkgbase = compiz-core-git
pkgdesc = This is the latest git release of Compiz without DE deps
pkgver = 0.8.12.3.r24.g292d9a2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/compiz-reloaded/compiz
arch = i686
arch = x86_64
@@ -44,7 +44,6 @@ pkgname = compiz-gtk-git
depends = libsm
depends = libxcomposite
depends = libxinerama
- depends = marco
depends = gtk2
provides = compiz-gtk=0.8.12.3.r24.g292d9a2
conflicts = compiz-gtk
diff --git a/PKGBUILD b/PKGBUILD
index 133f1f8af90..620527b2529 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: martadinata666 <martadinata666@gmail.com>
+# Maintainer: Sapphira Armageddos <shadowkyogre.public@gmail.com>
+# Contributor: martadinata666 <martadinata666@gmail.com>
_use_marco=0
@@ -7,7 +8,7 @@ _upstream="compiz"
pkgbase=compiz-core-git
pkgname=(compiz-core-git compiz-gtk-git)
pkgver=0.8.12.3.r24.g292d9a2
-pkgrel=1
+pkgrel=2
pkgdesc="This is the latest git release of Compiz without DE deps"
url="https://github.com/compiz-reloaded/${_upstream}"
license=('GPL' 'LGPL' 'MIT')
@@ -33,13 +34,19 @@ _configure_opts=(
--disable-inotify
)
-if (("${_use_marco}"));then
+if (("${_use_marco}" == 1));then
_configure_opts+=("--enable-marco")
makedepends+=("marco")
msg "Marco theme support enabled"
+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"
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"
fi
pkgver() {
@@ -56,7 +63,7 @@ build()
if ! grep -q pkg_cv_GTK config.log;then
# make sure only compiz-core-git is created if gtk is missing
- msg "Making sure only $pkgbase is made, gtk+2 is missing"
+ msg "Making sure only $pkgbase is made, gtk+2 or gtk+3 is missing"
pkgname=("$pkgbase")
fi
@@ -88,9 +95,11 @@ package_compiz-core-git() {
package_compiz-gtk-git()
{
- if (("${_use_marco}"));then
- #separating libmarco-private would be nice, but this is a workaround for now
+ #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')
else
depends+=('gtk2')
fi