[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-dev-tools][upstream/latest] New upstream version 4.19.0.
Unit 193 (@unit193)
gitlab at salsa.debian.org
Tue Jul 4 09:41:37 BST 2023
Unit 193 pushed to branch upstream/latest at xfce / desktop / xfce4-dev-tools
Commits:
2caafceb by Unit 193 at 2023-07-04T04:36:02-04:00
New upstream version 4.19.0.
- - - - -
18 changed files:
- ChangeLog
- + INSTALL
- Makefile.in
- NEWS
- configure
- configure.ac
- docs/Makefile.in
- docs/xdt-csource.1
- helpers/Makefile.am
- helpers/Makefile.in
- helpers/xfce-do-release → helpers/xfce-do-release.in
- m4macros/Makefile.in
- m4macros/xdt-depends.m4
- scripts/Makefile.in
- scripts/xdt-autogen.in
- tests/Makefile.in
- tests/data/Makefile.in
- xdt-csource/Makefile.in
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,69 @@
+commit 2e5ee77b78c2fdb0f97b7b424ed44eaedadbf921
+Author: Brian J. Tarricone <brian at tarricone.org>
+Date: Thu Mar 2 15:54:39 2023 -0800
+
+ Add new macro XDT_CHECK_PACKAGE_BINARY
+
+commit 8aeae028f95c4b7cedbe9064526eb8e2aad823ed
+Author: Brian J. Tarricone <brian at tarricone.org>
+Date: Thu Mar 2 15:36:02 2023 -0800
+
+ Add new macro XDT_CHECK_OPTIONAL_FEATURE
+
+commit 074bfe3367609771d8ea05178e1d4fce7af2a311
+Author: Alexander Schwinn <alexxcons at xfce.org>
+Date: Mon Feb 13 21:44:05 2023 +0100
+
+ Add check for xsltproc (#60)
+
+commit fff16fc002223207756fc013f2787e66df1d2245
+Author: Gaël Bonithon <gael at xfce.org>
+Date: Sun Feb 19 18:04:28 2023 +0100
+
+ Add Tumbler plugins dependencies to CI build
+
+commit a8dd70a06e4d658f4e499d4d52f4d7eb086a6161
+Author: Erkki Moorits <erkki.moorits at mail.ee>
+Date: Fri Feb 17 15:42:08 2023 +0200
+
+ xfce-do-release: added OS dependent sed and make detection
+
+commit a207110ed20041c1d6f718722d18394e05fa6a06
+Author: Erkki Moorits <erkki.moorits at mail.ee>
+Date: Fri Feb 17 15:29:54 2023 +0200
+
+ xfce-do-release: added user settable sed and make
+
+commit a99e33603f6c981770aa90dad0f544f5b8259082
+Author: Erkki Moorits <erkki.moorits at mail.ee>
+Date: Wed Feb 8 17:01:35 2023 +0200
+
+ xdt-autogen: Fixed wrong make displayed on FreeBSD
+
+commit 91bff86d9c1348403773d8ea0f1e3c5362e04ec4
+Author: Brian J. Tarricone <brian at tarricone.org>
+Date: Tue Jan 3 04:13:51 2023 -0800
+
+ Add libxfce4windowing to the API docs HTML index
+
+commit a090b333a7b1ed6757aebc406e968e3d7a5ba4af
+Author: Brian J. Tarricone <brian at tarricone.org>
+Date: Thu Dec 15 02:15:14 2022 -0800
+
+ Add libxfce4windowing to CI build
+
+commit aa279559cbe6e9acb8728c59ea62b3ab14ab7069
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Thu Dec 15 10:46:18 2022 +0100
+
+ Back to development
+
+commit 98a7c8e777c21c127da2fd5f7d01a26c5e18d249
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Thu Dec 15 10:43:35 2022 +0100
+
+ Updates for release
+
commit 68716b0878c1bc0aa5d13c177cfb55c38cc770f7
Author: Gaël Bonithon <gael at xfce.org>
Date: Mon Dec 5 21:12:16 2022 +0100
=====================================
INSTALL
=====================================
@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS
+ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
+
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
=====================================
Makefile.in
=====================================
@@ -161,9 +161,9 @@ am__define_uniq_tagged_files = \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog NEWS \
- README.md compile config.guess config.sub install-sh ltmain.sh \
- missing
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
+ INSTALL NEWS README.md compile config.guess config.sub \
+ install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -237,7 +237,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -283,6 +285,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
=====================================
NEWS
=====================================
@@ -1,3 +1,16 @@
+4.19.0 (2023-03-05)
+======
+- Add new macro XDT_CHECK_PACKAGE_BINARY
+- Add new macro XDT_CHECK_OPTIONAL_FEATURE
+- Add check for xsltproc (#60)
+- Add Tumbler plugins dependencies to CI build
+- xfce-do-release: added OS dependent sed and make detection
+- xfce-do-release: added user settable sed and make
+- xdt-autogen: Fixed wrong make displayed on FreeBSD
+- Add libxfce4windowing to the API docs HTML index
+- Add libxfce4windowing to CI build
+
+
4.18.0 (2022-12-15)
======
- build: Bump requirements for Xfce 4.18
=====================================
configure
=====================================
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xfce4-dev-tools 4.18.0.
+# Generated by GNU Autoconf 2.71 for xfce4-dev-tools 4.19.0.
#
# Report bugs to <https://gitlab.xfce.org/xfce/xfce4-dev-tools/>.
#
@@ -624,8 +624,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-dev-tools'
PACKAGE_TARNAME='xfce4-dev-tools'
-PACKAGE_VERSION='4.18.0'
-PACKAGE_STRING='xfce4-dev-tools 4.18.0'
+PACKAGE_VERSION='4.19.0'
+PACKAGE_STRING='xfce4-dev-tools 4.19.0'
PACKAGE_BUGREPORT='https://gitlab.xfce.org/xfce/xfce4-dev-tools/'
PACKAGE_URL=''
@@ -670,6 +670,8 @@ GLIB_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
+GMAKE
+GSED
LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
@@ -691,15 +693,8 @@ FGREP
EGREP
GREP
SED
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
LIBTOOL
+XSLTPROC
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@@ -716,6 +711,14 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -1370,7 +1373,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.18.0 to adapt to many kinds of systems.
+\`configure' configures xfce4-dev-tools 4.19.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1441,7 +1444,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-dev-tools 4.18.0:";;
+ short | recursive ) echo "Configuration of xfce4-dev-tools 4.19.0:";;
esac
cat <<\_ACEOF
@@ -1561,7 +1564,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-dev-tools configure 4.18.0
+xfce4-dev-tools configure 4.19.0
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1781,7 +1784,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.18.0, which was
+It was created by xfce4-dev-tools $as_me 4.19.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2371,7 +2374,7 @@ as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
# Auxiliary files required by this configure script.
-ac_aux_files="config.guess config.sub ltmain.sh compile missing install-sh"
+ac_aux_files="ltmain.sh compile config.guess config.sub missing install-sh"
# Locations in which to look for auxiliary files.
ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
@@ -2542,7 +2545,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
VERSION_MAJOR=4
-VERSION_MINOR=18
+VERSION_MINOR=19
VERSION_MICRO=0
@@ -3063,7 +3066,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-dev-tools'
- VERSION='4.18.0'
+ VERSION='4.19.0'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3351,6 +3354,82 @@ AM_BACKSLASH='\'
+ # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
+
@@ -4601,6 +4680,53 @@ fi
+# Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_XSLTPROC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$XSLTPROC"; then
+ ac_cv_prog_XSLTPROC="$XSLTPROC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_XSLTPROC="yes"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+XSLTPROC=$ac_cv_prog_XSLTPROC
+if test -n "$XSLTPROC"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+printf "%s\n" "$XSLTPROC" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+if test x"$XSLTPROC" != x"yes"
+then :
+ as_fn_error $? "package 'xsltproc' missing" "$LINENO" 5
+fi
+
case `pwd` in
*\ * | *\ *)
@@ -4628,81 +4754,6 @@ macro_revision='2.4.6'
ltmain=$ac_aux_dir/ltmain.sh
-
-
- # Make sure we can run config.sub.
-$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-printf %s "checking build system type... " >&6; }
-if test ${ac_cv_build+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-printf %s "checking host system type... " >&6; }
-if test ${ac_cv_host+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
- as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
# Backslashify metacharacters that are still active within
# double-quoted strings.
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
@@ -12654,6 +12705,123 @@ CC=$lt_save_CC
+case "${host_os}" in
+ freebsd*)
+ for ac_prog in gsed
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_GSED+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$GSED"; then
+ ac_cv_prog_GSED="$GSED" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_GSED="$ac_prog"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+GSED=$ac_cv_prog_GSED
+if test -n "$GSED"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GSED" >&5
+printf "%s\n" "$GSED" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+ test -n "$GSED" && break
+done
+test -n "$GSED" || GSED="no"
+
+ if test x"$GSED" = x"no"
+then :
+ as_fn_error $? "GNU sed (gsed) missing" "$LINENO" 5
+fi
+
+ for ac_prog in gmake
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_GMAKE+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$GMAKE"; then
+ ac_cv_prog_GMAKE="$GMAKE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_GMAKE="$ac_prog"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+GMAKE=$ac_cv_prog_GMAKE
+if test -n "$GMAKE"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMAKE" >&5
+printf "%s\n" "$GMAKE" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+ test -n "$GMAKE" && break
+done
+test -n "$GMAKE" || GMAKE="no"
+
+ if test x"$GMAKE" = x"no"
+then :
+ as_fn_error $? "GNU make (gmake) missing" "$LINENO" 5
+fi
+ ;;
+ *)
+ GSED="sed"
+ GMAKE="make"
+ ;;
+esac
+
+
+
+
ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
if test "x$ac_cv_header_libintl_h" = xyes
then :
@@ -12914,7 +13082,7 @@ printf "%s\n" "yes" >&6; }
fi
-ac_config_files="$ac_config_files Makefile helpers/Makefile m4macros/Makefile scripts/Makefile scripts/xdt-autogen xdt-csource/Makefile docs/Makefile tests/Makefile tests/data/Makefile"
+ac_config_files="$ac_config_files Makefile helpers/Makefile helpers/xfce-do-release m4macros/Makefile scripts/Makefile scripts/xdt-autogen xdt-csource/Makefile docs/Makefile tests/Makefile tests/data/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -13479,7 +13647,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.18.0, which was
+This file was extended by xfce4-dev-tools $as_me 4.19.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13538,7 +13706,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-xfce4-dev-tools config.status 4.18.0
+xfce4-dev-tools config.status 4.19.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
@@ -13943,6 +14111,7 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"helpers/Makefile") CONFIG_FILES="$CONFIG_FILES helpers/Makefile" ;;
+ "helpers/xfce-do-release") CONFIG_FILES="$CONFIG_FILES helpers/xfce-do-release" ;;
"m4macros/Makefile") CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;;
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"scripts/xdt-autogen") CONFIG_FILES="$CONFIG_FILES scripts/xdt-autogen" ;;
=====================================
configure.ac
=====================================
@@ -9,7 +9,7 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
-XDT_VERSION_INIT([4.18.0])
+XDT_VERSION_INIT([4.19.0])
dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT
dnl # YOU ARE DOING.
@@ -38,6 +38,8 @@ AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar no-dist-gzip foreign])
AM_MAINTAINER_MODE()
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AC_CANONICAL_HOST
+
dnl ********************************
dnl *** Check for basic programs ***
dnl ********************************
@@ -45,12 +47,38 @@ AC_PROG_CC()
AM_PROG_CC_C_O()
AC_PROG_INSTALL()
+dnl **********************
+dnl *** Check xsltproc ***
+dnl **********************
+AC_CHECK_PROG([XSLTPROC], [xsltproc],yes)
+AS_IF([test x"$XSLTPROC" != x"yes"], [AC_MSG_ERROR([package 'xsltproc' missing])])
+
dnl **************************
dnl *** Initialize libtool ***
dnl **************************
LT_PREREQ([2.4])
LT_INIT([disable-static])
+dnl ****************************************
+dnl *** Check for host specific programs ***
+dnl ****************************************
+case "${host_os}" in
+ freebsd*)
+ AC_CHECK_PROGS(GSED, [gsed], no)
+ AS_IF([test x"$GSED" = x"no"], [AC_MSG_ERROR([GNU sed (gsed) missing])])
+
+ AC_CHECK_PROGS(GMAKE, [gmake], no)
+ AS_IF([test x"$GMAKE" = x"no"], [AC_MSG_ERROR([GNU make (gmake) missing])])
+ ;;
+ *)
+ GSED="sed"
+ GMAKE="make"
+ ;;
+esac
+
+AC_SUBST(GSED)
+AC_SUBST(GMAKE)
+
dnl ***************************************
dnl *** Check for standard header files ***
dnl ***************************************
@@ -67,6 +95,7 @@ dnl **********************
AC_CONFIG_FILES([
Makefile
helpers/Makefile
+helpers/xfce-do-release
m4macros/Makefile
scripts/Makefile
scripts/xdt-autogen
=====================================
docs/Makefile.in
=====================================
@@ -181,7 +181,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -227,6 +229,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
=====================================
docs/xdt-csource.1
=====================================
@@ -2,12 +2,12 @@
.\" Title: xdt-csource
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 10/29/2022
+.\" Date: 03/05/2023
.\" Manual: Xfce User\*(Aqs Manual
.\" Source: Xfce
.\" Language: English
.\"
-.TH "XDT\-CSOURCE" "1" "10/29/2022" "Xfce" "Xfce User\*(Aqs Manual"
+.TH "XDT\-CSOURCE" "1" "03/05/2023" "Xfce" "Xfce User\*(Aqs Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
=====================================
helpers/Makefile.am
=====================================
@@ -2,14 +2,23 @@
# The Xfce development team. All rights reserved.
#
-bin_SCRIPTS = \
+generated_scripts = \
+ xfce-do-release
+
+scripts = \
xfce-build \
- xfce-do-release \
xfce-get-release-notes \
xfce-get-translations \
xfce-update-news
+bin_SCRIPTS = \
+ $(scripts) \
+ $(generated_scripts)
+
EXTRA_DIST = \
- $(bin_SCRIPTS)
+ $(scripts)
+
+CLEANFILES = \
+ $(generated_scripts)
# vi:set ts=8 sw=8 noet ai:
=====================================
helpers/Makefile.in
=====================================
@@ -102,7 +102,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = xfce-do-release
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -153,7 +153,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in README.md
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/xfce-do-release.in \
+ README.md
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -184,7 +185,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -230,6 +233,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -283,15 +287,24 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-bin_SCRIPTS = \
+generated_scripts = \
+ xfce-do-release
+
+scripts = \
xfce-build \
- xfce-do-release \
xfce-get-release-notes \
xfce-get-translations \
xfce-update-news
+bin_SCRIPTS = \
+ $(scripts) \
+ $(generated_scripts)
+
EXTRA_DIST = \
- $(bin_SCRIPTS)
+ $(scripts)
+
+CLEANFILES = \
+ $(generated_scripts)
all: all-am
@@ -325,6 +338,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+xfce-do-release: $(top_builddir)/config.status $(srcdir)/xfce-do-release.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
@@ -434,6 +449,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
=====================================
helpers/xfce-do-release → helpers/xfce-do-release.in
=====================================
@@ -7,6 +7,9 @@ steps_complete=0
version_scheme=1
warning='\e[1;33mWarning:\e[0m'
+SED=${SED:- at GSED@}
+MAKE=${MAKE:- at GMAKE@}
+
# Check if the working directory is in the state we expect it to be in
sanity_checks () {
is_git=$(git rev-parse --is-inside-work-tree)
@@ -91,13 +94,13 @@ test_parameters () {
fi
if [ $version_scheme = 0 ]; then
- latest_major=$(echo $latest_tag | sed 's/\(.*\)\.\(.*\)\.\(.*\)/\1/')
- latest_minor=$(echo $latest_tag | sed 's/\(.*\)\.\(.*\)\.\(.*\)/\2/')
- latest_patch=$(echo $latest_tag | sed 's/\(.*\)\.\(.*\)\.\(.*\)/\3/')
+ latest_major=$(echo $latest_tag | $SED 's/\(.*\)\.\(.*\)\.\(.*\)/\1/')
+ latest_minor=$(echo $latest_tag | $SED 's/\(.*\)\.\(.*\)\.\(.*\)/\2/')
+ latest_patch=$(echo $latest_tag | $SED 's/\(.*\)\.\(.*\)\.\(.*\)/\3/')
else
- latest_major=$(echo $latest_tag | sed 's/\(.*\)-\(.*\)\.\(.*\)\.\(.*\)/\2/')
- latest_minor=$(echo $latest_tag | sed 's/\(.*\)-\(.*\)\.\(.*\)\.\(.*\)/\3/')
- latest_patch=$(echo $latest_tag | sed 's/\(.*\)-\(.*\)\.\(.*\)/\3/')
+ latest_major=$(echo $latest_tag | $SED 's/\(.*\)-\(.*\)\.\(.*\)\.\(.*\)/\2/')
+ latest_minor=$(echo $latest_tag | $SED 's/\(.*\)-\(.*\)\.\(.*\)\.\(.*\)/\3/')
+ latest_patch=$(echo $latest_tag | $SED 's/\(.*\)-\(.*\)\.\(.*\)/\3/')
fi
new_patch=$(echo "$(($latest_patch + 1))")
@@ -168,7 +171,7 @@ update_appdata_file () {
$set_nocaseglob
if ((${#files[@]} == 1)); then
- sed -Ei "s%(\s*)<releases>%&\n\1\1<release date=\"$(date '+%Y-%m-%d')\" version=\"$2\"/>%" "${files[0]}"
+ $SED -Ei "s%(\s*)<releases>%&\n\1\1<release date=\"$(date '+%Y-%m-%d')\" version=\"$2\"/>%" "${files[0]}"
elif ((${#files[@]} > 1)); then
echo " Found several files whose name ends with '$1.appdata.xml.in' (case insensitive, no modification):"
printf ' %s\n' "${files[@]}"
@@ -207,20 +210,20 @@ update_configure_ac_in () {
if grep -q 'XDT_VERSION_INIT' "$configure_file"; then
if [ "$1" = "pre" ]; then
- sed -i "s/^\(XDT_VERSION_INIT\s*\)(.*/\1([$version])/" "$configure_file"
+ $SED -i "s/^\(XDT_VERSION_INIT\s*\)(.*/\1([$version])/" "$configure_file"
elif [ "$1" = "post" ]; then
- sed -i "s/^\(XDT_VERSION_INIT\s*\)(.*/\1([$version], [git])/" "$configure_file"
+ $SED -i "s/^\(XDT_VERSION_INIT\s*\)(.*/\1([$version], [git])/" "$configure_file"
fi
else
if [ "$1" = "pre" ]; then
- sed -i \
+ $SED -i \
-e "s/^\(m4_define(\[.*_version_major\], *\[\)\(.*\)\(\])\)/\1$version_major\3/g" \
-e "s/^\(m4_define(\[.*_version_minor\], *\[\)\(.*\)\(\])\)/\1$version_minor\3/g" \
-e "s/^\(m4_define(\[.*_version_micro\], *\[\)\(.*\)\(\])\)/\1$version_patch\3/g" \
-e 's/^\(m4_define(\[.*_version_tag\], *\[\)\(git\)\(\])\)/\1\3/g' \
"$configure_file"
elif [ "$1" = "post" ]; then
- sed -i 's/\(m4_define(\[.*_version_tag\], *\[\)\(.*\)\(\])\)/\1git\3/g' "$configure_file"
+ $SED -i 's/\(m4_define(\[.*_version_tag\], *\[\)\(.*\)\(\])\)/\1git\3/g' "$configure_file"
fi
fi
@@ -243,16 +246,16 @@ run_steps () {
step "Update Appdata file \e[0m(add new release)"
run_command "update_appdata_file $component $version"
- step "Build the tarball \e[0m(./autogen.sh && make distcheck)"
+ step "Build the tarball \e[0m(./autogen.sh && $MAKE distcheck)"
# either in the xfce-build or xfce-test container or on the local machine
if [ -n "$TAG" ]; then
if [[ "$TAG" == "xfce-build" ]]; then
run_command "xfce-build"
else
- run_command "xfce-test call ./autogen.sh" "xfce-test call make distcheck"
+ run_command "xfce-test call ./autogen.sh" "xfce-test call $MAKE distcheck"
fi
else
- run_command "./autogen.sh" "make distcheck"
+ run_command "./autogen.sh" "$MAKE distcheck"
fi
step "Commit the changes \e[0m(git add -u; git commit -m 'Updates for release')"
=====================================
m4macros/Makefile.in
=====================================
@@ -186,7 +186,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -232,6 +234,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
=====================================
m4macros/xdt-depends.m4
=====================================
@@ -221,6 +221,165 @@ AS_HELP_STRING([--disable-$4],[Disable checking for $5]),
+dnl XDT_FEATURE_DEPENDENCY(varname, package, version)
+dnl
+dnl Used only as an argument to XDT_CHECK_OPTIONAL_FEATURE(), this macro
+dnl declares a dependency required for the feature to be enabled.
+dnl
+dnl If the dependency is checked and found, variables and substitutions will be
+dnl created and set as in XDT_CHECK_PACKAGE(), plus varname_FOUND will be set
+dnl to "yes", and HAVE_varname will be set in config.h.
+dnl
+dnl Note that, unlike with XDT_CHECK_OPTIONAL_PACKAGE(), no automake
+dnl conditional is set for this dependency.
+dnl
+dnl See XDT_CHECK_OPTIONAL_FEATURE() for more information.
+dnl
+AC_DEFUN([XDT_FEATURE_DEPENDENCY],
+[
+ AC_REQUIRE([XDT_PROG_PKG_CONFIG])
+
+ if test x"$xdt_feature_deps_check_only" = x"yes"; then
+ if ! $PKG_CONFIG --exists "$2 >= $3" >/dev/null 2>&1; then
+ if test x"$xdt_feature_deps_missing" = x""; then
+ xdt_feature_deps_missing="$2 >= $3"
+ else
+ xdt_feature_deps_missing="$xdt_feature_deps_missing, $2 >= $3"
+ fi
+ fi
+ else
+ XDT_CHECK_PACKAGE([$1], [$2], [$3],
+ [
+ AC_DEFINE([HAVE_$1], [1], [Define if $2 >= $3 present])
+ $1_FOUND="yes"
+ ])
+ fi
+])
+
+
+
+dnl XDT_CHECK_OPTIONAL_FEATURE(varname, optionname, dependency-checks, [helpstring], [default])
+dnl
+dnl Introduces an --enable-optionname/--disable-optionname flag pair for a
+dnl named feature. If neither flag is provided, the feature will be enabled or
+dnl disabled depending on whether or not dependency-checks succeed or fail.
+dnl If --enable-optionname is provided, the configure script will error out if
+dnl the dependencies are not met. If --disable-optionname is provided, the
+dnl feature will be disabled, and dependencies will not be checked.
+dnl
+dnl The dependency-checks argument should be a series of
+dnl XDT_FEATURE_DEPENDENCY() macro calls, passed as a single quoted argument to
+dnl XDT_CHECK_OPTIONAL_FEATURE().
+dnl
+dnl If helpstring is not provided, optionname is used instead.
+dnl
+dnl The default is "auto", and semantics are as described above. If default is
+dnl set to "yes", then the feature will be required unless --disable-optionname
+dnl is passed to configure. If default is set to "no", the feature will not be
+dnl built unless --enable-optionname is passed.
+dnl
+dnl If the feature is enabled and dependencies are met, ENABLE_varname will be
+dnl defined in config.h. Additionally, an automake conditional called
+dnl ENABLE_varname will be created, and a shell variable called ENABLE_varname
+dnl will set to "yes" or "no".
+dnl
+dnl Example usage:
+dnl
+dnl XDT_CHECK_OPTIONAL_FEATURE([WAYLAND],
+dnl [wayland],
+dnl [
+dnl XDT_FEATURE_DEPENDENCY([GDK_WAYLAND], [gdk-wayland-3.0], [3.24.0])
+dnl XDT_FEATURE_DEPENDENCY([GTK_LAYER_SHELL], [gtk-layer-shell-0], [0.7.0])
+dnl ],
+dnl [the Wayland windowing system])
+dnl
+dnl Note that there are no commas between the XDT_FEATURE_DEPENDENCY()
+dnl invocations; they should all form a single "argument" to
+dnl XDT_CHECK_OPTIONAL_FEATURE().
+dnl
+dnl Also note that you must quote the dependency-checks argument with square
+dnl brackets, or you will get syntax errors in the generated configure script.
+dnl
+AC_DEFUN([XDT_CHECK_OPTIONAL_FEATURE],
+[
+ AC_ARG_ENABLE([$2],
+AS_HELP_STRING([--enable-$2], [Enable support for m4_default($4, $2) (default=m4_default([$5], [auto]))])
+AS_HELP_STRING([--disable-$2], [Disable support for m4_default($4, $2)]),
+ [xdt_cv_$1_enabled=$enableval], [xdt_cv_$1_enabled=m4_default([$5], [auto])])
+
+ if test x"$xdt_cv_$1_enabled" != x"no"; then
+ xdt_feature_deps_check_only=yes
+ xdt_feature_deps_missing=
+ $3
+ if test x"$xdt_feature_deps_missing" = x""; then
+ xdt_feature_deps_check_only=
+ $3
+ ENABLE_$1="yes"
+ AC_DEFINE([ENABLE_$1], [1], [Define if m4_default($4, $2) is enabled])
+ AC_MSG_CHECKING([if m4_default($4, $2) is enabled])
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_CHECKING([if m4_default($4, $2) is enabled])
+ AC_MSG_RESULT([dependencies missing: $xdt_feature_deps_missing])
+ if test x"$xdt_cv_$1_enabled" = x"yes"; then
+ AC_MSG_ERROR([support for m4_default($4, $2) was required, but dependencies were not met])
+ else
+ ENABLE_$1="no"
+ fi
+ fi
+ xdt_feature_deps_check_only=
+ xdt_feature_deps_missing=
+ else
+ ENABLE_$1="no"
+ AC_MSG_CHECKING([if m4_default($4, $2) is enabled])
+ AC_MSG_RESULT([disabled])
+ fi
+
+ AM_CONDITIONAL([ENABLE_$1], [test x"$ENABLE_$1" = x"yes"])
+])
+
+
+
+dnl XDT_CHECK_PACKAGE_BINARY(varname, package, pkgvarname, [binname])
+dnl
+dnl Finds a program by looking for a variable named pkgvarname in the
+dnl pkg-config file for package. If found, varname (both a shell variable and
+dnl automake substitution) is set to the name of the binary (and possibly full
+dnl path, if that is how it is specified in the pkg-config file). If not found,
+dnl or not present and executable, configure will exit with an error.
+dnl
+dnl Users can also override this detection by specfying a varname on the
+dnl configure command line. In that case, the provided value is still checked
+dnl to ensure it exists and is executable.
+dnl
+dnl If binname is not provided (for documentation purposes), pkgvarname will be
+dnl used instead.
+dnl
+dnl Example usage:
+dnl
+dnl XDT_CHECK_PACKAGE_BINARY([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal], [glib-genmarshal])
+dnl
+AC_DEFUN([XDT_CHECK_PACKAGE_BINARY],
+[
+ AC_REQUIRE([XDT_PROG_PKG_CONFIG])
+
+ AC_ARG_VAR([$1], [Location of program ]m4_default($4, $3))
+ AC_MSG_CHECKING([for m4_default($4, $3)])
+
+ if test x"$$1" = x""; then
+ $1=`$PKG_CONFIG --variable=$3 $2`
+ fi
+ if test x"$$1" != x"" -a -x "$$1"; then
+ AC_MSG_RESULT([$$1])
+ else
+ AC_MSG_ERROR([could not find m4_default($4, $3). You can run:
+./configure $1=/path/to/m4_default($4, $3)
+to provide a custom location for it.])
+ fi
+])
+
+
+
dnl XDT_CHECK_LIBX11()
dnl
dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS
=====================================
scripts/Makefile.in
=====================================
@@ -186,7 +186,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -232,6 +234,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
=====================================
scripts/xdt-autogen.in
=====================================
@@ -446,7 +446,7 @@ if test -z "${NOCONFIGURE}"; then
( echo "Running ${MASTER_DIR}/configure ${CONFIGURE_FLAGS}..." \
&& cd "${MASTER_DIR}" \
&& ./configure ${CONFIGURE_FLAGS} \
- && echo "Now type \"make\" to compile." ) || exit 1
+ && echo "Now type \"${MAKE}\" to compile." ) || exit 1
else
echo "Skipping configure process."
fi
=====================================
tests/Makefile.in
=====================================
@@ -454,7 +454,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -500,6 +502,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
=====================================
tests/data/Makefile.in
=====================================
@@ -150,7 +150,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -196,6 +198,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
=====================================
xdt-csource/Makefile.in
=====================================
@@ -208,7 +208,9 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
+GMAKE = @GMAKE@
GREP = @GREP@
+GSED = @GSED@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -254,6 +256,7 @@ VERSION_MAJOR = @VERSION_MAJOR@
VERSION_MICRO = @VERSION_MICRO@
VERSION_MINOR = @VERSION_MINOR@
VERSION_REVISION = @VERSION_REVISION@
+XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-dev-tools/-/commit/2caafceb7a62ea6c74369000e146da9fe43fe162
--
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-dev-tools/-/commit/2caafceb7a62ea6c74369000e146da9fe43fe162
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/20230704/c837655b/attachment-0001.htm>
More information about the Pkg-xfce-commits
mailing list