Skip to content

Commit 4a101dc

Browse files
committed
vala-panel-appmenu: update to 25.04.
1 parent 0402528 commit 4a101dc

9 files changed

Lines changed: 66 additions & 65 deletions
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
# Loads appmenu-gtk-module via GTK_MODULES at X session start, so GTK2/3
3+
# apps export their menu over DBusMenu instead of rendering it in-window.
4+
if [ -n "$GTK_MODULES" ]; then
5+
GTK_MODULES="${GTK_MODULES}:appmenu-gtk-module"
6+
else
7+
GTK_MODULES="appmenu-gtk-module"
8+
fi
9+
if [ -z "$UBUNTU_MENUPROXY" ]; then
10+
UBUNTU_MENUPROXY=1
11+
fi
12+
export GTK_MODULES
13+
export UBUNTU_MENUPROXY

srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,79 @@
11
# Template file for 'vala-panel-appmenu'
22
pkgname=vala-panel-appmenu
3-
_glhash=18896e602f40b03fcb0a8437a2e197d4
4-
version=0.7.6
5-
revision=4
3+
version=25.04
4+
revision=1
65
build_style=meson
7-
hostmakedepends="pkg-config vala bamf glib-devel gettext"
8-
makedepends="vala-devel bamf-devel gtk+3-devel
9-
libxkbcommon-devel libpeas-devel libdbusmenu-glib-devel
10-
xfce4-panel-devel xfconf-devel libmate-panel-devel libXt-devel
11-
vala-panel-devel"
12-
depends="vala-panel-appmenu-data-${version}_${revision}"
13-
short_desc="Global Menu for Vala Panel"
6+
build_helper="gir"
7+
configure_args="-Dxfce=enabled -Dmate=disabled -Dbudgie=disabled
8+
-Dvalapanel=disabled -Dappmenu-gtk-module=enabled -Dregistrar=enabled
9+
-Djayatana=disabled"
10+
hostmakedepends="pkg-config vala glib-devel gobject-introspection gettext"
11+
makedepends="glib-devel libxkbcommon-devel libdbusmenu-glib-devel
12+
gdk-pixbuf-devel dconf-devel xfce4-panel-devel xfconf-devel libXt-devel
13+
libwnck-devel"
14+
short_desc="Global Menu plugin for XFCE panel"
1415
maintainer="John Eira <john.eira@web.de>"
1516
license="LGPL-3.0-or-later"
1617
homepage="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
17-
distfiles="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/$_glhash/vala-panel-appmenu-${version}.tar.xz"
18-
checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592
18+
distfiles="https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/archive/${version}/vala-panel-appmenu-${version}.tar.gz"
19+
checksum=48d0be87b260056a65a9056a9be7e190b67a508540ebcb1fc18a67349cca0177
1920

20-
appmenu-gtk-module-devel_package() {
21-
short_desc="GTK module for exposing menus - development files"
22-
depends="appmenu-gtk3-module-${version}_${revision}"
21+
if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
22+
configure_args+=" -Dintrospection=false"
23+
fi
24+
25+
post_install() {
26+
vinstall "${FILESDIR}/80-appmenu-gtk-module.sh" 755 etc/X11/xinit/xinitrc.d
27+
}
28+
29+
appmenu-glib-translator_package() {
30+
short_desc="Translate DBusMenu menus into GMenuModels"
2331
pkg_install() {
24-
vmove usr/include
25-
vmove usr/lib/pkgconfig
26-
vmove "usr/lib/libappmenu-gtk3*.so"
32+
vmove usr/lib/libappmenu-glib-translator*.so.*
33+
vmove usr/share/gir-1.0
34+
vmove usr/share/glib-2.0
35+
vmove usr/share/vala
2736
}
2837
}
29-
30-
appmenu-gtk3-module_package() {
31-
short_desc="GTK module for exposing menus"
32-
depends="${sourcepkg}-data-${version}_${revision}"
38+
appmenu-glib-translator-devel_package() {
39+
short_desc+=" - development files"
40+
depends="appmenu-glib-translator-${version}_${revision}"
3341
pkg_install() {
34-
vmove usr/lib/gtk-3.0
35-
vmove "usr/lib/libappmenu-gtk3*.so.*"
42+
vmove usr/include
43+
vmove usr/lib/pkgconfig
44+
vmove "usr/lib/libappmenu-glib-translator*.so"
3645
}
3746
}
38-
39-
appmenu-registrar_package() {
40-
short_desc="Appmenu registrar that allows to access a window's menu tree"
47+
vala-panel-appmenu-registrar_package() {
48+
short_desc="Small utility to hold DBusMenu menus"
4149
pkg_install() {
4250
vmove usr/libexec/vala-panel
4351
vmove usr/share/dbus-1
4452
}
4553
}
46-
47-
xfce4-panel-appmenu_package() {
48-
short_desc="XFCE Panel applet for appmenu module"
49-
depends="xfce4-panel appmenu-registrar
50-
${sourcepkg}-data-${version}_${revision}"
54+
vala-panel-appmenu-locale_package() {
55+
short_desc="Translations for vala-panel-appmenu"
5156
pkg_install() {
52-
vmove usr/lib/xfce4
53-
vmove usr/share/xfce4
57+
vmove usr/share/locale
5458
}
5559
}
56-
57-
mate-panel-appmenu_package() {
58-
short_desc="Mate Panel applet for appmenu module"
59-
depends="mate-panel appmenu-registrar
60-
${sourcepkg}-data-${version}_${revision}"
60+
appmenu-gtk3-module_package() {
61+
short_desc="GTK module for exposing menus over DBusMenu"
62+
depends="vala-panel-appmenu-registrar-${version}_${revision}"
6163
pkg_install() {
62-
vmove usr/lib/mate-panel
63-
vmove usr/share/mate-panel
64+
vmove usr/lib/gtk-3.0
65+
vmove "usr/lib/libappmenu-gtk3*.so.*"
66+
vmove etc/X11/xinit/xinitrc.d/80-appmenu-gtk-module.sh
6467
}
6568
}
66-
67-
vala-panel-appmenu-data_package() {
68-
short_desc+=" - common files"
69+
vala-panel-appmenu-xfce_package() {
70+
short_desc="XFCE Panel applet for vala-panel-appmenu"
71+
depends="appmenu-glib-translator-${version}_${revision}
72+
vala-panel-appmenu-registrar-${version}_${revision}
73+
vala-panel-appmenu-locale-${version}_${revision}
74+
appmenu-gtk3-module-${version}_${revision}"
6975
pkg_install() {
70-
vmove usr/share/locale
71-
vmove usr/share/glib-2.0
76+
vmove usr/lib/xfce4
77+
vmove usr/share/xfce4
7278
}
7379
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vala-panel-appmenu

0 commit comments

Comments
 (0)