[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1068679: marked as done (port-to-libsoup3.patch looks bad)

Your message dated Tue, 09 Apr 2024 20:34:54 +0000
with message-id <E1ruIBC-001l3i-Mr@fasolo.debian.org>
and subject line Bug#1068679: fixed in libtimezonemap 0.4.6-7
has caused the Debian Bug report #1068679,
regarding port-to-libsoup3.patch looks bad
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1068679: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1068679
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: libtimezonemap
Version: 0.4.6-6
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch

Hello,

This is a follow-up to bug #1037940 which is now archived.

With the move of webkit2gtk to libsoup3, this now becomes non-negotiable for
us in Ubuntu, as ubiquity requires both webkit and libtimezonemap.

I have taken a stab at fixing this patch up based on the feedback in the
other bug and have something that passes libtimezonemap's own build-time
tests, and ubiquity's tests, though it's hard to tell how much the latter
actually matters for verifying libtimezonemap correctness due to mocking.

Please consider this for inclusion in Debian as well.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek@ubuntu.com                                     vorlon@debian.org

diff -Nru libtimezonemap-0.4.6/debian/control libtimezonemap-0.4.6/debian/control
--- libtimezonemap-0.4.6/debian/control	2024-03-07 21:30:43.000000000 -0800
+++ libtimezonemap-0.4.6/debian/control	2024-04-08 16:33:09.000000000 -0700
@@ -1,8 +1,7 @@
 Source: libtimezonemap
 Section: misc
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Cinnamon Team <debian-cinnamon@lists.debian.org>
+Maintainer: Debian Cinnamon Team <debian-cinnamon@lists.debian.org>
 Uploaders:
  Maximiliano Curia <maxy@debian.org>,
  Margarita Manterola <marga@debian.org>,
@@ -20,7 +19,7 @@
                libgtk-3-dev (>= 3.1.4),
                libcairo2-dev (>= 1.10),
                libjson-glib-dev,
-               libsoup2.4-dev
+               libsoup-3.0-dev (>= 3.0.7)
 Standards-Version: 4.6.2
 Homepage: https://launchpad.net/timezonemap
 Vcs-Browser: https://salsa.debian.org/cinnamon-team/libtimezonemap
diff -Nru libtimezonemap-0.4.6/debian/patches/port-to-libsoup3.patch libtimezonemap-0.4.6/debian/patches/port-to-libsoup3.patch
--- libtimezonemap-0.4.6/debian/patches/port-to-libsoup3.patch	2023-06-20 23:54:22.000000000 -0700
+++ libtimezonemap-0.4.6/debian/patches/port-to-libsoup3.patch	2024-04-08 16:31:23.000000000 -0700
@@ -5,11 +5,11 @@
 Forwarded: not-yet
 Last-Update: 2022-08-06
 ---
-diff --git a/configure.ac b/configure.ac
-index 3f74dae..4e90e64 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,13 +50,13 @@ GDK_REQUIRED_VERSION=2.22
+Index: libtimezonemap/configure.ac
+===================================================================
+--- libtimezonemap.orig/configure.ac
++++ libtimezonemap/configure.ac
+@@ -50,13 +50,13 @@
  GLIB_REQUIRED_VERSION=2.26
  GTK3_REQUIRED_VERSION=3.1.4
  GIO_REQUIRED_VERSION=2.5.11
@@ -25,23 +25,24 @@
                                    json-glib-1.0)
  LIBTIMEZONEMAP_LIBS="$LIBTIMEZONEMAP_LIBS $LIBM"
  
-diff --git a/src/timezone-completion.c b/src/timezone-completion.c
-index d310235..6971ae9 100644
---- a/src/timezone-completion.c
-+++ b/src/timezone-completion.c
-@@ -271,8 +271,10 @@ geonames_data_ready (GObject *object, GAsyncResult *res, gpointer user_data)
+Index: libtimezonemap/src/timezone-completion.c
+===================================================================
+--- libtimezonemap.orig/src/timezone-completion.c
++++ libtimezonemap/src/timezone-completion.c
+@@ -270,9 +270,10 @@
+   CcTimezoneCompletionPrivate * priv = completion->priv;
    GError * error = NULL;
    GInputStream * stream;
