[Pkg-xfce-commits] [Git][xfce-team/goodies/thunar-volman][debian/master] d/p/0001-Allow-compilation-against-libxfce4ui-4.12-Bug-14100.patch: Add upstream…
Unit 193
gitlab at salsa.debian.org
Tue Sep 25 12:49:47 BST 2018
Unit 193 pushed to branch debian/master at xfce / goodies / thunar-volman
Commits:
bbe2db25 by Unit 193 at 2018-09-25T11:49:19Z
d/p/0001-Allow-compilation-against-libxfce4ui-4.12-Bug-14100.patch: Add upstream patch to build with libxfce4ui 4.12.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/0001-Allow-compilation-against-libxfce4ui-4.12-Bug-14100.patch
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -18,6 +18,8 @@ thunar-volman (0.9.0-1) UNRELEASED; urgency=medium
* d/*.1, d/control, d/copyright, d/watch: Use https where possible.
* Remove trailing whitespace from previous entries.
* Update Standards-Version to 4.2.1.
+ * d/p/0001-Allow-compilation-against-libxfce4ui-4.12-Bug-14100.patch:
+ - Add upstream patch to build with libxfce4ui 4.12.
-- Unit 193 <unit193 at ubuntu.com> Tue, 25 Sep 2018 07:11:37 -0400
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11),
libgtk-3-dev,
libgudev-1.0-dev,
libnotify-dev,
- libxfce4ui-2-dev (>= 4.13.2),
+ libxfce4ui-2-dev,
libxfce4util-dev,
libxfconf-0-dev,
xfce4-dev-tools
=====================================
debian/patches/0001-Allow-compilation-against-libxfce4ui-4.12-Bug-14100.patch
=====================================
@@ -0,0 +1,25 @@
+From: Andre Miranda <andreldm at xfce.org>
+Date: Sat, 23 Dec 2017 21:45:09 -0300
+Subject: Allow compilation against libxfce4ui 4.12 (Bug #14100)
+
+---
+ thunar-volman-settings/main.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/thunar-volman-settings/main.c b/thunar-volman-settings/main.c
+index d6ce5c5..4121166 100644
+--- a/thunar-volman-settings/main.c
++++ b/thunar-volman-settings/main.c
+@@ -105,7 +105,12 @@ main (int argc,
+ plug_child = list->data;
+ g_list_free (list);
+
++#if LIBXFCE4UI_CHECK_VERSION (4, 13, 0)
+ xfce_widget_reparent (plug_child, plug);
++#else
++ /* fallback to deprecated function */
++ gtk_widget_reparent (plug_child, plug);
++#endif
+
+ gtk_main ();
+ gtk_widget_destroy (plug);
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Allow-compilation-against-libxfce4ui-4.12-Bug-14100.patch
View it on GitLab: https://salsa.debian.org/xfce-team/goodies/thunar-volman/commit/bbe2db2571767bcef86cc60d4d54508c29fd6ab0
--
View it on GitLab: https://salsa.debian.org/xfce-team/goodies/thunar-volman/commit/bbe2db2571767bcef86cc60d4d54508c29fd6ab0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20180925/c9ecc85a/attachment-0001.html>
More information about the Pkg-xfce-commits
mailing list