[packages/glabels] Rel 7; build fix

arekm arekm at pld-linux.org
Mon Aug 11 23:35:06 CEST 2025


commit 65809187832ed64ed53c9c87ae62a67078aa3519
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Aug 11 23:35:00 2025 +0200

    Rel 7; build fix

 build.patch  | 26 ++++++++++++++++++++++++++
 glabels.spec |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/glabels.spec b/glabels.spec
index 66da489..3a329af 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -2,13 +2,14 @@ Summary:	gLabels - a GNOME program to create labels and business cards
 Summary(pl.UTF-8):	gLabels - program dla GNOME do tworzenia etykiet i wizytówek
 Name:		glabels
 Version:	3.4.1
-Release:	6
+Release:	7
 License:	GPL v3+ (libraries: LGPL v3+)
 Group:		X11/Applications/Graphics
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/%{name}-%{version}.tar.xz
 # Source0-md5:	095105ac95872bd9a767764fa60d5152
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-no-common.patch
+Patch2:		build.patch
 URL:		http://www.glabels.org/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
@@ -121,6 +122,7 @@ Dokumentacja API biblioteki glabels.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 %build
 %{__glib_gettextize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..c8a4188
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,26 @@
+--- glabels-3.4.1/src/ui-commands.c~	2016-01-24 03:06:18.000000000 +0100
++++ glabels-3.4.1/src/ui-commands.c	2025-08-11 23:31:54.168976191 +0200
+@@ -1070,10 +1070,10 @@ gl_ui_cmd_objects_merge_properties (GtkA
+ 
+         } else {
+ 
+-                window->merge_dialog =
++                window->merge_dialog = GL_MERGE_PROPERTIES_DIALOG(
+                         g_object_ref (
+                                 gl_merge_properties_dialog_new (GL_VIEW(window->view)->label,
+-                                                                GTK_WINDOW(window)) );
++                                                                GTK_WINDOW(window)) ));
+ 
+                 g_signal_connect (G_OBJECT(window->merge_dialog), "destroy",
+                                   G_CALLBACK (gtk_widget_destroyed),
+--- glabels-3.4.1/src/pixbuf-cache.c~	2016-01-24 03:06:18.000000000 +0100
++++ glabels-3.4.1/src/pixbuf-cache.c	2025-08-11 23:33:16.022792772 +0200
+@@ -125,7 +125,7 @@ gl_pixbuf_cache_add_pixbuf (GHashTable *
+ 	record = g_new0 (CacheRecord, 1);
+ 	record->key        = g_strdup (name);
+ 	record->references = 0; /* Nobody has referenced it yet. */
+-	record->pixbuf     = g_object_ref (G_OBJECT (pixbuf));
++	record->pixbuf     = GDK_PIXBUF (g_object_ref (pixbuf));
+ 
+ 	g_hash_table_insert (pixbuf_cache, record->key, record);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glabels.git/commitdiff/65809187832ed64ed53c9c87ae62a67078aa3519



More information about the pld-cvs-commit mailing list