[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-dev-tools][debian/master] 5 commits: New upstream version 4.17.0.
Unit 193 (@unit193)
gitlab at salsa.debian.org
Wed Jul 20 03:57:43 BST 2022
Unit 193 pushed to branch debian/master at xfce / desktop / xfce4-dev-tools
Commits:
90b9fac0 by Unit 193 at 2022-07-19T22:45:24-04:00
New upstream version 4.17.0.
- - - - -
596e4477 by Unit 193 at 2022-07-19T22:45:25-04:00
Update upstream source from tag 'upstream/4.17.0'
Update to upstream version '4.17.0'
with Debian dir 2e028cf9defe9a3099917c2275779d2e00bd9330
- - - - -
426db606 by Unit 193 at 2022-07-19T22:46:01-04:00
d/rules: Drop '--as-needed' from LDFLAGS, default in stable now.
- - - - -
15472b82 by Unit 193 at 2022-07-19T22:46:20-04:00
Update Standards-Version to 4.6.1.
- - - - -
3b148fe3 by Unit 193 at 2022-07-19T22:46:54-04:00
Update changelog for release.
- - - - -
27 changed files:
- ChangeLog
- Makefile.in
- NEWS
- aclocal.m4
- configure
- configure.ac
- debian/changelog
- debian/control
- debian/rules
- docs/Makefile.in
- docs/xdt-csource.1
- helpers/Makefile.in
- helpers/xfce-build
- helpers/xfce-do-release
- helpers/xfce-get-release-notes
- helpers/xfce-get-translations
- m4macros/Makefile.in
- m4macros/xdt-depends.m4
- m4macros/xdt-features.m4
- m4macros/xdt-i18n.m4
- m4macros/xdt-version.m4
- scripts/Makefile.in
- scripts/xdt-autogen.in
- tests/Makefile.in
- tests/data/Makefile.in
- xdt-csource/Makefile.in
- xdt-csource/main.c
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,193 @@
+commit 47ac35062ff081d904aa140373fe42ddb8e54c9b
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Mon Jul 5 12:57:29 2021 +0200
+
+ Try to build higher version available tag
+
+ - If 4.17.x is available, pick this one
+ - If 4.16.x is the higher (on component without 4.17 yet), pick it
+ - "grep" the component name to remove any "xfce-" release tags
+ - Enhance MR!49
+
+commit 2266437dc8afad8d2bb60516d92dc636402de6c7
+Author: Gaël Bonithon <gael at xfce.org>
+Date: Wed May 12 13:39:40 2021 +0200
+
+ xfce-do-release: A review of confirmation prompts
+
+ * Abort on failure in `sanity_checks()`
+ * Always test if the version specified exists as a git tag
+ * Always have a default choice, indicated by a capital letter
+ * Remove unused function `get_on_with_it()`
+
+commit 2c3d0deb8b512e1e4f8f5647a2ff893b4f365cc7
+Author: Landry Breuil <landry at xfce.org>
+Date: Tue Jun 8 07:25:51 2021 +0000
+
+ helpers: Improve script portability
+
+ Works better on OpenBSD now.
+
+commit 7c609066e9ec1dc2876818a84453c2988fa24cd1
+Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Wed Apr 28 15:11:31 2021 +0200
+
+ Improve Xfce Developer Center (developer.xfce.org)
+
+commit 5f372ab304353bcbb44a5807248cb494cb3024c4
+Author: Gaël Bonithon <gael at xfce.org>
+Date: Tue Jan 26 10:22:57 2021 +0100
+
+ xdt-features.m4: Always enable compilation warnings
+
+ Fixes #44.
+
+commit dba4b975a67bd39835c49069b1ebb5dc151eb981
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Thu Apr 22 09:45:23 2021 +0200
+
+ g_locale_to_utf8 is misspelled as g_local_to_utf8
+
+ - Fix issue #46
+ - This code path is almost never used (we don't really test
+ minGW/windows), but let's fix this anyway
+
+commit 54119a26c6faf54f1f1f6d6647a34b0b2239d470
+Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Wed Mar 10 15:40:19 2021 +0100
+
+ xfce-build: Always pick the latest stable release
+
+ Alternatively we could also pick the latest overall release, but the
+ downside would be that the container could jump back and forth between
+ 4.17 dev and 4.16 maintenance releases.
+ git describe --tags `git rev-list --tags --max-count=1` --match "$NAME*"
+
+commit 328f47cd130b61e2a6f7198e2a17af236649d6a4
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Sat Jan 30 23:49:17 2021 +0100
+
+ Create the m4/ if it does not exists
+
+ - So we are sure to not print any warning because of a missing m4/
+ folder on first aclocal run
+
+commit b569f211c16a49cba72f9a9d471c4ca02708f061
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Tue Jan 12 00:19:06 2021 +0100
+
+ Use autoreconf to bootstrap xfce4-dev-tools itself
+
+commit 2759f19c4c9215069ae5cae86d47909ea4d42ab3
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Mon Jan 11 01:19:52 2021 +0100
+
+ Use autoreconf to bootstrap autotools
+
+ - autoreconf already do all the jobs and detections, we don't need to run manually
+ multiples binaries
+ - Remove obsolete checks/warnings we are doing for libtoolize, all our
+ components have been ported
+ - Simply run autoreconf with good options should be enough for
+ everything
+ - We still need to run intltoolize and gtkdocize manually to support
+ autotool 2.69
+ - This fix issue #42
+
+commit 6885d2a572e127083c2ae72832e373e752db2db5
+Author: Gaël Bonithon <gael at xfce.org>
+Date: Sun Jan 31 20:47:00 2021 +0100
+
+ xfce-do-release: Check for `docker` installed
+
+commit 4ffc172cc6594ac6e88d49466f4572d729b5088f
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Sat Jan 30 13:17:57 2021 +0100
+
+ Add dependencies to build thunarx-python CI
+
+commit 248201216d9a59f81a7f72d47ceb19504463d157
+Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Tue Jan 19 15:45:51 2021 +0100
+
+ Fix location of apidocs
+
+ By copying the folder contents we don't end up with an additional docs/
+ folder inside the existing apidocs/ folder.
+
+commit f971760d832bd6f48f7adf313ef5a1e91eda4ae4
+Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Tue Jan 19 10:56:47 2021 +0100
+
+ xfce-build: Fix conditional in gitlabci
+
+commit 6560a412d4eaafcfede6cbb50ab48c5dd32aecd8
+Author: Simon Steinbeiß <ochosi at xfce.org>
+Date: Tue Jan 19 10:45:19 2021 +0100
+
+ Export apidocs as GitLab artifacts
+
+ The static index.html page and artifacts get merged into the newly
+ added apidocs folder.
+
+commit 6f651e4a6b1e78d4745cba1b8bb193d73e38af2b
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Mon Jan 11 00:33:52 2021 +0100
+
+ Get rid of glib-gettextize usage and XGETTEXT_ARGS custom args
+
+ - intltoolize already do all the job that glib-gettextize do (maybe
+ since 10 years)
+ - Remove the XGETTEXT_ARGS custom feature, I can't find any projec using
+ this in xfce
+
+commit 008475ee9a08aaa458df8ff650d739889fb377a0
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Mon Jan 11 00:06:16 2021 +0100
+
+ Remove obsolete AM_GLIB_GNU_GETTEXT
+
+ - This should no be used anymore since last century
+
+commit e3d60b58f2377766d0265ac8f4d01fbee8d199dd
+Author: Jan Ziak <0xe2.0x9a.0x9b at gmail.com>
+Date: Tue Jan 12 04:38:36 2021 +0100
+
+ helpers: Fix command-line if git-config core.editor is unset
+
+ Closes: https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/issues/43
+ Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b at gmail.com>
+
+commit f4212358a35267c8b3fec7a4765b6b44788f212a
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Fri Jan 8 11:22:48 2021 +0100
+
+ Update obsolete m4 macros
+
+ - They are obsolete since 2.69, and 2.70 now warn about it
+ - Bump minimal autoconf to 2.69 (available since 2012)
+ - AC_HEADER_STDC is not needed anymore: https://www.gnu.org/software/autoconf/manual/autoconf-2.70/html_node/Particular-Headers.html
+
+commit 385f43220419a38c3641482ecefe35189c1db030
+Author: Simon Steinbeiß <ochosi at xfce.org>
+Date: Sat Jan 2 22:50:18 2021 +0100
+
+ helpers: Add 'xfce-build describe' command
+
+ This command prints the versions of the components built within this container, which are located in the /git folder.
+
+commit 418ba8d073010112f6f7741dc3e3045020f67d07
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Tue Dec 22 23:49:22 2020 +0100
+
+ Back to development
+
+commit 665dac6b7bccef20ba5911807dc53b60faa7935b
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Tue Dec 22 21:45:06 2020 +0100
+
+ Updates for release
+
commit d16010634f98cba467cb61c8b9451e84ed323b7a
Author: Romain Bouvier <skunnyk at alteroot.org>
Date: Fri Dec 18 12:11:39 2020 +0100
=====================================
Makefile.in
=====================================
@@ -95,11 +95,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -278,7 +277,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
NEWS
=====================================
@@ -1,3 +1,27 @@
+4.17.0
+======
+- Try to build higher version available tag
+- xfce-do-release: A review of confirmation prompts
+- helpers: Improve script portability
+- Improve Xfce Developer Center (developer.xfce.org)
+- xdt-features.m4: Always enable compilation warnings
+- g_locale_to_utf8 is misspelled as g_local_to_utf8
+- xfce-build: Always pick the latest stable release
+- Create the m4/ if it does not exists
+- Use autoreconf to bootstrap xfce4-dev-tools itself
+- Use autoreconf to bootstrap autotools
+- xfce-do-release: Check for `docker` installed
+- Add dependencies to build thunarx-python CI
+- Fix location of apidocs
+- xfce-build: Fix conditional in gitlabci
+- Export apidocs as GitLab artifacts
+- Get rid of glib-gettextize usage and XGETTEXT_ARGS custom args
+- Remove obsolete AM_GLIB_GNU_GETTEXT
+- helpers: Fix command-line if git-config core.editor is unset
+- Update obsolete m4 macros
+- helpers: Add 'xfce-build describe' command
+
+
4.16.0
======
- Bump glib to 2.50 based on xfce4.16 roadmap
=====================================
aclocal.m4
=====================================
@@ -1445,9 +1445,9 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([m4macros/xdt-version.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
-m4_include([m4macros/xdt-version.m4])
=====================================
configure
=====================================
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-dev-tools 4.16.0.
+# Generated by GNU Autoconf 2.69 for xfce4-dev-tools 4.17.0.
#
# Report bugs to <https://gitlab.xfce.org/xfce/xfce4-dev-tools/>.
#
@@ -12,7 +12,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
-# Copyright (c) 2002-2020 The Xfce development team. All rights reserved..
+# Copyright (c) 2002-2021 The Xfce development team. All rights reserved..
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
@@ -593,8 +593,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-dev-tools'
PACKAGE_TARNAME='xfce4-dev-tools'
-PACKAGE_VERSION='4.16.0'
-PACKAGE_STRING='xfce4-dev-tools 4.16.0'
+PACKAGE_VERSION='4.17.0'
+PACKAGE_STRING='xfce4-dev-tools 4.17.0'
PACKAGE_BUGREPORT='https://gitlab.xfce.org/xfce/xfce4-dev-tools/'
PACKAGE_URL=''
@@ -674,7 +674,6 @@ build_vendor
build_cpu
build
LIBTOOL
-VERSION_LIBTOOL
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@@ -1345,7 +1344,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-dev-tools 4.16.0 to adapt to many kinds of systems.
+\`configure' configures xfce4-dev-tools 4.17.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1416,7 +1415,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-dev-tools 4.16.0:";;
+ short | recursive ) echo "Configuration of xfce4-dev-tools 4.17.0:";;
esac
cat <<\_ACEOF
@@ -1536,14 +1535,14 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-dev-tools configure 4.16.0
+xfce4-dev-tools configure 4.17.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright (c) 2002-2020 The Xfce development team. All rights reserved.
+Copyright (c) 2002-2021 The Xfce development team. All rights reserved.
_ACEOF
exit
fi
@@ -1907,7 +1906,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-dev-tools $as_me 4.16.0, which was
+It was created by xfce4-dev-tools $as_me 4.17.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2261,7 +2260,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
VERSION_MAJOR=4
-VERSION_MINOR=16
+VERSION_MINOR=17
VERSION_MICRO=0
@@ -2783,7 +2782,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-dev-tools'
- VERSION='4.16.0'
+ VERSION='4.17.0'
cat >>confdefs.h <<_ACEOF
@@ -4098,9 +4097,6 @@ fi
-VERSION_LIBTOOL=2.4
-
-
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -12189,118 +12185,6 @@ CC=$lt_save_CC
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
for ac_header in libintl.h locale.h memory.h stdio.h stdlib.h string.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13099,7 +12983,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-dev-tools $as_me 4.16.0, which was
+This file was extended by xfce4-dev-tools $as_me 4.17.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13156,7 +13040,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xfce4-dev-tools config.status 4.16.0
+xfce4-dev-tools config.status 4.17.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
=====================================
configure.ac
=====================================
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (c) 2002-2020
+dnl Copyright (c) 2002-2021
dnl The Xfce development team. All rights reserved.
dnl
dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
@@ -9,7 +9,7 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
-XDT_VERSION_INIT([4.16.0])
+XDT_VERSION_INIT([4.17.0])
dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT
dnl # YOU ARE DOING.
@@ -20,7 +20,7 @@ dnl *** Initialize autoconf ***
dnl ***************************
AC_INIT([xfce4-dev-tools], [xdt_version],
[https://gitlab.xfce.org/xfce/xfce4-dev-tools/])
-AC_COPYRIGHT([Copyright (c) 2002-2020 The Xfce development team. All rights reserved.])
+AC_COPYRIGHT([Copyright (c) 2002-2021 The Xfce development team. All rights reserved.])
AC_CONFIG_MACRO_DIR([m4])
AC_REVISION([xdt_version_build])
@@ -45,20 +45,15 @@ AC_PROG_CC()
AM_PROG_CC_C_O()
AC_PROG_INSTALL()
-dnl The libtool version is not only used here, but also in a warning
-dnl in the xdt-autogen script (to not confuse developers using
-dnl xfce4-dev-tools). Maybe one day this warning will become obsolete,
-dnl then it is safe to only use the version directly in the LT_PREREQ
-dnl statement, until then it is necessary to define it as is.
-m4_define([xdt_version_libtool], [2.4])
-AC_SUBST([VERSION_LIBTOOL], [xdt_version_libtool])
-LT_PREREQ(xdt_version_libtool())
+dnl **************************
+dnl *** Initialize libtool ***
+dnl **************************
+LT_PREREQ([2.4])
LT_INIT([disable-static])
dnl ***************************************
dnl *** Check for standard header files ***
dnl ***************************************
-AC_HEADER_STDC()
AC_CHECK_HEADERS([libintl.h locale.h memory.h stdio.h stdlib.h string.h])
dnl ***********************************
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+xfce4-dev-tools (4.17.0-1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream version 4.17.0.
+ * d/rules: Drop '--as-needed' from LDFLAGS, default in stable now.
+ * Update Standards-Version to 4.6.1.
+
+ -- Unit 193 <unit193 at debian.org> Tue, 19 Jul 2022 22:46:25 -0400
+
xfce4-dev-tools (4.16.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders: Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper-compat (= 13),
libglib2.0-dev
Rules-Requires-Root: no
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/xfce-team/desktop/xfce4-dev-tools.git
Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/xfce4-dev-tools
Homepage: https://docs.xfce.org/xfce/xfce4-dev-tools/start
=====================================
debian/rules
=====================================
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
=====================================
docs/Makefile.in
=====================================
@@ -89,11 +89,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = docs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -222,7 +221,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
docs/xdt-csource.1
=====================================
@@ -1,13 +1,13 @@
'\" t
.\" Title: xdt-csource
.\" Author: [see the "Author" section]
-.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 12/22/2020
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Date: 07/25/2021
.\" Manual: Xfce User\*(Aqs Manual
.\" Source: Xfce
.\" Language: English
.\"
-.TH "XDT\-CSOURCE" "1" "12/22/2020" "Xfce" "Xfce User\*(Aqs Manual"
+.TH "XDT\-CSOURCE" "1" "07/25/2021" "Xfce" "Xfce User\*(Aqs Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
=====================================
helpers/Makefile.in
=====================================
@@ -94,11 +94,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = helpers
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -225,7 +224,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
helpers/xfce-build
=====================================
@@ -4,6 +4,8 @@
# Possible arguments:
# - the version of the xfce-build container (if you want to build with a special version)
# - 'pull' to simply update the container and exit
+# - 'version' as second positional argument after an actual version (e.g. xfce-build latest version)
+# to print all git versions built in the container by build_libs.sh
CONTAINER="xfce/xfce-build"
VERSION="latest"
@@ -15,19 +17,27 @@ docker_pull () {
docker pull xfce/xfce-build:$VERSION
}
+docker_run () {
+ # Run the build in the docker container
+ docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --volume $VOLUME:/tmp --env CFLAGS="${CFLAGS}" --env CONTAINER=$CONTAINER --env VERSION=$VERSION $CONTAINER:$VERSION /bin/bash -c "${BUILD_CMD}"
+}
+
+# Parse the commandline arguments
if [ -z "$1" ]; then
VERSION="latest"
elif [[ "$1" == "pull" ]]; then
docker_pull
exit 0
-else
- VERSION=$1
+elif [[ "$1" == "describe" ]]; then
+ if [[ ! -z "$2" ]]; then
+ VERSION="$2"
+ fi
+ BUILD_CMD='printf "\e[1m$CONTAINER:$VERSION contains:\e[0m\n";cat /git/xfce_build_version_info.txt'
+ docker_run
+ exit 0
fi
-# Make sure we're running the latest version
+# Run the local build
docker_pull
-
-# Run the build in the docker container
-docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --volume $VOLUME:/tmp --env CFLAGS="${CFLAGS}" $CONTAINER:$VERSION /bin/bash -c "${BUILD_CMD}"
-
+docker_run
printf "\n---\nBuilt using container $CONTAINER:$VERSION on $VOLUME\n"
=====================================
helpers/xfce-do-release
=====================================
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
component=$1
version=$2
@@ -12,26 +12,40 @@ sanity_checks () {
if [ "$is_git" != "true" ]; then
exit 1
fi
+
current_branch=$(git rev-parse --abbrev-ref HEAD)
if [ "$current_branch" != "master" ]; then
if [[ "$current_branch" == *"xfce-4"* ]]; then
echo "You are on a maintenance branch."
else
printf "\e[1mWarning:\e[0m You are not on the master branch.\n"
- read -n 1 -s -p "Do you really want to continue?"
+ read -n 1 -p "Do you really want to continue? ([y]es, [N]o) " response
+ printf "\n"
+ if [ "$response" != "y" ]; then
+ exit 1
+ fi
fi
fi
+
echo "Updating $current_branch to avoid conflicts..."
- git pull
if [ -n "$(git status --untracked-files=no --porcelain)" ]; then
printf "\e[1mWarning:\e[0m The working directory is not clean.\nYou have the following unstaged or uncommitted changes:\n"
git status --untracked-files=no -s
- read -n 1 -s -p "Do you really want to continue?"
+ read -n 1 -p "Do you really want to continue? ([y]es, [N]o) " response
+ printf "\n"
+ if [ "$response" != "y" ]; then
+ exit 1
+ fi
+ else
+ git pull
fi
- if which xfce-build >/dev/null; then
+
+ if ! which docker &>/dev/null; then
+ echo "INFO: please install docker to support building in a clean environment."
+ elif which xfce-build &>/dev/null; then
export TAG="xfce-build"
echo "Working with the 'xfce-build' script and container."
- elif ! which xfce-test >/dev/null; then
+ elif ! which xfce-test &>/dev/null; then
echo "INFO: please install xfce-test to support building in a clean environment. See https://github.com/schuellerf/xfce-test"
else
images=$(docker images|grep -Po "(?<=^schuellerf/xfce-test) +[^ ]+"|tr -d ' ')
@@ -87,22 +101,26 @@ test_parameters () {
new_patch=$(echo "$(($latest_patch + 1))")
# Get the version
- if [ -n "$2" ]; then
- echo "Version: $version"
- else
- read -p "Specify a version (Default: $latest_major.$latest_minor.$new_patch): " new_version
- if [ "$new_version" = "" ]; then
+ if [ -z "$2" ]; then
+ read -p "Specify a version (Default: $latest_major.$latest_minor.$new_patch): " version
+ if [ -z "$version" ]; then
version="$(echo "$latest_major.$latest_minor.$new_patch")"
- echo "Version: $version"
- else
- if [ "$(git tag | grep -c $new_version\$)" = "1" ]; then
- read -n 1 -p "\e[1mWarning:\e[0m The version you specified ('$new_version') exists as a git tag. Do you really want to release again?"
- fi
- version="$(echo "$new_version")"
- echo "Version: $version"
fi
+ else
+ version=$2
fi
+ if [ "$(git tag | grep -c $version\$)" = "1" ]; then
+ printf "\e[1mWarning:\e[0m The version you specified ('$version') exists as a git tag. "
+ read -n 1 -p "Do you really want to release again? ([y]es, [N]o) " response
+ printf "\n"
+ if [ "$response" != "y" ]; then
+ exit 1
+ fi
+ fi
+
+ echo "Version: $version"
+
# Split up the actual version number so we can re-use it later
semantic_version=( ${version//./ } )
version_major="${semantic_version[0]}"
@@ -115,17 +133,10 @@ step () {
printf "\n\n \e[1mStep $steps: $1\e[0m\n ==================\n"
}
-# Just pause for user confirmation
-get_on_with_it () {
- read -n 1 -p " → Done?"
- let steps++
- let steps_complete++
-}
-
# Ask whether the step should be executed
run_command () {
let steps++
- read -n 1 -p " → Do it? ([y]es, [n]o, [s]kip)" response
+ read -n 1 -p " → Do it? ([y]es, [N]o, [s]kip) " response
printf "\n"
if [ "$response" = "y" ]; then
eval $1 && eval $2 && eval $3
@@ -135,7 +146,7 @@ run_command () {
printf "\n Step $(( $steps - 1 )) skipped."
return
else
- read -n 1 -p " Step $(( $steps - 1 )) aborted. Do you really want to quit? ([y]es, [n]o)" abort
+ read -n 1 -p " Step $(( $steps - 1 )) aborted. Do you really want to quit? ([y]es, [N]o) " abort
if [ "$abort" = "y" ]; then
printf "\n Aborted. (Steps complete: $steps_complete)\n"
exit 0
@@ -147,11 +158,11 @@ run_command () {
}
edit () {
- read -n 1 -p " → Accept? ([y]es, [e]dit" response
- if [ "$response" = "y" ]; then
+ read -n 1 -p " → Accept? ([Y]es, [e]dit) " response
+ if [ "$response" = "e" ]; then
+ $(git config --default "${EDITOR:-vi}" --global core.editor) $1
+ else
printf "\n ✓ Accepted.\n"
- elif [ "$response" = "e" ]; then
- $(git config --global core.editor) $1
fi
}
=====================================
helpers/xfce-get-release-notes
=====================================
@@ -19,6 +19,6 @@ git log --format=%s ${LAST_TAG}..HEAD | \
grep -v "Back to development" | \
while read line; do \
echo "- $line" | \
- fold -s -w $LINE_LENGTH - | \
+ fold -s -w $LINE_LENGTH | \
sed -e "s/^[^ ]/&/g"
done
=====================================
helpers/xfce-get-translations
=====================================
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Just a small script to get all language updates to a repository since a
# commit or tag.
@@ -28,7 +28,7 @@ printf '%s\n' '- Translation Updates:'
LANGUAGES=$(
for l in $UPDATES; do
- echo -n "$(grep '^"Language-Team:' po/$l.po | grep -Po '(?<=: ).*' | grep -Po '^(.*)(?= \(http)')"
+ echo -n "$(grep '^"Language-Team:' po/$l.po | sed -e 's/.*: //; s/ (http.*//;')"
echo ","
done
)
@@ -37,7 +37,7 @@ SORTED=$(echo "$LANGUAGES" | sort)
SORTED=${SORTED::-1} # remove last comma
while read line; do
echo -n "$line "
-done <<< "$SORTED" | fold -s -w $LINE_LENGTH - | sed -e "s/^[^ ]/${INDENT}&/g" | sed -e 's/[[:space:]]*$//'
+done <<< "$SORTED" | fold -s -w $LINE_LENGTH | sed -e "s/^[^ ]/${INDENT}&/g" | sed -e 's/[[:space:]]*$//'
echo ""
if [ "$SILENT" != "silent" ]; then
=====================================
m4macros/Makefile.in
=====================================
@@ -96,11 +96,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = m4macros
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -227,7 +226,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
m4macros/xdt-depends.m4
=====================================
@@ -26,7 +26,7 @@ dnl
dnl We need recent a autoconf version
-AC_PREREQ([2.60])
+AC_PREREQ([2.69])
@@ -175,8 +175,8 @@ AC_DEFUN([XDT_CHECK_OPTIONAL_PACKAGE],
AC_REQUIRE([XDT_PROG_PKG_CONFIG])
AC_ARG_ENABLE([$4],
-AC_HELP_STRING([--enable-$4], [Enable checking for $5 (default=m4_default([$6], [yes]))])
-AC_HELP_STRING([--disable-$4], [Disable checking for $5]),
+AS_HELP_STRING([--enable-$4],[Enable checking for $5 (default=m4_default([$6], [yes]))])
+AS_HELP_STRING([--disable-$4],[Disable checking for $5]),
[xdt_cv_$1_check=$enableval], [xdt_cv_$1_check=m4_default([$6], [yes])])
if test x"$xdt_cv_$1_check" = x"yes"; then
=====================================
m4macros/xdt-features.m4
=====================================
@@ -26,7 +26,7 @@ dnl
dnl We need recent a autoconf version
-AC_PREREQ([2.60])
+AC_PREREQ([2.69])
dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS)
@@ -58,62 +58,42 @@ AC_DEFUN([XDT_FEATURE_DEBUG],
[
dnl weird indentation to keep output indentation correct
AC_ARG_ENABLE([debug],
- AC_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],
- [Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@])
-AC_HELP_STRING([--disable-debug], [Include no debugging support]),
+ AS_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],[Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@])
+AS_HELP_STRING([--disable-debug],[Include no debugging support]),
[enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])])
+ dnl enable most warnings regardless of debug level
+ xdt_cv_additional_CFLAGS="-Wall -Wextra \
+ -Wno-missing-field-initializers \
+ -Wno-unused-parameter -Wold-style-definition \
+ -Wdeclaration-after-statement \
+ -Wmissing-declarations \
+ -Wmissing-noreturn -Wpointer-arith \
+ -Wcast-align -Wformat -Wformat-security -Wformat-y2k \
+ -Winit-self -Wmissing-include-dirs -Wundef \
+ -Wnested-externs -Wredundant-decls"
+
AC_MSG_CHECKING([whether to build with debugging support])
if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
AC_DEFINE([DEBUG], [1], [Define for debugging support])
- xdt_cv_additional_CFLAGS="-DXFCE_DISABLE_DEPRECATED \
- -Wall -Wextra \
- -Wno-missing-field-initializers \
- -Wno-unused-parameter -Wold-style-definition \
- -Wdeclaration-after-statement \
- -Wmissing-declarations \
- -Wmissing-noreturn -Wpointer-arith \
- -Wcast-align -Wformat -Wformat-security -Wformat-y2k \
- -Winit-self -Wmissing-include-dirs -Wundef \
- -Wnested-externs"
CPPFLAGS="$CPPFLAGS"
if test x`uname` = x"Linux"; then
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
fi
- dnl # signal.h inline is crapy on openbsd
- if test x`uname` != x"OpenBSD"; then
- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
- fi
-
if test x"$enable_debug" = x"full"; then
AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support])
- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror"
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g"
CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
AC_MSG_RESULT([full])
else
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow"
AC_MSG_RESULT([yes])
fi
-
- XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS])
-
- ifelse([$CXX], , , [
- dnl FIXME: should test on c++ compiler, but the following line causes
- dnl autoconf errors for projects that don't check for a
- dnl c++ compiler at all.
- dnl AC_LANG_PUSH([C++])
- dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS])
- dnl AC_LANG_POP()
- dnl instead, just use supported_CFLAGS...
- supported_CXXFLAGS="$supported_CFLAGS"
- ])
-
- CFLAGS="$CFLAGS $supported_CFLAGS"
- CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS"
else
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wshadow"
CPPFLAGS="$CPPFLAGS -DNDEBUG"
if test x"$enable_debug" = x"no"; then
@@ -123,6 +103,22 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]),
AC_MSG_RESULT([minimum])
fi
fi
+
+ XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS])
+
+ ifelse([$CXX], , , [
+ dnl FIXME: should test on c++ compiler, but the following line causes
+ dnl autoconf errors for projects that don't check for a
+ dnl c++ compiler at all.
+ dnl AC_LANG_PUSH([C++])
+ dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS])
+ dnl AC_LANG_POP()
+ dnl instead, just use supported_CFLAGS...
+ supported_CXXFLAGS="$supported_CFLAGS"
+ ])
+
+ CFLAGS="$CFLAGS $supported_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS"
])
@@ -135,8 +131,7 @@ dnl
AC_DEFUN([XDT_FEATURE_VISIBILITY],
[
AC_ARG_ENABLE([visibility],
- AC_HELP_STRING([--disable-visibility],
- [Don't use ELF visibility attributes]),
+ AS_HELP_STRING([--disable-visibility],[Don't use ELF visibility attributes]),
[enable_visibility=$enableval], [enable_visibility=yes])
have_gnuc_visibility=no
if test "x$enable_visibility" != "xno"; then
@@ -188,8 +183,7 @@ dnl
AC_DEFUN([XDT_FEATURE_LINKER_OPTS],
[
AC_ARG_ENABLE([linker-opts],
- AC_HELP_STRING([--disable-linker-opts],
- [Disable linker optimizations]),
+ AS_HELP_STRING([--disable-linker-opts],[Disable linker optimizations]),
[enable_linker_opts=$enableval], [enable_linker_opts=yes])
if test "x$enable_linker_opts" != "xno"; then
=====================================
m4macros/xdt-i18n.m4
=====================================
@@ -47,7 +47,6 @@ AC_DEFUN([XDT_I18N],
[$1],
[esyscmd([echo $(for i in po/*.po; do test -e "$i" && basename -- "$i" .po; done) | tr -d '\n'])],
[$1])"
- AM_GLIB_GNU_GETTEXT()
dnl This is required on some Linux systems
AC_CHECK_FUNC([bind_textdomain_codeset])
@@ -56,7 +55,7 @@ AC_DEFUN([XDT_I18N],
AC_MSG_CHECKING([for locales directory])
AC_ARG_WITH([locales-dir],
[
- AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+ AS_HELP_STRING([--with-locales-dir=DIR],[Install locales into DIR])
], [localedir=$withval],
[
if test x"$CATOBJEXT" = x".mo"; then
@@ -67,15 +66,5 @@ AC_DEFUN([XDT_I18N],
])
AC_MSG_RESULT([$localedir])
AC_SUBST([localedir])
-
- dnl Determine additional xgettext flags
- AC_MSG_CHECKING([for additional xgettext flags])
- if test x"$XGETTEXT_ARGS" = x""; then
- XGETTEXT_ARGS="--keyword=Q_ --from-code=UTF-8";
- else
- XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=Q_ --from-code=UTF-8";
- fi
- AC_SUBST([XGETTEXT_ARGS])
- AC_MSG_RESULT([$XGETTEXT_ARGS])
])
=====================================
m4macros/xdt-version.m4
=====================================
@@ -45,7 +45,7 @@ dnl
dnl Example usage:
dnl
dnl XDT_VERSION_INIT([4.15.3],[git])
-dnl AC_INIT([xfce4-someproject], [xdt_version()])
+dnl AC_INIT([xfce4-someproject],[xdt_version()])
dnl ...
dnl XDT_FEATURE_DEBUG([xdt_debug_default])
dnl
=====================================
scripts/Makefile.in
=====================================
@@ -96,11 +96,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = scripts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -227,7 +226,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
scripts/xdt-autogen.in
=====================================
@@ -283,15 +283,6 @@ if test "$1" = "clean"; then
}
)
- # determine translations used in this package directory
-# translations=$(
-# sed -n -e 's|\\[\\nt]| |g' \
-# -e 's|.*XDT_I18N(\[\{0,1\}\([a-zA-Z_@ ]\{1,\}\).*|\1|p') \
-# "${configure_ac_file}"
-# )
-# for translation in $translations; do
-# rm -f "${directory}/po/${translation}.gmo"
-# done
rm -f "${directory}"/po/*.gmo;
done
@@ -302,21 +293,20 @@ fi
##
## Check for autoconf
##
-if test -z "${XDT_PROG_AUTOCONF}"; then
- test -z "${AUTOCONF_VERSION}" && i=autoconf || i=autoconf-${AUTOCONF_VERSION}
- ${i} --version </dev/null >/dev/null 2>&1 && XDT_PROG_AUTOCONF=${i}
+if test -z "${XDT_PROG_AUTORECONF}"; then
+ test -z "${AUTOCONF_VERSION}" && i=autoreconf || i=autoreconf-${AUTOCONF_VERSION}
+ ${i} --version </dev/null >/dev/null 2>&1 && XDT_PROG_AUTORECONF=${i}
fi
-test -z "${XDT_PROG_AUTOCONF}" && {
+test -z "${XDT_PROG_AUTORECONF}" && {
cat >&2 <<EOF
xdt-autogen: You must have "autoconf" installed on your system.
Download the appropriate package for your distribution,
- or get the source tarball at ftp://ftp.gnu.org/pub/gnu/.
+ or get the source tarball at https://www.gnu.org/software/autoconf/.
EOF
exit 1
}
-
##
## Check for intltoolize
##
@@ -329,7 +319,7 @@ for configure_ac_file in $CONFIGURE_AC_FILES; do
cat >&2 <<EOF
xdt-autogen: You must have "intltool" installed on your system.
You can download the source tarball from
- ftp://ftp.gnome.org/pub/GNOME/.
+ https://launchpad.net/intltool.
EOF
exit 1
}
@@ -356,62 +346,15 @@ done
##
## Check for libtoolize
##
-if test -z "${XDT_PROG_LIBTOOLIZE}"; then
- if type glibtoolize >/dev/null 2>&1; then
- XDT_PROG_LIBTOOLIZE="glibtoolize"
- elif type libtoolize >/dev/null 2>&1; then
- XDT_PROG_LIBTOOLIZE="libtoolize"
- fi
-fi
-
+test -z "${XDT_PROG_LIBTOOLIZE}" && XDT_PROG_LIBTOOLIZE="libtoolize"
IFS=$special_IFS
for configure_ac_file in $CONFIGURE_AC_FILES; do
IFS=$default_IFS
- runlibtoolize=0
- if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then
- cat >&2 <<EOF
-xdt-autogen: It is recommended to use LT_PREREQ([@VERSION_LIBTOOL@]) and
- LT_INIT([disable-static]) in your configure.ac
- file and remove AC_PROG_LIBTOOL and AC_DISABLE_STATIC.
-
- See https://bugzilla.xfce.org/show_bug.cgi?id=6920 for
- more information.
-
-EOF
- runlibtoolize=1
- fi
-
if grep -q "^LT_PREREQ" "${configure_ac_file}"; then
- runlibtoolize=1
- fi
-
- if test "$runlibtoolize" -eq 1; then
${XDT_PROG_LIBTOOLIZE} --version </dev/null >/dev/null 2>&1 || {
cat >&2 <<EOF
-xdt-autogen: You must have "libtool" installed on your system.
- Download the appropriate package for your distribution,
- or get the source tarball at ftp://ftp.gnu.org/pub/gnu/.
-EOF
- exit 1
- }
- break
- fi
-done
-
-
-##
-## Check for glib-gettextize
-##
-test -z "${XDT_PROG_GLIB_GETTEXTIZE}" && XDT_PROG_GLIB_GETTEXTIZE="glib-gettextize"
-IFS=$special_IFS
-for configure_ac_file in $CONFIGURE_AC_FILES; do
- IFS=$default_IFS
- directory=$(dirname "${configure_ac_file}")
- if test -d "${directory}/po"; then
- ${XDT_PROG_GLIB_GETTEXTIZE} --version </dev/null >/dev/null 2>&1 || {
- cat >&2 <<EOF
-xdt-autogen: You must have "glib2" installed. You can get if from
- ftp://ftp.gtk.org/pub/gtk/.
+xdt-autogen: You must have "libtoolize" installed. You can get if from
+ https://www.gnu.org/software/libtool/.
EOF
exit 1
}
@@ -430,51 +373,9 @@ for configure_ac_file in $CONFIGURE_AC_FILES; do
if grep -q "^GTK_DOC_CHECK" "${configure_ac_file}"; then
${XDT_PROG_GTKDOCIZE} --version </dev/null >/dev/null 2>&1 || {
cat >&2 <<EOF
-xdt-autogen: You must have "gtk-doc" installed. You can get if from
- http://www.gtk.org/gtk-doc/.
-EOF
- exit 1
- }
- break
- fi
-done
-
-
-##
-## Check for aclocal
-##
-if test -z "${XDT_PROG_ACLOCAL}"; then
- test -z "${ACLOCAL_VERSION}" && i=aclocal || i=aclocal-${ACLOCAL_VERSION}
- ${i} --version </dev/null >/dev/null 2>&1 && XDT_PROG_ACLOCAL=${i}
-fi
-
-test -z "${XDT_PROG_ACLOCAL}" && {
- cat >&2 <<EOF
-xdt-autogen: You must have "automake" installed (which includes the
- "aclocal" tool). You can get the source tarball at
- ftp://ftp.gnu.org/pub/gnu/.
-EOF
- exit 1
-}
-
-
-##
-## Check for autoheader
-##
-test -z "${XDT_PROG_AUTOHEADER}" &&
-IFS=$special_IFS
-for configure_ac_file in $CONFIGURE_AC_FILES; do
- IFS=$default_IFS
- if $EGREP -q "^A(M|C)_CONFIG_HEADER" "${configure_ac_file}"; then
- test -z "${AUTOHEADER_VERSION}" && i=autoheader \
- || i=autoheader-${AUTOHEADER_VERSION}
- ${i} --version </dev/null >/dev/null 2>&1 && XDT_PROG_AUTOHEADER=${i}
-
- test -z "${XDT_PROG_AUTOHEADER}" && {
- cat >&2 <<EOF
-xdt-autogen: You must have "autoconf" installed (which includes the
- "autoheader" tool). You can get the source tarball at
- ftp://ftp.gnu.org/pub/gnu/.
+xdt-autogen: You must have "gtk-doc" installed.
+ Download the appropriate package for your distribution,
+ or get the source tarball at https://www.gtk.org.
EOF
exit 1
}
@@ -495,7 +396,7 @@ test -z "${XDT_PROG_AUTOMAKE}" && {
cat >&2 <<EOF
xdt-autogen: You must have "automake" installed on your system.
You can get the source tarball at
- ftp://ftp.gnu.org/pub/gnu/.
+ https://www.gnu.org/software/automake/.
EOF
exit 1
}
@@ -511,6 +412,9 @@ CONFIGURE_FLAGS="${XDT_CONFIGURE_FLAGS} $*"
##
## Do the real work(TM)
##
+# We need to create m4 directory in case it does not exists yet, to avoid any aclocal warnings
+mkdir -p m4
+
IFS=$special_IFS
for configure_ac_file in ${CONFIGURE_AC_FILES}; do
IFS=$default_IFS
@@ -518,93 +422,23 @@ for configure_ac_file in ${CONFIGURE_AC_FILES}; do
source_dir=$(dirname "${configure_ac_file}")
echo "Preparing package directory ${source_dir}..."
- # set aclocal flags
- ACLOCAL_FLAGS="${ACLOCAL_FLAGS} ${XDT_ACLOCAL_FLAGS} -I ${m4macrodir}"
- if test -d "${source_dir}/m4macros"; then
- ACLOCAL_DIR_1="${source_dir}/m4macros";
- fi
- if test -d "${source_dir}/m4"; then
- ACLOCAL_DIR_2="${source_dir}/m4";
- fi
-
- if test -d "${source_dir}/po"; then
- if test ! -f "${source_dir}/aclocal.m4"; then
- echo "Creating ${source_dir}/aclocal.m4..." \
- && echo "dnl Auto-generated by xdt-autogen" > "${source_dir}/aclocal.m4" \
- || exit 1
- fi
- echo "Running ${XDT_PROG_GLIB_GETTEXTIZE} --force --copy..." \
- && ${XDT_PROG_GLIB_GETTEXTIZE} --force --copy \
- || exit 1
- if test -f "${source_dir}/aclocal.m4" -a ! -w "${source_dir}/aclocal.m4"; then
- echo "Making ${source_dir}/aclocal.m4 writable..." \
- && chmod u+w "${source_dir}/aclocal.m4" \
- || exit 1
- fi
- fi
-
+ # For autoconf 2.69, we need to run intltool and gtkdocize manually
+ # If we are still using autotools once 2.70 is the minimum version required, we can remove theses run
if $EGREP -q "^(AC|IT)_PROG_INTLTOOL" "${configure_ac_file}"; then
( echo "Running ${XDT_PROG_INTLTOOLIZE} --automake --copy --force" \
&& cd "${source_dir}" \
&& ${XDT_PROG_INTLTOOLIZE} --automake --copy --force ) || exit 1
fi
- # patch the po/Makefile.in.in to take into account the setting of
- # XGETTEXT_ARGS properly
- if test -f "${source_dir}/po/Makefile.in.in"; then
- if ! grep -q '^XGETTEXT_ARGS[ ]*=[ ]*@XGETTEXT_ARGS@$' \
- "${source_dir}/po/Makefile.in.in"
- then
- echo "Patching file 'po/Makefile.in.in'"
- if sed \
- -e 's/^\(XGETTEXT[ ]*=[ ]*@XGETTEXT@\)[ ]*$/\1 $(XGETTEXT_ARGS)/' \
- -e 's/^\(MSGMERGE[ ]*=\)[ ]*\(INTLTOOL_EXTRACT=\)/\1 XGETTEXT_ARGS="$(XGETTEXT_ARGS)" \2/' \
- -e 's/^\(GENPOT[ ]*=\)[ ]*\(INTLTOOL_EXTRACT=\)/\1 XGETTEXT_ARGS="$(XGETTEXT_ARGS)" \2/' \
- -e "/^XGETTEXT = @XGETTEXT@/{
-i\\
-XGETTEXT_ARGS = @XGETTEXT_ARGS@
-}" "${source_dir}/po/Makefile.in.in" > "${source_dir}/po/Makefile.in.in.tmp"
- then
- mv -f "${source_dir}/po/Makefile.in.in.tmp" \
- "${source_dir}/po/Makefile.in.in" || exit 1
- fi
- fi
- fi
-
- if grep -q -e "^AC_PROG_LIBTOOL" -e "^LT_PREREQ" "${configure_ac_file}"; then
- ( echo "Running ${XDT_PROG_LIBTOOLIZE} --force --copy..." \
- && cd "${source_dir}" \
- && ${XDT_PROG_LIBTOOLIZE} --force --copy ) || exit 1
- fi
-
if grep -q "^GTK_DOC_CHECK" "${configure_ac_file}"; then
( echo "Running ${XDT_PROG_GTKDOCIZE} --copy..." \
&& cd "${source_dir}" \
&& ${XDT_PROG_GTKDOCIZE} --copy ) || exit 1
fi
- ( echo -n "Running ${XDT_PROG_ACLOCAL}" ${ACLOCAL_FLAGS} \
- ${ACLOCAL_DIR_1:+-I "${ACLOCAL_DIR_1}"} \
- ${ACLOCAL_DIR_2:+-I "${ACLOCAL_DIR_2}"} \
- && echo '...' \
- && cd "${source_dir}" \
- && ${XDT_PROG_ACLOCAL} ${ACLOCAL_FLAGS} \
- ${ACLOCAL_DIR_1:+-I "${ACLOCAL_DIR_1}"} \
- ${ACLOCAL_DIR_2:+-I "${ACLOCAL_DIR_2}"} ) || exit 1
-
- if $EGREP -q "^A(M|C)_CONFIG_HEADER" "${configure_ac_file}"; then
- ( echo "Running ${XDT_PROG_AUTOHEADER}..." \
- && cd "${source_dir}" \
- && ${XDT_PROG_AUTOHEADER} ) || exit 1
- fi
-
- ( echo "Running ${XDT_PROG_AUTOMAKE} --force-missing --add-missing --copy --gnu..." \
- && cd "${source_dir}" \
- && ${XDT_PROG_AUTOMAKE} --force-missing --add-missing --copy --gnu ) || exit 1
-
- ( echo "Running ${XDT_PROG_AUTOCONF}..." \
- && cd "${source_dir}" \
- && ${XDT_PROG_AUTOCONF} ) || exit 1
+ ( echo "Running ${XDT_PROG_AUTORECONF}..." \
+ && cd "${source_dir}" \
+ && ${XDT_PROG_AUTORECONF} --verbose --install --force) || exit 1
echo
done
=====================================
tests/Makefile.in
=====================================
@@ -91,11 +91,10 @@ TESTS = test-xdt-csource$(EXEEXT)
check_PROGRAMS = test-xdt-csource$(EXEEXT)
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -496,7 +495,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
tests/data/Makefile.in
=====================================
@@ -89,11 +89,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = tests/data
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -191,7 +190,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
xdt-csource/Makefile.in
=====================================
@@ -95,11 +95,10 @@ host_triplet = @host@
bin_PROGRAMS = xdt-csource$(EXEEXT)
subdir = xdt-csource
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4macros/xdt-version.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/xdt-version.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -251,7 +250,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VERSION_LIBTOOL = @VERSION_LIBTOOL@
VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
=====================================
xdt-csource/main.c
=====================================
@@ -376,7 +376,7 @@ main (int argc, char **argv)
}
#ifdef G_OS_WIN32
- filename = g_local_to_utf8 (argv[1], -1, NULL, NULL, NULL);
+ filename = g_locale_to_utf8 (argv[1], -1, NULL, NULL, NULL);
#else
filename = argv[1];
#endif
@@ -401,7 +401,7 @@ main (int argc, char **argv)
for (n = argc - 1, p = argv + 1; n-- > 0; ++p, toggle = !toggle)
{
#ifdef G_OS_WIN32
- filename = g_local_to_utf8 (*p, -1, NULL, NULL, NULL);
+ filename = g_locale_to_utf8 (*p, -1, NULL, NULL, NULL);
#else
filename = *p;
#endif
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-dev-tools/-/compare/6130d3b61396d82cf2485342771f5277a7cfb12c...3b148fe38f2aaad6dbfff2513655550601245134
--
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-dev-tools/-/compare/6130d3b61396d82cf2485342771f5277a7cfb12c...3b148fe38f2aaad6dbfff2513655550601245134
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/20220720/cf650d10/attachment-0001.htm>
More information about the Pkg-xfce-commits
mailing list