From 5a5b2bf93c85b363bb1a6fc2d7101141f9dbe2dc Mon Sep 17 00:00:00 2001 From: Matt Boehlke Date: Sat, 21 Dec 2024 20:59:48 -0600 Subject: [PATCH] libgedit-gtksourceview: update to 299.4.0. --- common/shlibs | 2 +- ...5422a932e01791f44753392e0d18abee0db8.patch | 37 ------ ...79ec9b12fe416e7adbb5bec41267dbc58213.patch | 108 ------------------ srcpkgs/libgedit-gtksourceview/template | 4 +- 4 files changed, 3 insertions(+), 148 deletions(-) delete mode 100644 srcpkgs/libgedit-gtksourceview/patches/080c5422a932e01791f44753392e0d18abee0db8.patch delete mode 100644 srcpkgs/libgedit-gtksourceview/patches/0f6179ec9b12fe416e7adbb5bec41267dbc58213.patch diff --git a/common/shlibs b/common/shlibs index 4c0f6dc75b7..4972d06feaf 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3734,7 +3734,7 @@ libyang.so.1 libyang-1.0r5_1 libhtp.so.2 libhtp-0.5.30_1 libgedit-48.so gedit-48.0_1 libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1 -libgedit-gtksourceview-300.so.2 libgedit-gtksourceview-299.3.0_1 +libgedit-gtksourceview-300.so.3 libgedit-gtksourceview-299.4.0_1 libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1 libgedit-tepl-6.so.1 libgedit-tepl-6.11.0_1 libchewing.so.3 libchewing-0.5.1_1 diff --git a/srcpkgs/libgedit-gtksourceview/patches/080c5422a932e01791f44753392e0d18abee0db8.patch b/srcpkgs/libgedit-gtksourceview/patches/080c5422a932e01791f44753392e0d18abee0db8.patch deleted file mode 100644 index 3ac8cb5ec64..00000000000 --- a/srcpkgs/libgedit-gtksourceview/patches/080c5422a932e01791f44753392e0d18abee0db8.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 080c5422a932e01791f44753392e0d18abee0db8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= -Date: Sat, 31 Aug 2024 17:59:29 +0200 -Subject: [PATCH] Completion: fix a potential crash - ---- - gtksourceview/gtksourcecompletion.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c -index ecd829b4a..b3813c92d 100644 ---- a/gtksourceview/gtksourcecompletion.c -+++ b/gtksourceview/gtksourcecompletion.c -@@ -2028,7 +2028,7 @@ init_tree_view (GtkSourceCompletion *completion, - GtkTreeViewColumn *column; - GtkCellRenderer *cell_renderer; - GtkStyleContext *style_context; -- GdkRGBA *background_color; -+ GdkRGBA *background_color = NULL; - GdkRGBA foreground_color; - - completion->priv->tree_view_proposals = GTK_TREE_VIEW (gtk_builder_get_object (builder, "tree_view_proposals")); -@@ -2147,7 +2147,10 @@ init_tree_view (GtkSourceCompletion *completion, - column, - 0); - -- gdk_rgba_free (background_color); -+ if (background_color != NULL) -+ { -+ gdk_rgba_free (background_color); -+ } - } - - static void --- -GitLab - diff --git a/srcpkgs/libgedit-gtksourceview/patches/0f6179ec9b12fe416e7adbb5bec41267dbc58213.patch b/srcpkgs/libgedit-gtksourceview/patches/0f6179ec9b12fe416e7adbb5bec41267dbc58213.patch deleted file mode 100644 index 425059e885f..00000000000 --- a/srcpkgs/libgedit-gtksourceview/patches/0f6179ec9b12fe416e7adbb5bec41267dbc58213.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 0f6179ec9b12fe416e7adbb5bec41267dbc58213 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= -Date: Sat, 31 Aug 2024 19:10:18 +0200 -Subject: [PATCH] StyleSchemeCss: more robust code for cursors CSS - -Retrieving the background_color can fail. ---- - gtksourceview/gtksourcestyleschemecss.c | 63 ++++++++++++++----------- - 1 file changed, 36 insertions(+), 27 deletions(-) - -diff --git a/gtksourceview/gtksourcestyleschemecss.c b/gtksourceview/gtksourcestyleschemecss.c -index 8e2e734cb..355e31b52 100644 ---- a/gtksourceview/gtksourcestyleschemecss.c -+++ b/gtksourceview/gtksourcestyleschemecss.c -@@ -247,7 +247,6 @@ get_cursors_css (GtkSourceStyleScheme *scheme, - gboolean secondary_color_set; - GdkRGBA primary_color; - GdkRGBA secondary_color; -- gchar *secondary_color_str; - GString *css; - - primary_color_set = get_style_foreground_color (scheme, "cursor", &primary_color); -@@ -258,23 +257,10 @@ get_cursors_css (GtkSourceStyleScheme *scheme, - return NULL; - } - -- css = g_string_new ("textview text {\n"); -- -- if (primary_color_set) -- { -- gchar *primary_color_str; -- -- primary_color_str = gdk_rgba_to_string (&primary_color); -- g_string_append_printf (css, -- "\tcaret-color: %s;\n", -- primary_color_str); -- g_free (primary_color_str); -- } -- - if (!secondary_color_set) - { - GtkStyleContext *context; -- GdkRGBA *background_color; -+ GdkRGBA *background_color = NULL; - - g_assert (primary_color_set); - -@@ -290,22 +276,45 @@ get_cursors_css (GtkSourceStyleScheme *scheme, - - gtk_style_context_restore (context); - -- /* Blend primary cursor color with background color. */ -- secondary_color.red = (primary_color.red + background_color->red) * 0.5; -- secondary_color.green = (primary_color.green + background_color->green) * 0.5; -- secondary_color.blue = (primary_color.blue + background_color->blue) * 0.5; -- secondary_color.alpha = (primary_color.alpha + background_color->alpha) * 0.5; -+ if (background_color != NULL) -+ { -+ /* Blend primary cursor color with background color. */ -+ secondary_color.red = (primary_color.red + background_color->red) * 0.5; -+ secondary_color.green = (primary_color.green + background_color->green) * 0.5; -+ secondary_color.blue = (primary_color.blue + background_color->blue) * 0.5; -+ secondary_color.alpha = (primary_color.alpha + background_color->alpha) * 0.5; -+ -+ secondary_color_set = TRUE; - -- gdk_rgba_free (background_color); -+ gdk_rgba_free (background_color); -+ } - } - -- secondary_color_str = gdk_rgba_to_string (&secondary_color); -- g_string_append_printf (css, -- "\t-gtk-secondary-caret-color: %s;\n", -- secondary_color_str); -- g_free (secondary_color_str); -+ css = g_string_new ("textview text {\n"); -+ -+ if (primary_color_set) -+ { -+ gchar *primary_color_str; -+ -+ primary_color_str = gdk_rgba_to_string (&primary_color); -+ g_string_append_printf (css, -+ "\tcaret-color: %s;\n", -+ primary_color_str); -+ g_free (primary_color_str); -+ } -+ -+ if (secondary_color_set) -+ { -+ gchar *secondary_color_str; -+ -+ secondary_color_str = gdk_rgba_to_string (&secondary_color); -+ g_string_append_printf (css, -+ "\t-gtk-secondary-caret-color: %s;\n", -+ secondary_color_str); -+ g_free (secondary_color_str); -+ } - -- g_string_append_printf (css, "}\n"); -+ g_string_append (css, "}\n"); - - return g_string_free (css, FALSE); - } --- -GitLab - diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template index d92f8b7ffbc..1cb50dc3264 100644 --- a/srcpkgs/libgedit-gtksourceview/template +++ b/srcpkgs/libgedit-gtksourceview/template @@ -1,6 +1,6 @@ # Template file for 'libgedit-gtksourceview' pkgname=libgedit-gtksourceview -version=299.3.0 +version=299.4.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview" changelog="https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview/-/raw/main/NEWS" distfiles="${GNOME_SITE}/libgedit-gtksourceview/${version%%.*}/libgedit-gtksourceview-${version}.tar.xz" -checksum=5ab049520010501e78ca4a19df96e2041412756ce90a3dde0a8a1ae6d88af052 +checksum=20c17ff89e2031aed5dc1107fe9a93fd50f92b569be2954b119c86f9e2fd85d6 make_check_pre="xvfb-run" libgedit-gtksourceview-devel_package() {