summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Bos2015-09-14 09:14:52 +0100
committerCharles Bos2015-09-14 09:14:52 +0100
commitd04036960a84556c6df469021664e765d9c49c84 (patch)
treecd7e38c27d01b3d723f4f30dc6c81e62029cf435
parent8785fb1b4c62c5abb34d930d77c49ae28a11d2aa (diff)
downloadaur-d04036960a84556c6df469021664e765d9c49c84.tar.gz
re-add exec command. remove unused cmake vars. remove replaces line - compiz-core-devel was a long time ago
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 3 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 21140e940010..dfc57b56f0ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = compiz
pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM (release version)
pkgver = 0.9.12.2
- pkgrel = 2
+ pkgrel = 3
url = https://launchpad.net/compiz
install = compiz.install
arch = i686
@@ -33,7 +33,6 @@ pkgbase = compiz
depends = dconf
optdepends = xorg-xprop: grab various window properties for use in window matching rules
conflicts = compiz-core
- replaces = compiz-core-devel
source = https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2
source = focus-prevention-disable.patch
source = gtk-extents.patch
diff --git a/PKGBUILD b/PKGBUILD
index 730729f262e3..75f109b9e1c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=compiz
pkgver=0.9.12.2
_pkgseries=0.9.12
-pkgrel=2
+pkgrel=3
pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM (release version)"
arch=('i686' 'x86_64')
url="https://launchpad.net/compiz"
@@ -18,7 +18,6 @@ optdepends=(
'xorg-xprop: grab various window properties for use in window matching rules'
)
conflicts=('compiz-core')
-replaces=('compiz-core-devel')
source=("https://launchpad.net/compiz/${_pkgseries}/${pkgver}/+download/compiz-${pkgver}.tar.bz2"
"focus-prevention-disable.patch"
"gtk-extents.patch")
@@ -31,7 +30,7 @@ prepare() {
cd "${pkgname}-${pkgver}"
# Fix decorator start command
- sed -i 's/exec \\"${COMPIZ_BIN_PATH}compiz-decorator\\"/\/usr\/bin\/compiz-decorator/g' plugins/decor/decor.xml.in
+ sed -i 's/exec \\"${COMPIZ_BIN_PATH}compiz-decorator\\"/exec \/usr\/bin\/compiz-decorator/g' plugins/decor/decor.xml.in
# Set focus prevention level to off which means that new windows will always get focus
patch -Np1 -i "${srcdir}/focus-prevention-disable.patch"
@@ -58,9 +57,6 @@ build() {
-DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_INSTALL_LIBDIR="/usr/lib" \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On \
-DCOMPIZ_BUILD_WITH_RPATH=Off \
-DCOMPIZ_PACKAGING_ENABLED=On \