From 6df744bce7a439ec734f11b0fce96caf245620db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Tue, 28 Jan 2025 18:08:51 +0100
Subject: [PATCH] build: Use VERSION_FULL intead of VERSION or PACKAGE_VERSION
---
configure.ac | 1 +
xfce4-kiosk-query/main.c | 5 ++++-
xfce4-kiosk-query/meson.build | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 4d18199..e1f43ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_COPYRIGHT([Copyright (c) 2002-2024
AC_INIT([libxfce4util], [xdt_version], [https://gitlab.xfce.org/xfce/libxfce4util])
AC_PREREQ([2.69])
AC_REVISION([xdt_version_build])
+AC_DEFINE([VERSION_FULL], [PACKAGE_VERSION], [Alias for VERSION and PACKAGE_VERSION for meson compatibility])
dnl ***************************
dnl *** Initialize automake ***
diff --git a/xfce4-kiosk-query/main.c b/xfce4-kiosk-query/main.c
index 36412e0..3234c11 100644
--- a/xfce4-kiosk-query/main.c
+++ b/xfce4-kiosk-query/main.c
@@ -21,6 +21,9 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#ifdef HAVE_XFCE_REVISION_H
+#include "xfce-revision.h"
+#endif
#include <stdio.h>
#ifdef HAVE_STDLIB_H
@@ -72,7 +75,7 @@ main (int argc, char **argv)
" The Xfce development team. All rights reserved.\n"
"Written for Xfce by Benedikt Meurer <benny@xfce.org>.\n\n"
"Please report bugs to <%s>.\n",
- PACKAGE_VERSION, xfce_version_string (), PACKAGE_BUGREPORT);
+ VERSION_FULL, xfce_version_string (), PACKAGE_BUGREPORT);
return EXIT_SUCCESS;
case 'h':
diff --git a/xfce4-kiosk-query/meson.build b/xfce4-kiosk-query/meson.build
index 0173949..a2278a3 100644
--- a/xfce4-kiosk-query/meson.build
+++ b/xfce4-kiosk-query/meson.build
@@ -3,6 +3,7 @@ executable(
[
'main.c',
],
+ sources: xfce_revision_h,
include_directories: [
include_directories('..'),
],
--
GitLab