summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin2017-04-08 01:33:33 +0300
committerKonstantin2017-04-08 01:33:33 +0300
commit2ba8e0c954cfd56fbd6dd8531546c6bed65a55d8 (patch)
tree8f14279854a8946ce942f335f291f306bd282940
parent3b0b0a5ba184296b874759a50e2d6a09083f7dd3 (diff)
downloadaur-2ba8e0c954cfd56fbd6dd8531546c6bed65a55d8.tar.gz
Update vala-panel-appmenu
-rw-r--r--.SRCINFO43
-rw-r--r--80appmenu-gtk-module12
-rw-r--r--PKGBUILD35
3 files changed, 61 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9dd0d735c0a..58bf3e0ed77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Sep 5 00:08:41 UTC 2016
+# Fri Apr 7 22:32:41 UTC 2017
pkgbase = vala-panel-appmenu-xfce-git
- pkgdesc = AppMenu (Global Menu) plugin for xfce4-panel and vala-panel
- pkgver = 0.3.4
+ pkgdesc = AppMenu (Global Menu) plugin
+ pkgver = 0.4.2
pkgrel = 1
url = https://github.com/rilian-la-te/vala-panel-appmenu
arch = i686
@@ -11,18 +11,21 @@ pkgbase = vala-panel-appmenu-xfce-git
makedepends = cmake
makedepends = vala
makedepends = gtk3
+ makedepends = libwnck3
makedepends = bamf>=0.5.0
+ makedepends = mate-panel
makedepends = xfce4-panel>=4.11.2
makedepends = xfconf
- makedepends = libwnck3
makedepends = vala-panel-git
- makedepends = mate-panel
+ makedepends = gtk2
source = git://github.com/rilian-la-te/vala-panel-appmenu.git
source = git://github.com/rilian-la-te/cmake-vala.git
source = git://github.com/rilian-la-te/vala-dbusmenu.git
+ source = 80appmenu-gtk-module
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
+ sha256sums = 4c006c4ea7b8556070ad6d35529d3a9e23da8033429e34d1824c25942d969fbc
pkgname = vala-panel-appmenu-translations-git
pkgdesc = Translations for Global Menu
@@ -31,6 +34,17 @@ pkgname = vala-panel-appmenu-translations-git
optdepends = vala-panel-appmenu-valapanel-git
optdepends = vala-panel-appmenu-mate-git
+pkgname = vala-panel-appmenu-mate-git
+ pkgdesc = AppMenu (Global Menu) plugin for mate-panel
+ depends = gtk3
+ depends = bamf>=0.5.0
+ depends = mate-panel
+ depends = libwnck3
+ optdepends = gtk2-ubuntu: for hiding gtk2 menus
+ optdepends = unity-gtk-module: for gtk2/gtk3 menus
+ optdepends = appmenu-qt: for qt4 menus
+ optdepends = appmenu-qt5: for qt5 menus
+
pkgname = vala-panel-appmenu-xfce-git
pkgdesc = AppMenu (Global Menu) plugin for xfce4-panel
depends = gtk3
@@ -40,8 +54,6 @@ pkgname = vala-panel-appmenu-xfce-git
depends = libwnck3
optdepends = gtk2-ubuntu: for hiding gtk2 menus
optdepends = unity-gtk-module: for gtk2/gtk3 menus
- optdepends = gtk2-appmenu: for gtk2 menus, alternate way
- optdepends = gtk3-appmenu: for gtk3 menus, alternate way
optdepends = appmenu-qt: for qt4 menus
optdepends = appmenu-qt5: for qt5 menus
@@ -53,21 +65,12 @@ pkgname = vala-panel-appmenu-valapanel-git
depends = libwnck3
optdepends = gtk2-ubuntu: for hiding gtk2 menus
optdepends = unity-gtk-module: for gtk2/gtk3 menus
- optdepends = gtk2-appmenu: for gtk2 menus, alternate way
- optdepends = gtk3-appmenu: for gtk3 menus, alternate way
optdepends = appmenu-qt: for qt4 menus
optdepends = appmenu-qt5: for qt5 menus
-pkgname = vala-panel-appmenu-mate-git
- pkgdesc = AppMenu (Global Menu) plugin for mate-panel
+pkgname = appmenu-gtk-module-git
+ pkgdesc = Gtk module for exporting menus
depends = gtk3
- depends = bamf>=0.5.0
- depends = mate-panel
- depends = libwnck3
- optdepends = gtk2-ubuntu: for hiding gtk2 menus
- optdepends = unity-gtk-module: for gtk2/gtk3 menus
- optdepends = gtk2-appmenu: for gtk2 menus, alternate way
- optdepends = gtk3-appmenu: for gtk3 menus, alternate way
- optdepends = appmenu-qt: for qt4 menus
- optdepends = appmenu-qt5: for qt5 menus
+ depends = gtk2
+ provides = unity-gtk-module
diff --git a/80appmenu-gtk-module b/80appmenu-gtk-module
new file mode 100644
index 00000000000..feef2240e06
--- /dev/null
+++ b/80appmenu-gtk-module
@@ -0,0 +1,12 @@
+if [ -n "$GTK_MODULES" ]; then
+ GTK_MODULES="${GTK_MODULES}:appmenu-gtk-module"
+else
+ GTK_MODULES="appmenu-gtk-module"
+fi
+
+if [ -z "$UBUNTU_MENUPROXY" ]; then
+ UBUNTU_MENUPROXY=1
+fi
+
+export GTK_MODULES
+export UBUNTU_MENUPROXY
diff --git a/PKGBUILD b/PKGBUILD
index 2475e79cc31..2154f0a4ba1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,6 +3,7 @@
_disable_mate=0
_disable_xfce=0
_disable_vala=0
+_disable_unity_gtk_module=o
_opts=(
-DCMAKE_INSTALL_PREFIX=/usr
@@ -42,13 +43,21 @@ else
_opts+=(-DENABLE_VALAPANEL=OFF)
fi
+if (("${_disable_unity_gtk_module}" == 0));then
+ _opts+=(-DENABLE_UNITY_GTK_MODULE=ON)
+ pkgname+=('appmenu-gtk-module-git')
+ makedepends+=('gtk2')
+ msg "AppMenu GTK+ module enabled"
+else
+ _opts+=(-DENABLE_UNITY_GTK_MODULE=OFF)
+fi
msg "If you want to disable an applet, edit pkgbuild variables _disable_[applet]"
_pkgbase=vala-panel-appmenu
pkgbase=${_pkgbase}-xfce-git
_cmakename=cmake-vala
_dbusmenuname=vala-dbusmenu
-pkgver=0.3.4
+pkgver=0.4.2
pkgrel=1
pkgdesc="AppMenu (Global Menu) plugin"
url="https://github.com/rilian-la-te/vala-panel-appmenu"
@@ -57,10 +66,12 @@ license=('GPL3')
source=("git://github.com/rilian-la-te/${_pkgbase}.git"
"git://github.com/rilian-la-te/${_cmakename}.git"
- "git://github.com/rilian-la-te/${_dbusmenuname}.git")
+ "git://github.com/rilian-la-te/${_dbusmenuname}.git"
+ 80appmenu-gtk-module)
sha256sums=('SKIP'
'SKIP'
- 'SKIP')
+ 'SKIP'
+ '4c006c4ea7b8556070ad6d35529d3a9e23da8033429e34d1824c25942d969fbc')
pkgver() {
cd "${srcdir}/${_pkgbase}"
@@ -88,8 +99,6 @@ package_vala-panel-appmenu-xfce-git() {
depends=('gtk3' 'bamf>=0.5.0' 'xfce4-panel>=4.11.2' 'xfconf' 'libwnck3')
optdepends=('gtk2-ubuntu: for hiding gtk2 menus'
'unity-gtk-module: for gtk2/gtk3 menus'
- 'gtk2-appmenu: for gtk2 menus, alternate way'
- 'gtk3-appmenu: for gtk3 menus, alternate way'
'appmenu-qt: for qt4 menus'
'appmenu-qt5: for qt5 menus')
cd "${srcdir}/${_pkgbase}"
@@ -106,8 +115,6 @@ package_vala-panel-appmenu-valapanel-git() {
depends=('gtk3' 'bamf>=0.5.0' 'vala-panel' 'libwnck3')
optdepends=('gtk2-ubuntu: for hiding gtk2 menus'
'unity-gtk-module: for gtk2/gtk3 menus'
- 'gtk2-appmenu: for gtk2 menus, alternate way'
- 'gtk3-appmenu: for gtk3 menus, alternate way'
'appmenu-qt: for qt4 menus'
'appmenu-qt5: for qt5 menus')
cd "${srcdir}/${_pkgbase}"
@@ -124,8 +131,6 @@ package_vala-panel-appmenu-mate-git() {
depends=('gtk3' 'bamf>=0.5.0' 'mate-panel' 'libwnck3')
optdepends=('gtk2-ubuntu: for hiding gtk2 menus'
'unity-gtk-module: for gtk2/gtk3 menus'
- 'gtk2-appmenu: for gtk2 menus, alternate way'
- 'gtk3-appmenu: for gtk3 menus, alternate way'
'appmenu-qt: for qt4 menus'
'appmenu-qt5: for qt5 menus')
cd "${srcdir}/${_pkgbase}"
@@ -145,3 +150,15 @@ package_vala-panel-appmenu-translations-git() {
cd "${srcdir}/${_pkgbase}"
make -C "po" DESTDIR="${pkgdir}" install
}
+
+package_appmenu-gtk-module-git()
+{
+ pkgdesc="Gtk module for exporting menus"
+ depends=('gtk3' 'gtk2')
+ provides=(unity-gtk-module)
+ cd "${srcdir}/${_pkgbase}"
+ make -C "unity-gtk-module" DESTDIR="${pkgdir}" install
+ install -dm755 "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+ install -m755 "${srcdir}/80appmenu-gtk-module" \
+ "${pkgdir}/etc/X11/xinit/xinitrc.d/"tk
+}