merge libgtk3-nocsd back

3 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 098bdbdc3121..e3b7e494dcea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jul 12 11:59:45 UTC 2016
+# Tue Jul 12 17:30:25 UTC 2016
 pkgbase = gtk3-nocsd-git
 	pkgdesc = A hack to disable gtk+ 3 client side decoration
 	pkgver = r55.82ff5a0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/PCMan/gtk3-nocsd
 	arch = i686
 	arch = x86_64
@@ -13,8 +13,7 @@ pkgbase = gtk3-nocsd-git
 	makedepends = gobject-introspection
 	makedepends = gtk3
 	depends = gtk3
-	depends = libgtk3-nocsd-git
-	optdepends = lib32-libgtk3-nocsd-git: multilib library
+	optdepends = lib32-libgtk3-nocsd-git: 32-Bit library
 	conflicts = gtk3-nocsd
 	source = git+https://github.com/PCMan/gtk3-nocsd
 	source = 30-gtk3-nocsd.sh
diff --git a/30-gtk3-nocsd.sh b/30-gtk3-nocsd.sh
index 02639f0348b2..6e2c9de87fc3 100755
--- a/30-gtk3-nocsd.sh
+++ b/30-gtk3-nocsd.sh
@@ -19,7 +19,7 @@ case "${_check}" in
     fi
     export GTK_CSD
     if [ x"$GTK_CSD"x = x"0"x ] ; then
-      export LD_PRELOAD="libgtk3-nocsd.so.0${LD_PRELOAD:+:$LD_PRELOAD}"
+      export LD_PRELOAD="/usr/\${LIB}/libgtk3-nocsd.so.0${LD_PRELOAD:+:$LD_PRELOAD}"
     fi
     ;;
 esac
diff --git a/PKGBUILD b/PKGBUILD
index fae9af38e09f..4fc7c4a06dc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=gtk3-nocsd-git
 pkgver=r55.82ff5a0
-pkgrel=1
+pkgrel=2
 pkgdesc='A hack to disable gtk+ 3 client side decoration'
 arch=('i686' 'x86_64')
 url='https://github.com/PCMan/gtk3-nocsd'
 license=('GPL')
-depends=('gtk3' 'libgtk3-nocsd-git')
+depends=('gtk3')
 makedepends=('git' 'pkgconfig' 'gobject-introspection' 'gtk3')
-optdepends=('lib32-libgtk3-nocsd-git: multilib library')
+optdepends=('lib32-libgtk3-nocsd-git: 32-Bit library')
 conflicts=('gtk3-nocsd')
 source=(git+https://github.com/PCMan/gtk3-nocsd
         30-gtk3-nocsd.sh)
@@ -35,6 +35,8 @@ package() {
   install -D -m 0644 gtk3-nocsd.1 "${pkgdir}"/usr/share/man/man1/gtk3-nocsd.1
   install -D -m 0644 gtk3-nocsd.bash-completion "${pkgdir}"/usr/share/bash-completion/completions/gtk3-nocsd
 
+  install -D -m 0644 libgtk3-nocsd.so.0 "${pkgdir}"/usr/lib/libgtk3-nocsd.so.0
+
   cd "$srcdir"
   install -D -m 0755 30-gtk3-nocsd.sh "${pkgdir}"/etc/X11/xinit/xinitrc.d/30-gtk3-nocsd.sh
 }