Stable version

2 files changed, 139 insertions, 126 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23a39fcb7c99..462e88429304 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = vala-panel-appmenu-xfce-git
+pkgbase = vala-panel-appmenu
 	pkgdesc = AppMenu (Global Menu) plugin
-	pkgver = 0.7.4
+	pkgver = 0.7.6
 	pkgrel = 1
 	url = https://gitlab.com/vala-panel-project/vala-panel-appmenu
 	arch = i686
@@ -11,78 +11,82 @@ pkgbase = vala-panel-appmenu-xfce-git
 	makedepends = gtk3
 	makedepends = libwnck3
 	makedepends = bamf>=0.5.0
-	makedepends = git
 	makedepends = mate-panel
 	makedepends = xfce4-panel>=4.11.2
 	makedepends = xfconf
 	makedepends = vala-panel>=0.4.50
 	makedepends = budgie-desktop
-	source = git+https://gitlab.com/vala-panel-project/vala-panel-appmenu.git
+	source = git+https://gitlab.com/vala-panel-project/vala-panel-appmenu.git#tag=0.7.6
 	sha256sums = SKIP
 
-pkgname = vala-panel-appmenu-common-git
+pkgname = vala-panel-appmenu-common
 	pkgdesc = Translations and common files for Global Menu
 	arch = any
-	optdepends = vala-panel-appmenu-xfce-git
-	optdepends = vala-panel-appmenu-valapanel-git
-	optdepends = vala-panel-appmenu-mate-git
-	optdepends = vala-panel-appmenu-budgie-git
+	optdepends = vala-panel-appmenu-xfce
+	optdepends = vala-panel-appmenu-valapanel
+	optdepends = vala-panel-appmenu-mate
+	optdepends = vala-panel-appmenu-budgie
+	conflicts = vala-panel-appmenu-common-git
 	replaces = vala-panel-appmenu-translations-git
 
-pkgname = vala-panel-appmenu-mate-git
+pkgname = vala-panel-appmenu-mate
 	pkgdesc = AppMenu (Global Menu) plugin for mate-panel
 	depends = gtk3
 	depends = bamf>=0.5.0
 	depends = mate-panel
 	depends = libwnck3
-	depends = vala-panel-appmenu-common-git
+	depends = vala-panel-appmenu-common
 	optdepends = gtk2-ubuntu: for hiding gtk2 menus
 	optdepends = unity-gtk-module: for gtk2/gtk3 menus
 	optdepends = vala-panel-appmenu-registrar: for DBusMenu registrar
 	optdepends = jayatana: for Java applications support
-	optdepends = appmenu-qt: for qt4 menus
+	optdepends = appmenu-qt4: for qt4 menus
 	optdepends = appmenu-qt5: for qt5 menus
+	conflicts = vala-panel-appmenu-mate-git
 
-pkgname = vala-panel-appmenu-xfce-git
+pkgname = vala-panel-appmenu-xfce
 	pkgdesc = AppMenu (Global Menu) plugin for xfce4-panel
 	depends = gtk3
 	depends = bamf>=0.5.0
 	depends = xfce4-panel>=4.11.2
 	depends = xfconf
 	depends = libwnck3
-	depends = vala-panel-appmenu-common-git
+	depends = vala-panel-appmenu-common
 	optdepends = gtk2-ubuntu: for hiding gtk2 menus
 	optdepends = unity-gtk-module: for gtk2/gtk3 menus
 	optdepends = vala-panel-appmenu-registrar: for DBusMenu registrar
 	optdepends = jayatana: for Java applications support
-	optdepends = appmenu-qt: for qt4 menus
+	optdepends = appmenu-qt4: for qt4 menus
 	optdepends = appmenu-qt5: for qt5 menus
+	conflicts = vala-panel-appmenu-xfce-git
 
-pkgname = vala-panel-appmenu-valapanel-git
+pkgname = vala-panel-appmenu-valapanel
 	pkgdesc = AppMenu (Global Menu) plugin for vala-panel
 	depends = gtk3
 	depends = bamf>=0.5.0
 	depends = vala-panel
 	depends = libwnck3
-	depends = vala-panel-appmenu-common-git
+	depends = vala-panel-appmenu-common
 	optdepends = gtk2-ubuntu: for hiding gtk2 menus
 	optdepends = unity-gtk-module: for gtk2/gtk3 menus
 	optdepends = vala-panel-appmenu-registrar: for DBusMenu registrar
 	optdepends = jayatana: for Java applications support
-	optdepends = appmenu-qt: for qt4 menus
+	optdepends = appmenu-qt4: for qt4 menus
 	optdepends = appmenu-qt5: for qt5 menus
+	conflicts = vala-panel-appmenu-valapanel-git
 
-pkgname = vala-panel-appmenu-budgie-git
+pkgname = vala-panel-appmenu-budgie
 	pkgdesc = AppMenu (Global Menu) plugin for budgie-panel
 	depends = gtk3
 	depends = bamf>=0.5.0
 	depends = budgie-desktop
 	depends = libwnck3
-	depends = vala-panel-appmenu-common-git
+	depends = vala-panel-appmenu-common
 	optdepends = gtk2-ubuntu: for hiding gtk2 menus
 	optdepends = unity-gtk-module: for gtk2/gtk3 menus
 	optdepends = vala-panel-appmenu-registrar: for DBusMenu registrar
 	optdepends = jayatana: for Java applications support
-	optdepends = appmenu-qt: for qt4 menus
+	optdepends = appmenu-qt4: for qt4 menus
 	optdepends = appmenu-qt5: for qt5 menus
+	conflicts = vala-panel-appmenu-budgie-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2a2f73ffcdf8..2a050e25ac19 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: rilian-la-te <ria.freelander@gmail.com>
+# Maintainer : Yamada Hayao <hayao@fascode.net>
+# Contributer: rilian-la-te <ria.freelander@gmail.com>
 
-_disable_mate=0
-_disable_xfce=0
-_disable_vala=0
-_disable_budgie=0
+_disable_mate=false
+_disable_xfce=false
+_disable_vala=false
+_disable_budgie=false
 
 _opts=(
 	--prefix=/usr
@@ -12,135 +13,143 @@ _opts=(
 	-Dauto_features=disabled
 )
 
-pkgname=(
-'vala-panel-appmenu-common-git'
-)
+pkgname=('vala-panel-appmenu-common')
 
-makedepends=('meson' 'vala' 'gtk3' 'libwnck3' 'bamf>=0.5.0' 'git')
+makedepends=('meson' 'vala' 'gtk3' 'libwnck3' 'bamf>=0.5.0')
 
-if (("${_disable_mate}" == 0));then
-	_opts+=(-Dmate=enabled)
-	pkgname+=('vala-panel-appmenu-mate-git')
-	makedepends+=('mate-panel')
-#	msg "Mate applet enabled"
+if [[ "${_disable_mate}" = false ]];then
+    _opts+=(-Dmate=enabled)
+    pkgname+=('vala-panel-appmenu-mate')
+    makedepends+=('mate-panel')
+    #msg "Mate applet enabled"
 fi
 
-if (("${_disable_xfce}" == 0));then
-	_opts+=(-Dxfce=enabled)
-	pkgname+=('vala-panel-appmenu-xfce-git')
-	makedepends+=('xfce4-panel>=4.11.2' 'xfconf')
-#	msg "Xfce applet enabled"
+if [[ "${_disable_xfce}" = false ]];then
+    _opts+=(-Dxfce=enabled)
+    pkgname+=('vala-panel-appmenu-xfce')
+    makedepends+=('xfce4-panel>=4.11.2' 'xfconf')
+    # msg "Xfce applet enabled"
 fi
 
-if (("${_disable_vala}" == 0));then
-	_opts+=(-Dvalapanel=enabled)
-	pkgname+=('vala-panel-appmenu-valapanel-git')
-	makedepends+=('vala-panel>=0.4.50')
-#	msg "Vala Panel applet enabled"
+if [[ "${_disable_vala}" = false ]]; then
+    _opts+=(-Dvalapanel=enabled)
+    pkgname+=('vala-panel-appmenu-valapanel')
+    makedepends+=('vala-panel>=0.4.50')
+    # msg "Vala Panel applet enabled"
 fi
 
-if (("${_disable_budgie}" == 0));then
-	_opts+=(-Dbudgie=enabled)
-	pkgname+=('vala-panel-appmenu-budgie-git')
-	makedepends+=('budgie-desktop')
-#	msg "Budgie applet enabled"
+if [[ "${_disable_budgie}" = false ]]; then
+    _opts+=(-Dbudgie=enabled)
+    pkgname+=('vala-panel-appmenu-budgie')
+    makedepends+=('budgie-desktop')
+    # msg "Budgie applet enabled"
 fi
 
 
 #msg "If you want to disable an applet, edit pkgbuild variables _disable_[applet]"
 
-_pkgbase=vala-panel-appmenu
-pkgbase=${_pkgbase}-xfce-git
-pkgver=0.7.4
-pkgrel=1
+_pkgbase="vala-panel-appmenu"
+pkgbase="${_pkgbase}"
+pkgver="0.7.6"
+pkgrel="1"
 pkgdesc="AppMenu (Global Menu) plugin"
 url="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
 arch=('i686' 'x86_64')
 license=('LGPL3')
 
-source=("git+https://gitlab.com/vala-panel-project/${_pkgbase}.git")
+source=("git+https://gitlab.com/vala-panel-project/${_pkgbase}.git#tag=${pkgver}")
 sha256sums=('SKIP')
 
-pkgver() {
-  cd "${srcdir}/${_pkgbase}"
-  ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
-
 build() {
-  meson "${_opts[@]}" build "${srcdir}/${_pkgbase}"
-  meson compile -C build
+    meson "${_opts[@]}" build "${srcdir}/${_pkgbase}"
+    meson compile -C build
 }
 
-package_vala-panel-appmenu-xfce-git() {
-  pkgdesc="AppMenu (Global Menu) plugin for xfce4-panel"
-  depends=('gtk3' 'bamf>=0.5.0' 'xfce4-panel>=4.11.2' 'xfconf' 'libwnck3' 'vala-panel-appmenu-common-git')
-  optdepends=('gtk2-ubuntu: for hiding gtk2 menus'
-            'unity-gtk-module: for gtk2/gtk3 menus'
-            'vala-panel-appmenu-registrar: for DBusMenu registrar' 
-			'jayatana: for Java applications support'
-            'appmenu-qt: for qt4 menus'
-            'appmenu-qt5: for qt5 menus')
-  DESTDIR="${pkgdir}" meson install -C build
-  rm -rf ${pkgdir}/usr/share/{vala-panel,glib-2.0,locale,mate-panel,vala-panel-appmenu}
-  rm -rf ${pkgdir}/usr/lib/{mate-panel,vala-panel,budgie-desktop}
+package_vala-panel-appmenu-xfce() {
+    pkgdesc="AppMenu (Global Menu) plugin for xfce4-panel"
+    depends=('gtk3' 'bamf>=0.5.0' 'xfce4-panel>=4.11.2' 'xfconf' 'libwnck3' 'vala-panel-appmenu-common')
+    optdepends=(
+        'gtk2-ubuntu: for hiding gtk2 menus'
+        'unity-gtk-module: for gtk2/gtk3 menus'
+        'vala-panel-appmenu-registrar: for DBusMenu registrar' 
+        'jayatana: for Java applications support'
+        'appmenu-qt4: for qt4 menus'
+        'appmenu-qt5: for qt5 menus'
+    )
+    conflicts=("vala-panel-appmenu-xfce-git")
+
+    DESTDIR="${pkgdir}" meson install -C build
+    rm -rf ${pkgdir}/usr/share/{vala-panel,glib-2.0,locale,mate-panel,vala-panel-appmenu}
+    rm -rf ${pkgdir}/usr/lib/{mate-panel,vala-panel,budgie-desktop}
 }
 
-package_vala-panel-appmenu-valapanel-git() {
-  pkgdesc="AppMenu (Global Menu) plugin for vala-panel"
-  depends=('gtk3' 'bamf>=0.5.0' 'vala-panel' 'libwnck3' 'vala-panel-appmenu-common-git')
-  optdepends=('gtk2-ubuntu: for hiding gtk2 menus'
-            'unity-gtk-module: for gtk2/gtk3 menus'
-            'vala-panel-appmenu-registrar: for DBusMenu registrar' 
-			'jayatana: for Java applications support'
-            'appmenu-qt: for qt4 menus'
-            'appmenu-qt5: for qt5 menus')
-  
-  DESTDIR="${pkgdir}" meson install -C build
-  rm -rf ${pkgdir}/usr/share/{xfce4,glib-2.0,locale,mate-panel,vala-panel-appmenu}
-  rm -rf ${pkgdir}/usr/lib/{mate-panel,xfce4,budgie-desktop}
+package_vala-panel-appmenu-valapanel() {
+    pkgdesc="AppMenu (Global Menu) plugin for vala-panel"
+    depends=('gtk3' 'bamf>=0.5.0' 'vala-panel' 'libwnck3' 'vala-panel-appmenu-common')
+    optdepends=(
+        'gtk2-ubuntu: for hiding gtk2 menus'
+        'unity-gtk-module: for gtk2/gtk3 menus'
+        'vala-panel-appmenu-registrar: for DBusMenu registrar' 
+        'jayatana: for Java applications support'
+        'appmenu-qt4: for qt4 menus'
+        'appmenu-qt5: for qt5 menus'
+    )
+    conflicts=("vala-panel-appmenu-valapanel-git")
+
+    DESTDIR="${pkgdir}" meson install -C build
+    rm -rf ${pkgdir}/usr/share/{xfce4,glib-2.0,locale,mate-panel,vala-panel-appmenu}
+    rm -rf ${pkgdir}/usr/lib/{mate-panel,xfce4,budgie-desktop}
 }
 
-package_vala-panel-appmenu-mate-git() {
-  pkgdesc="AppMenu (Global Menu) plugin for mate-panel"
-  depends=('gtk3' 'bamf>=0.5.0' 'mate-panel' 'libwnck3' 'vala-panel-appmenu-common-git')
-  optdepends=('gtk2-ubuntu: for hiding gtk2 menus'
-            'unity-gtk-module: for gtk2/gtk3 menus'
-            'vala-panel-appmenu-registrar: for DBusMenu registrar' 
-			'jayatana: for Java applications support'
-            'appmenu-qt: for qt4 menus'
-            'appmenu-qt5: for qt5 menus')
-  DESTDIR="${pkgdir}" meson install -C build
-  rm -rf ${pkgdir}/usr/share/{vala-panel,glib-2.0,locale,xfce4,vala-panel-appmenu}
-  rm -rf ${pkgdir}/usr/lib/{xfce4,vala-panel,budgie-desktop}
+package_vala-panel-appmenu-mate() {
+    pkgdesc="AppMenu (Global Menu) plugin for mate-panel"
+    depends=('gtk3' 'bamf>=0.5.0' 'mate-panel' 'libwnck3' 'vala-panel-appmenu-common')
+    optdepends=(
+        'gtk2-ubuntu: for hiding gtk2 menus'
+        'unity-gtk-module: for gtk2/gtk3 menus'
+        'vala-panel-appmenu-registrar: for DBusMenu registrar' 
+        'jayatana: for Java applications support'
+        'appmenu-qt4: for qt4 menus'
+        'appmenu-qt5: for qt5 menus'
+    )
+    conflicts=("vala-panel-appmenu-mate-git")
+
+    DESTDIR="${pkgdir}" meson install -C build
+    rm -rf ${pkgdir}/usr/share/{vala-panel,glib-2.0,locale,xfce4,vala-panel-appmenu}
+    rm -rf ${pkgdir}/usr/lib/{xfce4,vala-panel,budgie-desktop}
 }
 
-package_vala-panel-appmenu-budgie-git() {
-  pkgdesc="AppMenu (Global Menu) plugin for budgie-panel"
-  depends=('gtk3' 'bamf>=0.5.0' 'budgie-desktop' 'libwnck3' 'vala-panel-appmenu-common-git')
-  optdepends=('gtk2-ubuntu: for hiding gtk2 menus'
-            'unity-gtk-module: for gtk2/gtk3 menus'
-            'vala-panel-appmenu-registrar: for DBusMenu registrar' 
-			'jayatana: for Java applications support'
-            'appmenu-qt: for qt4 menus'
-            'appmenu-qt5: for qt5 menus')
-  DESTDIR="${pkgdir}" meson install -C build
-  rm -rf "${pkgdir}/usr/share/"
-  rm -rf ${pkgdir}/usr/lib/{mate-panel,vala-panel,xfce4}
+package_vala-panel-appmenu-budgie() {
+    pkgdesc="AppMenu (Global Menu) plugin for budgie-panel"
+    depends=('gtk3' 'bamf>=0.5.0' 'budgie-desktop' 'libwnck3' 'vala-panel-appmenu-common')
+    optdepends=(
+        'gtk2-ubuntu: for hiding gtk2 menus'
+        'unity-gtk-module: for gtk2/gtk3 menus'
+        'vala-panel-appmenu-registrar: for DBusMenu registrar' 
+        'jayatana: for Java applications support'
+        'appmenu-qt4: for qt4 menus'
+        'appmenu-qt5: for qt5 menus'
+    )
+    conflicts=("vala-panel-appmenu-budgie-git")
+
+    DESTDIR="${pkgdir}" meson install -C build
+    rm -rf "${pkgdir}/usr/share/"
+    rm -rf ${pkgdir}/usr/lib/{mate-panel,vala-panel,xfce4}
 }
 
-package_vala-panel-appmenu-common-git() {
-  pkgdesc="Translations and common files for Global Menu"
-  replaces=('vala-panel-appmenu-translations-git')
-  optdepends=('vala-panel-appmenu-xfce-git'
-              'vala-panel-appmenu-valapanel-git'
-              'vala-panel-appmenu-mate-git'
-              'vala-panel-appmenu-budgie-git')
-  arch=('any')
-  DESTDIR="${pkgdir}" meson install -C build
-  rm -rf ${pkgdir}/usr/share/{vala-panel,xfce4,mate-panel}
-  rm -rf ${pkgdir}/usr/lib
+package_vala-panel-appmenu-common() {
+    pkgdesc="Translations and common files for Global Menu"
+    replaces=('vala-panel-appmenu-translations-git')
+    optdepends=(
+        'vala-panel-appmenu-xfce'
+        'vala-panel-appmenu-valapanel'
+        'vala-panel-appmenu-mate'
+        'vala-panel-appmenu-budgie'
+    )
+    conflicts=("vala-panel-appmenu-common-git")
+    arch=('any')
+
+    DESTDIR="${pkgdir}" meson install -C build
+    rm -rf ${pkgdir}/usr/share/{vala-panel,xfce4,mate-panel}
+    rm -rf ${pkgdir}/usr/lib
 }