Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
2f6abf9
libxml2: update to 2.15.1
aosc-buildit-bot Dec 30, 2025
4a6bc39
groups: add libxml2-rebuilds
stydxm Dec 30, 2025
5cfca47
libxslt: update to 1.1.45
stydxm Dec 31, 2025
662dfce
gettext: bump REL due to libxml2 update
stydxm Dec 31, 2025
46d10b5
shared-mime-info: bump REL due to libxml2 update
stydxm Dec 31, 2025
6b5fe20
llvm-20: bump REL due to libxml2 update
stydxm Feb 17, 2026
f60cbd7
kdoctools: bump REL due to libxml2 update
stydxm Jan 1, 2026
14c4591
kio: bump REL due to libxml2 update
stydxm Jan 2, 2026
68d2f07
librsvg: bump REL due to libxml2 update
stydxm Jan 1, 2026
c5227b4
appstream: bump REL due to libxml2 update
stydxm Dec 30, 2025
d374c15
wayland: bump REL due to libxml2 update
stydxm Jan 2, 2026
1bfe64e
libxkbcommon: bump REL due to libxml2 update
stydxm Jan 2, 2026
6100a40
libsoup: bump REL due to libxml2 update
stydxm Jan 2, 2026
68698dc
tinysparql: bump REL due to libxml2 update
stydxm Feb 18, 2026
8186851
webkit2gtk: bump REL due to libxml2 update
stydxm Feb 17, 2026
8752b6a
libaccounts-glib: bump REL due to libxml2 update
stydxm Jan 15, 2026
0addfac
totem-pl-parser: bump REL due to libxml2 update
stydxm Feb 17, 2026
6763b82
libgdata: bump REL due to libxml2 update
stydxm Feb 17, 2026
65f0c45
libgweather: bump REL due to libxml2 update
stydxm Jan 3, 2026
3c29361
libical: bump REL due to libxml2 update
stydxm Jan 3, 2026
622271d
evolution-data-server: bump REL due to libxml2 update
stydxm Jan 3, 2026
38cfbe5
libxklavier: bump REL due to libxml2 update
stydxm Jan 4, 2026
a614f2f
cinnamon: bump REL due to libxml2 update
stydxm Jan 4, 2026
6c38ebc
gtksourceview-3: bump REL due to libxml2 update
stydxm Jan 16, 2026
7e90112
gtksourceview-4: bump REL due to libxml2 update
stydxm Jan 5, 2026
5bfaff5
gtksourceview-5: bump REL due to libxml2 update
stydxm Feb 17, 2026
8f66024
gupnp: bump REL due to libxml2 update
stydxm Jan 4, 2026
fea2b80
gupnp-av: bump REL due to libxml2 update
stydxm Jan 4, 2026
353fbbd
gupnp-dlna: bump REL due to libxml2 update
stydxm Jan 4, 2026
482be8b
dleyna: bump REL due to libxml2 update
stydxm Feb 17, 2026
3f2e0db
libgnt: bump REL due to libxml2 update
stydxm Jan 4, 2026
30f246b
libspatialite: bump REL due to libxml2 update
stydxm Jan 5, 2026
eb22853
m17n-lib: bump REL due to libxml2 update
stydxm Jan 4, 2026
cbf0b55
rest: bump REL due to libxml2 update
stydxm Jan 5, 2026
712cbcc
libbluray: bump REL due to libxml2 update
stydxm Jan 5, 2026
7368106
postgresql-17: bump REL due to libxml2 update
stydxm Jan 5, 2026
05d0279
qt-5: bump REL due to libxml2 update
stydxm Jan 4, 2026
474188d
libvisio: bump REL due to libxml2 update
stydxm Jan 8, 2026
e67552a
imagemagick: bump REL due to libxml2 update
stydxm Jan 8, 2026
5420a37
imagemagick+7: bump REL due to libxml2 update
stydxm Jan 8, 2026
847e437
libmateweather: bump REL due to libxml2 update
stydxm Jan 8, 2026
2dd16d1
libvirt: bump REL due to libxml2 update
stydxm Jan 8, 2026
63198ec
libxml++: bump REL due to libxml2 update
stydxm Jan 8, 2026
5458fe6
xmlsec: bump REL due to libxml2 update
stydxm Jan 8, 2026
737387a
openbox: bump REL due to libxml2 update
stydxm Jan 8, 2026
f7baf8a
glade: bump REL due to libxml2 update
stydxm Jan 16, 2026
4ead54f
lasem: bump REL due to libxml2 update
stydxm Jan 16, 2026
0d35cdb
yaz: bump REL due to libxml2 update
stydxm Jan 18, 2026
53db5d3
libgsf: bump REL due to libxml2 update
stydxm Jan 20, 2026
78b2d3f
raptor2: bump REL due to libxml2 update
stydxm Jan 20, 2026
5fe554f
0ad: bump REL due to libxml2 update
stydxm Jan 2, 2026
5aa89b6
akonadi: bump REL due to libxml2 update
stydxm Jan 15, 2026
f0394f7
aria2: bump REL due to libxml2 update
stydxm Jan 15, 2026
a156492
artikulate: bump REL due to libxml2 update
stydxm Jan 15, 2026
b18e7e1
atril: bump REL due to libxml2 update
stydxm Jan 15, 2026
58a8130
audacious: bump REL due to libxml2 update
stydxm Jan 15, 2026
801a71b
augeas: bump REL due to libxml2 update
stydxm Jan 15, 2026
c30215a
autofs: bump REL due to libxml2 update
stydxm Dec 30, 2025
8fd57ef
autogen: bump REL due to libxml2 update
stydxm Jan 15, 2026
43b97a1
bind: bump REL due to libxml2 update
stydxm Jan 3, 2026
c36e7e5
brasero: bump REL due to libxml2 update
stydxm Jan 15, 2026
d4d018b
caja: bump REL due to libxml2 update
stydxm Jan 15, 2026
143e05c
cantor: bump REL due to libxml2 update
stydxm Jan 15, 2026
a31532b
castget: bump REL due to libxml2 update
stydxm Jan 3, 2026
95954e6
clamav: bump REL due to libxml2 update
stydxm Dec 30, 2025
d18082c
conky: bump REL due to libxml2 update
stydxm Jan 16, 2026
7958a84
ctags: bump REL due to libxml2 update
stydxm Jan 16, 2026
0b9e1a1
cuda: bump REL due to libxml2 update
stydxm Jan 16, 2026
79b87e3
darktable: bump REL due to libxml2 update
stydxm Jan 16, 2026
d223b05
dvdauthor: bump REL due to libxml2 update
stydxm Jan 16, 2026
adbab64
digikam: bump REL due to libxml2 update
stydxm Mar 1, 2026
eaad727
ebook-tools: bump REL due to libxml2 update
stydxm Jan 16, 2026
73aae13
emacs: bump REL due to libxml2 update
stydxm Jan 16, 2026
0ae0300
eom: bump REL due to libxml2 update
stydxm Jan 16, 2026
722b167
epiphany: bump REL due to libxml2 update
stydxm Jan 16, 2026
3c046d6
evolution: bump REL due to libxml2 update
stydxm Feb 20, 2026
a4d90b5
evolution-ews: bump REL due to libxml2 update
stydxm Jan 16, 2026
9bf8db5
fcitx: bump REL due to libxml2 update
stydxm Jan 16, 2026
9d8c87b
flatpak: bump REL due to libxml2 update
stydxm Dec 30, 2025
524d9b0
flatpak-builder: bump REL due to libxml2 update
stydxm Feb 17, 2026
7457cfd
fontforge: bump REL due to libxml2 update
stydxm Mar 1, 2026
f9c7834
font-manager: bump REL due to libxml2 update
stydxm Jan 16, 2026
bd099c8
foomatic-db-engine: bump REL due to libxml2 update
stydxm Jan 16, 2026
2b3c0f7
gconf: bump REL due to libxml2 update
stydxm Dec 30, 2025
d681c1a
gdal: bump REL due to libxml2 update
stydxm Mar 1, 2026
52c46a5
geany-plugins: bump REL due to libxml2 update
stydxm Jan 18, 2026
178f46a
gnome-calculator: bump REL due to libxml2 update
stydxm Jan 18, 2026
14117a8
gnome-control-center: bump REL due to libxml2 update
stydxm Jan 18, 2026
c6643f2
gnustep-base: bump REL due to libxml2 update
stydxm Jan 19, 2026
a9e1203
goffice: bump REL due to libxml2 update
stydxm Jan 19, 2026
ff798d1
graphicsmagick: bump REL due to libxml2 update
stydxm Mar 1, 2026
c4d78c8
grilo-plugins: bump REL due to libxml2 update
stydxm Jan 19, 2026
96a7be9
gstreamer: bump REL due to libxml2 update
stydxm Jan 19, 2026
bb89b84
gtranslator: bump REL due to libxml2 update
stydxm Feb 20, 2026
8994239
gvfs: bump REL due to libxml2 update
stydxm Jan 19, 2026
b252a92
gweather-locations: bump REL due to libxml2 update
stydxm Feb 17, 2026
8775a4d
handbrake: bump REL due to libxml2 update
stydxm Jan 19, 2026
922a0c9
hivex: bump REL due to libxml2 update
stydxm Jan 19, 2026
a322724
hotdoc: bump REL due to libxml2 update
stydxm Jan 19, 2026
e549211
html5-parser: bump REL due to libxml2 update
stydxm Jan 19, 2026
18ab8ea
httpd: bump REL due to libxml2 update
stydxm Jan 19, 2026
c2b61da
hwloc: bump REL due to libxml2 update
stydxm Jan 19, 2026
9b9553e
icecast: bump REL due to libxml2 update
stydxm Jan 19, 2026
e54d6d8
inkscpae: bump REL due to libxml2 update
stydxm Jan 19, 2026
ffc2c83
kbibtex-trinity: bump REL due to libxml2 update
stydxm Jan 20, 2026
97d8875
khelpcenter: bump REL due to libxml2 update
stydxm Jan 20, 2026
7ad9ed2
kitinerary: bump REL due to libxml2 update
stydxm Jan 20, 2026
74b7817
kodi: bump REL due to libxml2 update
stydxm Jan 20, 2026
1f751be
koffice-trinity: bump REL due to libxml2 update
stydxm Mar 1, 2026
9d2fc0b
kopete: bump REL due to libxml2 update
stydxm Jan 20, 2026
7fd1e6c
ktouch: bump REL due to libxml2 update
stydxm Jan 20, 2026
4c48778
labwc: bump REL due to libxml2 update
stydxm Jan 23, 2026
312c76d
lash: bump REL due to libxml2 update
stydxm Jan 23, 2026
4b07429
libabw: bump REL due to libxml2 update
stydxm Jan 23, 2026
8ae9641
libavif: bump REL due to libxml2 update
stydxm Jan 23, 2026
5deef32
libcmis: bump REL due to libxml2 update
stydxm Feb 11, 2026
7bcab56
libcroco: bump REL due to libxml2 update
stydxm Feb 11, 2026
624896f
libe-book: bump REL due to libxml2 update
stydxm Feb 11, 2026
c8abdce
libetonyek: bump REL due to libxml2 update
stydxm Feb 11, 2026
05f678e
libglade: bump REL due to libxml2 update
stydxm Feb 17, 2026
9936cc0
libgovirt: bump REL due to libxml2 update
stydxm Feb 11, 2026
4a469bc
libgphoto2: bump REL due to libxml2 update
stydxm Mar 1, 2026
5638218
libgpod: bump REL due to libxml2 update
stydxm Mar 1, 2026
12d0d28
libguestfs: bump REL due to libxml2 update
stydxm Mar 1, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app-admin/appstream/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VER=1.1.1
REL=1
SRCS="git::commit=tags/v${VER};copy-repo=true::https://github.com/ximion/appstream.git"
CHKSUMS="SKIP"
CHKUPDATE="anitya::id=10385"
16 changes: 9 additions & 7 deletions app-admin/autofs/autobuild/defines
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ PKGNAME=autofs
PKGSEC=admin
PKGDEP="openldap kmod krb5 libxml2 libnsl2"
BUILDDEP="rpcsvc-proto"
PKGDES="A kernel-based automounter for Linux"
PKGDES="Kernel-based automounter for Linux"

