Re: ANNOUNCE: xfce4-terminal 1.1.1 released
> We have the same issue for xfce4-notifyd but then I assumed 0.9 was the
> development branch leading to a 0.10 release for Xfce 4.20. So we pushed it to
> experimental without too much fuss.
Xfce4-notifyd 0.9.x are not dev versions as far as I know.
> Well, if you have it and it's sensible, yes sure.
See the attached patch. Not all XDT_CHECK_OPTIONAL_FEATURE features are reproduced, but it should be enough. And since it has a limited impact, it should continue to apply until Xfce 4.20.
Cheers,
Gaël
------- Original Message -------
On Sunday, October 15th, 2023 at 6:53 PM, Yves-Alexis Perez <corsac@debian.org> wrote:
> On Sun, 2023-10-15 at 15:39 +0000, Gaël Bonithon wrote:
>
> > Hi Yves-Alexis,
>
> Hi Gael,
>
> > It's definitely not something I was expecting, but I have to admit I'm a
> > little embarrassed to revert this commit. As said on IRC, I saw that Brian
> > had also used xdt 4.19 for xfce4-notifyd 0.9.x without anyone complaining,
> > so I thought it was fine (after hesitating to use xdt 4.19 right away, it's
> > true).
>
>
> We have the same issue for xfce4-notifyd but then I assumed 0.9 was the
> development branch leading to a 0.10 release for Xfce 4.20. So we pushed it to
> experimental without too much fuss.
>
> For xfce4-terminal it looks (to me) like a stable point release so I was
> surprised.
>
> > Note that this is only a build dependency, which is only bumped to be able
> > to use XDT_CHECK_OPTIONAL_FEATURE(). This doesn't pose a problem on Arch
> > Linux, for example, which doesn't package any of the development versions of
> > Xfce. Even though I know Arch isn't Debian :)
>
>
> I have no idea how packaging works on Arch, and specifically Xfce. But in
> Debian we basically run the autoreconf thing so we need xfce4-dev-tools at
> build time. And we can't build-dep on an experimental package in unstable (or
> testing), so that's why xfce4-terminal would have to go to experimental as
> well.
>
> > Would it be possible to apply a minimal patch (which I can provide) on your
> > side to bring xdt down to a stable version?
>
>
> Well, if you have it and it's sensible, yes sure.
>
> Regards,
> --
> Yves-Alexis
From ae06f6e984e461a1806cfe76b222938cd3b7a1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@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/autogen.sh b/autogen.sh
index 9c0b8a52..6059acc9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,4 +10,4 @@ EOF
exit 1
}
-XDT_AUTOGEN_REQUIRED_VERSION="4.19.0" exec xdt-autogen "$@"
+XDT_AUTOGEN_REQUIRED_VERSION="4.18.0" exec xdt-autogen "$@"
diff --git a/configure.ac.in b/configure.ac.in
index 52a7296c..4ba3422a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -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
Reply to: