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

[Antonio Rojas]

    Date: Friday, March 17, 2017 @ 19:49:58
  Author: arojas
Revision: 216947

Update to 1.18.0

Modified:
  libmatekbd/trunk/PKGBUILD

----------+
 PKGBUILD |   50 ++++++++++----------------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-17 19:46:25 UTC (rev 216946)
+++ PKGBUILD	2017-03-17 19:49:58 UTC (rev 216947)
@@ -1,61 +1,31 @@
 # Contributor: Martin Wimpress <code at flexion.org>
 
-_ver=1.16
-pkgbase=libmatekbd
-pkgname=(${pkgbase} ${pkgbase}-gtk3)
-pkgver=${_ver}.0
+pkgname=libmatekbd
+pkgver=1.18.0
 pkgrel=1
 pkgdesc="MATE keyboard library"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('gtk2' 'gtk3' 'libxklavier')
+depends=('gtk3' 'libxklavier')
 makedepends=('intltool')
-source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('3d73769c887cf709b0615808679fdac02491cd0a')
+conflicts=('libmatekbd-gtk3')
+replaces=('libmatekbd-gtk3')
+source=("http://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('81de4ffca10f0a2dfb01449cc89037f7d1760f87')
 
-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
+        --prefix=/usr 
 
     #https://bugzilla.gnome.org/show_bug.cgi?id=656231
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
     make
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    ./configure \
-        --prefix=/usr \
-        --with-gtk=3.0
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
 }
 
 package_libmatekbd() {
-    pkgdesc+=' (GTK2 version)'
-    conflicts=("${pkgbase}-gtk3")
-    depends=('dconf' 'gtk2' 'libxklavier')
-    
-    cd "${srcdir}/${pkgbase}-gtk2"
+    cd ${pkgname}-${pkgver}
     make DESTDIR="${pkgdir}" install
 }
-
-package_libmatekbd-gtk3() {
-    pkgdesc+=' (GTK3 version)'
-    conflicts=("${pkgbase}")
-    depends=('gtk3' 'libxklavier')
-    
-    cd "${srcdir}/${pkgbase}-gtk3"
-    make DESTDIR="${pkgdir}" install
-}