upgpkg: muffin-git 4.0.5.r0.gf001ea2-1

rebase off of community

3 files changed, 53 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48f89a870b53..f82577216b62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = muffin-git
 	pkgdesc = A window manager for GNOME
-	pkgver = 527.d9f4fcd
+	pkgver = 4.0.5.r0.gf001ea2
 	pkgrel = 1
 	url = https://github.com/linuxmint/muffin
-	install = muffin-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = git
 	makedepends = intltool
+	makedepends = gobject-introspection
+	makedepends = gtk-doc
 	makedepends = gnome-doc-utils
-	makedepends = gnome-common
-	makedepends = git
-	depends = clutter
-	depends = gobject-introspection
-	depends = cinnamon-desktop-git
+	depends = cinnamon-desktop
+	depends = gobject-introspection-runtime
 	depends = libcanberra
+	depends = libinput
+	depends = libsm
+	depends = libxkbcommon-x11
 	depends = startup-notification
 	depends = zenity
-	depends = dconf
 	provides = muffin
 	conflicts = muffin
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index f50517947747..bfd79b34bccf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,61 @@
-# $Id$
-# Maintainer: Realex
-# Based on muffin PKGBUILD
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
 
-_pkgname=muffin
-pkgname=${_pkgname}-git
-pkgver=527.d9f4fcd
+# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
+
+pkgname=muffin-git
+pkgver=4.0.5.r0.gf001ea2
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
-depends=('clutter' 'gobject-introspection' 'cinnamon-desktop-git' 'libcanberra'
-         'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'git')
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
+depends=('cinnamon-desktop' 'gobject-introspection-runtime' 'libcanberra' 'libinput'
+         'libsm' 'libxkbcommon-x11' 'startup-notification' 'zenity')
+makedepends=('git' 'intltool' 'gobject-introspection' 'gtk-doc' 'gnome-doc-utils')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
 options=('!emptydirs')
-install=${pkgname}.install
-source=("git+https://github.com/linuxmint/${_pkgname}.git")
+source=("git+${url}.git")
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+    cd "${srcdir}"/${pkgname%-git}
+
+    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd "${srcdir}"/${pkgname%-git}
+
+    NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}"
-  PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
-  				 			 --localstatedir=/var --disable-static --disable-schemas-compile \
-                 --enable-compile-warnings=minimum
-  make
+    cd "${srcdir}"/${pkgname%-git}
+
+    ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --libexecdir=/usr/lib/muffin \
+                --localstatedir=/var \
+                --disable-gtk-doc \
+                --disable-static \
+                --disable-schemas-compile \
+                --enable-compile-warnings=minimum
+
+    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}"
-  make DESTDIR="${pkgdir}" install
+    cd "${srcdir}"/${pkgname%-git}
+
+    make DESTDIR="${pkgdir}" install
+
+    # Remove unused stuff
+    make -C src DESTDIR="${pkgdir}" uninstall-binPROGRAMS uninstall-desktopfilesDATA
+    make -C src/tools DESTDIR="${pkgdir}" uninstall
+    make -C src/compositor/plugins DESTDIR="${pkgdir}" uninstall
+    make -C doc/man DESTDIR="${pkgdir}" uninstall
 }
diff --git a/muffin-git.install b/muffin-git.install
deleted file mode 100644
index 2daef58d5574..000000000000
--- a/muffin-git.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}