On Sun, Oct 15, 2023 at 07:10:16PM +0000, Klemens Nanni wrote: > Simple https://github.com/bk138/gromit-mpx/releases/tag/1.5.0, works for me. > Remove default HOMEPAGE. > > Patch churn due to code moving from between .[ch] files, change is the same. > > Feedback? OK?
Didn't cvs add the main.h patch, thanks Laurie. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/gromit-mpx/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile 14 Aug 2023 08:28:14 -0000 1.4 +++ Makefile 15 Oct 2023 19:03:06 -0000 @@ -2,12 +2,10 @@ COMMENT = draw annotations on X11 GH_ACCOUNT = bk138 GH_PROJECT = gromit-mpx -GH_TAGNAME = 1.4.3 +GH_TAGNAME = 1.5.0 CATEGORIES = x11 -HOMEPAGE = https://github.com/bk138/gromit-mpx - MAINTAINER = Laurence Tratt <lau...@tratt.net> # GPLv2+ @@ -20,6 +18,8 @@ WANTLIB += pango-1.0 pangocairo-1.0 MODULES = devel/cmake CONFIGURE_ARGS = -DCMAKE_INSTALL_SYSCONFDIR=share/examples + +BUILD_DEPENDS = devel/gettext,-tools RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+4,-guic Index: distinfo =================================================================== RCS file: /cvs/ports/x11/gromit-mpx/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 14 Aug 2023 08:28:14 -0000 1.2 +++ distinfo 15 Oct 2023 18:54:29 -0000 @@ -1,2 +1,2 @@ -SHA256 (gromit-mpx-1.4.3.tar.gz) = AcPjfqCXelBzSd80xHS9yTmlcoeqQc6W2e600hJ5xqQ= -SIZE (gromit-mpx-1.4.3.tar.gz) = 1861824 +SHA256 (gromit-mpx-1.5.0.tar.gz) = vjvX3szXN1JcwEle/rXNRQ+wJScemytUyufDlWpMAGU= +SIZE (gromit-mpx-1.5.0.tar.gz) = 1878498 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/x11/gromit-mpx/patches/patch-CMakeLists_txt,v retrieving revision 1.3 diff -u -p -r1.3 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 14 Aug 2023 08:28:14 -0000 1.3 +++ patches/patch-CMakeLists_txt 15 Oct 2023 18:58:13 -0000 @@ -3,7 +3,7 @@ Remove libappindicator support. Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -22,25 +22,18 @@ find_package(PkgConfig) +@@ -24,25 +24,18 @@ find_package(Gettext) pkg_check_modules(gtk3 REQUIRED "gtk+-3.0 >= 3.22") pkg_check_modules(xinput REQUIRED "xi >= 1.3") pkg_check_modules(x11 REQUIRED x11) @@ -29,7 +29,7 @@ Index: CMakeLists.txt ${xinput_LIBRARY_DIRS} ${x11_LIBRARY_DIRS} ) -@@ -62,7 +55,6 @@ add_executable(${target_name} ${sources}) +@@ -66,7 +59,6 @@ add_executable(${target_name} ${sources}) target_link_libraries(${target_name} ${gtk3_LIBRARIES} Index: patches/patch-src_gromit-mpx_c =================================================================== RCS file: patches/patch-src_gromit-mpx_c diff -N patches/patch-src_gromit-mpx_c --- patches/patch-src_gromit-mpx_c 14 Aug 2023 08:28:14 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,42 +0,0 @@ -Remove libappindicator support. - -Index: src/gromit-mpx.c ---- src/gromit-mpx.c.orig -+++ src/gromit-mpx.c -@@ -951,17 +951,6 @@ void setup_main_app (GromitData *data, int argc, char - if (activate) - acquire_grab (data, NULL); /* grab all */ - -- /* -- TRAY ICON -- */ -- data->trayicon = app_indicator_new (PACKAGE_NAME, -- "net.christianbeier.Gromit-MPX", -- APP_INDICATOR_CATEGORY_APPLICATION_STATUS); -- -- app_indicator_set_status (data->trayicon, APP_INDICATOR_STATUS_ACTIVE); -- -- -- - /* create the menu */ - GtkWidget *menu = gtk_menu_new (); - -@@ -1087,9 +1076,6 @@ void setup_main_app (GromitData *data, int argc, char - gtk_widget_show (about_item); - gtk_widget_show (quit_item); - -- -- app_indicator_set_menu (data->trayicon, GTK_MENU(menu)); -- - /* - Build the support menu - */ -@@ -1417,8 +1403,4 @@ int main (int argc, char **argv) - - void indicate_active(GromitData *data, gboolean YESNO) - { -- if(YESNO) -- app_indicator_set_icon(data->trayicon, "net.christianbeier.Gromit-MPX.active"); -- else -- app_indicator_set_icon(data->trayicon, "net.christianbeier.Gromit-MPX"); - } Index: patches/patch-src_gromit-mpx_h =================================================================== RCS file: patches/patch-src_gromit-mpx_h diff -N patches/patch-src_gromit-mpx_h --- patches/patch-src_gromit-mpx_h 14 Aug 2023 08:28:14 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -Remove libappindicator support. - -Index: src/gromit-mpx.h ---- src/gromit-mpx.h.orig -+++ src/gromit-mpx.h -@@ -28,11 +28,6 @@ - #include <glib.h> - #include <gdk/gdk.h> - #include <gtk/gtk.h> --#ifdef APPINDICATOR_IS_LEGACY --#include <libappindicator/app-indicator.h> --#else --#include <libayatana-appindicator/app-indicator.h> --#endif - - #define GROMIT_MOUSE_EVENTS ( GDK_BUTTON_MOTION_MASK | \ - GDK_BUTTON_PRESS_MASK | \ -@@ -102,7 +97,6 @@ typedef struct - typedef struct - { - GtkWidget *win; -- AppIndicator *trayicon; - - GdkCursor *paint_cursor; - GdkCursor *erase_cursor; Index: patches/patch-src_main_c =================================================================== RCS file: patches/patch-src_main_c diff -N patches/patch-src_main_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_main_c 15 Oct 2023 19:00:55 -0000 @@ -0,0 +1,40 @@ +Remove libappindicator support. + +Index: src/main.c +--- src/main.c.orig ++++ src/main.c +@@ -765,17 +765,9 @@ void setup_main_app (GromitData *data, int argc, char + if (activate) + acquire_grab (data, NULL); /* grab all */ + +- /* +- TRAY ICON +- */ +- data->trayicon = app_indicator_new (PACKAGE_NAME, +- "net.christianbeier.Gromit-MPX", +- APP_INDICATOR_CATEGORY_APPLICATION_STATUS); + +- app_indicator_set_status (data->trayicon, APP_INDICATOR_STATUS_ACTIVE); + + +- + /* create the menu */ + GtkWidget *menu = gtk_menu_new (); + +@@ -908,7 +900,6 @@ void setup_main_app (GromitData *data, int argc, char + gtk_widget_show (quit_item); + + +- app_indicator_set_menu (data->trayicon, GTK_MENU(menu)); + + /* + Build the support menu +@@ -1156,8 +1147,4 @@ int main (int argc, char **argv) + + void indicate_active(GromitData *data, gboolean YESNO) + { +- if(YESNO) +- app_indicator_set_icon(data->trayicon, "net.christianbeier.Gromit-MPX.active"); +- else +- app_indicator_set_icon(data->trayicon, "net.christianbeier.Gromit-MPX"); + } Index: patches/patch-src_main_h =================================================================== RCS file: patches/patch-src_main_h diff -N patches/patch-src_main_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_main_h 15 Oct 2023 19:01:00 -0000 @@ -0,0 +1,25 @@ +Remove libappindicator support. + +Index: src/main.h +--- src/main.h.orig ++++ src/main.h +@@ -29,11 +29,6 @@ + #include <glib/gi18n.h> + #include <gdk/gdk.h> + #include <gtk/gtk.h> +-#ifdef APPINDICATOR_IS_LEGACY +-#include <libappindicator/app-indicator.h> +-#else +-#include <libayatana-appindicator/app-indicator.h> +-#endif + + #define GROMIT_MOUSE_EVENTS ( GDK_BUTTON_MOTION_MASK | \ + GDK_BUTTON_PRESS_MASK | \ +@@ -99,7 +94,6 @@ typedef struct + typedef struct + { + GtkWidget *win; +- AppIndicator *trayicon; + + GdkCursor *paint_cursor; + GdkCursor *erase_cursor; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/gromit-mpx/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 14 Aug 2023 08:28:14 -0000 1.3 +++ pkg/PLIST 15 Oct 2023 19:04:50 -0000 @@ -12,6 +12,11 @@ share/examples/gromit-mpx/gromit-mpx.cfg @sample ${SYSCONFDIR}/gromit-mpx/gromit-mpx.cfg share/icons/hicolor/scalable/apps/net.christianbeier.Gromit-MPX.active.svg share/icons/hicolor/scalable/apps/net.christianbeier.Gromit-MPX.svg +share/locale/de/LC_MESSAGES/gromit-mpx.mo +share/locale/es/LC_MESSAGES/gromit-mpx.mo +share/locale/fa/LC_MESSAGES/gromit-mpx.mo +share/locale/he/LC_MESSAGES/gromit-mpx.mo +share/locale/it/LC_MESSAGES/gromit-mpx.mo share/metainfo/ share/metainfo/net.christianbeier.Gromit-MPX.appdata.xml share/pixmaps/