From 6ac266c18b6dfa96d1a281b7a397cfa9b1b967dc Mon Sep 17 00:00:00 2001 From: zlice Date: Mon, 30 Jun 2025 16:02:21 -0400 Subject: [PATCH] Marker: patch gcc14 incompat --- srcpkgs/Marker/patches/gcc14.patch | 10 ++++++++++ srcpkgs/Marker/template | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 srcpkgs/Marker/patches/gcc14.patch diff --git a/srcpkgs/Marker/patches/gcc14.patch b/srcpkgs/Marker/patches/gcc14.patch new file mode 100644 index 00000000000..773f783d7b6 --- /dev/null +++ b/srcpkgs/Marker/patches/gcc14.patch @@ -0,0 +1,10 @@ +--- a/src/marker-window.c ++++ b/src/marker-window.c +@@ -866,7 +866,7 @@ + if (marker_prefs_get_show_sidebar()) + { + // show sidebar and set the "Sidebar" button as activated +- g_action_group_activate_action(G_ACTION_MAP (window), "sidebar", NULL); ++ g_action_group_activate_action(G_ACTION_GROUP (window), "sidebar", NULL); + } + g_signal_connect(window, "delete-event", G_CALLBACK(window_deleted_event_cb), window); diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template index 0bcf2f8f9f4..9e4816a619c 100644 --- a/srcpkgs/Marker/template +++ b/srcpkgs/Marker/template @@ -1,11 +1,10 @@ # Template file for 'Marker' pkgname=Marker version=2023.05.02 -revision=1 +revision=2 _scidown_commit=a7b7f063de4f272ef0ec12d00b98470888e8cb32 _charter_commit=a25dee1214ea9ba5882325066555cb813efbb489 _tinyexpr_commit=9476568b69de4c384903f1d5f255907b92592f45 -build_wrksrc="Marker-${version}" build_style=meson hostmakedepends="glib-devel pkg-config itstool gettext" makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel @@ -16,21 +15,21 @@ maintainer="Enno Boland " license="GPL-3.0-or-later, ISC, Zlib" homepage="https://fabiocolacio.github.io/Marker/" distfiles="https://github.com/fabiocolacio/Marker/archive/refs/tags/${version}.tar.gz - https://github.com/Mandarancio/scidown/archive/${_scidown_commit}.tar.gz - https://github.com/Mandarancio/charter/archive/${_charter_commit}.tar.gz - https://github.com/codeplea/tinyexpr/archive/${_tinyexpr_commit}.tar.gz" + https://github.com/Mandarancio/scidown/archive/${_scidown_commit}.tar.gz>scidown-${_scidown_commit}.tar.gz + https://github.com/Mandarancio/charter/archive/${_charter_commit}.tar.gz>charter-${_charter_commit}.tar.gz + https://github.com/codeplea/tinyexpr/archive/${_tinyexpr_commit}.tar.gz>tinyexpr-${_tinyexpr_commit}.tar.gz" checksum="097a6e3811f0c4c14c574b8aafee27ee62232ae3ad3084e18a35c2dc8a1e93dd 31e63658e2e79b5c5b0497d568e548f177fc89cb1dd9b6d78aba7685f0506ff0 60237a813383b44891e57049ba1f86cc5b89c28eee620b6ee90582a0c7ba6f8a 1c0c9496d9e9b693ae364860f0b66c403b87337db1b5a78275a0c78a07495286" +skip_extraction="scidown-${_scidown_commit}.tar.gz + charter-${_charter_commit}.tar.gz + tinyexpr-${_tinyexpr_commit}.tar.gz" post_extract() { - rmdir "${build_wrksrc}/src/scidown" - mv "scidown-${_scidown_commit}" "${build_wrksrc}/src/scidown" - rmdir "${build_wrksrc}/src/scidown/src/charter" - mv "charter-${_charter_commit}" "${build_wrksrc}/src/scidown/src/charter" - rmdir "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr" - mv "tinyexpr-${_tinyexpr_commit}" "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr" + vsrcextract -C "src/scidown" "scidown-${_scidown_commit}.tar.gz" + vsrcextract -C "src/scidown/src/charter" "charter-${_charter_commit}.tar.gz" + vsrcextract -C "src/scidown/src/charter/src/tinyexpr" "tinyexpr-${_tinyexpr_commit}.tar.gz" } post_install() {