x11/gtk-app-menu: Update to 0.7.6

PR:             252361
Submitted by:   Trenton Schulz <trueos AT norwegianrockcat DOT com> (maintainer)

7 files changed, 36 insertions, 47 deletions

diff --git a/x11/gtk-app-menu/Makefile b/x11/gtk-app-menu/Makefile
index 4391815f2618..869b59c97f4e 100644
--- a/x11/gtk-app-menu/Makefile
+++ b/x11/gtk-app-menu/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	appmenu-gtk-module
-DISTVERSION=	0.7.3.2
+DISTVERSION=	0.7.6
 CATEGORIES=	x11
 
 MAINTAINER=	trueos@norwegianrockcat.com
@@ -10,9 +10,12 @@ COMMENT=	GTK module for putting application menubar in a global menubar
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/subprojects/appmenu-gtk-module/LICENSE
 
-USES=	cmake gnome pkgconfig
+LIB_DEPENDS=	libbamf3.so:sysutils/bamf
+BUILD_DEPENDS=	valac:lang/vala
 
-CMAKE_SOURCE_PATH=	${WRKSRC}/subprojects/appmenu-gtk-module
+USES=	meson gnome pkgconfig
+
+MESON_ARGS=	-Dvalapanel=disabled -Dxfce=disabled -Dmate=disabled -Dbudgie=disabled -Djayatana=disabled -Dregistrar=disabled -Dappmenu-gtk-module=enabled
 
 USE_GNOME=	gtk30 glib20 gtk20 gdkpixbuf2
 GLIB_SCHEMAS=	org.appmenu.gtk-module.gschema.xml
@@ -20,6 +23,6 @@ GLIB_SCHEMAS=	org.appmenu.gtk-module.gschema.xml
 USE_GITLAB=	yes
 GL_ACCOUNT=	vala-panel-project
 GL_PROJECT=	vala-panel-appmenu
-GL_COMMIT=	c2cb48f07d95079e566eed78b28880e00f31c637
+GL_COMMIT=	4e362c22ab3a23c98f13fb379c782786ee057cf6
 
 .include <bsd.port.mk>
diff --git a/x11/gtk-app-menu/distinfo b/x11/gtk-app-menu/distinfo
index 2ccef33585ec..9e2d16aef2ae 100644
--- a/x11/gtk-app-menu/distinfo
+++ b/x11/gtk-app-menu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600631254
-SHA256 (vala-panel-project-vala-panel-appmenu-c2cb48f07d95079e566eed78b28880e00f31c637_GL0.tar.gz) = ca56fe93ccaacde658af56666867c5ccd6ad4831b61491afa4a5335c261c6560
-SIZE (vala-panel-project-vala-panel-appmenu-c2cb48f07d95079e566eed78b28880e00f31c637_GL0.tar.gz) = 165788
+TIMESTAMP = 1609531769
+SHA256 (vala-panel-project-vala-panel-appmenu-4e362c22ab3a23c98f13fb379c782786ee057cf6_GL0.tar.gz) = 520b715e179b405615ac4cef6adf5fd77fae319db5ee0a7d9737b3c37dfa42fb
+SIZE (vala-panel-project-vala-panel-appmenu-4e362c22ab3a23c98f13fb379c782786ee057cf6_GL0.tar.gz) = 149391
diff --git a/x11/gtk-app-menu/files/patch-lib_dbusmenu-importer_importer.c b/x11/gtk-app-menu/files/patch-lib_dbusmenu-importer_importer.c
new file mode 100644
index 000000000000..c36a53d3b3e3
--- /dev/null
+++ b/x11/gtk-app-menu/files/patch-lib_dbusmenu-importer_importer.c
@@ -0,0 +1,11 @@
+--- lib/dbusmenu-importer/importer.c.orig	2021-01-01 20:18:10 UTC
++++ lib/dbusmenu-importer/importer.c
+@@ -25,7 +25,7 @@ struct _DBusMenuImporter
+ 	GObject parent_instance;
+ 	char *bus_name;
+ 	char *object_path;
+-	ulong name_id;
++	gulong name_id;
+ 	GCancellable *cancellable;
+ 	DBusMenuXml *proxy;
+ 	DBusMenuModel *top_model;
diff --git a/x11/gtk-app-menu/files/patch-meson.build b/x11/gtk-app-menu/files/patch-meson.build
new file mode 100644
index 000000000000..4ff6b1ce2cbd
--- /dev/null
+++ b/x11/gtk-app-menu/files/patch-meson.build
@@ -0,0 +1,8 @@
+--- meson.build.orig	2021-01-02 21:06:31 UTC
++++ meson.build
+@@ -117,4 +117,4 @@ readmes = [
+     'README.md',
+     'LICENSE',
+ ]
+-install_data(readmes, install_dir : join_paths(get_option('datadir'), meson.project_name(), 'doc'))
++# install_data(readmes, install_dir : join_paths(get_option('datadir'), meson.project_name(), 'doc'))
diff --git a/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_cmake_GLibProgramHandlers.cmake b/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_cmake_GLibProgramHandlers.cmake
deleted file mode 100644
index 1ccbf2d8b2d2..000000000000
--- a/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_cmake_GLibProgramHandlers.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- subprojects/appmenu-gtk-module/cmake/GLibProgramHandlers.cmake.orig	2019-07-29 14:45:42 UTC
-+++ subprojects/appmenu-gtk-module/cmake/GLibProgramHandlers.cmake
-@@ -27,10 +27,10 @@ macro(add_schema SCHEMA_NAME)
-     message (STATUS "GSettings schemas will be installed into ${GSETTINGS_PREFIX}/${GSETTINGS_DIR}")
-     install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_PREFIX}/${GSETTINGS_DIR} COMPONENT ${ARGV1} OPTIONAL)
- 
--    if (GSETTINGS_COMPILE)
--        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
--        install (CODE "execute_process (COMMAND ${GLIB2_COMPILE_SCHEMAS_EXECUTABLE} ${GSETTINGS_PREFIX}/${GSETTINGS_DIR})")
--    endif ()
-+    # if (GSETTINGS_COMPILE)
-+        # install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-+        # install (CODE "execute_process (COMMAND ${GLIB2_COMPILE_SCHEMAS_EXECUTABLE} ${GSETTINGS_PREFIX}/${GSETTINGS_DIR})")
-+    # endif ()
- endmacro()
- 
- macro(add_glib_marshal outsources outincludes name prefix)
diff --git a/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_src_CMakeLists.txt b/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_src_CMakeLists.txt
deleted file mode 100644
index df2476173388..000000000000
--- a/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_src_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
---- subprojects/appmenu-gtk-module/src/CMakeLists.txt.orig	2019-03-02 16:02:35 UTC
-+++ subprojects/appmenu-gtk-module/src/CMakeLists.txt
-@@ -13,6 +13,10 @@ set(MODULE_SOURCES
-     platform.h
-     consts.h)
- 
-+find_package(X11 REQUIRED)
-+if (X11_FOUND)
-+    include_directories(${X11_INCLUDE_DIR})
-+endif(X11_FOUND)
- get_filename_component(GTK3_LIBDIR ${GTK3_GTK_LIBRARY} DIRECTORY)
- set(GTK3_MODULEDIR ${GTK3_LIBDIR}/gtk-3.0/modules)
- add_library(appmenu-gtk3-module MODULE ${MODULE_SOURCES})
-@@ -27,7 +31,7 @@ if(GTK2_FOUND)
-     get_filename_component(GTK2_LIBDIR ${GTK2_GTK_LIBRARY} DIRECTORY)
-     set(GTK2_MODULEDIR ${GTK2_LIBDIR}/gtk-2.0/modules)
-     add_library(appmenu-gtk2-module MODULE ${MODULE_SOURCES})
--    target_include_directories(appmenu-gtk2-module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
-+    target_include_directories(appmenu-gtk2-module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib )
-     target_link_libraries(appmenu-gtk2-module PRIVATE appmenu-gtk2-parser GLIB2::GIO_UNIX GTK2::GTK)
-     set_target_properties(appmenu-gtk2-module PROPERTIES
-         OUTPUT_NAME appmenu-gtk-module
diff --git a/x11/gtk-app-menu/pkg-plist b/x11/gtk-app-menu/pkg-plist
index c7e6288ca6e0..f5f55b27a062 100644
--- a/x11/gtk-app-menu/pkg-plist
+++ b/x11/gtk-app-menu/pkg-plist
@@ -1,11 +1,17 @@
 libdata/pkgconfig/appmenu-gtk3-parser.pc
 libdata/pkgconfig/appmenu-gtk2-parser.pc
-lib/libappmenu-gtk2-parser.so.0
 lib/gtk-2.0/modules/libappmenu-gtk-module.so
+lib/libappmenu-gtk2-parser.so.0.7
+lib/libappmenu-gtk2-parser.so.0
 lib/libappmenu-gtk2-parser.so
 lib/libappmenu-gtk3-parser.so
 lib/libappmenu-gtk3-parser.so.0
+lib/libappmenu-gtk3-parser.so.0.7
 lib/gtk-3.0/modules/libappmenu-gtk-module.so
 include/appmenu-gtk-parser/appmenu-gtk-menu-shell.h
 include/appmenu-gtk-parser/appmenu-gtk-parser.h
 include/appmenu-gtk-parser/appmenu-gtk-action-group.h
+%%DATADIR%%/doc/AUTHORS
+%%DATADIR%%/doc/LICENSE
+%%DATADIR%%/doc/README.md
+%%DATADIR%%/doc/TODO