This updates klavaro to the latest release available, along with its dep gtkdatabox (klavaro is the sole consumer). The french "ergo-l" keyboard mapping sadly isn't supported OOTB, but the update is worth it anyway (minus two gtk+2 users).
pea, do you want to keep maintainership? ok? Index: x11/gtkdatabox/Makefile =================================================================== RCS file: /home/cvs/ports/x11/gtkdatabox/Makefile,v diff -u -p -r1.21 Makefile --- x11/gtkdatabox/Makefile 27 Sep 2023 20:37:13 -0000 1.21 +++ x11/gtkdatabox/Makefile 10 Feb 2025 17:26:18 -0000 @@ -1,33 +1,32 @@ -COMMENT = GTK+2 widget to display large amounts of numerical data +COMMENT = GTK+3 widget to display large amounts of numerical data -DISTNAME = gtkdatabox-0.9.1.1 -REVISION = 12 +DISTNAME = gtkdatabox-1.0.0 -SHARED_LIBS = gtkdatabox 0.0 +SHARED_LIBS = gtkdatabox 1.0 CATEGORIES = x11 -HOMEPAGE = http://www.eudoxos.de/gtk/gtkdatabox/ +HOMEPAGE = https://gtkdatabox.sourceforge.io/ MAINTAINER = Pierre-Emmanuel Andre <p...@openbsd.org> # GPLv2 PERMIT_PACKAGE = Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender atk-1.0 cairo expat ffi fontconfig freetype fribidi -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 -WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv -WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 -WANTLIB += png pthread xcb xcb-render xcb-shm z ${COMPILER_LIBCXX} -WANTLIB += Xau Xdmcp jpeg +WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage +WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 +WANTLIB += atk-bridge-2.0 atspi cairo cairo-gobject dbus-1 epoll-shim +WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 +WANTLIB += gtk-3 harfbuzz iconv intl jpeg m pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png wayland-client wayland-cursor +WANTLIB += wayland-egl xcb xcb-render xcb-shm xkbcommon z SITES= ${SITE_SOURCEFORGE:=gtkdatabox/} -LIB_DEPENDS = x11/gtk+2 +LIB_DEPENDS = x11/gtk+3 - - -CONFIGURE_STYLE=gnu +CONFIGURE_STYLE=autoconf +AUTOCONF_VERSION=2.69 .include <bsd.port.mk> Index: x11/gtkdatabox/distinfo =================================================================== RCS file: /home/cvs/ports/x11/gtkdatabox/distinfo,v diff -u -p -r1.2 distinfo --- x11/gtkdatabox/distinfo 18 Jan 2015 03:15:55 -0000 1.2 +++ x11/gtkdatabox/distinfo 10 Feb 2025 12:59:54 -0000 @@ -1,2 +1,2 @@ -SHA256 (gtkdatabox-0.9.1.1.tar.gz) = Rrx/C4iqhr511y4mMF4fdZqwHTVJUxz801sf5U4mIjk= -SIZE (gtkdatabox-0.9.1.1.tar.gz) = 420545 +SHA256 (gtkdatabox-1.0.0.tar.gz) = i+5wIGSUpCLs/smojTLZFMULt6DA6P7cRRL1FUqp0+M= +SIZE (gtkdatabox-1.0.0.tar.gz) = 520992 Index: x11/gtkdatabox/patches/patch-configure_ac =================================================================== RCS file: x11/gtkdatabox/patches/patch-configure_ac diff -N x11/gtkdatabox/patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/gtkdatabox/patches/patch-configure_ac 11 Feb 2025 00:01:43 -0000 @@ -0,0 +1,20 @@ +Don't overquote m4 macros + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -40,10 +40,10 @@ m4_define([gtk_required_version], [3.4.0]) + m4_define([pango_required_version], [1.29.0]) + m4_define([cairo_required_version], [1.10.0]) + +-PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= [gtk_required_version]]) +-PKG_CHECK_MODULES(GTK, [gdk-3.0 >= [gtk_required_version]]) +-PKG_CHECK_MODULES(PANGO, pango >= [pango_required_version]) +-PKG_CHECK_MODULES(CAIRO, cairo >= [cairo_required_version]) ++PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= gtk_required_version]) ++PKG_CHECK_MODULES(GTK, [gdk-3.0 >= gtk_required_version]) ++PKG_CHECK_MODULES(PANGO, [pango >= pango_required_version]) ++PKG_CHECK_MODULES(CAIRO, [cairo >= cairo_required_version]) + AC_SUBST(GTK_REQUIRED, [gtk_required_version]) + AC_SUBST(PANGO_REQUIRED, [pango_required_version]) + AC_SUBST(CAIRO_REQUIRED, [cairo_required_version]) Index: x11/gtkdatabox/patches/patch-examples_Makefile_in =================================================================== RCS file: /home/cvs/ports/x11/gtkdatabox/patches/patch-examples_Makefile_in,v diff -u -p -r1.3 patch-examples_Makefile_in --- x11/gtkdatabox/patches/patch-examples_Makefile_in 8 Feb 2023 19:54:07 -0000 1.3 +++ x11/gtkdatabox/patches/patch-examples_Makefile_in 10 Feb 2025 17:28:03 -0000 @@ -1,19 +1,11 @@ -XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED) -basics.c:116: error: lvalue required as left operand of assignment - Index: examples/Makefile.in --- examples/Makefile.in.orig +++ examples/Makefile.in -@@ -280,12 +280,10 @@ INCLUDES = \ +@@ -407,7 +407,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/gtk AM_CFLAGS = \ - -O2\ -W -Wall -pedantic\ - -DG_DISABLE_DEPRECATED\ - -DGDK_DISABLE_DEPRECATED\ - -DGDK_PIXBUF_DISABLE_DEPRECATED\ -- -DGTK_DISABLE_DEPRECATED\ - @LIBGLADE_CFLAGS@ \ - `pkg-config gtk+-2.0 --cflags` - + -DGDK_MIN_VERSION_REQUIRED=GDK_VERSION_3_4\ + -DGTK_DISABLE_SINGLE_INCLUDES\ Index: x11/gtkdatabox/patches/patch-gtk_Makefile_in =================================================================== RCS file: /home/cvs/ports/x11/gtkdatabox/patches/patch-gtk_Makefile_in,v diff -u -p -r1.4 patch-gtk_Makefile_in --- x11/gtkdatabox/patches/patch-gtk_Makefile_in 8 Feb 2023 19:54:07 -0000 1.4 +++ x11/gtkdatabox/patches/patch-gtk_Makefile_in 10 Feb 2025 17:28:03 -0000 @@ -1,24 +1,11 @@ Index: gtk/Makefile.in --- gtk/Makefile.in.orig +++ gtk/Makefile.in -@@ -231,7 +231,6 @@ libgtkdatabox_la_SOURCES = \ - - libgtkdatabox_la_LDFLAGS = \ - -version-info $(LT_CURRENT)\ -- -release $(LT_RELEASE)\ - @GTK_LIBS@ - - include_HEADERS = \ -@@ -255,12 +254,9 @@ INCLUDES = \ +@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) AM_CFLAGS = \ - -O2\ -W -Wall -pedantic\ - -DG_DISABLE_DEPRECATED\ -- -DGDK_DISABLE_DEPRECATED\ - -DGDK_PIXBUF_DISABLE_DEPRECATED\ -- -DGTK_DISABLE_DEPRECATED\ + -DGDK_MIN_VERSION_REQUIRED=GDK_VERSION_3_4\ -DGTK_MULTIHEAD_SAFE=1\ - `pkg-config gtk+-2.0 --cflags` - Index: x11/gtkdatabox/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/x11/gtkdatabox/pkg/PLIST,v diff -u -p -r1.3 PLIST --- x11/gtkdatabox/pkg/PLIST 11 Mar 2022 20:16:04 -0000 1.3 +++ x11/gtkdatabox/pkg/PLIST 10 Feb 2025 17:29:08 -0000 @@ -6,38 +6,44 @@ include/gtkdatabox_grid.h include/gtkdatabox_lines.h include/gtkdatabox_markers.h include/gtkdatabox_marshal.h +include/gtkdatabox_offset_bars.h include/gtkdatabox_points.h +include/gtkdatabox_regions.h include/gtkdatabox_ruler.h include/gtkdatabox_scale.h include/gtkdatabox_typedefs.h include/gtkdatabox_xyc_graph.h -lib/libgtkdatabox.a +include/gtkdatabox_xyyc_graph.h +@static-lib lib/libgtkdatabox.a lib/libgtkdatabox.la @lib lib/libgtkdatabox.so.${LIBgtkdatabox_VERSION} lib/pkgconfig/gtkdatabox.pc -share/gtk-doc/ -share/gtk-doc/html/ -share/gtk-doc/html/gtkdatabox/ -share/gtk-doc/html/gtkdatabox/GtkDatabox.html -share/gtk-doc/html/gtkdatabox/GtkDataboxBars.html -share/gtk-doc/html/gtkdatabox/GtkDataboxCrossSimple.html -share/gtk-doc/html/gtkdatabox/GtkDataboxGraph.html -share/gtk-doc/html/gtkdatabox/GtkDataboxGrid.html -share/gtk-doc/html/gtkdatabox/GtkDataboxLines.html -share/gtk-doc/html/gtkdatabox/GtkDataboxMarkers.html -share/gtk-doc/html/gtkdatabox/GtkDataboxPoints.html -share/gtk-doc/html/gtkdatabox/GtkDataboxRuler.html -share/gtk-doc/html/gtkdatabox/GtkDataboxXYCGraph.html -share/gtk-doc/html/gtkdatabox/ch01.html -share/gtk-doc/html/gtkdatabox/gtkdatabox-gtkdatabox-marshal.html -share/gtk-doc/html/gtkdatabox/gtkdatabox-gtkdatabox-scale.html -share/gtk-doc/html/gtkdatabox/gtkdatabox-gtkdatabox-typedefs.html -share/gtk-doc/html/gtkdatabox/gtkdatabox.devhelp -share/gtk-doc/html/gtkdatabox/gtkdatabox.devhelp2 -share/gtk-doc/html/gtkdatabox/home.png -share/gtk-doc/html/gtkdatabox/index.html -share/gtk-doc/html/gtkdatabox/index.sgml -share/gtk-doc/html/gtkdatabox/left.png -share/gtk-doc/html/gtkdatabox/right.png -share/gtk-doc/html/gtkdatabox/style.css -share/gtk-doc/html/gtkdatabox/up.png +share/gtk-doc/html/gtkdatabox-1/ +share/gtk-doc/html/gtkdatabox-1/GtkDatabox.html +share/gtk-doc/html/gtkdatabox-1/GtkDataboxRuler.html +share/gtk-doc/html/gtkdatabox-1/api-index-full.html +share/gtk-doc/html/gtkdatabox-1/ch01.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-1.devhelp2 +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxBars.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxCrossSimple.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxGraph.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxGrid.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxLines.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxMarkers.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxOffsetBars.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxPoints.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxRegions.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxScaleType.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxXYCGraph.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-GtkDataboxXYYCGraph.html +share/gtk-doc/html/gtkdatabox-1/gtkdatabox-gtkdatabox-typedefs.html +share/gtk-doc/html/gtkdatabox-1/home.png +share/gtk-doc/html/gtkdatabox-1/index.html +share/gtk-doc/html/gtkdatabox-1/left-insensitive.png +share/gtk-doc/html/gtkdatabox-1/left.png +share/gtk-doc/html/gtkdatabox-1/object-tree.html +share/gtk-doc/html/gtkdatabox-1/right-insensitive.png +share/gtk-doc/html/gtkdatabox-1/right.png +share/gtk-doc/html/gtkdatabox-1/style.css +share/gtk-doc/html/gtkdatabox-1/up-insensitive.png +share/gtk-doc/html/gtkdatabox-1/up.png Index: x11/klavaro/Makefile =================================================================== RCS file: /home/cvs/ports/x11/klavaro/Makefile,v diff -u -p -r1.29 Makefile --- x11/klavaro/Makefile 7 Nov 2023 14:19:50 -0000 1.29 +++ x11/klavaro/Makefile 10 Feb 2025 18:03:27 -0000 @@ -1,7 +1,6 @@ COMMENT = touch typing tutor program -DISTNAME = klavaro-1.5.0 -REVISION = 14 +DISTNAME = klavaro-3.14 CATEGORIES = x11 @@ -14,24 +13,32 @@ PERMIT_PACKAGE = Yes USE_BZIP2 = Yes -WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender atk-1.0 c cairo curl fontconfig freetype gdk-x11-2.0 -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gtk-x11-2.0 gtkdatabox harfbuzz intl m pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread z +WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage +WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 +WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject crypto curl +WANTLIB += dbus-1 epoll-shim epoxy expat ffi fontconfig freetype +WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 +WANTLIB += gobject-2.0 graphite2 gtk-3 gtkdatabox harfbuzz iconv +WANTLIB += intl jpeg m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 +WANTLIB += png ssl wayland-client wayland-cursor wayland-egl xcb +WANTLIB += xcb-render xcb-shm xkbcommon z SITES = ${SITE_SOURCEFORGE:=klavaro/} EXTRACT_SUFX = .tar.bz2 +MODULES = textproc/intltool +USE_GMAKE = Yes BUILD_DEPENDS = devel/gettext,-tools LIB_DEPENDS = devel/gettext,-runtime \ - x11/gtk+2 \ + x11/gtk+3 \ x11/gtkdatabox \ net/curl RUN_DEPENDS = x11/gtk+4,-guic -CONFIGURE_STYLE=gnu +CONFIGURE_STYLE=autoconf +AUTOCONF_VERSION= 2.69 CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" Index: x11/klavaro/distinfo =================================================================== RCS file: /home/cvs/ports/x11/klavaro/distinfo,v diff -u -p -r1.5 distinfo --- x11/klavaro/distinfo 18 Jan 2015 03:15:57 -0000 1.5 +++ x11/klavaro/distinfo 10 Feb 2025 11:34:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (klavaro-1.5.0.tar.bz2) = eVkPRQN5NP07Uwb/gVUDTLzr4UhQNPKN+bVbDeMC7og= -SIZE (klavaro-1.5.0.tar.bz2) = 748636 +SHA256 (klavaro-3.14.tar.bz2) = hxh+SdMBxRDmlkCYzbYSEmvwMNKodf15nq3K0+rlbas= +SIZE (klavaro-3.14.tar.bz2) = 1246616 Index: x11/klavaro/patches/patch-configure =================================================================== RCS file: x11/klavaro/patches/patch-configure diff -N x11/klavaro/patches/patch-configure --- x11/klavaro/patches/patch-configure 11 Mar 2022 20:16:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Index: configure ---- configure.orig -+++ configure -@@ -4828,7 +4828,7 @@ fi - done - - --pkg_modules="gtk+-2.0 >= 2.16.0, gtkdatabox >= 0.9.0.0, libcurl >= 7.18.2" -+pkg_modules="gtk+-2.0 >= 2.16.0, gtkdatabox >= 0.9.0.0, gmodule-2.0, libcurl >= 7.18.2" - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then Index: x11/klavaro/patches/patch-configure_ac =================================================================== RCS file: x11/klavaro/patches/patch-configure_ac diff -N x11/klavaro/patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/klavaro/patches/patch-configure_ac 11 Feb 2025 00:14:20 -0000 @@ -0,0 +1,36 @@ +Don't overquote m4 macros +uname -o is not portable +test(1) -a is not portable + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -31,10 +31,10 @@ m4_define([gtk_required_version], [3.12.0]) + m4_define([pango_required_version], [1.32.4]) + m4_define([cairo_required_version], [1.12.0]) + +-PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= [gtk_required_version]]) +-PKG_CHECK_MODULES(GDK, [gdk-3.0 >= [gtk_required_version]]) +-PKG_CHECK_MODULES(PANGO, [pango >= [pango_required_version]]) +-PKG_CHECK_MODULES(CAIRO, [cairo >= [cairo_required_version]]) ++PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= gtk_required_version]) ++PKG_CHECK_MODULES(GDK, [gdk-3.0 >= gtk_required_version]) ++PKG_CHECK_MODULES(PANGO, [pango >= pango_required_version]) ++PKG_CHECK_MODULES(CAIRO, [cairo >= cairo_required_version]) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +@@ -46,8 +46,11 @@ AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) + AC_DEFINE(ENABLE_NLS,"1",[enable nls]) + +-AM_CONDITIONAL(IS_WIN, test `uname -o` = "Msys") +-AM_CONDITIONAL(IS_POSIX, test `uname -o` != "Msys" -a `uname -o` != "Darwin") ++# uname -o isn't supported on all systems ++osname=`uname -o` ++AS_IF([test "$osname" = "" ], [osname=`uname -s`]) ++AM_CONDITIONAL(IS_WIN, test "$osname" = "Msys") ++AM_CONDITIONAL(IS_POSIX, test "$osname" != "Msys" && test "$osname" != "Darwin") + + AC_CONFIG_FILES([Makefile + src/Makefile Index: x11/klavaro/patches/patch-src_Makefile_am =================================================================== RCS file: /home/cvs/ports/x11/klavaro/patches/patch-src_Makefile_am,v diff -u -p -r1.3 patch-src_Makefile_am --- x11/klavaro/patches/patch-src_Makefile_am 11 Mar 2022 20:16:34 -0000 1.3 +++ x11/klavaro/patches/patch-src_Makefile_am 11 Feb 2025 00:23:04 -0000 @@ -1,15 +1,16 @@ -For upstream: fix passing --export-dynamic to the linker. -rdynamic is -implemented by at least gcc and clang. Using -export-dynamic with gcc -only worked because of an implementation quirk that was since acknowledged. +For upstream: -rdynamic is implemented by at least gcc and clang. +Using -export-dynamic with gcc only worked because of what was initially +a gcc implementation quirk. -rdynamic isn't used at compile time anyway, +so using -rdynamic or -Wl,--export-dynamic in LDFLAGS would be enough. Index: src/Makefile.am --- src/Makefile.am.orig +++ src/Makefile.am -@@ -24,5 +24,6 @@ AM_CPPFLAGS = @PACKAGE_CFLAGS@ \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" +@@ -32,7 +32,6 @@ klavaro_LDADD = \ + -lgmodule-2.0 --AM_CFLAGS = -export-dynamic -Wall -+AM_CFLAGS = -Wall -+AM_LDFLAGS = -rdynamic + if IS_POSIX +-AM_CPPFLAGS += -export-dynamic + AM_LDFLAGS = -Wl,--export-dynamic + endif Index: x11/klavaro/patches/patch-src_Makefile_in =================================================================== RCS file: /home/cvs/ports/x11/klavaro/patches/patch-src_Makefile_in,v diff -u -p -r1.2 patch-src_Makefile_in --- x11/klavaro/patches/patch-src_Makefile_in 11 Mar 2022 20:16:34 -0000 1.2 +++ x11/klavaro/patches/patch-src_Makefile_in 11 Feb 2025 00:23:04 -0000 @@ -1,15 +1,17 @@ -Fix passing --export-dynamic to the linker. +For upstream: -rdynamic is implemented by at least gcc and clang. +Using -export-dynamic with gcc only worked because of what was initially +a gcc implementation quirk. -rdynamic isn't used at compile time anyway, +so using -rdynamic or -Wl,--export-dynamic in LDFLAGS would be enough. Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -194,7 +194,8 @@ AM_CPPFLAGS = @PACKAGE_CFLAGS@ \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" - --AM_CFLAGS = -export-dynamic -Wall -+AM_CFLAGS = -Wall -+AM_LDFLAGS = -rdynamic - all: all-am - - .SUFFIXES: +@@ -89,7 +89,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + bin_PROGRAMS = klavaro$(EXEEXT) +-@IS_POSIX_TRUE@am__append_1 = -export-dynamic ++@IS_POSIX_TRUE@am__append_1 = + @IS_WIN_TRUE@am__append_2 = -mwindows + subdir = src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 Index: x11/klavaro/patches/patch-src_top10_c =================================================================== RCS file: x11/klavaro/patches/patch-src_top10_c diff -N x11/klavaro/patches/patch-src_top10_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/klavaro/patches/patch-src_top10_c 10 Feb 2025 18:01:24 -0000 @@ -0,0 +1,32 @@ +Fix time_t printing + +Index: src/top10.c +--- src/top10.c.orig ++++ src/top10.c +@@ -363,7 +363,7 @@ top10_merge_stats_from_file (gchar * file) + n = fread (&top10.when, sizeof (gint32), 1, fh); + if (n == 0) + { +- g_message ("Problem: when = %li", top10.when); ++ g_message ("Problem: when = %lld", (long long)top10.when); + break; + } + +@@ -479,7 +479,7 @@ top10_read_stats_from_file (gboolean locally, gchar * + n = fread (&top10[i].when, sizeof (gint32), 1, fh); + if (n == 0) + { +- g_message ("Problem: when = %li", top10[i].when); ++ g_message ("Problem: when = %lld", (long long)top10[i].when); + break; + } + +@@ -676,7 +676,7 @@ top10_show_stat (Statistics * stat) + { + g_print ("Language: %c%c\n", stat->lang[0], stat->lang[1]); + g_print ("Graphical environment: %s\n", stat->genv == 'x' ? "Linux" : "Windows"); +- g_print ("When: %li\n", stat->when); ++ g_print ("When: %lld\n", (long long)stat->when); + g_print ("# of characters: %i\n", stat->nchars); + g_print ("Accuracy: %2.1f\n", stat->accur); + g_print ("Velocity: %2.1f\n", stat->velo); Index: x11/klavaro/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/x11/klavaro/pkg/PLIST,v diff -u -p -r1.9 PLIST --- x11/klavaro/pkg/PLIST 11 Mar 2022 20:16:34 -0000 1.9 +++ x11/klavaro/pkg/PLIST 10 Feb 2025 17:59:23 -0000 @@ -1,35 +1,35 @@ @bin bin/klavaro @man man/man1/klavaro.1 -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ +share/applications/ +share/applications/klavaro.desktop share/icons/hicolor/16x16/apps/klavaro.png -share/icons/hicolor/22x22/ -share/icons/hicolor/22x22/apps/ share/icons/hicolor/22x22/apps/klavaro.png -share/icons/hicolor/24x24/ -share/icons/hicolor/24x24/apps/ share/icons/hicolor/24x24/apps/klavaro.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/klavaro.png -share/icons/hicolor/48x48/ -share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/klavaro.png +share/icons/hicolor/64x64/apps/klavaro.png +share/icons/hicolor/96x96/apps/klavaro.png share/klavaro/ share/klavaro/C.paragraphs share/klavaro/C.words share/klavaro/alphagrip5_us.kbd +share/klavaro/altcolor.ini +share/klavaro/altcolor.png share/klavaro/ar.paragraphs share/klavaro/ar.words share/klavaro/azerty_be.kbd share/klavaro/azerty_fr.kbd +share/klavaro/azerty_fr_afnor.kbd share/klavaro/azerty_fr_ibook.kbd share/klavaro/basic_lessons.txt -share/klavaro/beep.png +share/klavaro/bg.paragraphs +share/klavaro/bg.words share/klavaro/bn.paragraphs share/klavaro/bn.words +share/klavaro/bo.paragraphs +share/klavaro/bo.words +share/klavaro/ca.paragraphs +share/klavaro/ca.words share/klavaro/colemak_us.kbd share/klavaro/cs.paragraphs share/klavaro/cs.words @@ -37,11 +37,18 @@ share/klavaro/da.paragraphs share/klavaro/da.words share/klavaro/de.paragraphs share/klavaro/de.words +share/klavaro/dubeolsik_kr.kbd +share/klavaro/dvorak_bg.kbd share/klavaro/dvorak_br_nativo.kbd share/klavaro/dvorak_br_us.kbd +share/klavaro/dvorak_ca_fr.kbd +share/klavaro/dvorak_de_adnw.kbd +share/klavaro/dvorak_de_bone.kbd +share/klavaro/dvorak_de_neo2.kbd share/klavaro/dvorak_eo_eurokeys.kbd share/klavaro/dvorak_eo_nativo.kbd share/klavaro/dvorak_eo_uk.kbd +share/klavaro/dvorak_es_nativo.kbd share/klavaro/dvorak_es_us.kbd share/klavaro/dvorak_fr.kbd share/klavaro/dvorak_fr_bepo.kbd @@ -49,19 +56,30 @@ share/klavaro/dvorak_se_us.kbd share/klavaro/dvorak_tr_F.kbd share/klavaro/dvorak_uk.kbd share/klavaro/dvorak_us.kbd +share/klavaro/dvorak_us_left.kbd +share/klavaro/dvorak_us_prog.kbd +share/klavaro/dvorak_us_rigth.kbd +share/klavaro/el.paragraphs +share/klavaro/el.words share/klavaro/en_GB.paragraphs share/klavaro/en_GB.words share/klavaro/eo.paragraphs share/klavaro/eo.words share/klavaro/es.paragraphs share/klavaro/es.words +share/klavaro/eu.paragraphs +share/klavaro/eu.words +share/klavaro/fi.paragraphs +share/klavaro/fi.words share/klavaro/fingers_position.txt share/klavaro/fluid.png share/klavaro/fr.paragraphs share/klavaro/fr.words share/klavaro/gl.paragraphs share/klavaro/gl.words -share/klavaro/go_www.png +share/klavaro/gurmukhi_in_jhelum.kbd +share/klavaro/gurmukhi_pk_jhelum.kbd +share/klavaro/gurmukhi_pk_jhelumShift.kbd share/klavaro/hands_0.png share/klavaro/hands_1.png share/klavaro/hands_2.png @@ -72,80 +90,146 @@ share/klavaro/hands_6.png share/klavaro/hands_7.png share/klavaro/hands_8.png share/klavaro/hands_9.png +share/klavaro/hi.paragraphs +share/klavaro/hi.words +share/klavaro/hindi_in_kruti.kbd +share/klavaro/hr.paragraphs +share/klavaro/hr.words share/klavaro/hu.paragraphs share/klavaro/hu.words +share/klavaro/id.paragraphs +share/klavaro/id.words +share/klavaro/it.paragraphs +share/klavaro/it.words +share/klavaro/jtsuken_kk.kbd share/klavaro/jtsuken_ru.kbd +share/klavaro/jtsuken_ru_typewriter.kbd +share/klavaro/jtsuken_ua.kbd share/klavaro/key.png -share/klavaro/klavaro.ui -share/klavaro/klavaro_96x96.png +share/klavaro/kk.paragraphs +share/klavaro/kk.words +share/klavaro/klavaro.glade +share/klavaro/klavaro_icon.png +share/klavaro/ko.paragraphs +share/klavaro/ko.words share/klavaro/nb.paragraphs share/klavaro/nb.words share/klavaro/nl.paragraphs share/klavaro/nl.words +share/klavaro/norman_us.kbd share/klavaro/other.png +share/klavaro/pa.paragraphs +share/klavaro/pa.words share/klavaro/pl.paragraphs share/klavaro/pl.words share/klavaro/progress.png share/klavaro/pt_BR.paragraphs share/klavaro/pt_BR.words +share/klavaro/pt_PT.paragraphs +share/klavaro/pt_PT.words share/klavaro/qwerty_ar.kbd +share/klavaro/qwerty_bg.kbd +share/klavaro/qwerty_bg_2.kbd +share/klavaro/qwerty_bo.kbd share/klavaro/qwerty_br.kbd share/klavaro/qwerty_br_abnt2.kbd +share/klavaro/qwerty_ca_multling.kbd +share/klavaro/qwerty_ca_quebec.kbd +share/klavaro/qwerty_cn_us.kbd share/klavaro/qwerty_cz.kbd share/klavaro/qwerty_dk.kbd share/klavaro/qwerty_es.kbd share/klavaro/qwerty_gr.kbd +share/klavaro/qwerty_gr_old.kbd share/klavaro/qwerty_il.kbd share/klavaro/qwerty_il_old.kbd +share/klavaro/qwerty_in.kbd share/klavaro/qwerty_it.kbd share/klavaro/qwerty_jp.kbd -share/klavaro/qwerty_nb.kbd +share/klavaro/qwerty_no.kbd share/klavaro/qwerty_pk_crulp.kbd share/klavaro/qwerty_pk_nla.kbd +share/klavaro/qwerty_pl_us.kbd share/klavaro/qwerty_pt.kbd share/klavaro/qwerty_se.kbd +share/klavaro/qwerty_sk.kbd share/klavaro/qwerty_tr.kbd share/klavaro/qwerty_uk.kbd share/klavaro/qwerty_us.kbd share/klavaro/qwerty_us_2.kbd +share/klavaro/qwertz_ch_de.kbd +share/klavaro/qwertz_ch_fr.kbd share/klavaro/qwertz_cz.kbd share/klavaro/qwertz_de.kbd +share/klavaro/qwertz_hr.kbd share/klavaro/qwertz_hu.kbd share/klavaro/qwertz_pl.kbd +share/klavaro/qwertz_rs.kbd +share/klavaro/qwertz_si.kbd share/klavaro/ru.paragraphs share/klavaro/ru.words +share/klavaro/sl.paragraphs +share/klavaro/sl.words +share/klavaro/sr.paragraphs +share/klavaro/sr.words share/klavaro/sv.paragraphs share/klavaro/sv.words share/klavaro/top10.png +share/klavaro/tr.paragraphs +share/klavaro/tr.words +share/klavaro/uk.paragraphs +share/klavaro/uk.words share/klavaro/ur.paragraphs share/klavaro/ur.words share/klavaro/vi.paragraphs share/klavaro/vi.words -share/locale/ar/ -share/locale/ar/LC_MESSAGES/ +share/klavaro/workman_us.kbd share/locale/ar/LC_MESSAGES/klavaro.mo -share/locale/bn/ -share/locale/bn/LC_MESSAGES/ +share/locale/bg/LC_MESSAGES/klavaro.mo share/locale/bn/LC_MESSAGES/klavaro.mo +share/locale/ca/LC_MESSAGES/klavaro.mo share/locale/cs/LC_MESSAGES/klavaro.mo share/locale/da/LC_MESSAGES/klavaro.mo share/locale/de/LC_MESSAGES/klavaro.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ +share/locale/el/LC_MESSAGES/klavaro.mo share/locale/en_GB/LC_MESSAGES/klavaro.mo share/locale/eo/LC_MESSAGES/klavaro.mo share/locale/es/LC_MESSAGES/klavaro.mo +share/locale/eu/LC_MESSAGES/klavaro.mo +share/locale/fi/LC_MESSAGES/klavaro.mo share/locale/fr/LC_MESSAGES/klavaro.mo share/locale/gl/LC_MESSAGES/klavaro.mo +share/locale/hr/LC_MESSAGES/klavaro.mo share/locale/hu/LC_MESSAGES/klavaro.mo +share/locale/id/LC_MESSAGES/klavaro.mo +share/locale/it/LC_MESSAGES/klavaro.mo +share/locale/kk/LC_MESSAGES/klavaro.mo +share/locale/ky/LC_MESSAGES/klavaro.mo share/locale/nb/LC_MESSAGES/klavaro.mo share/locale/nl/LC_MESSAGES/klavaro.mo +share/locale/pa/LC_MESSAGES/klavaro.mo share/locale/pl/LC_MESSAGES/klavaro.mo share/locale/pt_BR/LC_MESSAGES/klavaro.mo +share/locale/pt_PT/ +share/locale/pt_PT/LC_MESSAGES/ +share/locale/pt_PT/LC_MESSAGES/klavaro.mo +share/locale/ro/LC_MESSAGES/klavaro.mo share/locale/ru/LC_MESSAGES/klavaro.mo +share/locale/sl/LC_MESSAGES/klavaro.mo +share/locale/sr/LC_MESSAGES/klavaro.mo share/locale/sv/LC_MESSAGES/klavaro.mo +share/locale/te/LC_MESSAGES/klavaro.mo +share/locale/tr/LC_MESSAGES/klavaro.mo +share/locale/uk/LC_MESSAGES/klavaro.mo share/locale/ur/ share/locale/ur/LC_MESSAGES/ share/locale/ur/LC_MESSAGES/klavaro.mo share/locale/vi/LC_MESSAGES/klavaro.mo +share/locale/wo/ +share/locale/wo/LC_MESSAGES/ +share/locale/wo/LC_MESSAGES/klavaro.mo +share/locale/zh_CN/LC_MESSAGES/klavaro.mo +share/metainfo/ +share/metainfo/klavaro.appdata.xml +@tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor -- jca
