[arch-commits] Commit in mate-desktop/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Friday, March 17, 2017 @ 19:12:30
  Author: arojas
Revision: 216935

Update to 1.18.0

Modified:
  mate-desktop/trunk/PKGBUILD

----------+
 PKGBUILD |   64 ++++++++++---------------------------------------------------
 1 file changed, 11 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-17 18:06:29 UTC (rev 216934)
+++ PKGBUILD	2017-03-17 19:12:30 UTC (rev 216935)
@@ -1,31 +1,24 @@
 # Contributor: Martin Wimpress <code at flexion.org>
 
-_ver=1.16
-pkgbase=mate-desktop
-pkgname=(${pkgbase} ${pkgbase}-gtk3 ${pkgbase}-schemas)
-pkgver=${_ver}.1
+pkgname=mate-desktop
+pkgver=1.18.0
 pkgrel=1
 pkgdesc="Library with common API for various MATE modules"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-options=('!emptydirs')
-depends=('gtk2' 'gtk3' 'startup-notification')
+depends=('gtk3' 'startup-notification')
 makedepends=('gobject-introspection' 'intltool')
-source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('bcded93e383e810817e9737ce2796050f9038b2a')
+groups=('mate')
+conflicts=('mate-desktop-gtk3' 'mate-desktop-schemas')
+replaces=('mate-desktop-gtk3' 'mate-desktop-schemas')
+source=("http://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('df31ccabe87aa83746e088b43441ca7aac0e67ac')
 
-prepare() {
-    cd "${srcdir}"
-    mv "${pkgname}-${pkgver}" "${pkgbase}-gtk2"
-    cp -a "${pkgbase}-gtk2" "${pkgbase}-gtk3"
-}
-
 build() {
-    cd "${srcdir}/${pkgbase}-gtk2"
+    cd $pkgname-$pkgver
     ./configure \
         --prefix=/usr \
-        --with-gtk=2.0 \
         --disable-schemas-compile
 
     #https://bugzilla.gnome.org/show_bug.cgi?id=656231
@@ -32,45 +25,10 @@
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
     make
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    ./configure \
-        --prefix=/usr \
-        --with-gtk=3.0 \
-        --disable-schemas-compile
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
 }
 
-package_mate-desktop() {
-    pkgdesc+=' (GTK2 version)'
-    groups=('mate')
-    conflicts=("${pkgbase}-gtk3")
-    depends=('dconf' 'gtk2' 'mate-desktop-schemas' 'startup-notification')
+package() {
+    cd $pkgname-$pkgver
 
-    cd "${srcdir}/${pkgbase}-gtk2"
     make DESTDIR="${pkgdir}" install
-    make -C schemas DESTDIR="${pkgdir}" uninstall
 }
-
-package_mate-desktop-gtk3() {
-    pkgdesc+=' (GTK3 version)'
-    groups=('mate-gtk3')
-    conflicts=("${pkgbase}")
-    depends=('gtk3' 'mate-desktop-schemas' 'startup-notification')
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    make DESTDIR="${pkgdir}" install
-    make -C schemas DESTDIR="${pkgdir}" uninstall
-}
-
-package_mate-desktop-schemas() {
-    pkgdesc='GSettings schemas for MATE Desktop'
-    depends=()
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    make -C schemas DESTDIR="${pkgdir}" install
-}