hi, here's a (totally untested yet) update to latest version of srain, migrates to meson and libsoup3, so that's one less consumer of the old libsoup. I've neutered the stupid get_executable_dir calls, they're useless since it should rely on default paths from meson.
brian, are you still using this, and do you plan to keep maintaining it ? https://portroach.openbsd.org/brian%20callahan%20%[email protected]%3E.html is .. not much promising :) testing/feedback/oks welcome Landry
Index: Makefile =================================================================== RCS file: /cvs/ports/net/srain/Makefile,v diff -u -r1.10 Makefile --- Makefile 3 Feb 2026 14:31:18 -0000 1.10 +++ Makefile 4 Feb 2026 08:20:59 -0000 @@ -3,8 +3,7 @@ GH_ACCOUNT = SrainApp GH_PROJECT = srain -GH_TAGNAME = 1.1.1 -REVISION = 2 +GH_TAGNAME = 1.8.1 HOMEPAGE = https://srain.silverrainz.me/ MAINTAINER = Brian Callahan <[email protected]> @@ -12,18 +11,19 @@ # GPLv3+ PERMIT_PACKAGE = Yes -WANTLIB += atk-1.0 c cairo cairo-gobject config crypto gdk-3 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0 -WANTLIB += pangocairo-1.0 secret-1 soup-2.4 ssl gmodule-2.0 pthread +WANTLIB += c cairo cairo-gobject config crypto gdk-3 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl secret-1 soup-3.0 # C11 COMPILER = base-clang ports-gcc COMPILER_LANGS = c +MODULES = devel/meson + BUILD_DEPENDS = devel/gettext,-tools LIB_DEPENDS = devel/libconfig \ - devel/libsoup \ + devel/libsoup3 \ x11/gnome/libsecret \ x11/gtk+3 @@ -31,17 +31,10 @@ x11/gnome/keyring \ x11/gtk+4,-guic -CONFIGURE_STYLE = simple -CONFIGURE_ARGS = --disable-debug \ - --sysconfdir="${SYSCONFDIR}" - -USE_GMAKE = Yes -ALL_TARGET = default -MAKE_FLAGS = CC="${CC}" MAKE="${MAKE_PROGRAM}" - -FAKE_FLAGS = INSTALL="${INSTALL}" \ - SYSCONFDIR="${PREFIX}/share/examples" - +CONFIGURE_ARGS = -Dapp_indicator=false NO_TEST = Yes + +post-install: + mv ${WRKINST}/etc/srain ${PREFIX}/share/examples/ .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/srain/distinfo,v diff -u -r1.6 distinfo --- distinfo 30 Jun 2020 16:26:29 -0000 1.6 +++ distinfo 4 Feb 2026 08:20:59 -0000 @@ -1,2 +1,2 @@ -SHA256 (srain-1.1.1.tar.gz) = e7sTlReu8EckPC8E4jr/KNwbg+HRI8MxIVzxtsD2WU8= -SIZE (srain-1.1.1.tar.gz) = 941824 +SHA256 (srain-1.8.1.tar.gz) = zn/I5QrS0YxeyhD3Kx4MBgvKUgVyC11Rw2w6/AJf10c= +SIZE (srain-1.8.1.tar.gz) = 2765196 Index: patches/patch-src_Makefile =================================================================== RCS file: patches/patch-src_Makefile diff -N patches/patch-src_Makefile --- patches/patch-src_Makefile 11 Mar 2022 19:47:35 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -Don't hardcode -O2. -This is actually C11 according to clang. - -Index: src/Makefile ---- src/Makefile.orig -+++ src/Makefile -@@ -29,7 +29,7 @@ LIBSSLLIBS = $(shell pkg-config --libs openssl) - LIBSECRETFLAGS =$(shell pkg-config --cflags libsecret-1) - LIBSECRETLIBS =$(shell pkg-config --libs libsecret-1) - --CFLAGS += -std=gnu99 -O2 -Wall -Iinc -Wno-deprecated-declarations \ -+CFLAGS += -std=gnu11 -Wall -Iinc -Wno-deprecated-declarations \ - $(DEFS) \ - $(DBGFLAGS) \ - $(GTK3FLAGS) \ Index: patches/patch-src_lib_path_c =================================================================== RCS file: patches/patch-src_lib_path_c diff -N patches/patch-src_lib_path_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_lib_path_c 4 Feb 2026 08:20:59 -0000 @@ -0,0 +1,33 @@ +drop calls to get_executable_dir + +Index: src/lib/path.c +--- src/lib/path.c.orig ++++ src/lib/path.c +@@ -106,9 +106,6 @@ static char *srn_try_to_find_data_file(const char *nam + char *path; + char *prefix[] = { + g_build_filename(PACKAGE_DATA_DIR, PACKAGE, NULL), +- g_build_filename(srn_get_executable_dir(), "share", PACKAGE, NULL), +- g_build_filename(srn_get_executable_dir(), "..", "share", PACKAGE, NULL), +- srn_get_executable_dir(), + NULL + }; + +@@ -122,9 +119,6 @@ static char *srn_try_to_find_config_file(const char *n + char *path; + char *prefix[] = { + g_build_filename(PACKAGE_CONFIG_DIR, PACKAGE, NULL), +- g_build_filename(srn_get_executable_dir(), "etc", PACKAGE, NULL), +- g_build_filename(srn_get_executable_dir(), "..", "etc", PACKAGE, NULL), +- srn_get_executable_dir(), + NULL + }; + +@@ -138,7 +132,6 @@ static char *srn_try_to_find_user_file(const char *nam + char *path; + char *prefix[] = { + g_build_filename(g_get_user_config_dir(), PACKAGE, NULL), +- srn_get_executable_dir(), + NULL + }; + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/srain/pkg/PLIST,v diff -u -r1.5 PLIST --- pkg/PLIST 11 Mar 2022 19:47:35 -0000 1.5 +++ pkg/PLIST 4 Feb 2026 08:20:59 -0000 @@ -4,10 +4,14 @@ @sample ${SYSCONFDIR}/srain/ share/examples/srain/builtin.cfg @sample ${SYSCONFDIR}/srain/builtin.cfg +share/icons/hicolor/128x128/apps/im.srain.Srain.Red.png share/icons/hicolor/128x128/apps/im.srain.Srain.png +share/locale/fr/LC_MESSAGES/srain.mo share/locale/nl/LC_MESSAGES/srain.mo share/locale/ru/LC_MESSAGES/srain.mo +share/locale/uk/LC_MESSAGES/srain.mo share/locale/zh_CN/LC_MESSAGES/srain.mo +share/locale/zh_TW/LC_MESSAGES/srain.mo share/metainfo/ share/metainfo/im.srain.Srain.metainfo.xml share/srain/
