This updates x11/gromit-mpx to the latest version. As before, this
involves ripping out the appindicator support, which is slightly
tedious. Tested working successfully.
Laurie
diff --git x11/gromit-mpx/Makefile x11/gromit-mpx/Makefile
index 26c3310cb9c..16973831985 100644
--- x11/gromit-mpx/Makefile
+++ x11/gromit-mpx/Makefile
@@ -2,8 +2,7 @@ COMMENT = draw annotations on X11
GH_ACCOUNT = bk138
GH_PROJECT = gromit-mpx
-GH_TAGNAME = 1.3.1
-REVISION = 0
+GH_TAGNAME = 1.4.3
CATEGORIES = x11
@@ -30,5 +29,7 @@ NO_TEST = Yes
post-install:
rm -f ${PREFIX}/share/doc/gromit-mpx/ChangeLog
+ rm -f ${PREFIX}/share/pixmaps/net.christianbeier.Gromit-MPX.active.png
+ rm -f ${PREFIX}/share/pixmaps/net.christianbeier.Gromit-MPX.png
.include <bsd.port.mk>
diff --git x11/gromit-mpx/distinfo x11/gromit-mpx/distinfo
index 3d8e8ffc34d..6c77bd4a184 100644
--- x11/gromit-mpx/distinfo
+++ x11/gromit-mpx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gromit-mpx-1.3.1.tar.gz) = Fjnl5TZdr0iCaAjIgszTxvBIO7TnBzMregV7alc5j/A=
-SIZE (gromit-mpx-1.3.1.tar.gz) = 60834
+SHA256 (gromit-mpx-1.4.3.tar.gz) = AcPjfqCXelBzSd80xHS9yTmlcoeqQc6W2e600hJ5xqQ=
+SIZE (gromit-mpx-1.4.3.tar.gz) = 1861824
diff --git x11/gromit-mpx/patches/patch-CMakeLists_txt
x11/gromit-mpx/patches/patch-CMakeLists_txt
index 931b7b3fe84..ab19b0d1a7c 100644
--- x11/gromit-mpx/patches/patch-CMakeLists_txt
+++ x11/gromit-mpx/patches/patch-CMakeLists_txt
@@ -3,13 +3,17 @@ Remove libappindicator support.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -21,21 +21,18 @@ configure_file(build-config.h_cmake_in build-config.h)
- find_package(PkgConfig)
-
- pkg_check_modules(gtk3 REQUIRED "gtk+-3.0 >= 2.99.3")
--pkg_check_modules(appindicator3 REQUIRED "appindicator3-0.1 >= 0.4.92")
+@@ -22,25 +22,18 @@ find_package(PkgConfig)
+ pkg_check_modules(gtk3 REQUIRED "gtk+-3.0 >= 3.22")
pkg_check_modules(xinput REQUIRED "xi >= 1.3")
pkg_check_modules(x11 REQUIRED x11)
+-pkg_check_modules(appindicator3 "ayatana-appindicator3-0.1 >= 0.5")
+-if(NOT appindicator3_FOUND)
+- pkg_check_modules(appindicator3 REQUIRED "appindicator3-0.1 >= 0.4.92")
+- set(APPINDICATOR_IS_LEGACY 1)
+-endif()
+
+ configure_file(build-config.h_cmake_in build-config.h)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
@@ -25,7 +29,7 @@ Index: CMakeLists.txt
${xinput_LIBRARY_DIRS}
${x11_LIBRARY_DIRS}
)
-@@ -57,7 +54,6 @@ add_executable(${target_name} ${sources})
+@@ -62,7 +55,6 @@ add_executable(${target_name} ${sources})
target_link_libraries(${target_name}
${gtk3_LIBRARIES}
diff --git x11/gromit-mpx/patches/patch-src_gromit-mpx_c
x11/gromit-mpx/patches/patch-src_gromit-mpx_c
index 39f6a34f10e..df201d54f96 100644
--- x11/gromit-mpx/patches/patch-src_gromit-mpx_c
+++ x11/gromit-mpx/patches/patch-src_gromit-mpx_c
@@ -3,7 +3,7 @@ Remove libappindicator support.
Index: src/gromit-mpx.c
--- src/gromit-mpx.c.orig
+++ src/gromit-mpx.c
-@@ -887,17 +887,6 @@ void setup_main_app (GromitData *data, gboolean activa
+@@ -951,17 +951,6 @@ void setup_main_app (GromitData *data, int argc, char
if (activate)
acquire_grab (data, NULL); /* grab all */
@@ -11,7 +11,7 @@ Index: src/gromit-mpx.c
- TRAY ICON
- */
- data->trayicon = app_indicator_new (PACKAGE_NAME,
-- PACKAGE_NAME,
+- "net.christianbeier.Gromit-MPX",
-
APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
- app_indicator_set_status (data->trayicon, APP_INDICATOR_STATUS_ACTIVE);
@@ -21,13 +21,22 @@ Index: src/gromit-mpx.c
/* create the menu */
GtkWidget *menu = gtk_menu_new ();
-@@ -997,9 +986,6 @@ void setup_main_app (GromitData *data, gboolean activa
- gtk_widget_show (intro_item);
+@@ -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)
- if(data->show_intro_on_startup)
- on_intro(NULL, data);
+ 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");
+ }
diff --git x11/gromit-mpx/patches/patch-src_gromit-mpx_h
x11/gromit-mpx/patches/patch-src_gromit-mpx_h
index 0a1ad6ea7a3..c6f03c89220 100644
--- x11/gromit-mpx/patches/patch-src_gromit-mpx_h
+++ x11/gromit-mpx/patches/patch-src_gromit-mpx_h
@@ -3,15 +3,19 @@ Remove libappindicator support.
Index: src/gromit-mpx.h
--- src/gromit-mpx.h.orig
+++ src/gromit-mpx.h
-@@ -27,7 +27,6 @@
+@@ -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 | \
-@@ -98,7 +97,6 @@ typedef struct
+ GDK_BUTTON_PRESS_MASK | \
+@@ -102,7 +97,6 @@ typedef struct
typedef struct
{
GtkWidget *win;
diff --git x11/gromit-mpx/pkg/PLIST x11/gromit-mpx/pkg/PLIST
index aef924f3002..3215ef2ab7c 100644
--- x11/gromit-mpx/pkg/PLIST
+++ x11/gromit-mpx/pkg/PLIST
@@ -1,6 +1,6 @@
@bin bin/gromit-mpx
@man man/man1/gromit-mpx.1
-share/applications/gromit-mpx.desktop
+share/applications/net.christianbeier.Gromit-MPX.desktop
share/doc/gromit-mpx/
share/doc/gromit-mpx/AUTHORS
share/doc/gromit-mpx/NEWS.md
@@ -10,9 +10,10 @@ share/examples/gromit-mpx/
@sample ${SYSCONFDIR}/gromit-mpx/
share/examples/gromit-mpx/gromit-mpx.cfg
@sample ${SYSCONFDIR}/gromit-mpx/gromit-mpx.cfg
-share/icons/hicolor/scalable/apps/gromit-mpx.svg
+share/icons/hicolor/scalable/apps/net.christianbeier.Gromit-MPX.active.svg
+share/icons/hicolor/scalable/apps/net.christianbeier.Gromit-MPX.svg
+share/metainfo/
+share/metainfo/net.christianbeier.Gromit-MPX.appdata.xml
share/pixmaps/
-share/pixmaps/gromit-mpx.png
-share/pixmaps/gromit-mpx.xpm
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
