[packages/GConf2] Rel 9; fix build

[arekm]

commit 670c3426d04f7ffcfa8cc865bda69f69b6eb09bb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Jul 14 21:23:32 2025 +0200

    Rel 9; fix build

 GConf-3.2.6-Use-gettext-0.21.patch | 34 ++++++++++++++++++++++++++++++++++
 GConf2.spec                        | 17 +++++++++++------
 example.patch                      | 11 +++++++++++
 3 files changed, 56 insertions(+), 6 deletions(-)
---
diff --git a/GConf2.spec b/GConf2.spec
index 3aba1d8..c9e04f9 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -11,7 +11,7 @@ Summary(pt_BR.UTF-8):	Sistema de Configuração do GNOME 2
 Summary(ru.UTF-8):	Система конфигурации GNOME 2
 Name:		GConf2
 Version:	3.2.6
-Release:	8
+Release:	9
 License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
@@ -20,6 +20,8 @@ Patch0:		%{name}-NO_MAJOR_VERSION.patch
 Patch1:		%{name}-reload.patch
 Patch2:		workaround-crash.patch
 Patch3:		python3.patch
+Patch4:		GConf-3.2.6-Use-gettext-0.21.patch
+Patch5:		example.patch
 URL:		https://projects-old.gnome.org/gconf/
 BuildRequires:	ORBit2-devel >= 1:2.14.9
 BuildRequires:	autoconf >= 2.60
@@ -172,17 +174,20 @@ automatycznie skonfigurowane do używania tych adresów.
 
 %prep
 %setup -q -n GConf-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
+%{__autopoint}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %{__automake}
diff --git a/GConf-3.2.6-Use-gettext-0.21.patch b/GConf-3.2.6-Use-gettext-0.21.patch
new file mode 100644
index 0000000..6ff72db
--- /dev/null
+++ b/GConf-3.2.6-Use-gettext-0.21.patch
@@ -0,0 +1,34 @@
+From 6160b99595275f9942bc90ae2067e0349889e589 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 20 May 2025 13:40:30 +0200
+Subject: [PATCH] Use gettext 0.21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ configure.ac |   3 +++
+
+diff --git a/configure.ac b/configure.ac
+index 69a57e6..3c6ba2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,11 +3,14 @@ AC_INIT([GConf],
+   [3.2.6],
+   [http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],
+   [GConf])
++AC_CONFIG_MACRO_DIRS([m4])
+ 
+ AC_CONFIG_SRCDIR([gconf/gconf.h])
+ AC_CONFIG_HEADERS([config.h])
+ 
+ AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wall])
++AM_GNU_GETTEXT_VERSION(0.21)
++AM_GNU_GETTEXT([external])
+ 
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ 
+-- 
+2.49.0
+
diff --git a/example.patch b/example.patch
new file mode 100644
index 0000000..002ba9b
--- /dev/null
+++ b/example.patch
@@ -0,0 +1,11 @@
+--- GConf-3.2.6/examples/basic-gconf-app.c~	2011-08-16 04:59:31.000000000 +0200
++++ GConf-3.2.6/examples/basic-gconf-app.c	2025-07-14 21:21:36.453748899 +0200
+@@ -455,7 +455,7 @@ create_prefs_dialog (GtkWidget   *parent
+ 
+   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+   
+-  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(dialog)),
++  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+                       vbox, TRUE, TRUE, 0);
+ 
+   entry = create_config_entry (dialog, client, "/apps/basic-gconf-app/foo",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/GConf2.git/commitdiff/670c3426d04f7ffcfa8cc865bda69f69b6eb09bb