-   SoupMessage *message;
+-  SoupMessage *message;
 +  const gchar * reason_phrase;
 +  SoupStatus status_code;
  
 -  stream = soup_request_send_finish (SOUP_REQUEST (object), res, &error);
-+  stream = soup_session_send_finish (SOUP_SESSION (object), res, &error);
++  stream = soup_session_send_finish (priv->soup_session, res, &error);
    if (stream == NULL)
      {
        if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-@@ -283,8 +285,9 @@ geonames_data_ready (GObject *object, GAsyncResult *res, gpointer user_data)
+@@ -283,8 +284,9 @@
        return;
      }
  
@@ -53,7 +54,7 @@
      {
        JsonParser *parser;
  
-@@ -296,7 +299,7 @@ geonames_data_ready (GObject *object, GAsyncResult *res, gpointer user_data)
+@@ -296,10 +298,10 @@
    else
      {
        g_warning ("Unable to fetch geonames (server responded with: %u %s)",
@@ -61,8 +62,12 @@
 +                 status_code, reason_phrase);
      }
  
-   g_object_unref (message);
-@@ -362,7 +365,7 @@ static gboolean
+-  g_object_unref (message);
++  g_object_unref (object);
+   g_object_unref (stream);
+ }
+ 
+@@ -362,7 +364,7 @@
  request_zones (CcTimezoneCompletion * completion)
  {
    CcTimezoneCompletionPrivate * priv = completion->priv;
@@ -71,28 +76,17 @@
    GError *error = NULL;
  
    priv->queued_request = 0;
-@@ -388,13 +391,14 @@ request_zones (CcTimezoneCompletion * completion)
-   gchar * version = get_version ();
-   gchar * locale = get_locale ();
-   gchar * url = g_strdup_printf (GEONAME_URL, escaped, version, locale);
-+  GAsyncResult * res;
+@@ -391,10 +393,11 @@
    g_free (locale);
    g_free (escaped);
  
 -  req = soup_session_request (priv->soup_session, url, &error);
-+  req = soup_message_new_from_uri (NULL, (GUri *) url);
++  req = soup_message_new (NULL, url);
    if (req)
      {
 -      soup_request_send_async (req, priv->cancel, geonames_data_ready, completion);
-+      soup_session_get_async_result_message (SOUP_SESSION (req), res);
++      soup_session_send_async (priv->soup_session, req, G_PRIORITY_DEFAULT,
++                               priv->cancel, geonames_data_ready, completion);
        g_object_unref (req);
      }
    else
-@@ -403,6 +407,7 @@ request_zones (CcTimezoneCompletion * completion)
-       g_error_free (error);
-     }
- 
-+  g_free (res);
-   g_free (url);
-   return FALSE;
- }
diff -Nru libtimezonemap-0.4.6/debian/patches/series libtimezonemap-0.4.6/debian/patches/series
--- libtimezonemap-0.4.6/debian/patches/series	2023-06-20 23:54:22.000000000 -0700
+++ libtimezonemap-0.4.6/debian/patches/series	2024-04-08 14:26:38.000000000 -0700
@@ -1,3 +1,3 @@
+port-to-libsoup3.patch
 tz-Include-UI-files-from-installed-path.patch
 timezone-map-Never-try-to-access-to-free-d-or-null-values.patch
-#port-to-libsoup3.patch - need fixes, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1037940

--- End Message ---
--- Begin Message --- 
Source: libtimezonemap
Source-Version: 0.4.6-7
Done: Fabio Fantoni <fantonifabio@tiscali.it>

