Update to new version

3 files changed, 26 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 135700337fb7..3bb554e7f0a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,22 @@
-# Generated by mksrcinfo v8
-# Mon Mar 14 19:26:52 UTC 2016
 pkgbase = topmenu-gtk
 	pkgdesc = Gtk+ module and Mate/Xfce panel applets for a global menubar
-	pkgver = 0.2.2
+	pkgver = 0.3
 	pkgrel = 1
 	url = https://git.javispedro.com/cgit/topmenu-gtk.git/about/
-	install = topmenu-gtk.install
 	arch = i686
 	arch = x86_64
-	license = LGPL
-	makedepends = mate-panel
+	license = GPL
 	makedepends = lxpanel
+	makedepends = mate-panel-gtk3
 	makedepends = xfce4-panel
-	depends = gtk2
+	optdepends = gtk2: Module for GTK+ 2
 	optdepends = gtk3: Module for GTK+ 3
-	optdepends = mate-panel: Topmenu Applet for MATE panel
 	optdepends = lxpanel: Topmenu Applet for LXPanel
+	optdepends = mate-panel-gtk3: Topmenu Applet for MATE panel
 	optdepends = xfce4-panel: Topmenu Applet for Xfce4 panel
-	source = topmenu-gtk-0.2.2.tar.xz::https://git.javispedro.com/cgit/topmenu-gtk.git/snapshot/release_0.2.2.tar.xz
+	source = topmenu-gtk-0.3.tar.xz::https://git.javispedro.com/cgit/topmenu-gtk.git/snapshot/release_0.3.tar.xz
 	source = topmenu.xinit
-	md5sums = a84ef6a2a169b8e58ddb819e31f8a57f
+	md5sums = ff178220b1821ae0bb6f2e86afcabbbe
 	md5sums = 9b16242683f36fd2e97c8fad2326782b
 
 pkgname = topmenu-gtk
diff --git a/PKGBUILD b/PKGBUILD
index 78a292f64457..aa33573ff204 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,22 @@
 # $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=topmenu-gtk
-pkgver=0.2.2
+pkgver=0.3
 pkgrel=1
 pkgdesc="Gtk+ module and Mate/Xfce panel applets for a global menubar"
 arch=('i686' 'x86_64')
 url="https://git.javispedro.com/cgit/topmenu-gtk.git/about/"
-license=('LGPL')
-depends=('gtk2')
-makedepends=('mate-panel' 'lxpanel' 'xfce4-panel')
-optdepends=('gtk3: Module for GTK+ 3'
-            'mate-panel: Topmenu Applet for MATE panel'
+license=('GPL')
+makedepends=('lxpanel' 'mate-panel-gtk3' 'xfce4-panel')
+optdepends=('gtk2: Module for GTK+ 2'
+            'gtk3: Module for GTK+ 3'
             'lxpanel: Topmenu Applet for LXPanel'
+            'mate-panel-gtk3: Topmenu Applet for MATE panel'
             'xfce4-panel: Topmenu Applet for Xfce4 panel')
-install=$pkgname.install
 source=("$pkgname-$pkgver.tar.xz::https://git.javispedro.com/cgit/$pkgname.git/snapshot/release_$pkgver.tar.xz"
         "topmenu.xinit")
-md5sums=('a84ef6a2a169b8e58ddb819e31f8a57f'
+md5sums=('ff178220b1821ae0bb6f2e86afcabbbe'
          '9b16242683f36fd2e97c8fad2326782b')
 
 prepare() {
@@ -29,19 +28,27 @@ build() {
   # GTK+ 2 version
   [ -d gtk2 ] || cp -r release_$pkgver gtk2
   cd gtk2
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --disable-mate-applet
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 
   cd "$srcdir"
   # GTK+ 3 version
   [ -d gtk3 ] || cp -r release_$pkgver gtk3
   cd gtk3
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --with-gtk=3
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --with-gtk=3 --enable-mate-applet
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
 package() {
-  cd gtk2
+  cd "$srcdir/gtk2"
   make DESTDIR="$pkgdir" install
   cd "$srcdir/gtk3"
   make DESTDIR="$pkgdir" install
diff --git a/topmenu-gtk.install b/topmenu-gtk.install
deleted file mode 100644
index 1a05f573e594..000000000000
--- a/topmenu-gtk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}