commit: 6ff5fc4e0a2823379e25fbdc54f92416db75a1b7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 15 21:16:55 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 15 21:18:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff5fc4e
x11-misc/appmenu-gtk-module: drop 0.7.6 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/appmenu-gtk-module/Manifest | 1 - .../appmenu-gtk-module-0.7.6.ebuild | 50 ------------------- .../appmenu-gtk-module/files/appmenu-gtk-module | 12 ----- .../appmenu-gtk-module-0.7.6-fix-pkgconfig.patch | 10 ---- ...enu-gtk-module-0.7.6-no-automagic-unitdir.patch | 56 ---------------------- 5 files changed, 129 deletions(-) diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest index ea75a3b62cfd..35a686296e97 100644 --- a/x11-misc/appmenu-gtk-module/Manifest +++ b/x11-misc/appmenu-gtk-module/Manifest @@ -1,2 +1 @@ -DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5 DIST appmenu-gtk-module-24.05.tar.xz 41364 BLAKE2B 45593cad5431f1b12fd7bc710399f7be7ff381d5757672c90db42187197de67b80f4436fc402e59abfa164d6d659557fb5a57737020d4cda361a2904154e9878 SHA512 0b233e56663f1e46f35b8edda5ea551f9569f6ffc20730fc62fcc090cf14a4032d58c7b8f03f14b29e9433f8ccd9fc89e3de7be50141fba5f85f5bf219517fa7 diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild deleted file mode 100644 index a711dd4c2b59..000000000000 --- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome2-utils meson systemd - -DESCRIPTION="Application menu module for GTK" -HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"; -SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/e0b6a32a340922cd05060292b0757162/${P}.tar.xz"; -S="${WORKDIR}/${PN}" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="gtk2 wayland" - -RDEPEND=" - dev-libs/glib[dbus] - >=x11-libs/gtk+-3.22.0:3[wayland=] - gtk2? ( >=x11-libs/gtk+-2.24.0:2 ) -" -DEPEND="${RDEPEND} - wayland? ( dev-libs/wayland ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-no-automagic-gtk.patch" - "${FILESDIR}/${P}-no-automagic-unitdir.patch" - "${FILESDIR}/${P}-fix-pkgconfig.patch" -) - -src_configure() { - # outputs [ '2', '3' ] OR [ '3' ] - local gtks="[$(usex gtk2 " '2'," '') '3' ]" - - meson_src_configure -Dgtk="${gtks}" -Duserunitdir="$(systemd_get_userunitdir)" -} - -src_install() { - meson_src_install - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}"/${PN} 85-${PN} -} - -pkg_postinst() { - gnome2_schemas_update -} diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module deleted file mode 100644 index e6520aabcd6f..000000000000 --- a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module +++ /dev/null @@ -1,12 +0,0 @@ -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/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch deleted file mode 100644 index f8b5439b28cb..000000000000 --- a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build 2020-10-28 22:05:23.000000000 +0100 -+++ b/meson.build 2022-07-17 09:53:55.047880112 +0200 -@@ -1,6 +1,6 @@ - project('appmenu-gtk-module', 'c', - meson_version: '>=0.49.0', -- version: '0.7', -+ version: '0.7.6', - license: ['LGPL-3.0-or-later'], - default_options: [ - 'c_std=gnu11', diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch deleted file mode 100644 index e46fe74c0734..000000000000 --- a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c60d530583a8bd07aea22c4f3f3aa8b0aaf271c1 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <[email protected]> -Date: Tue, 4 Jan 2022 19:06:37 -0800 -Subject: [PATCH] appmenu-gtk-module: add userunitdir option - -allows setting systemd unit on systemd-less systems - -Signed-off-by: Georgy Yakovlev <[email protected]> ---- - .../appmenu-gtk-module/data/meson.build | 19 ++++++++++++------- - .../appmenu-gtk-module/meson_options.txt | 1 + - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/subprojects/appmenu-gtk-module/data/meson.build b/subprojects/appmenu-gtk-module/data/meson.build -index 8378965..d0d1717 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -2,14 +2,19 @@ install_data([ - 'org.appmenu.gtk-module.gschema.xml' - ], install_dir: schema_dir) - -+userunitdir = get_option('userunitdir') - systemd = dependency('systemd', required: false) - --if systemd.found() -+if userunitdir == '' -+ if systemd.found() - userunitdir = systemd.get_pkgconfig_variable('systemduserunitdir') -- configure_file( -- input: 'appmenu-gtk-module.service.in', -- output: 'appmenu-gtk-module.service', -- install_dir: userunitdir, -- configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))} -- ) -+ else -+ userunitdir = '/usr/lib/systemd/user' -+ endif - endif -+configure_file( -+ input: 'appmenu-gtk-module.service.in', -+ output: 'appmenu-gtk-module.service', -+ install_dir: userunitdir, -+ configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))} -+) -diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt -index f93877a..ec0b3a6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ - option('gtk', type: 'array', choices : ['2','3'], value: ['2','3'], description: 'Supported GTK versions') - option('tests', type : 'boolean', value : false, description: 'Parser tests') - option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference') -+option('userunitdir', type: 'string', description: 'Installation path for user unit file (optional)') --- -2.34.1 -
