[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-terminal][debian/master] 3 commits: d/p: add upstream patch to demote xdt build-dep back to 4.18

[Yves-Alexis Perez (@corsac)]

Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / xfce4-terminal


Commits:
d8e42c2f by Yves-Alexis Perez at 2023-10-17T20:57:52+02:00
d/p: add upstream patch to demote xdt build-dep back to 4.18

- - - - -
b74855c1 by Yves-Alexis Perez at 2023-10-17T20:57:52+02:00
d/control: revert x-d-t b-dep to 4.18

- - - - -
e49220ca by Yves-Alexis Perez at 2023-10-17T20:58:06+02:00
update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/0001-build-Replace-XDT_CHECK_OPTIONAL_FEATURE-and-require.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -3,8 +3,10 @@ xfce4-terminal (1.1.1-1) UNRELEASED; urgency=medium
   * New upstream version 1.1.1
   * d/patches: fix_disable_F10_key dropped, included upstream
   * d/control: update x-d-t build-dep
+  * d/p: add upstream patch to demote xdt build-dep back to 4.18
+  * d/control: revert x-d-t b-dep to 4.18
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 15 Oct 2023 16:46:50 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 17 Oct 2023 20:58:01 +0200
 
 xfce4-terminal (1.1.0-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends: debhelper-compat (= 13),
                libvte-2.91-dev,
                libxfce4ui-2-dev,
                libxml-perl,
-               xfce4-dev-tools (>= 4.19)
+               xfce4-dev-tools (>= 4.18)
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://docs.xfce.org/apps/terminal/start


=====================================
debian/patches/0001-build-Replace-XDT_CHECK_OPTIONAL_FEATURE-and-require.patch
=====================================
@@ -0,0 +1,51 @@
+From ae06f6e984e461a1806cfe76b222938cd3b7a1ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael at xfce.org>
+Date: Sun, 15 Oct 2023 22:56:38 +0200
+Subject: [PATCH] build: Replace XDT_CHECK_OPTIONAL_FEATURE and require xdt
+ 4.18
+
+---
+ autogen.sh      |  2 +-
+ configure.ac.in | 26 +++++++++++++-------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac
+index 52a7296c..4ba3422a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,19 +98,19 @@ XDT_I18N([@LINGUAS@])
+ dnl ***********************************
+ dnl *** Check for optional packages ***
+ dnl ***********************************
+-XDT_CHECK_OPTIONAL_FEATURE([X11],
+-                           [x11],
+-                           [
+-                             XDT_FEATURE_DEPENDENCY([LIBX11], [x11], [libx11_min_version])
+-                             XDT_FEATURE_DEPENDENCY([GDK_X11], [gdk-x11-3.0], [gtk_min_version])
+-                           ],
+-                           [the X11 windowing system])
+-XDT_CHECK_OPTIONAL_FEATURE([WAYLAND],
+-                           [wayland],
+-                           [
+-                             XDT_FEATURE_DEPENDENCY([GDK_WAYLAND], [gdk-wayland-3.0], [gtk_min_version])
+-                           ],
+-                           [the Wayland windowing system])
++XDT_CHECK_OPTIONAL_PACKAGE([LIBX11], [x11], [libx11_min_version], [libx11], [Libx11 support])
++XDT_CHECK_OPTIONAL_PACKAGE([GDK_X11], [gdk-x11-3.0], [gtk_min_version], [gdk-x11], [GDK X11 support])
++if test x"$LIBX11_FOUND" = x"yes" -a x"$GDK_X11_FOUND" = x"yes"; then
++  ENABLE_X11="yes"
++  AC_DEFINE([ENABLE_X11], [1], [X11 support])
++fi
++AM_CONDITIONAL([ENABLE_X11], [test x"$LIBX11_FOUND" = x"yes" -a x"$GDK_X11_FOUND" = x"yes"])
++XDT_CHECK_OPTIONAL_PACKAGE([GDK_WAYLAND], [gdk-wayland-3.0], [gtk_min_version], [gdk-wayland], [GDK Wayland support])
++if test x"$GDK_WAYLAND_FOUND" = x"yes"; then
++  ENABLE_WAYLAND="yes"
++  AC_DEFINE([ENABLE_WAYLAND], [1], [Wayland support])
++fi
++AM_CONDITIONAL([ENABLE_WAYLAND], [test x"$GDK_WAYLAND_FOUND" = x"yes"])
+ if test x"$ENABLE_X11" != x"yes" -a x"$ENABLE_WAYLAND" != x"yes"; then
+   AC_MSG_ERROR([Either both X11 and Wayland support was disabled, or required dependencies are missing. One of the two must be enabled.])
+ fi
+-- 
+2.42.0
+


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-build-Replace-XDT_CHECK_OPTIONAL_FEATURE-and-require.patch



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-terminal/-/compare/a9385ceb05ca004fc86a80a9b11e75ec8f117e7c...e49220caa896467e7e5d5b659f03e87f9d12415d

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-terminal/-/compare/a9385ceb05ca004fc86a80a9b11e75ec8f117e7c...e49220caa896467e7e5d5b659f03e87f9d12415d
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/20231017/0a57ff70/attachment-0001.htm>