From ff61e1b51984ef8ea37c9e79053f2f0b96767316 Mon Sep 17 00:00:00 2001
From: ImperatorStorm <imperatorstorm11@protonmail.com>
Date: Tue, 31 May 2022 16:34:40 -0700
Subject: [PATCH] Remove `gtk2` support per
 https://archlinux.org/todo/gtk-2-eol/.

Signed-off-by: ImperatorStorm <imperatorstorm11@protonmail.com>
---
 repos/community-x86_64/0001-gtk3-only.patch | 95 +++++++++++++++++++++
 repos/community-x86_64/PKGBUILD             | 15 ++--
 2 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 repos/community-x86_64/0001-gtk3-only.patch

diff --git a/repos/community-x86_64/0001-gtk3-only.patch b/repos/community-x86_64/0001-gtk3-only.patch
new file mode 100644
index 00000000..cc45952e
--- /dev/null
+++ b/repos/community-x86_64/0001-gtk3-only.patch
@@ -0,0 +1,95 @@
+diff --git a/subprojects/appmenu-gtk-module/lib/meson.build b/subprojects/appmenu-gtk-module/lib/meson.build
+index 98881b8..c95009e 100644
+--- a/subprojects/appmenu-gtk-module/lib/meson.build
++++ b/subprojects/appmenu-gtk-module/lib/meson.build
+@@ -31,23 +31,6 @@ pc_kwargs = {
+     'extra_cflags': ['-I${includedir}/appmenu-gtk-parser']
+ }
+ 
+-if build_gtk2
+-    gtk2_parser_lib = shared_library(
+-        'appmenu-gtk2-parser',
+-        dependencies: gtk2,
+-        kwargs: parser_kwargs
+-    )
+-    pkgconfig.generate(gtk2_parser_lib,
+-        requires: gtk2,
+-        kwargs: pc_kwargs
+-    )
+-    gtk2_parser_dep = declare_dependency(
+-        include_directories: parser_inc,
+-        link_with: gtk2_parser_lib,
+-        dependencies: gtk2
+-    )
+-endif
+-
+ if build_gtk3
+     gtk3_parser_lib = shared_library(
+         'appmenu-gtk3-parser',
+@@ -65,6 +48,6 @@ if build_gtk3
+     )
+ endif
+ 
+-if build_gtk2 or build_gtk3
++if build_gtk3
+     install_headers(lib_headers, subdir: 'appmenu-gtk-parser')
+ endif
+diff --git a/subprojects/appmenu-gtk-module/meson.build b/subprojects/appmenu-gtk-module/meson.build
+index 06ab76d..5b0ad70 100644
+--- a/subprojects/appmenu-gtk-module/meson.build
++++ b/subprojects/appmenu-gtk-module/meson.build
+@@ -32,16 +32,12 @@ glib_ver = '>=2.52.0'
+ giounix = dependency('gio-unix-2.0', version: glib_ver)
+ 
+ gtk_versions = get_option('gtk')
+-gtk2_requested = '2' in gtk_versions
+ gtk3_requested = '3' in gtk_versions
+ 
+-gtk2_ver = '>=2.24.0'
+ gtk3_ver = '>=3.22.0'
+ 
+-gtk2 = dependency('gtk+-2.0', version: gtk2_ver, required: gtk2_requested)
+ gtk3 = dependency('gtk+-3.0', version: gtk3_ver, required: gtk3_requested)
+ 
+-build_gtk2 = gtk2.found()
+ build_gtk3 = gtk3.found()
+ 
+ #################
+diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt
+index f93877a..08b794d 100644
+--- a/subprojects/appmenu-gtk-module/meson_options.txt
++++ b/subprojects/appmenu-gtk-module/meson_options.txt
+@@ -1,3 +1,3 @@
+-option('gtk', type: 'array', choices : ['2','3'],  value: ['2','3'], description: 'Supported GTK versions')
++option('gtk', type: 'array', choices : ['3'],  value: ['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')
+diff --git a/subprojects/appmenu-gtk-module/src/gtk-2.0/meson.build b/subprojects/appmenu-gtk-module/src/gtk-2.0/meson.build
+deleted file mode 100644
+index e0d5348..0000000
+--- a/subprojects/appmenu-gtk-module/src/gtk-2.0/meson.build
++++ /dev/null
+@@ -1,6 +0,0 @@
+-gtk2_module = shared_module(
+-    'appmenu-gtk-module', module_sources,
+-    dependencies: gtk2_parser_dep,
+-    install: true,
+-    install_dir: join_paths(gtk2.get_pkgconfig_variable('libdir'),'gtk-2.0','modules')
+-)
+diff --git a/subprojects/appmenu-gtk-module/src/meson.build b/subprojects/appmenu-gtk-module/src/meson.build
+index c749fa6..1c2d174 100644
+--- a/subprojects/appmenu-gtk-module/src/meson.build
++++ b/subprojects/appmenu-gtk-module/src/meson.build
+@@ -14,11 +14,7 @@ module_sources = files(
+     'consts.h'
+ )
+ 
+-module_subdirs = ['gtk-2.0','gtk-3.0']
+-
+-if build_gtk2
+-    subdir('gtk-2.0')
+-endif
++module_subdirs = ['gtk-3.0']
+ 
+ if build_gtk3
+     subdir('gtk-3.0')
diff --git a/repos/community-x86_64/PKGBUILD b/repos/community-x86_64/PKGBUILD
index d49a7d36..d5e2bd90 100644
--- a/repos/community-x86_64/PKGBUILD
+++ b/repos/community-x86_64/PKGBUILD
@@ -4,19 +4,24 @@
 
 pkgname=appmenu-gtk-module
 pkgver=0.7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Application Menu GTK+ Module"
-depends=()
-makedepends=(meson gtk3 gtk2)
-optdepends=('gtk3: GTK3 module' 'gtk2: GTK2 module')
+depends=(gtk3)
+makedepends=(meson)
+optdepends=()
 url="https://gitlab.com/vala-panel-project/vala-panel-appmenu/"
 arch=(x86_64)
 license=(LGPL3)
 source=("https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/archive/$pkgver/vala-panel-appmenu-$pkgver.tar.gz"
+        0001-gtk3-only.patch
         80-appmenu-gtk-module)
 sha256sums=('6ade911726c5cfa6e49416b7480c286cd5e098a7a1105f7f027827e3c3a4e119'
+            '5015fbd9d4e5a1464ce300099148233146b66a843bd95f72d170c4f28ddbda6b'
             '4c006c4ea7b8556070ad6d35529d3a9e23da8033429e34d1824c25942d969fbc')
-
+prepare() {
+  cd $srcdir/vala-panel-appmenu-0.7.6/
+  patch -Np1 <$srcdir/0001-gtk3-only.patch
+}
 build() {
   meson build vala-panel-appmenu-$pkgver/subprojects/$pkgname \
     --prefix=/usr
-- 
2.36.1