Source: peony-extensions
Version: 1.1.2-1
Severity: serious
Tags: patch
Justification: FTBFS

Dear Maintainer,

The peony-extensions package currently fails to build from source.

The package will soon also be part of the gssdp/gupnp transition.
Since I haven't been able to find any signs of porting attempts started
anywhere I think it might be best to simply unblock the transition by
disabling upnp sendto support. This can be easily done by dropping the
gupnp build-dependency as built features are autodetected.

The attached debdiff takes care of both of the above issues.

Regards,
Andreas Henriksson
diff -Nru peony-extensions-1.1.2/debian/changelog 
peony-extensions-1.1.2/debian/changelog
--- peony-extensions-1.1.2/debian/changelog     2018-11-16 08:13:45.000000000 
+0100
+++ peony-extensions-1.1.2/debian/changelog     2019-10-14 22:22:38.000000000 
+0200
@@ -1,3 +1,14 @@
+peony-extensions (1.1.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add debian/patches/fix-ftbfs-gptrarraycopy.patch
+    - fixes FTBFS by dropping unused locally defined
+      g_ptr_array_copy which collides with glib function with same name.
+  * Drop gupnp build-dependency, disabling upnp sendto support.
+    - needs porting to gupnp 1.2
+
+ -- Andreas Henriksson <andr...@fatal.se>  Mon, 14 Oct 2019 22:22:38 +0200
+
 peony-extensions (1.1.2-1) unstable; urgency=medium
 
   * Initial release. (Closes: #913874)
diff -Nru peony-extensions-1.1.2/debian/control 
peony-extensions-1.1.2/debian/control
--- peony-extensions-1.1.2/debian/control       2018-11-16 08:13:45.000000000 
+0100
+++ peony-extensions-1.1.2/debian/control       2019-10-14 22:01:01.000000000 
+0200
@@ -16,7 +16,6 @@
                libgtk-3-dev,
                libjson-glib-dev,
                libmagic-dev,
-               libgupnp-1.0-dev,
                libmate-desktop-dev (>= 1.18),
                libstartup-notification0-dev,
                mate-common (>= 1.18),
diff -Nru peony-extensions-1.1.2/debian/patches/fix-ftbfs-gptrarraycopy.patch 
peony-extensions-1.1.2/debian/patches/fix-ftbfs-gptrarraycopy.patch
--- peony-extensions-1.1.2/debian/patches/fix-ftbfs-gptrarraycopy.patch 
1970-01-01 01:00:00.000000000 +0100
+++ peony-extensions-1.1.2/debian/patches/fix-ftbfs-gptrarraycopy.patch 
2019-10-14 22:20:03.000000000 +0200
@@ -0,0 +1,35 @@
+--- a/parchives/src/glib-utils.c
++++ b/parchives/src/glib-utils.c
+@@ -569,22 +569,6 @@
+ }
+ 
+ 
+-GPtrArray *
+-g_ptr_array_copy (GPtrArray *array)
+-{
+-      GPtrArray *new_array;
+-      
+-      if (array == NULL)
+-              return NULL;
+-              
+-      new_array = g_ptr_array_sized_new (array->len);
+-      memcpy (new_array->pdata, array->pdata, array->len * sizeof 
(gpointer)); 
+-      new_array->len = array->len;
+-      
+-      return new_array;
+-}
+-
+-
+ void
+ g_ptr_array_free_full (GPtrArray *array,
+                        GFunc      free_func,
+--- a/parchives/src/glib-utils.h
++++ b/parchives/src/glib-utils.h
+@@ -67,7 +67,6 @@
+                                                 int          last_field);
+ int                 n_fields                     (char       **str_array);
+ char *              get_time_string              (time_t       time);
+-GPtrArray *         g_ptr_array_copy             (GPtrArray   *array);
+ void                g_ptr_array_free_full        (GPtrArray   *array,
+                                                         GFunc        func,
+                                                         gpointer     
user_data);
diff -Nru peony-extensions-1.1.2/debian/patches/series 
peony-extensions-1.1.2/debian/patches/series
--- peony-extensions-1.1.2/debian/patches/series        1970-01-01 
01:00:00.000000000 +0100
+++ peony-extensions-1.1.2/debian/patches/series        2019-10-14 
22:19:31.000000000 +0200
@@ -0,0 +1 @@
+fix-ftbfs-gptrarraycopy.patch

Reply via email to