Attachment #221213 for bug #252361

Lines 1-7 Link Here

(-)b/x11/gtk-app-menu/Makefile (-4 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= appmenu-gtk-module	3	PORTNAME= appmenu-gtk-module
4	DISTVERSION= 0.7.3.2	4	DISTVERSION= 0.7.6
5	CATEGORIES= x11	5	CATEGORIES= x11
6		6
7	MAINTAINER= trueos@norwegianrockcat.com	7	MAINTAINER= trueos@norwegianrockcat.com
Lines 10-18 COMMENT= GTK module for putting application menubar in a global menubar Link Here
10	LICENSE= LGPL3	10	LICENSE= LGPL3
11	LICENSE_FILE= ${WRKSRC}/subprojects/appmenu-gtk-module/LICENSE	11	LICENSE_FILE= ${WRKSRC}/subprojects/appmenu-gtk-module/LICENSE
12		12
13	USES= cmake gnome pkgconfig	13	LIB_DEPENDS= libbamf3.so:sysutils/bamf
		14	BUILD_DEPENDS= valac:lang/vala
14		15
15	CMAKE_SOURCE_PATH= ${WRKSRC}/subprojects/appmenu-gtk-module	16	USES= meson gnome pkgconfig
		17
		18	MESON_ARGS= -Dvalapanel=disabled -Dxfce=disabled -Dmate=disabled -Dbudgie=disabled -Djayatana=disabled -Dregistrar=disabled -Dappmenu-gtk-module=enabled
16		19
17	USE_GNOME= gtk30 glib20 gtk20 gdkpixbuf2	20	USE_GNOME= gtk30 glib20 gtk20 gdkpixbuf2
18	GLIB_SCHEMAS= org.appmenu.gtk-module.gschema.xml	21	GLIB_SCHEMAS= org.appmenu.gtk-module.gschema.xml
Lines 20-25 GLIB_SCHEMAS= org.appmenu.gtk-module.gschema.xml Link Here
20	USE_GITLAB= yes	23	USE_GITLAB= yes
21	GL_ACCOUNT= vala-panel-project	24	GL_ACCOUNT= vala-panel-project
22	GL_PROJECT= vala-panel-appmenu	25	GL_PROJECT= vala-panel-appmenu
23	GL_COMMIT= c2cb48f07d95079e566eed78b28880e00f31c637	26	GL_COMMIT= 4e362c22ab3a23c98f13fb379c782786ee057cf6
24		27
25	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11/gtk-app-menu/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1600631254	1	TIMESTAMP = 1609531769
2	SHA256 (vala-panel-project-vala-panel-appmenu-c2cb48f07d95079e566eed78b28880e00f31c637_GL0.tar.gz) = ca56fe93ccaacde658af56666867c5ccd6ad4831b61491afa4a5335c261c6560	2	SHA256 (vala-panel-project-vala-panel-appmenu-4e362c22ab3a23c98f13fb379c782786ee057cf6_GL0.tar.gz) = 520b715e179b405615ac4cef6adf5fd77fae319db5ee0a7d9737b3c37dfa42fb
3	SIZE (vala-panel-project-vala-panel-appmenu-c2cb48f07d95079e566eed78b28880e00f31c637_GL0.tar.gz) = 165788	3	SIZE (vala-panel-project-vala-panel-appmenu-4e362c22ab3a23c98f13fb379c782786ee057cf6_GL0.tar.gz) = 149391

Added Link Here

(-)b/x11/gtk-app-menu/files/patch-lib_dbusmenu-importer_importer.c (+11 lines)
1	--- lib/dbusmenu-importer/importer.c.orig 2021-01-01 20:18:10 UTC
2	+++ lib/dbusmenu-importer/importer.c
3	@@ -25,7 +25,7 @@ struct _DBusMenuImporter
4	GObject parent_instance;
5	char *bus_name;
6	char *object_path;
7	- ulong name_id;
8	+ gulong name_id;
9	GCancellable *cancellable;
10	DBusMenuXml *proxy;
11	DBusMenuModel *top_model;

Added Link Here

(-)b/x11/gtk-app-menu/files/patch-meson.build (+8 lines)
1	--- meson.build.orig 2021-01-02 21:06:31 UTC
2	+++ meson.build
3	@@ -117,4 +117,4 @@ readmes = [
4	'README.md',
5	'LICENSE',
6	]
7	-install_data(readmes, install_dir : join_paths(get_option('datadir'), meson.project_name(), 'doc'))
8	+# install_data(readmes, install_dir : join_paths(get_option('datadir'), meson.project_name(), 'doc'))




--- 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)




--- 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




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

Return to bug 252361

Removed Link Here

