summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsixsixfive2015-12-17 17:20:59 +0100
committersixsixfive2015-12-17 17:20:59 +0100
commite4a79ff0bb77d0882c5236f0e363d638a21ef8dc (patch)
tree991054205127fe1f35383501491c68245c5a6cd9
parentef870495a575ab4cfcfe2dc009fbcbe2e4a3a40a (diff)
downloadaur-e4a79ff0bb77d0882c5236f0e363d638a21ef8dc.tar.gz
lib32
-rw-r--r--.SRCINFO25
-rw-r--r--PKGBUILD52
2 files changed, 60 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ad8e42fc063..2a9715db356d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,33 @@
# Generated by mksrcinfo v8
-# Tue Dec 15 04:30:53 UTC 2015
+# Thu Dec 17 16:20:53 UTC 2015
pkgbase = gtk3-nocsd-git
pkgdesc = A hack to disable the GTK+3 client side decorations, to integrate them better into other desktop environments
pkgver = 2.r36
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/PCMan/gtk3-nocsd
arch = x86_64
arch = i686
license = GPL2
makedepends = pkg-config
depends = gtk3
- provides = gtk3-nocsd=2.r36
- conflicts = gtk3-nocsd<=2.r36
- replaces = gtk3-nocsd<=2.r36
source = gtk3-nocsd::git://github.com/PCMan/gtk3-nocsd.git
sha1sums = SKIP
-pkgname = gtk3-nocsd-git
+pkgname = gtk3-nocsd
+ provides = gtk3-nocsd
+ provides = gtk3-nocsd-git=2.r36
+ conflicts = gtk3-nocsd
+ conflicts = gtk3-nocsd-git<=2.r36
+ replaces = gtk3-nocsd
+ replaces = gtk3-nocsd-git<=2.r36
+
+pkgname = lib32-gtk3-nocsd
+ arch = x86_64
+ depends = gtk3-nocsd
+ provides = lib32-gtk3-nocsd
+ provides = lib32-gtk3-nocsd-git=2.r36
+ conflicts = lib32-gtk3-nocsd
+ conflicts = lib32-gtk3-nocsd-git<=2.r36
+ replaces = lib32-gtk3-nocsd
+ replaces = lib32-gtk3-nocsd-git<=2.r36
diff --git a/PKGBUILD b/PKGBUILD
index 44de2e6a7b89..0c53b2e85fde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,71 @@
# Maintainer: ssf <punx69 at gmx dot net>
-pkgname=gtk3-nocsd-git
+pkgbase=gtk3-nocsd-git
+pkgname=('gtk3-nocsd' 'lib32-gtk3-nocsd')
pkgver=2.r36
-pkgrel=1
+pkgrel=2
pkgdesc="A hack to disable the GTK+3 client side decorations, to integrate them better into other desktop environments"
arch=('x86_64' 'i686')
url='https://github.com/PCMan/gtk3-nocsd'
license=('GPL2')
depends=('gtk3')
makedepends=('pkg-config')
-provides=("${pkgname//-git/}=${pkgver}")
-conflicts=("${pkgname//-git/}<=${pkgver}")
-replaces=("${pkgname//-git/}<=${pkgver}")
-source=("${pkgname//-git/}::git://github.com/PCMan/gtk3-nocsd.git")
+source=("${pkgbase//-git/}::git://github.com/PCMan/gtk3-nocsd.git")
sha1sums=('SKIP')
pkgver() {
- cd "${pkgname//-git/}"
+ cd "${pkgbase//-git/}"
_ver=$(git describe --abbrev=0 --tags|sed 's/^v//')
_rev=$(git rev-list --count HEAD)
printf "$_ver.r$_rev"
}
+prepare() {
+ cd "${pkgbase//-git/}"
+ if [ "$(uname -m)" = "x86_64" ]; then
+ if (pacman -Q gcc-multilib >/dev/null); then
+ if [ ! -d lib32 ];then
+ mkdir lib32
+ find -type f -not -path '*.git/*' -exec cp -t lib32/ {} +
+ fi
+ fi
+ fi
+}
+
build() {
- cd "${pkgname//-git/}"
+ cd "${pkgbase//-git/}"
make
+ if [ "$(uname -m)" = "x86_64" ]; then
+ if (pacman -Q gcc-multilib >/dev/null); then
+ cd lib32
+ CFLAGS="-m32" make
+ fi
+ fi
}
-package() {
- install -Dm644 "${srcdir}"/"${pkgname//-git/}"/libgtk3-nocsd.so.0 "${pkgdir}"/usr/lib/libgtk3-nocsd.so.0
+package_gtk3-nocsd() {
+ provides=("${pkgname}" "${pkgname}-git=${pkgver}")
+ conflicts=("${pkgname}" "${pkgname}-git<=${pkgver}")
+ replaces=("${pkgname}" "${pkgname}-git<=${pkgver}")
+ install -Dm644 ${srcdir}/${pkgbase//-git/}/libgtk3-nocsd.so.0 "${pkgdir}"/usr/lib/libgtk3-nocsd.so.0
install -d "${pkgdir}"/etc/profile.d
cat <<\EOF >>"${pkgdir}"/etc/profile.d/gtk3-nocsd.sh
##disables overlay scrolling in newer GTK3 versions
export GTK_OVERLAY_SCROLLING=0
##No silly CSD stuff
export GTK_CSD=0
-export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0
+##that preload works for both 32 and 64 bit but will always show errors
+#export LD_PRELOAD="$LD_PRELOAD:/usr/lib32/libgtk3-nocsd.so.0:/usr/lib/libgtk3-nocsd.so.0" gtk3-dem
+export LD_PRELOAD="$LD_PRELOAD:/usr/lib/libgtk3-nocsd.so.0"
EOF
chmod +x "${pkgdir}"/etc/profile.d/gtk3-nocsd.sh
}
+
+package_lib32-gtk3-nocsd() {
+ provides=("${pkgname}" "${pkgname}-git=${pkgver}")
+ conflicts=("${pkgname}" "${pkgname}-git<=${pkgver}")
+ replaces=("${pkgname}" "${pkgname}-git<=${pkgver}")
+ depends=('gtk3-nocsd')
+ arch=('x86_64')
+ install -Dm644 ${srcdir}/${pkgbase//-git/}/lib32/libgtk3-nocsd.so.0 "${pkgdir}"/usr/lib32/libgtk3-nocsd.so.0
+}