Those three all fail to build with LLVM 22 for the same reason: sysutils/gkrellm/plugins/itime sysutils/gkrellm/plugins/mailwatch sysutils/gkrellm/plugins/reminder
I don't really know what I'm doing here ... but gkrellm's Changelog-plugins.html instructs me to replace gdk_string_width() with gkrellm_gdk_string_width(), and that fixes the build. Does anybody use those and can check they work as before? OK? ----------------------------------------------- commit 345620ec5e74e234494767ff007c819e9ecb66ce (mystuff) from: Christian Weisgerber <[email protected]> date: Wed Jun 3 21:03:57 2026 UTC sysutils/gkrellm/plugins/*: call correct API to fix build with llvm22 diff 7a00e16b172f951e7a56097736b4864f8e091590 345620ec5e74e234494767ff007c819e9ecb66ce commit - 7a00e16b172f951e7a56097736b4864f8e091590 commit + 345620ec5e74e234494767ff007c819e9ecb66ce blob - d4d730423d83c2d6f7521d5cf2c5fd207a88ae1e blob + 351406a22dd88824e5dfa4fce268ca2371114d14 --- sysutils/gkrellm/plugins/itime/Makefile +++ sysutils/gkrellm/plugins/itime/Makefile @@ -2,7 +2,7 @@ COMMENT= GkrellM2 plugin that shows Internet time V= 1.0.1 DISTNAME= gkrellmitime-${V} -REVISION= 20 +REVISION= 21 CATEGORIES= net EXTRA_WANTLIB= gthread-2.0 blob - 58fd07c34e4afe1da85b0e206d78ec7a8baf82ad blob + f49e05d5c382d13d8ddcc0fe1ade42306ccaaba0 --- sysutils/gkrellm/plugins/itime/patches/patch-gkrellm_itime_c +++ sysutils/gkrellm/plugins/itime/patches/patch-gkrellm_itime_c @@ -1,5 +1,6 @@ ---- gkrellm_itime.c.orig Wed Aug 14 12:18:21 2002 -+++ gkrellm_itime.c Wed Jan 8 22:27:58 2003 +Index: gkrellm_itime.c +--- gkrellm_itime.c.orig ++++ gkrellm_itime.c @@ -71,7 +71,8 @@ #define gkrellm_panel_bg_image_override gkrellm_panel_bg_piximage_override #define gkrellm_load_image gkrellm_load_piximage @@ -10,3 +11,14 @@ #define gkrellm_bg_grid_image gkrellm_bg_grid_piximage #define gkrellm_bg_panel_image gkrellm_bg_panel_piximage #define gkrellm_bg_meter_image gkrellm_bg_meter_piximage +@@ -178,8 +179,8 @@ static void update_itime() + + if (g_ticks->second_tick) { + getBeats(); +- w = gdk_string_width(decal_symbol->text_style.font, "@"); +- w_time = gdk_string_width(decal_text1->text_style.font, s_itime); ++ w = gkrellm_gdk_string_width(decal_symbol->text_style.font, "@"); ++ w_time = gkrellm_gdk_string_width(decal_text1->text_style.font, s_itime); + decal_symbol->x_off = ((w + w_time) < decal_symbol->w) ? (decal_text1->w - (w + w_time)) / 2 : 0; + decal_text1->x_off = decal_symbol->x_off + w + 2; + blob - e5198dd77bdc1bfa2a8d8f21ce9ae1655ac1eb3f blob + 60f6ed71426de4c874c29728a97e287920286955 --- sysutils/gkrellm/plugins/mailwatch/Makefile +++ sysutils/gkrellm/plugins/mailwatch/Makefile @@ -3,7 +3,7 @@ COMMENT= GkrellM2 plugin to monitor multiple mailboxes V= 2.4.3 DISTNAME= gkrellm-mailwatch-${V} PKGNAME= gkrellmmailwatch-${V} -REVISION= 12 +REVISION= 13 CATEGORIES= mail HOMEPAGE= http://gkrellm.luon.net/mailwatch.phtml blob - 011ad5f43feb3c71d0ab065e088c4a7e82c65663 blob + 3a3e8a91b47195577e78b490391d4a605840802f --- sysutils/gkrellm/plugins/mailwatch/patches/patch-Makefile +++ sysutils/gkrellm/plugins/mailwatch/patches/patch-Makefile @@ -1,5 +1,6 @@ ---- Makefile.orig Tue Dec 24 12:47:34 2002 -+++ Makefile Tue Dec 24 12:48:21 2002 +Index: Makefile +--- Makefile.orig ++++ Makefile @@ -1,18 +1,18 @@ # Makefile for the GKrellM mailwatch plugin @@ -21,5 +22,5 @@ -LFLAGS += -shared +LFLAGS += -shared -pthread - OBJS = mailwatch.o - + LOCALEDIR := $(DESTDIR)/usr/share/locale + PACKAGE ?= gkrellm-mailwatch blob - /dev/null blob + c0bce3c3cc4f262896a2a70197a29869fc2baac9 (mode 644) --- /dev/null +++ sysutils/gkrellm/plugins/mailwatch/patches/patch-mailwatch_c @@ -0,0 +1,12 @@ +Index: mailwatch.c +--- mailwatch.c.orig ++++ mailwatch.c +@@ -608,7 +608,7 @@ update_plugin(void) { + + p->statstext->x_off = + gkrellm_chart_width() - +- gdk_string_width(p->panel->textstyle->font, ++ gkrellm_gdk_string_width(p->panel->textstyle->font, + buf) - + 2 * gkrellm_get_style_margins(p->panel->style)->left; + blob - 5965754a26c46d125cb2a05afc0ba3bb6cd4f587 blob + 9600ccce3482e6d48d927b97809a73af18d50e6c --- sysutils/gkrellm/plugins/reminder/Makefile +++ sysutils/gkrellm/plugins/reminder/Makefile @@ -3,7 +3,7 @@ COMMENT= GKrellM2 will remind you to do important even V= 2.0.0 DISTNAME= gkrellm-reminder-${V} PKGNAME= gkrellmreminder-${V} -REVISION= 13 +REVISION= 14 CATEGORIES= misc HOMEPAGE= http://members.dslextreme.com/users/billw/gkrellm/Plugins.html\#REMINDER blob - 65f45cf88b979c8374298046fcf925404092c154 blob + d8ef943a9b79ecc9b67b09e5a8ca33178e85d018 --- sysutils/gkrellm/plugins/reminder/patches/patch-reminder_c +++ sysutils/gkrellm/plugins/reminder/patches/patch-reminder_c @@ -1,8 +1,7 @@ -Index: reminder.c - second, third and fourth chunk: scan/serialize time_t as/into into long long, fixes crashes at runtime due to timestamps corruption. +Index: reminder.c --- reminder.c.orig +++ reminder.c @@ -87,7 +87,7 @@ static struct reminder_config { @@ -189,3 +188,18 @@ long, fixes crashes at runtime due to timestamps corru /* delete event from today */ num_active--; +@@ -3181,12 +3186,12 @@ reminder_draw_panel_text( gint num_active, gint num_to + + ts_old = ts = reminder_text_decal->text_style; + +- w = gdk_string_width( ts.font, buf ); ++ w = gkrellm_gdk_string_width( ts.font, buf ); + + if( w > reminder_text_decal->w ) + { + ts.font = gkrellm_meter_alt_textstyle( style_id )->font; +- w = gdk_string_width( ts.font, buf ); ++ w = gkrellm_gdk_string_width( ts.font, buf ); + } + + style = gkrellm_meter_style( style_id ); -- Christian "naddy" Weisgerber [email protected]