We believe that the bug you reported is fixed in the latest version of
libtimezonemap, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1068679@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Fabio Fantoni <fantonifabio@tiscali.it> (supplier of updated libtimezonemap package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Tue, 09 Apr 2024 22:17:09 +0200
Source: libtimezonemap
Architecture: source
Version: 0.4.6-7
Distribution: unstable
Urgency: medium
Maintainer: Debian Cinnamon Team <debian-cinnamon@lists.debian.org>
Changed-By: Fabio Fantoni <fantonifabio@tiscali.it>
Closes: 1068679
Changes:
 libtimezonemap (0.4.6-7) unstable; urgency=medium
 .
   [ Steve Langasek ]
   * Restore port to libsoup3, required now for compatibility with current
     webkit2gtk. (Closes: #1068679)
   * Fix up patch based on feedback in Debian bug #1037940.
 .
   [ Fabio Fantoni ]
   * Switch to dh-sequence-gir
Checksums-Sha1:
 629b5b100457eae8c4d815b4a23dce0df8f6057e 2624 libtimezonemap_0.4.6-7.dsc
 7441c9cbc6e6e03593a977574103505f3943e894 2872895 libtimezonemap_0.4.6.orig.tar.gz
 34c9d814f3a1fc689254a133860dd7fb9542c88e 11472 libtimezonemap_0.4.6-7.debian.tar.xz
 208cfb4f12fb3fd19380c96c9c8d73bcf8e46002 17881 libtimezonemap_0.4.6-7_source.buildinfo
Checksums-Sha256:
 7bb57f62f85cb09ce534c7b0f0c6960b08e151c4d198ac38e64586266630eedd 2624 libtimezonemap_0.4.6-7.dsc
 0d634cc2476d8f57d1ee1864bd4f442180ae4bf040a9ae4bf73b66bbd85d7195 2872895 libtimezonemap_0.4.6.orig.tar.gz
 fab84bb81fb40039625398491ff8249e1d6c20f29b60f9d2a619392ee3a1c6be 11472 libtimezonemap_0.4.6-7.debian.tar.xz
 14a654368e8892af83d6402d776bc1c040c73aee94ae6fbb2fd7edb653d3be15 17881 libtimezonemap_0.4.6-7_source.buildinfo
Files:
 f1f746210116cbe997a0fb2936151142 2624 misc optional libtimezonemap_0.4.6-7.dsc
 f85a21994a397fb1ff2d3ec404bdd592 2872895 misc optional libtimezonemap_0.4.6.orig.tar.gz
 95396c451a7aad6e42bb5133ba8f56d1 11472 misc optional libtimezonemap_0.4.6-7.debian.tar.xz
 971bc8928f3683b300e976c4fc3ef52b 17881 misc optional libtimezonemap_0.4.6-7_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEELEHRfLe4S9D5+1GzaAZorpB/EB0FAmYVov0ACgkQaAZorpB/
EB1bjQ//SUjZjULr0OL9RrN8eZZaw7cfGqFuVOdqZJk4XvkSCN3tMBMiCO+L5K9n
0bu7Osy7fthcRMm9Zhv1/xV9yfLXRDCFFD2DDuqP2H1T6HL79WmP5cFs4KTaqfZT
zhTwRd0+rE0jfqaonY2/v41f8WxRawBKlpVxjU2K48Af9UXufg/wsk0vvgU+vAF1
RNwANpsop9QIDHpkkz49y876+1xg0/gPWqjKDhD3HELdy0wyXi5Gm2RmaiNcCB1m
+fydAvK6gkZly1r44r0nKp09uIlcSlM/nJeVr4YAkw9MkIHTPNYfKPrTAUY1lGIw
P4Zk72xvPmfw9udjCftXkyzAfPq85ZPd7RfCvja0mVdIXtQ7ArH1bPLGAdlBqOkP
QVuRCrWlUO/KRbXxQ9QjnYSgQxS7o7RTYrUg1VXhkMqMshIJHYU5qzOq0TgIYheb
6EK/tGsuBfF4dOS0euM1DgYr77NIPzJisw8Ch0demz8cNo92ZqsCGdKOGFVImVrO
goziQPSVWSaJj7+UbJahrzBWogccMHRxrlnn+k67pipzG6JaWX0gThdkjDh/OpgK
jIJPc5g4Hr9imVZeGrJQish8AnBF6PqTYmfsH+9c1rIlq4+ERTDtCQXOO+po6Bw2
dv9seSq/p29TzdhBb3W7zyZZ4L3+uyjpDmSoTjQKXRoK17Rty6s=
=9WsO
-----END PGP SIGNATURE-----

Attachment: pgpYzv0B8MJ47.pgp
Description: PGP signature


--- End Message ---
Reply to: