[Pkg-xfce-commits] [Git][xfce-team/desktop/libxfce4util][upstream/latest] New upstream version 4.16.0
Yves-Alexis Perez
gitlab at salsa.debian.org
Wed Dec 23 08:45:25 GMT 2020
Yves-Alexis Perez pushed to branch upstream/latest at xfce / desktop / libxfce4util
Commits:
d63dffa6 by Yves-Alexis Perez at 2020-12-23T09:06:20+01:00
New upstream version 4.16.0
- - - - -
20 changed files:
- ChangeLog
- − INSTALL
- Makefile.in
- NEWS
- configure
- configure.ac
- docs/Makefile.in
- docs/html/annotation-glossary.html
- docs/html/index.html
- docs/html/libxfce4util-POSIX-Signal-Handling.html
- docs/html/libxfce4util-Resource-Config-File-Support.html
- docs/html/libxfce4util-Resource-lookup-functions.html
- docs/html/libxfce4util-Version-Information.html
- docs/html/libxfce4util-Xfce-Kiosk-functions.html
- docs/version.xml
- libxfce4util/Makefile.am
- libxfce4util/Makefile.in
- libxfce4util/libxfce4util-config.h
- libxfce4util/xfce-miscutils.c
- xfce4-kiosk-query/Makefile.in
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,33 @@
+commit ea6c56a668cbd1055b0acaa65466fd163e02b651
+Author: Romain Bouvier <skunnyk at alteroot.org>
+Date: Tue Dec 22 21:22:33 2020 +0100
+
+ Updates for release
+
+commit 3084615fe0526f590aa5251f5ed296be4a513f0b
+Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Sat Dec 19 22:51:49 2020 +0100
+
+ Prepare for 4.16 final release
+
+commit 082be333f9463a749e89ec53cb92dfb59c59a9d2
+Author: Gaël Bonithon <gael at xfce.org>
+Date: Sat Dec 5 15:34:30 2020 +0100
+
+ Properly handle URI schemes other than "file"
+
+commit 78700e077ae66f8267644ba0a5e6927eef7250c7
+Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Sun Dec 13 20:30:33 2020 +0100
+
+ Back to development
+
+commit f493060f23cc6ef7d175cc83dc872d0f5f778357
+Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Sun Dec 13 20:29:50 2020 +0100
+
+ Updates for release
+
commit bd908e93a6c8d4d5d5f18d24a27de352e16fc1a9
Author: Romain Bouvier <skunnyk at alteroot.org>
Date: Fri Dec 11 17:24:38 2020 +0100
=====================================
INSTALL deleted
=====================================
@@ -1,368 +0,0 @@
-Installation Instructions
-*************************
-
- Copyright (C) 1994-1996, 1999-2002, 2004-2016 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
=====================================
@@ -160,8 +160,8 @@ CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
- COPYING ChangeLog INSTALL NEWS THANKS TODO compile \
- config.guess config.sub install-sh ltmain.sh missing
+ COPYING ChangeLog NEWS THANKS TODO compile config.guess \
+ config.sub install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -234,6 +234,10 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@
+GIO_VERSION = @GIO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
=====================================
NEWS
=====================================
@@ -1,3 +1,9 @@
+4.16.0
+======
+- Prepare for 4.16 final release
+- Properly handle URI schemes other than "file"
+
+
4.15.6
======
- Update configure.ac.in syntax
=====================================
configure
=====================================
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac bd908e9.
+# From configure.ac ea6c56a.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libxfce4util 4.15.6.
+# Generated by GNU Autoconf 2.69 for libxfce4util 4.16.0.
#
# Report bugs to <xfce4-dev at xfce.org>.
#
@@ -594,8 +594,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libxfce4util'
PACKAGE_TARNAME='libxfce4util'
-PACKAGE_VERSION='4.15.6'
-PACKAGE_STRING='libxfce4util 4.15.6'
+PACKAGE_VERSION='4.16.0'
+PACKAGE_STRING='libxfce4util 4.16.0'
PACKAGE_BUGREPORT='xfce4-dev at xfce.org'
PACKAGE_URL=''
@@ -677,6 +677,10 @@ GTKDOC_MKPDF
GTKDOC_REBASE
GTKDOC_CHECK_PATH
GTKDOC_CHECK
+GIO_REQUIRED_VERSION
+GIO_LIBS
+GIO_CFLAGS
+GIO_VERSION
GLIB_REQUIRED_VERSION
GLIB_LIBS
GLIB_CFLAGS
@@ -1451,7 +1455,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 libxfce4util 4.15.6 to adapt to many kinds of systems.
+\`configure' configures libxfce4util 4.16.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1522,7 +1526,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libxfce4util 4.15.6:";;
+ short | recursive ) echo "Configuration of libxfce4util 4.16.0:";;
esac
cat <<\_ACEOF
@@ -1662,7 +1666,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libxfce4util configure 4.15.6
+libxfce4util configure 4.16.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2034,7 +2038,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 libxfce4util $as_me 4.15.6, which was
+It was created by libxfce4util $as_me 4.16.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2385,7 +2389,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-LIBXFCE4UTIL_VERSION=4.15.6
+LIBXFCE4UTIL_VERSION=4.16.0
am__api_version='1.16'
ac_aux_dir=
@@ -2901,7 +2905,7 @@ fi
# Define the identity of the package.
PACKAGE='libxfce4util'
- VERSION='4.15.6'
+ VERSION='4.16.0'
cat >>confdefs.h <<_ACEOF
@@ -3180,12 +3184,12 @@ LIBXFCE4UTIL_VERINFO=7:0:0
-$as_echo "#define XFCE_VERSION_STRING \"4.16pre2\"" >>confdefs.h
+$as_echo "#define XFCE_VERSION_STRING \"4.16\"" >>confdefs.h
LIBXFCE4UTIL_VERSION_MAJOR=4
-LIBXFCE4UTIL_VERSION_MINOR=15
-LIBXFCE4UTIL_VERSION_MICRO=6
+LIBXFCE4UTIL_VERSION_MINOR=16
+LIBXFCE4UTIL_VERSION_MICRO=0
@@ -13838,7 +13842,7 @@ _ACEOF
- ALL_LINGUAS="en_GB uz ca zh_CN nb tr en_AU fr eu gl be zh_TW th sr fi pl ast it he et pt_BR de sl pa zh_HK nl hy_AM hi ja hu nn hy si cy ar ko es kk ur sk am hr sq pt cs is uk hye bn ur_PK id da ug lv el sv ru ie lt ms ro bg oc "
+ ALL_LINGUAS="bg nb hye ur_PK ca ug de ro si gl hr en_GB en_AU hy hy_AM ast ie hi nl ur th ru tr sq el et id zh_CN oc ar cs uz sr fr pt_BR is ko be es bn eu zh_HK sk sv da pt uk cy it am he lv pa lt pl zh_TW ms fi nn kk hu sl ja "
for ac_header in locale.h
do :
@@ -15056,6 +15060,202 @@ $as_echo "not found" >&6; }
+ # minimum supported version of pkg-config
+ xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+fi
+
+ if test x"$PKG_CONFIG" = x""; then
+ echo
+ echo "*** Your version of pkg-config is too old. You need atleast"
+ echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+ echo "*** from the freedesktop.org software repository at"
+ echo "***"
+ echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
+ echo "***"
+ exit 1;
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.50.0" >&5
+$as_echo_n "checking for gio-2.0 >= 2.50.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=2.50.0" "gio-2.0" >/dev/null 2>&1; then
+ GIO_VERSION=`$PKG_CONFIG --modversion "gio-2.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_VERSION" >&5
+$as_echo "$GIO_VERSION" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_CFLAGS" >&5
+$as_echo_n "checking GIO_CFLAGS... " >&6; }
+ GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_CFLAGS" >&5
+$as_echo "$GIO_CFLAGS" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_LIBS" >&5
+$as_echo_n "checking GIO_LIBS... " >&6; }
+ GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_LIBS" >&5
+$as_echo "$GIO_LIBS" >&6; }
+
+ GIO_REQUIRED_VERSION=2.50.0
+
+
+
+
+
+
+
+ elif $PKG_CONFIG --exists "gio-2.0" >/dev/null 2>&1; then
+ xdt_cv_version=`$PKG_CONFIG --modversion "gio-2.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
+$as_echo "found, but $xdt_cv_version" >&6; }
+
+
+ echo "*** The required package gio-2.0 was found on your system,"
+ echo "*** but the installed version ($xdt_cv_version) is too old."
+ echo "*** Please upgrade gio-2.0 to atleast version 2.50.0, or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+ echo "*** the new version of the package in a nonstandard prefix so"
+ echo "*** pkg-config is able to find it."
+ exit 1
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+
+ echo "*** The required package gio-2.0 was not found on your system."
+ echo "*** Please install gio-2.0 (atleast version 2.50.0) or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you"
+ echo "*** installed the package in a nonstandard prefix so that"
+ echo "*** pkg-config is able to find it."
+ exit 1
+
+ fi
+
+
+
+
gtk_doc_requires="gtk-doc >= 1.9"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5
@@ -16605,7 +16805,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 libxfce4util $as_me 4.15.6, which was
+This file was extended by libxfce4util $as_me 4.16.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16671,7 +16871,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="\\
-libxfce4util config.status 4.15.6
+libxfce4util config.status 4.16.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
=====================================
configure.ac
=====================================
@@ -17,17 +17,17 @@ dnl *** Version information ***
dnl ***************************
m4_define([libxfce4util_verinfo], [7:0:0])
m4_define([libxfce4util_version_major], [4])
-m4_define([libxfce4util_version_minor], [15])
-m4_define([libxfce4util_version_micro], [6])
+m4_define([libxfce4util_version_minor], [16])
+m4_define([libxfce4util_version_micro], [0])
m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version
-m4_define([libxfce4util_version_build], [bd908e9])
+m4_define([libxfce4util_version_build], [ea6c56a])
m4_define([libxfce4util_version_tag], [])
m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])])
dnl **************************************************************
dnl *** Overall Xfce version, modify this when making releases ***
dnl **************************************************************
-m4_define([xfce_version_string], [4.16pre2])
+m4_define([xfce_version_string], [4.16])
dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT
@@ -113,7 +113,7 @@ AC_CHECK_FUNCS([gethostname getpwnam setlocale strdup \
dnl ******************************
dnl *** Check for i18n support ***
dnl ******************************
-XDT_I18N([en_GB uz ca zh_CN nb tr en_AU fr eu gl be zh_TW th sr fi pl ast it he et pt_BR de sl pa zh_HK nl hy_AM hi ja hu nn hy si cy ar ko es kk ur sk am hr sq pt cs is uk hye bn ur_PK id da ug lv el sv ru ie lt ms ro bg oc ])
+XDT_I18N([bg nb hye ur_PK ca ug de ro si gl hr en_GB en_AU hy hy_AM ast ie hi nl ur th ru tr sq el et id zh_CN oc ar cs uz sr fr pt_BR is ko be es bn eu zh_HK sk sv da pt uk cy it am he lv pa lt pl zh_TW ms fi nn kk hu sl ja ])
dnl ***********************************
dnl *** Check for GObject installed ***
@@ -125,6 +125,11 @@ dnl *** Check for GLib installed ***
dnl ********************************
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.50.0])
+dnl ********************************
+dnl *** Check for GIO installed ***
+dnl ********************************
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.50.0])
+
dnl *************************
dnl *** Check for gtk-doc ***
dnl *************************
=====================================
docs/Makefile.in
=====================================
@@ -178,6 +178,10 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@
+GIO_VERSION = @GIO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
=====================================
docs/html/annotation-glossary.html
=====================================
@@ -37,7 +37,7 @@
<dd class="glossdef"><p>This symbol is a constructor, not a static method.</p></dd>
<a name="glsO"></a><h3 class="title">O</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
-<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>.</p></dd>
<a name="glsS"></a><h3 class="title">S</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
@@ -51,7 +51,7 @@ justifications.
</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
-<dd class="glossdef"><p>Free data after the code is done.</p></dd>
+<dd class="glossdef"><p>The caller owns the data, and is responsible for free it.</p></dd>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.32</div>
=====================================
docs/html/index.html
=====================================
@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libxfce4util Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for libxfce4util 4.15.6
+<div><p class="releaseinfo">for libxfce4util 4.16.0
</p></div>
</div>
<hr>
=====================================
docs/html/libxfce4util-POSIX-Signal-Handling.html
=====================================
@@ -145,7 +145,7 @@ before setting any POSIX signal handlers.</p>
<tbody><tr>
<td class="parameter_name"><p>error</p></td>
<td class="parameter_description"><p>Location of a <span class="type">GError</span> to store any possible errors. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></td>
</tr></tbody>
</table></div>
</div>
@@ -223,7 +223,7 @@ to <em class="parameter"><code>handler</code></em>
<tr>
<td class="parameter_name"><p>error</p></td>
<td class="parameter_description"><p>Location of a <span class="type">GError</span> to store any possible errors. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></td>
</tr>
</tbody>
</table></div>
=====================================
docs/html/libxfce4util-Resource-Config-File-Support.html
=====================================
@@ -314,7 +314,7 @@ readonly.</p></td>
<div class="refsect3">
<a name="xfce-rc-simple-open.returns"></a><h4>Returns</h4>
<p>the newly created <a class="link" href="libxfce4util-Resource-Config-File-Support.html#XfceRc" title="XfceRc"><span class="type">XfceRc</span></a> object, or <code class="literal">NULL</code> on error. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -368,7 +368,7 @@ readonly.</p></td>
<div class="refsect3">
<a name="xfce-rc-config-open.returns"></a><h4>Returns</h4>
<p>the newly created <a class="link" href="libxfce4util-Resource-Config-File-Support.html#XfceRc" title="XfceRc"><span class="type">XfceRc</span></a> object, or <code class="literal">NULL</code> on error. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -539,7 +539,7 @@ default group is known to always exist.</p>
<p>a NULL-terminated string array will the names of all groups in
<em class="parameter"><code>rc</code></em>
. Should be freed using <code class="function">g_strfreev()</code> when no longer needed. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -587,7 +587,7 @@ be freed using <code class="function">g_strfreev()</code> if no longer needed. I
does not exists, <code class="literal">NULL</code> is returned. If the <em class="parameter"><code>group</code></em>
has no entries,
an empty string array is returned. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -1048,7 +1048,7 @@ If NULL, "," is used.</p></td>
<div class="refsect3">
<a name="xfce-rc-read-list-entry.returns"></a><h4>Returns</h4>
<p>the list or NULL if the entry does not exist. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
=====================================
docs/html/libxfce4util-Resource-lookup-functions.html
=====================================
@@ -206,7 +206,7 @@ of the directories returned in the list are garantied to exist.</p>
<a name="xfce-resource-dirs.returns"></a><h4>Returns</h4>
<p>list of possible directories for <em class="parameter"><code>type</code></em>
. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -254,7 +254,7 @@ when no longer needed.</p>
search path, that matches <em class="parameter"><code>filename</code></em>
or <code class="literal">NULL</code> if no such
file or directory could be found. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -299,7 +299,7 @@ a file.</p></td>
<a name="xfce-resource-lookup-all.returns"></a><h4>Returns</h4>
<p>list of possible resources for <em class="parameter"><code>type</code></em>
. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -359,7 +359,7 @@ needs to be a valid GPattern.</p></td>
given <em class="parameter"><code>pattern</code></em>
. The return value has to be freed using
<code class="function">g_strfreev()</code> when no longer needed. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -408,7 +408,7 @@ xfce_resource_match_custom (<em class="parameter"><code><a class="link" href="li
<a name="xfce-resource-match-custom.returns"></a><h4>Returns</h4>
<p>The caller is responsible to free
the returned string array using <code class="function">g_strfreev()</code> when no longer needed. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
@@ -534,7 +534,7 @@ you should not need this.</p>
should be
saved or <code class="literal">NULL</code> on error. The returned string should be freed
when no longer needed. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
=====================================
docs/html/libxfce4util-Version-Information.html
=====================================
@@ -146,13 +146,13 @@ xfce_version_string (<em class="parameter"><code><span class="type">void</span><
<hr>
<div class="refsect2">
<a name="LIBXFCE4UTIL-MINOR-VERSION:CAPS"></a><h3>LIBXFCE4UTIL_MINOR_VERSION</h3>
-<pre class="programlisting">#define LIBXFCE4UTIL_MINOR_VERSION 15
+<pre class="programlisting">#define LIBXFCE4UTIL_MINOR_VERSION 16
</pre>
</div>
<hr>
<div class="refsect2">
<a name="LIBXFCE4UTIL-MICRO-VERSION:CAPS"></a><h3>LIBXFCE4UTIL_MICRO_VERSION</h3>
-<pre class="programlisting">#define LIBXFCE4UTIL_MICRO_VERSION 6
+<pre class="programlisting">#define LIBXFCE4UTIL_MICRO_VERSION 0
</pre>
</div>
</div>
=====================================
docs/html/libxfce4util-Xfce-Kiosk-functions.html
=====================================
@@ -114,7 +114,7 @@ xfce_kiosk_new (<em class="parameter"><code>const <span class="type">gchar</span
<div class="refsect3">
<a name="xfce-kiosk-new.returns"></a><h4>Returns</h4>
<p>a new instance of <a class="link" href="libxfce4util-Xfce-Kiosk-functions.html#XfceKiosk" title="XfceKiosk"><span class="type">XfceKiosk</span></a>. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>]</span></p>
</div>
<p class="since">Since: 4.2</p>
</div>
=====================================
docs/version.xml
=====================================
@@ -1 +1 @@
-4.15.6
+4.16.0
=====================================
libxfce4util/Makefile.am
=====================================
@@ -65,6 +65,7 @@ libxfce4util_la_SOURCES = \
libxfce4util_la_CFLAGS = \
$(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
$(GOBJECT_CFLAGS)
libxfce4util_la_LDFLAGS = \
@@ -75,6 +76,7 @@ libxfce4util_la_LDFLAGS = \
libxfce4util_la_LIBADD = \
$(GLIB_LIBS) \
+ $(GIO_LIBS) \
$(GOBJECT_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
=====================================
libxfce4util/Makefile.in
=====================================
@@ -142,7 +142,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libxfce4util_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__objects_1 =
am__objects_2 = $(am__objects_1)
am__objects_3 = libxfce4util_la-libxfce4util-aliasdef.lo
@@ -454,6 +454,10 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@
+GIO_VERSION = @GIO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
@@ -672,6 +676,7 @@ libxfce4util_la_SOURCES = \
libxfce4util_la_CFLAGS = \
$(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
$(GOBJECT_CFLAGS)
libxfce4util_la_LDFLAGS = \
@@ -682,6 +687,7 @@ libxfce4util_la_LDFLAGS = \
libxfce4util_la_LIBADD = \
$(GLIB_LIBS) \
+ $(GIO_LIBS) \
$(GOBJECT_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
=====================================
libxfce4util/libxfce4util-config.h
=====================================
@@ -31,8 +31,8 @@
G_BEGIN_DECLS
#define LIBXFCE4UTIL_MAJOR_VERSION 4
-#define LIBXFCE4UTIL_MINOR_VERSION 15
-#define LIBXFCE4UTIL_MICRO_VERSION 6
+#define LIBXFCE4UTIL_MINOR_VERSION 16
+#define LIBXFCE4UTIL_MICRO_VERSION 0
#define LIBXFCE4UTIL_CHECK_VERSION(major,minor,micro) \
(LIBXFCE4UTIL_MAJOR_VERSION > (major) \
=====================================
libxfce4util/xfce-miscutils.c
=====================================
@@ -67,6 +67,8 @@
#include <unistd.h>
#endif
+#include <gio/gio.h>
+
#include <libxfce4util/libxfce4util.h>
#include <libxfce4util/libxfce4util-alias.h>
@@ -501,6 +503,7 @@ xfce_expand_desktop_entry_field_codes (const gchar *command,
gchar *filename;
GString *string;
GSList *li;
+ GFile *file;
if (G_UNLIKELY (command == NULL))
return NULL;
@@ -520,9 +523,15 @@ xfce_expand_desktop_entry_field_codes (const gchar *command,
case 'F':
for (li = uri_list; li != NULL; li = li->next)
{
- filename = g_filename_from_uri (li->data, NULL, NULL);
+ /* passing through a GFile seems necessary to properly handle
+ * all URI schemes, in particular g_filename_from_uri() is not
+ * able to do so */
+ file = g_file_new_for_uri (li->data);
+ filename = g_file_get_path (file);
if (G_LIKELY (filename != NULL))
xfce_append_quoted (string, filename);
+
+ g_object_unref (file);
g_free (filename);
if (*p == 'f')
=====================================
xfce4-kiosk-query/Makefile.in
=====================================
@@ -205,6 +205,10 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@
+GIO_VERSION = @GIO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/libxfce4util/-/commit/d63dffa613f5a463f30ebb12c10258577d91bc1c
--
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/libxfce4util/-/commit/d63dffa613f5a463f30ebb12c10258577d91bc1c
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/20201223/17372bcb/attachment-0001.html>
More information about the Pkg-xfce-commits
mailing list