(-)a/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_cmake_GLibProgramHandlers.cmake (-17 lines)
1	--- subprojects/appmenu-gtk-module/cmake/GLibProgramHandlers.cmake.orig 2019-07-29 14:45:42 UTC
2	+++ subprojects/appmenu-gtk-module/cmake/GLibProgramHandlers.cmake
3	@@ -27,10 +27,10 @@ macro(add_schema SCHEMA_NAME)
4	message (STATUS "GSettings schemas will be installed into ${GSETTINGS_PREFIX}/${GSETTINGS_DIR}")
5	install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_PREFIX}/${GSETTINGS_DIR} COMPONENT ${ARGV1} OPTIONAL)
6
7	- if (GSETTINGS_COMPILE)
8	- install (CODE "message (STATUS \"Compiling GSettings schemas\")")
9	- install (CODE "execute_process (COMMAND ${GLIB2_COMPILE_SCHEMAS_EXECUTABLE} ${GSETTINGS_PREFIX}/${GSETTINGS_DIR})")
10	- endif ()
11	+ # if (GSETTINGS_COMPILE)
12	+ # install (CODE "message (STATUS \"Compiling GSettings schemas\")")
13	+ # install (CODE "execute_process (COMMAND ${GLIB2_COMPILE_SCHEMAS_EXECUTABLE} ${GSETTINGS_PREFIX}/${GSETTINGS_DIR})")
14	+ # endif ()
15	endmacro()
16
17	macro(add_glib_marshal outsources outincludes name prefix)

Removed Link Here

(-)a/x11/gtk-app-menu/files/patch-subprojects_appmenu-gtk-module_src_CMakeLists.txt (-22 lines)
1	--- subprojects/appmenu-gtk-module/src/CMakeLists.txt.orig 2019-03-02 16:02:35 UTC
2	+++ subprojects/appmenu-gtk-module/src/CMakeLists.txt
3	@@ -13,6 +13,10 @@ set(MODULE_SOURCES
4	platform.h
5	consts.h)
6
7	+find_package(X11 REQUIRED)
8	+if (X11_FOUND)
9	+ include_directories(${X11_INCLUDE_DIR})
10	+endif(X11_FOUND)
11	get_filename_component(GTK3_LIBDIR ${GTK3_GTK_LIBRARY} DIRECTORY)
12	set(GTK3_MODULEDIR ${GTK3_LIBDIR}/gtk-3.0/modules)
13	add_library(appmenu-gtk3-module MODULE ${MODULE_SOURCES})
14	@@ -27,7 +31,7 @@ if(GTK2_FOUND)
15	get_filename_component(GTK2_LIBDIR ${GTK2_GTK_LIBRARY} DIRECTORY)
16	set(GTK2_MODULEDIR ${GTK2_LIBDIR}/gtk-2.0/modules)
17	add_library(appmenu-gtk2-module MODULE ${MODULE_SOURCES})
18	- target_include_directories(appmenu-gtk2-module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
19	+ target_include_directories(appmenu-gtk2-module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib )
20	target_link_libraries(appmenu-gtk2-module PRIVATE appmenu-gtk2-parser GLIB2::GIO_UNIX GTK2::GTK)
21	set_target_properties(appmenu-gtk2-module PROPERTIES
22	OUTPUT_NAME appmenu-gtk-module

Lines 1-11 Link Here

(-)b/x11/gtk-app-menu/pkg-plist (-1 / +7 lines)
1	libdata/pkgconfig/appmenu-gtk3-parser.pc	1	libdata/pkgconfig/appmenu-gtk3-parser.pc
2	libdata/pkgconfig/appmenu-gtk2-parser.pc	2	libdata/pkgconfig/appmenu-gtk2-parser.pc
3	lib/libappmenu-gtk2-parser.so.0
4	lib/gtk-2.0/modules/libappmenu-gtk-module.so	3	lib/gtk-2.0/modules/libappmenu-gtk-module.so
		4	lib/libappmenu-gtk2-parser.so.0.7
		5	lib/libappmenu-gtk2-parser.so.0
5	lib/libappmenu-gtk2-parser.so	6	lib/libappmenu-gtk2-parser.so
6	lib/libappmenu-gtk3-parser.so	7	lib/libappmenu-gtk3-parser.so
7	lib/libappmenu-gtk3-parser.so.0	8	lib/libappmenu-gtk3-parser.so.0
		9	lib/libappmenu-gtk3-parser.so.0.7
8	lib/gtk-3.0/modules/libappmenu-gtk-module.so	10	lib/gtk-3.0/modules/libappmenu-gtk-module.so
9	include/appmenu-gtk-parser/appmenu-gtk-menu-shell.h	11	include/appmenu-gtk-parser/appmenu-gtk-menu-shell.h
10	include/appmenu-gtk-parser/appmenu-gtk-parser.h	12	include/appmenu-gtk-parser/appmenu-gtk-parser.h
11	include/appmenu-gtk-parser/appmenu-gtk-action-group.h	13	include/appmenu-gtk-parser/appmenu-gtk-action-group.h
		14	%%DATADIR%%/doc/AUTHORS
		15	%%DATADIR%%/doc/LICENSE
		16	%%DATADIR%%/doc/README.md
		17	%%DATADIR%%/doc/TODO