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

[Antonio Rojas]

    Date: Saturday, September 24, 2016 @ 13:59:40
  Author: arojas
Revision: 190301

Update to 1.16.0

Modified:
  mate-notification-daemon/trunk/PKGBUILD

----------+
 PKGBUILD |   57 +++++++++++++--------------------------------------------
 1 file changed, 13 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-24 13:55:04 UTC (rev 190300)
+++ PKGBUILD	2016-09-24 13:59:40 UTC (rev 190301)
@@ -1,9 +1,8 @@
 # Contributor: Martin Wimpress <code at flexion.org>
 
-_ver=1.14
-pkgbase=mate-notification-daemon
-pkgname=(${pkgbase} ${pkgbase}-gtk3)
-pkgver=${_ver}.1
+_ver=1.16
+pkgname=mate-notification-daemon
+pkgver=${_ver}.0
 pkgrel=1
 provides=('notification-daemon')
 pkgdesc="Notification daemon for MATE"
@@ -10,57 +9,27 @@
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus-glib' 'libcanberra' 'libwnck' 'libwnck3' 'libnotify')
+groups=('mate' 'mate-gtk3')
+depends=('dbus-glib' 'libcanberra' 'libwnck3' 'libnotify')
 makedepends=('intltool')
-source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('10e863c16112b45935d6d5e6e003088df43f87ab')
+conflicts=('mate-notification-daemon-gtk3')
+replaces=('mate-notification-daemon-gtk3')
+source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('e3dbd1b91706503162f75103b3aa6d46335a4c94')
 
-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 \
-        --libexecdir=/usr/lib/${pkgbase} \
-        --with-gtk=2.0
+        --libexecdir=/usr/lib/${pkgname}
 
     #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 \
-        --libexecdir=/usr/lib/${pkgbase} \
-        --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_mate-notification-daemon() {
-    pkgdesc+=' (GTK2 version)'
-    groups=('mate')
-    conflicts=("${pkgbase}-gtk3")
-    depends=('dconf' 'dbus-glib' 'libcanberra' 'libwnck' 'libnotify')
-
-    cd "${srcdir}/${pkgbase}-gtk2"
+package() {
+    cd "${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
-
-package_mate-notification-daemon-gtk3() {
-    pkgdesc+=' (GTK3 version)'
-    groups=('mate-gtk3')
-    conflicts=("${pkgbase}")
-    depends=('dbus-glib' 'libcanberra' 'libwnck3' 'libnotify')
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    make DESTDIR="${pkgdir}" install
-}