ABSHADOW=0

AUTOTOOLS_AFTER="--with-mapdir=/etc/autofs \
--without-hesiod \
--enable-ignore-busy \
--with-systemd"
ABTYPE=autotools
AUTOTOOLS_AFTER=(
"--with-mapdir=/etc/autofs"
"--without-hesiod"
"--enable-ignore-busy"
"--with-systemd"
)
ABMK="INSTALLROOT=$PKGDIR \
TIRPCLIB=-ltirpc \
STRIP=true"
ABSHADOW=0
2 changes: 1 addition & 1 deletion app-admin/autofs/spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VER=5.1.9
REL=1
REL=2
SRCS="tbl::https://www.kernel.org/pub/linux/daemons/autofs/v${VER:0:1}/autofs-$VER.tar.xz"
CHKSUMS="sha256::87e6af6a03794b9462ea519781e50e7d23b5f7c92cd59e1142c85d2493b3c24b"
CHKUPDATE="anitya::id=140"
66 changes: 28 additions & 38 deletions app-admin/clamav/autobuild/defines
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PKGNAME=clamav
PKGSEC=admin
PKGDEP="bzip2 curl json-c libtool libmspack libxml2 pcre2 systemd unrar"
BUILDDEP="check doxygen rustc"
BUILDDEP="check rustc"
BUILDDEP__RETRO=""
BUILDDEP__ARMV4="${BUILDDEP__RETRO}"
BUILDDEP__ARMV6HF="${BUILDDEP__RETRO}"
Expand All @@ -13,42 +13,32 @@ BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
BUILDDEP__PPC64="${BUILDDEP__RETRO}"
PKGDES="Anti-virus toolkit for Unix"

CMAKE_AFTER="-DAPP_CONFIG_DIRECTORY=/etc/clamav \
-DCLAMAV_USER=clamav \
-DCLAMAV_GROUP=clamav \
-DBYTECODE_RUNTIME=interpreter \
-DOPTIMIZE=ON \
-DENABLE_WERROR=OFF \
-DENABLE_EXPERIMENTAL=OFF \
-DENABLE_FRESHCLAM_DNS_FIX=ON \
-DENABLE_FRESHCLAM_NO_CACHE=OFF \
-DENABLE_EXTERNAL_MSPACK=ON \
-DENABLE_JSON_SHARED=ON \
-DENABLE_APP=ON \
-DENABLE_MILTER=OFF \
-DENABLE_CLAMONACC=ON \
-DENABLE_MAN_PAGES=ON \
-DENABLE_DOXYGEN=ON \
-DENABLE_EXAMPLES=ON \
-DENABLE_TESTS=OFF \
-DENABLE_LIBCLAMAV_ONLY=OFF \
-DENABLE_STATIC_LIB=OFF \
-DENABLE_SHARED_LIB=ON \
-DENABLE_UNRAR=ON \
-DENABLE_SYSTEMD=ON \
-DVENDOR_DEPENDENCIES=ON"
CMAKE_AFTER__RETRO=" \
${CMAKE_AFTER} \
-DENABLE_DOXYGEN=OFF \
-DENABLE_EXAMPLES=OFF"
CMAKE_AFTER__ARMV4="${CMAKE_AFTER__RETRO}"
CMAKE_AFTER__ARMV6HF="${CMAKE_AFTER__RETRO}"
CMAKE_AFTER__ARMV7HF="${CMAKE_AFTER__RETRO}"
CMAKE_AFTER__I486="${CMAKE_AFTER__RETRO}"
CMAKE_AFTER__LOONGSON2F="${CMAKE_AFTER__RETRO}"
CMAKE_AFTER__M68K="${CMAKE_AFTER__RETRO}"
CMAKE_AFTER__POWERPC="${CMAKE_AFTER__RETRO}"
CMAKE_AFTER__PPC64="${CMAKE_AFTER__RETRO}"

ABTYPE=cmakeninja
CMAKE_AFTER=(
"-DAPP_CONFIG_DIRECTORY=/etc/clamav"
"-DCLAMAV_USER=clamav"
"-DCLAMAV_GROUP=clamav"
"-DBYTECODE_RUNTIME=interpreter"
"-DOPTIMIZE=ON"
"-DENABLE_WERROR=OFF"
"-DENABLE_EXPERIMENTAL=OFF"
"-DENABLE_FRESHCLAM_DNS_FIX=ON"
"-DENABLE_FRESHCLAM_NO_CACHE=OFF"
"-DENABLE_EXTERNAL_MSPACK=ON"
"-DENABLE_JSON_SHARED=ON"
"-DENABLE_APP=ON"
"-DENABLE_MILTER=OFF"
"-DENABLE_CLAMONACC=ON"
"-DENABLE_MAN_PAGES=ON"
"-DENABLE_DOXYGEN=OFF"
"-DENABLE_EXAMPLES=OFF"
"-DENABLE_TESTS=OFF"
"-DENABLE_LIBCLAMAV_ONLY=OFF"
"-DENABLE_STATIC_LIB=OFF"
"-DENABLE_SHARED_LIB=ON"
"-DENABLE_UNRAR=ON"
"-DENABLE_SYSTEMD=ON"
"-DVENDOR_DEPENDENCIES=ON"
)
# FIXME: error adding symbols: file format not recognized
NOLTO=1
1 change: 1 addition & 0 deletions app-admin/clamav/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VER=1.5.1
REL=1
SRCS="tbl::https://www.clamav.net/downloads/production/clamav-$VER.tar.gz"
CHKSUMS="sha256::64fe4a16a5622c1d71efe9ed7f2c2fbd37f8f237da9f11ff66b73038df71db91"
CHKUPDATE="anitya::id=291"
1 change: 1 addition & 0 deletions app-admin/flatpak/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VER=1.17.2
REL=1
SRCS="git::commit=tags/$VER::https://github.com/flatpak/flatpak.git \
file::rename=flathub.flatpakrepo::https://flathub.org/repo/flathub.flatpakrepo"
CHKSUMS="SKIP \
Expand Down
11 changes: 8 additions & 3 deletions app-admin/gconf/autobuild/defines
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
PKGNAME=gconf
PKGSEC=gnome
PKGDEP="dbus-glib polkit libxml2"
BUILDDEP="gtk-doc gobject-introspection intltool"
# FIXME: this project requires gt-doc even if it's disabled
BUILDDEP="gobject-introspection intltool libtool gtk-doc"
PKGDES="GConf configuration database system"

# FIXME: Re-generation fails.
#
# configure:20829: error: possibly undefined macro: AM_NLS
# If this token and others are legitimate, please use m4_pattern_allow.
# See the Autoconf documentation.
RECONF=0
# RECONF=0
AUTOTOOLS_AFTER=(
'--disable-orbit'
'--disable-static'
'--enable-defaults-service'
'--disable-orbit'
'--without-openldap'
'--disable-gsettings-backend'
'--disable-gtk-doc'
)

# Note: Extra Provides for Spiral, gconf has been removed from Ubuntu's
Expand Down
98 changes: 98 additions & 0 deletions app-admin/gconf/autobuild/patches/0002-drop-spew.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 15 Apr 2013 09:57:34 -0400
Subject: [PATCH] dbus: Don't spew to console when unable to connect to dbus
daemon

Instead pass the error up for the caller to decide what to do.

This prevent untrappable warning messages from showing up at the
console if gconftool --makefile-install-rule is called.
---
gconf/gconf-dbus.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
index 5610fcf..048e3ea 100644
--- a/gconf/gconf-dbus.c
+++ b/gconf/gconf-dbus.c
@@ -104,9 +104,9 @@ static GConfEngine *default_engine = NULL;
static GHashTable *engines_by_db = NULL;
static GHashTable *engines_by_address = NULL;
static gboolean dbus_disconnected = FALSE;

-static gboolean ensure_dbus_connection (void);
+static gboolean ensure_dbus_connection (GError **error);
static gboolean ensure_service (gboolean start_if_not_found,
GError **err);
static gboolean ensure_database (GConfEngine *conf,
gboolean start_if_not_found,
@@ -382,18 +382,20 @@ gconf_engine_detach (GConfEngine *conf)
}
}

static gboolean
-ensure_dbus_connection (void)
+ensure_dbus_connection (GError **err)
{
DBusError error;

if (global_conn != NULL)
return TRUE;

if (dbus_disconnected)
{
- g_warning ("The connection to DBus was broken. Can't reinitialize it.");
+ g_set_error (err, GCONF_ERROR,
+ GCONF_ERROR_NO_SERVER,
+ "The connection to DBus was broken. Can't reinitialize it.");
return FALSE;
}

dbus_error_init (&error);
@@ -401,9 +403,12 @@ ensure_dbus_connection (void)
global_conn = dbus_bus_get_private (DBUS_BUS_SESSION, &error);

if (!global_conn)
{
- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message);
+ g_set_error (err, GCONF_ERROR,
+ GCONF_ERROR_NO_SERVER,
+ "Client failed to connect to the D-BUS daemon:\n%s",
+ error.message);

dbus_error_free (&error);
return FALSE;
}
@@ -430,15 +435,10 @@ ensure_service (gboolean start_if_not_found,
DBusError error;

if (global_conn == NULL)
{
- if (!ensure_dbus_connection ())
- {
- g_set_error (err, GCONF_ERROR,
- GCONF_ERROR_NO_SERVER,
- _("No D-BUS daemon running\n"));
- return FALSE;
- }
+ if (!ensure_dbus_connection (err))
+ return FALSE;

g_assert (global_conn != NULL);
}

@@ -2511,9 +2511,9 @@ gboolean
gconf_ping_daemon (void)
{
if (global_conn == NULL)
{
- if (!ensure_dbus_connection ())
+ if (!ensure_dbus_connection (NULL))
{
return FALSE;
}
g_assert (global_conn != NULL);
--
1.8.1.4

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 6160b99595275f9942bc90ae2067e0349889e589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@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@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

46 changes: 46 additions & 0 deletions app-admin/gconf/autobuild/patches/0005-workaround-crash.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
diff -up GConf-3.2.6/gconf/gconfd.c.workaround-crash GConf-3.2.6/gconf/gconfd.c
--- GConf-3.2.6/gconf/gconfd.c.workaround-crash 2013-04-15 10:12:54.480753142 -0400
+++ GConf-3.2.6/gconf/gconfd.c 2013-04-15 10:12:53.457736847 -0400
@@ -1076,17 +1076,6 @@ periodic_cleanup_timeout(gpointer data)
#endif
drop_old_databases ();

-#ifdef HAVE_DBUS
- if (no_databases_in_use () && gconfd_dbus_client_count () == 0)
-#else
- if (no_databases_in_use () && client_count () == 0)
-#endif
- {
- gconf_log (GCL_INFO, _("GConf server is not in use, shutting down."));
- gconfd_main_quit ();
- return FALSE;
- }
-
/* expire old locale cache entries */
gconfd_locale_cache_expire ();

@@ -1105,7 +1094,6 @@ periodic_cleanup_timeout(gpointer data)

return TRUE;
}
-
void
gconfd_need_log_cleanup (void)
{
@@ -1131,14 +1119,14 @@ gconf_main(void)
}

main_loops = g_slist_prepend(main_loops, loop);
+ main_loops = g_slist_prepend(main_loops, loop);

g_main_loop_run (loop);

main_loops = g_slist_remove(main_loops, loop);

- if (main_loops == NULL)
+ if (main_loops == NULL && timeout_id != 0)
{
- g_assert(timeout_id != 0);
g_source_remove(timeout_id);
timeout_id = 0;
}
14 changes: 14 additions & 0 deletions app-admin/gconf/autobuild/patches/0006-pkill-hack.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff -up GConf-3.2.6/gconf/gconftool.c.pkill-hack GConf-3.2.6/gconf/gconftool.c
--- GConf-3.2.6/gconf/gconftool.c.pkill-hack 2013-04-17 10:46:13.225426329 -0400
+++ GConf-3.2.6/gconf/gconftool.c 2013-04-17 10:48:25.963508300 -0400
@@ -916,8 +916,8 @@ main (int argc, char** argv)

use_local_source = TRUE;

- /* shut down daemon, this is a race condition, but will usually work. */
- gconf_shutdown_daemon (NULL);
+ g_spawn_command_line_sync ("/usr/bin/pkill -HUP -f /usr/libexec/gconfd-2",
+ NULL, NULL, NULL, NULL);
}

if (config_source == NULL)
12 changes: 12 additions & 0 deletions app-admin/gconf/autobuild/patches/0007-fix-conf.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/configure.ac b/configure.ac
index 69a57e64..eb9d3013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ AC_ISC_POSIX
AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
+AM_PROG_AR
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)

changequote(,)dnl
26 changes: 0 additions & 26 deletions app-admin/gconf/autobuild/patches/01_defaults_path.patch

This file was deleted.

Loading