--- Begin Message ---
Package: gbonds
Version: 2.0.3-12
Severity: normal
This package still build-depends on libgconf2-dev which prevents the
removal of src:gconf2 from the archive.
Unrelated, but please consider applying the attached patch for your next
upload. The GConf migration was done during the stretch->buster upgrade
so there's no point in keeping that code. Thanks.
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500,
'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, x32
Kernel: Linux 5.3.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8),
LANGUAGE=bg_BG.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages gbonds depends on:
ii gbonds-data 2.0.3-12
ii libc6 2.29-2
ii libcairo2 1.16.0-4
ii libgdk-pixbuf2.0-0 2.40.0+dfsg-1
ii libglib2.0-0 2.62.1-1
ii libgtk-3-0 3.24.12-1
ii libpango-1.0-0 1.42.4-7
ii libpangocairo-1.0-0 1.42.4-7
ii libxml2 2.9.4+dfsg1-7+b3
gbonds recommends no packages.
gbonds suggests no packages.
-- no debconf information
>From bda0f3c1d7a94c913f15f5d3092d00d068273756 Mon Sep 17 00:00:00 2001
From: Yavor Doganov <[email protected]>
Date: Wed, 23 Oct 2019 19:06:27 +0300
Subject: [PATCH] Remove GConf migration code
---
debian/gbonds-data.install | 1 -
debian/patches/gsettings-port | 155 ++--------------------------------
2 files changed, 7 insertions(+), 149 deletions(-)
diff --git a/debian/gbonds-data.install b/debian/gbonds-data.install
index dc88514..5216214 100644
--- a/debian/gbonds-data.install
+++ b/debian/gbonds-data.install
@@ -1,6 +1,5 @@
usr/share/application-registry
usr/share/gbonds
-usr/share/GConf/gsettings
usr/share/glib-2.0/schemas
usr/share/gnome
usr/share/mime
diff --git a/debian/patches/gsettings-port b/debian/patches/gsettings-port
index 79b2a08..7fb02ec 100644
--- a/debian/patches/gsettings-port
+++ b/debian/patches/gsettings-port
@@ -94,7 +94,7 @@ Last-Update: 2018-10-28
--- gbonds-pkg.orig/data/Makefile.am
+++ gbonds-pkg/data/Makefile.am
-@@ -27,6 +27,15 @@
+@@ -27,6 +27,12 @@
newmimedir = $(datadir)/mime/packages
newmime_DATA = $(xml_files)
@@ -103,14 +103,11 @@ Last-Update: 2018-10-28
+gsettings_ENUM_FILES = $(top_srcdir)/src/prefs.h
+
+@GSETTINGS_RULES@
-+
-+data_convertdir = $(datadir)/GConf/gsettings
-+dist_data_convert_DATA = gbonds.convert
+
redemptiondir = $(datadir)/gbonds
redemption_DATA = \
download-sites.xml \
-@@ -72,6 +81,7 @@
+@@ -72,6 +78,7 @@
$(mime_DATA) \
$(app_DATA) \
$(xml_in_files) \
@@ -259,7 +256,7 @@ Last-Update: 2018-10-28
}
-@@ -102,210 +85,160 @@
+@@ -102,52 +85,42 @@
{
gb_debug (DEBUG_PREFS, "START");
@@ -325,89 +322,17 @@ Last-Update: 2018-10-28
- BASE_KEY PREF_MAX_RECENTS,
- gb_prefs->max_recents,
- NULL);
+-
+ g_settings_set_int (settings,
+ PREF_MAX_RECENTS,
+ gb_prefs->max_recents);
--
- gconf_client_suggest_sync (gconf_client, NULL);
+ g_settings_apply (settings);
gb_debug (DEBUG_PREFS, "END");
}
-
- /*****************************************************************************/
-+/* PRIVATE. Migrate old GConf settings to GSettings. */
-+/*****************************************************************************/
-+static gchar *
-+migrate_gconf_settings (const gchar *name)
-+{
-+ gboolean needed = TRUE;
-+ GError *error = NULL;
-+ GKeyFile *kf;
-+ gchar **list;
-+ gchar *msg = NULL;
-+ gsize i, n;
-+
-+ kf = g_key_file_new ();
-+
-+ if (!g_key_file_load_from_data_dirs (kf, "gsettings-data-convert",
-+ NULL, G_KEY_FILE_NONE, NULL)) {
-+ g_key_file_free (kf);
-+ return NULL;
-+ }
-+ list = g_key_file_get_string_list (kf, "State", "converted", &n, NULL);
-+
-+ if (list) {
-+ for (i = 0; i < n; i++)
-+ if (!g_strcmp0 (list[i], name)) {
-+ needed = FALSE;
-+ break;
-+ }
-+ g_strfreev (list);
-+ }
-+ g_key_file_free (kf);
-+
-+ if (needed) {
-+ g_spawn_command_line_sync ("gsettings-data-convert",
-+ NULL, NULL, NULL, &error);
-+ if (error) {
-+ if (!g_error_matches (error, G_SPAWN_ERROR,
-+ G_SPAWN_ERROR_NOENT))
-+ msg = g_strdup_printf (
-+ _("Could not migrate old GConf settings: %s\n"
-+ "Please make sure that GConf is installed "
-+ "and the gsettings-data-convert tool is in "
-+ "your PATH.\nAlternatively, ignore this "
-+ "message and convert your old settings "
-+ "manually."), error->message);
-+ g_error_free (error);
-+ } else {
-+ msg = g_strdup (_("Old GConf settings were either "
-+ "missing or migrated successfully."));
-+
-+ /* Allow some time for the GSettings backend
-+ to record the changes, otherwise the
-+ default values from the new schema might be
-+ set. */
-+ sleep (1);
-+ }
-+ }
-+
-+ return msg;
-+}
-+
-+/*****************************************************************************/
- /* Load all settings. */
- /*****************************************************************************/
--void
-+gchar *
- gb_prefs_load_settings (void)
- {
-+ gchar *migration_msg = NULL;
-+
- gb_debug (DEBUG_PREFS, "START");
-
+@@ -163,52 +136,27 @@
if (gb_prefs == NULL)
gb_prefs = g_new0 (gbPrefs, 1);
@@ -418,8 +343,7 @@ Last-Update: 2018-10-28
- return;
- }
-
-+ migration_msg = migrate_gconf_settings ("gbonds.convert");
-
+-
/* Startup action */
gb_prefs->startup_action =
- get_int (gconf_client,
@@ -467,13 +391,7 @@ Last-Update: 2018-10-28
gb_debug (DEBUG_PREFS, "max_recents = %d", gb_prefs->max_recents);
-
- gb_debug (DEBUG_PREFS, "END");
-+
-+ return migration_msg;
- }
-
- /*---------------------------------------------------------------------------*/
+@@ -220,92 +168,10 @@
/* PRIVATE. Key changed callback. */
/*---------------------------------------------------------------------------*/
static void
@@ -579,62 +497,3 @@ Last-Update: 2018-10-28
/* Recent files */
gint max_recents;
-@@ -66,7 +65,7 @@
-
- void gb_prefs_save_settings (void);
-
--void gb_prefs_load_settings (void);
-+gchar * gb_prefs_load_settings (void);
-
- void gb_prefs_init (void);
-
---- /dev/null
-+++ gbonds-pkg/data/gbonds.convert
-@@ -0,0 +1,7 @@
-+[net.sf.GBonds]
-+startup-action = /apps/gbonds/startup-action
-+startup-file = /apps/gbonds/startup-file
-+rdate-range = /apps/gbonds/rdate-range
-+main-toolbar-visible = /apps/gbonds/main-toolbar-visible
-+main-toolbar-buttons-style = /apps/gbonds/main-toolbar-buttons-style
-+max-recents = /apps/gbonds/max-recents
---- gbonds-pkg.orig/src/gbonds.c
-+++ gbonds-pkg/src/gbonds.c
-@@ -63,6 +63,7 @@
- gchar *utf8_filename;
- GList *dates;
- gbTableModel *table_model;
-+ gchar *gconf_migration = NULL;
-
- bindtextdomain (GETTEXT_PACKAGE, GBONDS_LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-@@ -105,7 +106,7 @@
- /* Load user preferences */
- gb_debug_init ();
- gb_prefs_init ();
-- gb_prefs_load_settings ();
-+ gconf_migration = gb_prefs_load_settings ();
- gb_recent_init ();
- gb_table_init ();
-
-@@ -210,6 +211,20 @@
-
- g_list_free (file_list);
-
-+ if (gconf_migration) {
-+ GtkWidget *dlg;
-+
-+ dlg = gb_hig_alert_new (GTK_WINDOW (win),
-+ GTK_DIALOG_DESTROY_WITH_PARENT,
-+ GTK_MESSAGE_INFO,
-+ GTK_BUTTONS_CLOSE,
-+ _("GConf Migration"),
-+ gconf_migration);
-+ gtk_dialog_run (GTK_DIALOG (dlg));
-+ gtk_widget_destroy (dlg);
-+ g_free (gconf_migration);
-+ }
-+
- /* If our redemption data is about to expire, or has expired, help the user
- download new data. */
- if (gb_table_model_get_rdate_today()>=gb_table_model_get_rdate_max(table_model)) {
--
2.24.0.rc0
--- End Message ---
