From: Theo Buehler Subject: [update] railway 2.8.1 To: ports@openbsd.org Cc: landry@openbsd.org Date: Sat, 7 Jun 2025 23:38:12 +0200 The changelog doesn't contain anything super exciting. The existing SITES didn't work for 2.8.x, so I used one guessed from the releases page that works with 2.8.0 and 2.8.1. Now depends on blueprint-compiler and uses rust-openssl which thus requires a version patch and a checksum hack. Works for me. https://gitlab.com/schmiddi-on-mobile/railway/-/blob/master/CHANGELOG.md?ref_type=heads#281---2025-05-10 Index: Makefile =================================================================== RCS file: /cvs/ports/productivity/railway/Makefile,v diff -u -p -r1.3 Makefile --- Makefile 3 Nov 2024 11:06:01 -0000 1.3 +++ Makefile 7 Jun 2025 21:23:50 -0000 @@ -1,12 +1,10 @@ COMMENT= look up travel information for many different railways GNOME_PROJECT= railway -GNOME_VERSION= 2.7.0 -DISTFILES= diebahn-${GNOME_VERSION}${EXTRACT_SUFX}{download} +GNOME_VERSION= 2.8.1 +DISTFILES= diebahn-${GNOME_VERSION}${EXTRACT_SUFX} WRKDIST= ${WRKDIR}/diebahn-${GNOME_VERSION} -SITES= https://gitlab.com/schmiddi-on-mobile/railway/-/package_files/139774320/ - -REVISION= 1 +SITES= https://gitlab.com/api/v4/projects/34570753/packages/generic/railway/${GNOME_VERSION}/ CATEGORIES= productivity @@ -22,10 +20,11 @@ MODULES= devel/meson \ MODGNOME_TOOLS= desktop-file-utils \ gtk-update-icon-cache +BUILD_DEPENDS= x11/blueprint-compiler LIB_DEPENDS= x11/gnome/libadwaita -WANTLIB += ${MODRUST_WANTLIB} adwaita-1 gio-2.0 glib-2.0 gobject-2.0 -WANTLIB += gtk-4 intl m pango-1.0 +WANTLIB += ${MODRUST_WANTLIB} adwaita-1 crypto gio-2.0 glib-2.0 gobject-2.0 +WANTLIB += gtk-4 intl m pango-1.0 ssl # don't rebuild the gettext crate MAKE_ENV= GETTEXT_DIR=${LOCALBASE} \ @@ -43,7 +42,7 @@ pre-configure: >${WRKBUILD}/.cargo/config ${} # patched crate sed -i 's/"files":{[^}]*}/"files":{}/' \ - ${WRKSRC}/vendor/libadwaita/.cargo-checksum.json + ${WRKSRC}/vendor/openssl-sys/.cargo-checksum.json post-install: ln -sf ${TRUEPREFIX}/bin/diebahn ${PREFIX}/bin/railway Index: distinfo =================================================================== RCS file: /cvs/ports/productivity/railway/distinfo,v diff -u -p -r1.1.1.1 distinfo --- distinfo 5 Oct 2024 08:15:32 -0000 1.1.1.1 +++ distinfo 7 Jun 2025 20:28:14 -0000 @@ -1,2 +1,2 @@ -SHA256 (diebahn-2.7.0.tar.xz) = 8WTK6v4hTwsfvEIq2Mpj5iCzhCOfvifTSXJGjDuVorQ= -SIZE (diebahn-2.7.0.tar.xz) = 28195344 +SHA256 (diebahn-2.8.1.tar.xz) = FRWapO6Hqe4QGlsWnccqWrP6dJUkqaktYYstUxeAi6M= +SIZE (diebahn-2.8.1.tar.xz) = 38026668 Index: patches/patch-vendor_libadwaita_src_auto_about_dialog_rs =================================================================== RCS file: patches/patch-vendor_libadwaita_src_auto_about_dialog_rs diff -N patches/patch-vendor_libadwaita_src_auto_about_dialog_rs --- patches/patch-vendor_libadwaita_src_auto_about_dialog_rs 5 Oct 2024 08:15:32 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -https://gitlab.gnome.org/World/Rust/libadwaita-rs/-/commit/dc129df76c859c3565146d177d426fb5e2a7c8ba - -Index: vendor/libadwaita/src/auto/about_dialog.rs ---- vendor/libadwaita/src/auto/about_dialog.rs.orig -+++ vendor/libadwaita/src/auto/about_dialog.rs -@@ -27,8 +27,8 @@ impl AboutDialog { - unsafe { Dialog::from_glib_none(ffi::adw_about_dialog_new()).unsafe_cast() } - } - -- #[cfg(target_os = "linux")] -- #[cfg_attr(docsrs, doc(cfg(target_os = "linux")))] -+ #[cfg(not(target_env = "msvc"))] -+ #[cfg_attr(docsrs, doc(cfg(not(target_env = "msvc"))))] - #[doc(alias = "adw_about_dialog_new_from_appdata")] - #[doc(alias = "new_from_appdata")] - pub fn from_appdata(resource_path: &str, release_notes_version: Option<&str>) -> AboutDialog { Index: patches/patch-vendor_openssl-sys_build_main_rs =================================================================== RCS file: patches/patch-vendor_openssl-sys_build_main_rs diff -N patches/patch-vendor_openssl-sys_build_main_rs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-vendor_openssl-sys_build_main_rs 7 Jun 2025 20:42:46 -0000 @@ -0,0 +1,11 @@ +Index: vendor/openssl-sys/build/main.rs +--- vendor/openssl-sys/build/main.rs.orig ++++ vendor/openssl-sys/build/main.rs +@@ -449,6 +449,7 @@ See rust-openssl documentation for more information: + (3, 9, _) => ('3', '9', 'x'), + (4, 0, 0) => ('4', '0', '0'), + (4, 0, _) => ('4', '0', 'x'), ++ (4, _, _) => ('4', '1', 'x'), + _ => version_error(), + }; + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/productivity/railway/pkg/PLIST,v diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 5 Oct 2024 08:15:32 -0000 1.1.1.1 +++ pkg/PLIST 7 Jun 2025 20:59:46 -0000 @@ -2,6 +2,7 @@ @bin bin/diebahn bin/railway share/applications/de.schmidhuberj.DieBahn.desktop +share/dbus-1/services/de.schmidhuberj.DieBahn.service share/diebahn/ share/diebahn/resources.gresource share/glib-2.0/schemas/de.schmidhuberj.DieBahn.gschema.xml @@ -9,17 +10,24 @@ share/icons/hicolor/scalable/apps/de.sch share/icons/hicolor/symbolic/apps/de.schmidhuberj.DieBahn-symbolic.svg share/locale/ar/LC_MESSAGES/diebahn.mo share/locale/bg/LC_MESSAGES/diebahn.mo +share/locale/bn/LC_MESSAGES/diebahn.mo share/locale/da/LC_MESSAGES/diebahn.mo share/locale/de/LC_MESSAGES/diebahn.mo share/locale/es/LC_MESSAGES/diebahn.mo +share/locale/et/LC_MESSAGES/diebahn.mo share/locale/fi/LC_MESSAGES/diebahn.mo share/locale/fr/LC_MESSAGES/diebahn.mo share/locale/hi/LC_MESSAGES/diebahn.mo share/locale/hr/LC_MESSAGES/diebahn.mo share/locale/hu/LC_MESSAGES/diebahn.mo +share/locale/ia/LC_MESSAGES/diebahn.mo share/locale/it/LC_MESSAGES/diebahn.mo share/locale/ja/LC_MESSAGES/diebahn.mo +share/locale/kab/LC_MESSAGES/diebahn.mo share/locale/ko/LC_MESSAGES/diebahn.mo +share/locale/nb_NO/ +share/locale/nb_NO/LC_MESSAGES/ +share/locale/nb_NO/LC_MESSAGES/diebahn.mo share/locale/nl/LC_MESSAGES/diebahn.mo share/locale/oc/LC_MESSAGES/diebahn.mo share/locale/pl/LC_MESSAGES/diebahn.mo @@ -28,10 +36,13 @@ share/locale/pt_BR/LC_MESSAGES/diebahn.m share/locale/ro/LC_MESSAGES/diebahn.mo share/locale/ru/LC_MESSAGES/diebahn.mo share/locale/sv/LC_MESSAGES/diebahn.mo +share/locale/ta/LC_MESSAGES/diebahn.mo share/locale/tr/LC_MESSAGES/diebahn.mo share/locale/uk/LC_MESSAGES/diebahn.mo +share/locale/zh_Hans/ +share/locale/zh_Hans/LC_MESSAGES/ +share/locale/zh_Hans/LC_MESSAGES/diebahn.mo share/metainfo/de.schmidhuberj.DieBahn.metainfo.xml -share/metainfo/resources.gresource.xml @tag glib-compile-schemas @tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor