Hello community, here is the log from the commit of package xwmfs for openSUSE:Factory checked in at 2020-03-31 17:16:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xwmfs (Old) and /work/SRC/openSUSE:Factory/.xwmfs.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xwmfs" Tue Mar 31 17:16:33 2020 rev:4 rq:790008 version:0.84 Changes: -------- --- /work/SRC/openSUSE:Factory/xwmfs/xwmfs.changes 2019-07-18 15:23:26.420111720 +0200 +++ /work/SRC/openSUSE:Factory/.xwmfs.new.3160/xwmfs.changes 2020-03-31 17:16:37.351680077 +0200 @@ -1,0 +2,9 @@ +Tue Mar 31 07:45:07 UTC 2020 - Matthias Gerstner <[email protected]> + +- version bump to minor release 0.84: + * fixes a possible crash of Xwmfs when programs like ibus are running + that maintain hidden windows that quickly add/remove X properties. See + GitHub issue #2 [1]. +- removed cxx-one-definition.patch: is now contained in upstream tarball + +------------------------------------------------------------------- Old: ---- cxx-one-definition.patch xwmfs-0.83-dist.tar.gz New: ---- xwmfs-0.84-dist.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xwmfs.spec ++++++ --- /var/tmp/diff_new_pack.J4XiaQ/_old 2020-03-31 17:16:37.979680476 +0200 +++ /var/tmp/diff_new_pack.J4XiaQ/_new 2020-03-31 17:16:37.983680478 +0200 @@ -1,7 +1,7 @@ # # spec file for package xwmfs # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,10 +23,9 @@ BuildRequires: gcc-c++ BuildRequires: libX11-devel Requires: fuse -Version: 0.83 +Version: 0.84 Release: 0 -Patch0: cxx-one-definition.patch -Url: https://github.com/gerstner-hub/xwmfs +URL: https://github.com/gerstner-hub/xwmfs Summary: A file system for accessing X server and window manager features License: GPL-2.0-or-later Group: System/Filesystems @@ -53,7 +52,6 @@ %prep %setup -q -%patch0 -p1 %build %configure ++++++ xwmfs-0.83-dist.tar.gz -> xwmfs-0.84-dist.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/ChangeLog new/xwmfs-0.84/ChangeLog --- old/xwmfs-0.83/ChangeLog 2019-05-15 18:48:56.000000000 +0200 +++ new/xwmfs-0.84/ChangeLog 2020-03-24 12:14:09.000000000 +0100 @@ -1,3 +1,15 @@ +2020-03-24 Matthias Gerstner <[email protected]> + + version 0.84 + + Bugfix release + + - fixes a possible crash of Xwmfs when programs like ibus are running + that maintain hidden windows that quickly add/remove X properties. See + GitHub issue #2 [1]. + + [1]: https://github.com/gerstner-hub/xwmfs/issues/2 + 2019-05-15 Matthias Gerstner <[email protected]> version 0.83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/Makefile.in new/xwmfs-0.84/Makefile.in --- old/xwmfs-0.83/Makefile.in 2019-05-15 19:12:50.000000000 +0200 +++ new/xwmfs-0.84/Makefile.in 2020-03-24 12:17:49.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,7 +162,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, @@ -356,8 +356,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -511,7 +511,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/aclocal.m4 new/xwmfs-0.84/aclocal.m4 --- old/xwmfs-0.83/aclocal.m4 2019-05-15 19:12:49.000000000 +0200 +++ new/xwmfs-0.84/aclocal.m4 2020-03-24 12:17:48.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -296,7 +296,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -308,10 +308,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -327,14 +327,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -386,7 +386,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -417,7 +417,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -608,13 +608,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -622,49 +621,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -673,18 +664,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -771,8 +761,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -839,7 +829,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. +that behaves properly: <https://www.gnu.org/software/coreutils/>. If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -881,7 +871,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -902,7 +892,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -923,7 +913,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -931,49 +921,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1012,7 +995,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1041,7 +1024,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1088,7 +1071,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1107,7 +1090,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1188,7 +1171,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1248,7 +1231,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1276,7 +1259,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1295,7 +1278,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/configure new/xwmfs-0.84/configure --- old/xwmfs-0.83/configure 2019-05-15 19:12:50.000000000 +0200 +++ new/xwmfs-0.84/configure 2020-03-24 12:17:49.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xwmfs 0.83. +# Generated by GNU Autoconf 2.69 for xwmfs 0.84. # # Report bugs to <[email protected]>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='xwmfs' PACKAGE_TARNAME='xwmfs' -PACKAGE_VERSION='0.83' -PACKAGE_STRING='xwmfs 0.83' +PACKAGE_VERSION='0.84' +PACKAGE_STRING='xwmfs 0.84' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -611,7 +611,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -685,7 +684,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -1250,7 +1250,7 @@ # 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 xwmfs 0.83 to adapt to many kinds of systems. +\`configure' configures xwmfs 0.84 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1316,7 +1316,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xwmfs 0.83:";; + short | recursive ) echo "Configuration of xwmfs 0.84:";; esac cat <<\_ACEOF @@ -1417,7 +1417,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xwmfs configure 0.83 +xwmfs configure 0.84 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1510,7 +1510,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xwmfs $as_me 0.83, which was +It was created by xwmfs $as_me 0.84, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1892,7 +1892,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2378,7 +2378,7 @@ # Define the identity of the package. PACKAGE='xwmfs' - VERSION='0.83' + VERSION='0.84' cat >>confdefs.h <<_ACEOF @@ -2408,8 +2408,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -2460,7 +2460,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. +that behaves properly: <https://www.gnu.org/software/coreutils/>. If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -2476,45 +2476,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -4973,7 +4973,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xwmfs $as_me 0.83, which was +This file was extended by xwmfs $as_me 0.84, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5039,7 +5039,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xwmfs config.status 0.83 +xwmfs config.status 0.84 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -5158,7 +5158,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" _ACEOF @@ -5773,29 +5773,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -5813,53 +5819,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/configure.ac new/xwmfs-0.84/configure.ac --- old/xwmfs-0.83/configure.ac 2019-05-15 18:48:04.000000000 +0200 +++ new/xwmfs-0.84/configure.ac 2020-03-24 12:09:19.000000000 +0100 @@ -4,7 +4,7 @@ AC_PREREQ(2.61) dnl Our wmfs application -AC_INIT([xwmfs], [0.83], [[email protected]]) +AC_INIT([xwmfs], [0.84], [[email protected]]) dnl Stores some generated files in a separate directory for cleaner structure AC_CONFIG_AUX_DIR(config_aux) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/docs/Makefile.in new/xwmfs-0.84/docs/Makefile.in --- old/xwmfs-0.83/docs/Makefile.in 2019-05-15 19:12:50.000000000 +0200 +++ new/xwmfs-0.84/docs/Makefile.in 2020-03-24 12:17:49.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -267,8 +267,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -329,7 +329,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/Makefile.am new/xwmfs-0.84/src/Makefile.am --- old/xwmfs-0.83/src/Makefile.am 2017-10-16 19:48:01.000000000 +0200 +++ new/xwmfs-0.84/src/Makefile.am 2020-03-24 12:03:40.000000000 +0100 @@ -6,7 +6,7 @@ # we need x11 and fuse xwmfs_DEPENDENCIES = x11 fuse # makes it possible to include headers from fuse or x11, to select a recent fuse API version -AM_CFLAGS = -Wall -Werror -Wextra -I${top_srcdir}/src/ -DFUSE_USE_VERSION=26 @fuse_CFLAGS@ @x11_CFLAGS@ +AM_CFLAGS = -Wall -Werror -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wnull-dereference -Wdouble-promotion -Wshadow -Wformat=2 -I${top_srcdir}/src/ -DFUSE_USE_VERSION=26 @fuse_CFLAGS@ @x11_CFLAGS@ AM_CXXFLAGS =${AM_CFLAGS} -std=c++11 # use this instead of AM_LDFLAGS to have the libraries appear AFTER the object # files. Otherwise we get trouble on distros where as-needed linking is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/Makefile.in new/xwmfs-0.84/src/Makefile.in --- old/xwmfs-0.83/src/Makefile.in 2019-05-15 19:12:50.000000000 +0200 +++ new/xwmfs-0.84/src/Makefile.in 2020-03-24 12:17:49.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -133,7 +133,28 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config_aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = common/$(DEPDIR)/Exception.Po \ + common/$(DEPDIR)/Helper.Po common/$(DEPDIR)/ILogger.Po \ + common/$(DEPDIR)/Mutex.Po common/$(DEPDIR)/Thread.Po \ + fuse/$(DEPDIR)/AbortHandler.Po fuse/$(DEPDIR)/DirEntry.Po \ + fuse/$(DEPDIR)/Entry.Po fuse/$(DEPDIR)/EventFile.Po \ + fuse/$(DEPDIR)/FileEntry.Po fuse/$(DEPDIR)/RootEntry.Po \ + fuse/$(DEPDIR)/xwmfs_fuse_ops.Po \ + fuse/$(DEPDIR)/xwmfs_fuse_ops_impl.Po \ + main/$(DEPDIR)/SelectionAccessFile.Po \ + main/$(DEPDIR)/SelectionDirEntry.Po \ + main/$(DEPDIR)/SelectionOwnerFile.Po \ + main/$(DEPDIR)/StdLogger.Po main/$(DEPDIR)/UpdateableDir.Po \ + main/$(DEPDIR)/WinManagerDirEntry.Po \ + main/$(DEPDIR)/WinManagerFileEntry.Po \ + main/$(DEPDIR)/WindowDirEntry.Po \ + main/$(DEPDIR)/WindowFileEntry.Po \ + main/$(DEPDIR)/WindowsRootDir.Po main/$(DEPDIR)/Xwmfs.Po \ + main/$(DEPDIR)/main.Po main/$(DEPDIR)/terminate.Po \ + x11/$(DEPDIR)/RootWin.Po x11/$(DEPDIR)/XAtom.Po \ + x11/$(DEPDIR)/XDisplay.Po x11/$(DEPDIR)/XWindow.Po \ + x11/$(DEPDIR)/XWindowAttrs.Po x11/$(DEPDIR)/property.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -316,7 +337,7 @@ # we need x11 and fuse xwmfs_DEPENDENCIES = x11 fuse # makes it possible to include headers from fuse or x11, to select a recent fuse API version -AM_CFLAGS = -Wall -Werror -Wextra -I${top_srcdir}/src/ -DFUSE_USE_VERSION=26 @fuse_CFLAGS@ @x11_CFLAGS@ +AM_CFLAGS = -Wall -Werror -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wnull-dereference -Wdouble-promotion -Wshadow -Wformat=2 -I${top_srcdir}/src/ -DFUSE_USE_VERSION=26 @fuse_CFLAGS@ @x11_CFLAGS@ AM_CXXFLAGS = ${AM_CFLAGS} -std=c++11 # use this instead of AM_LDFLAGS to have the libraries appear AFTER the object # files. Otherwise we get trouble on distros where as-needed linking is @@ -343,8 +364,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -499,38 +520,44 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Exception.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/ILogger.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Mutex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Thread.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/AbortHandler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/DirEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/Entry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/EventFile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/FileEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/RootEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/xwmfs_fuse_ops.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/xwmfs_fuse_ops_impl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/SelectionAccessFile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/SelectionDirEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/SelectionOwnerFile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/StdLogger.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/UpdateableDir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WinManagerDirEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WinManagerFileEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WindowDirEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WindowFileEntry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WindowsRootDir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/Xwmfs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/terminate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/RootWin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XAtom.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XDisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XWindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XWindowAttrs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/property.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Exception.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Helper.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/ILogger.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Mutex.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Thread.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/AbortHandler.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/DirEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/Entry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/EventFile.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/FileEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/RootEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/xwmfs_fuse_ops.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@fuse/$(DEPDIR)/xwmfs_fuse_ops_impl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/SelectionAccessFile.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/SelectionDirEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/SelectionOwnerFile.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/StdLogger.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/UpdateableDir.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WinManagerDirEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WinManagerFileEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WindowDirEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WindowFileEntry.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/WindowsRootDir.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/Xwmfs.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@main/$(DEPDIR)/terminate.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/RootWin.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XAtom.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XDisplay.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XWindow.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/XWindowAttrs.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/property.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -616,7 +643,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -696,7 +726,38 @@ clean-am: clean-binPROGRAMS clean-generic mostlyclean-am distclean: distclean-am - -rm -rf common/$(DEPDIR) fuse/$(DEPDIR) main/$(DEPDIR) x11/$(DEPDIR) + -rm -f common/$(DEPDIR)/Exception.Po + -rm -f common/$(DEPDIR)/Helper.Po + -rm -f common/$(DEPDIR)/ILogger.Po + -rm -f common/$(DEPDIR)/Mutex.Po + -rm -f common/$(DEPDIR)/Thread.Po + -rm -f fuse/$(DEPDIR)/AbortHandler.Po + -rm -f fuse/$(DEPDIR)/DirEntry.Po + -rm -f fuse/$(DEPDIR)/Entry.Po + -rm -f fuse/$(DEPDIR)/EventFile.Po + -rm -f fuse/$(DEPDIR)/FileEntry.Po + -rm -f fuse/$(DEPDIR)/RootEntry.Po + -rm -f fuse/$(DEPDIR)/xwmfs_fuse_ops.Po + -rm -f fuse/$(DEPDIR)/xwmfs_fuse_ops_impl.Po + -rm -f main/$(DEPDIR)/SelectionAccessFile.Po + -rm -f main/$(DEPDIR)/SelectionDirEntry.Po + -rm -f main/$(DEPDIR)/SelectionOwnerFile.Po + -rm -f main/$(DEPDIR)/StdLogger.Po + -rm -f main/$(DEPDIR)/UpdateableDir.Po + -rm -f main/$(DEPDIR)/WinManagerDirEntry.Po + -rm -f main/$(DEPDIR)/WinManagerFileEntry.Po + -rm -f main/$(DEPDIR)/WindowDirEntry.Po + -rm -f main/$(DEPDIR)/WindowFileEntry.Po + -rm -f main/$(DEPDIR)/WindowsRootDir.Po + -rm -f main/$(DEPDIR)/Xwmfs.Po + -rm -f main/$(DEPDIR)/main.Po + -rm -f main/$(DEPDIR)/terminate.Po + -rm -f x11/$(DEPDIR)/RootWin.Po + -rm -f x11/$(DEPDIR)/XAtom.Po + -rm -f x11/$(DEPDIR)/XDisplay.Po + -rm -f x11/$(DEPDIR)/XWindow.Po + -rm -f x11/$(DEPDIR)/XWindowAttrs.Po + -rm -f x11/$(DEPDIR)/property.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -742,7 +803,38 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf common/$(DEPDIR) fuse/$(DEPDIR) main/$(DEPDIR) x11/$(DEPDIR) + -rm -f common/$(DEPDIR)/Exception.Po + -rm -f common/$(DEPDIR)/Helper.Po + -rm -f common/$(DEPDIR)/ILogger.Po + -rm -f common/$(DEPDIR)/Mutex.Po + -rm -f common/$(DEPDIR)/Thread.Po + -rm -f fuse/$(DEPDIR)/AbortHandler.Po + -rm -f fuse/$(DEPDIR)/DirEntry.Po + -rm -f fuse/$(DEPDIR)/Entry.Po + -rm -f fuse/$(DEPDIR)/EventFile.Po + -rm -f fuse/$(DEPDIR)/FileEntry.Po + -rm -f fuse/$(DEPDIR)/RootEntry.Po + -rm -f fuse/$(DEPDIR)/xwmfs_fuse_ops.Po + -rm -f fuse/$(DEPDIR)/xwmfs_fuse_ops_impl.Po + -rm -f main/$(DEPDIR)/SelectionAccessFile.Po + -rm -f main/$(DEPDIR)/SelectionDirEntry.Po + -rm -f main/$(DEPDIR)/SelectionOwnerFile.Po + -rm -f main/$(DEPDIR)/StdLogger.Po + -rm -f main/$(DEPDIR)/UpdateableDir.Po + -rm -f main/$(DEPDIR)/WinManagerDirEntry.Po + -rm -f main/$(DEPDIR)/WinManagerFileEntry.Po + -rm -f main/$(DEPDIR)/WindowDirEntry.Po + -rm -f main/$(DEPDIR)/WindowFileEntry.Po + -rm -f main/$(DEPDIR)/WindowsRootDir.Po + -rm -f main/$(DEPDIR)/Xwmfs.Po + -rm -f main/$(DEPDIR)/main.Po + -rm -f main/$(DEPDIR)/terminate.Po + -rm -f x11/$(DEPDIR)/RootWin.Po + -rm -f x11/$(DEPDIR)/XAtom.Po + -rm -f x11/$(DEPDIR)/XDisplay.Po + -rm -f x11/$(DEPDIR)/XWindow.Po + -rm -f x11/$(DEPDIR)/XWindowAttrs.Po + -rm -f x11/$(DEPDIR)/property.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -762,7 +854,7 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ distclean distclean-compile distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/main/SelectionDirEntry.cxx new/xwmfs-0.84/src/main/SelectionDirEntry.cxx --- old/xwmfs-0.83/src/main/SelectionDirEntry.cxx 2017-10-12 22:41:17.000000000 +0200 +++ new/xwmfs-0.84/src/main/SelectionDirEntry.cxx 2020-03-24 12:06:47.000000000 +0100 @@ -20,7 +20,7 @@ createSelectionAccessFiles(); } -Window SelectionDirEntry::getSelectionOwner(const Atom type) const +Window SelectionDirEntry::getSelectionOwner(const Atom _type) const { // it seems there is no general event mechanism available to keep // track of the selection owner when we're not currently involved in a @@ -28,7 +28,7 @@ // selection owner content upon each read in m_owners. // // https://stackoverflow.com/questions/28578220/process-receiving-x11-selectionnotify-event-xev-doesnt-show-the-event-why-is#28595450 - auto res = XGetSelectionOwner( XDisplay::getInstance(), type ); + auto res = XGetSelectionOwner( XDisplay::getInstance(), _type ); return res; } @@ -46,11 +46,11 @@ const char *selections[] = { "PRIMARY", "CLIPBOARD" }; auto &mapper = XAtomMapper::getInstance(); - for( const auto type: selections ) + for( const auto _type: selections ) { - XAtom atom = mapper.getAtom(type); + XAtom atom = mapper.getAtom(_type); - m_selection_types.push_back( { atom, type } ); + m_selection_types.push_back( { atom, _type } ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/main/WindowDirEntry.cxx new/xwmfs-0.84/src/main/WindowDirEntry.cxx --- old/xwmfs-0.83/src/main/WindowDirEntry.cxx 2017-09-03 11:44:32.000000000 +0200 +++ new/xwmfs-0.84/src/main/WindowDirEntry.cxx 2020-03-24 12:06:15.000000000 +0100 @@ -288,11 +288,11 @@ void WindowDirEntry::updateWindowType(FileEntry &entry) { - auto type = m_win.getWindowType(); + auto _type = m_win.getWindowType(); const auto &mapper = XAtomMapper::getInstance(); - entry << mapper.getName(XAtom(type)); + entry << mapper.getName(XAtom(_type)); } void WindowDirEntry::updateGeometry(const XWindowAttrs &attrs) @@ -326,9 +326,24 @@ * be more complex ... */ auto std_props = StandardProps::instance(); + const auto &mapper = XAtomMapper::getInstance(); switch(info.type) { + case XA_ATOM: + { + Property<std::vector<XAtom>> prop; + win.getProperty(prop_atom, prop, &info); + int i = 0; + for( const auto &val: prop.get() ) + { + const auto &name = mapper.getName(val); + if (i++) + value << " "; + value << name; + } + break; + } case XA_CARDINAL: { if( info.items == 1 ) @@ -398,7 +413,7 @@ const XAtom atom(plain_atom); m_win.getPropertyInfo(atom, info); const auto &name = mapper.getName(atom); - const auto &type = mapper.getName(XAtom(info.type)); + const auto &_type = mapper.getName(XAtom(info.type)); logger.debug() << "Querying property " << atom << " on window " @@ -406,7 +421,7 @@ logger.debug() << "type = " << info.type << ", items = " << info.items << ", format = " << info.format << std::endl; - entry << (first ? "" : "\n") << name << "(" << type << ") = "; + entry << (first ? "" : "\n") << name << "(" << _type << ") = "; try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/main/Xwmfs.cxx new/xwmfs-0.84/src/main/Xwmfs.cxx --- old/xwmfs-0.83/src/main/Xwmfs.cxx 2017-10-16 19:40:52.000000000 +0200 +++ new/xwmfs-0.84/src/main/Xwmfs.cxx 2019-07-21 00:35:42.000000000 +0200 @@ -16,7 +16,6 @@ #include <sys/select.h> #include <sys/stat.h> #include <fcntl.h> -#include <signal.h> // FUSE #include <fuse.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/main/Xwmfs.hxx new/xwmfs-0.84/src/main/Xwmfs.hxx --- old/xwmfs-0.83/src/main/Xwmfs.hxx 2017-09-21 18:09:07.000000000 +0200 +++ new/xwmfs-0.84/src/main/Xwmfs.hxx 2019-07-21 00:35:42.000000000 +0200 @@ -3,6 +3,7 @@ // POSIX #include <sys/select.h> +#include <signal.h> // C++ #include <map> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/x11/XWindow.cxx new/xwmfs-0.84/src/x11/XWindow.cxx --- old/xwmfs-0.83/src/x11/XWindow.cxx 2017-10-12 22:11:52.000000000 +0200 +++ new/xwmfs-0.84/src/x11/XWindow.cxx 2020-03-22 13:03:40.000000000 +0100 @@ -429,7 +429,15 @@ xwmfs_throw(X11Exception(XDisplay::getInstance(), res)); } - info.items = bytes_left / (actual_format / 8); + if( actual_format != 0 ) + { + info.items = bytes_left / (actual_format / 8); + } + else + { + info.items = 0; + } + info.format = actual_format; XFree(prop_data); @@ -633,6 +641,7 @@ */ template void XWindow::getProperty(const Atom, Property<unsigned long>&, const PropertyInfo*) const; template void XWindow::getProperty(const Atom, Property<const char*>&, const PropertyInfo*) const; +template void XWindow::getProperty(const Atom, Property<std::vector<XAtom> >&, const PropertyInfo*) const; template void XWindow::getProperty(const Atom, Property<std::vector<unsigned long> >&, const PropertyInfo*) const; template void XWindow::getProperty(const Atom, Property<std::vector<int> >&, const PropertyInfo*) const; template void XWindow::setProperty(const Atom, const Property<const char*>&); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/src/x11/property.hxx new/xwmfs-0.84/src/x11/property.hxx --- old/xwmfs-0.83/src/x11/property.hxx 2017-08-10 23:27:08.000000000 +0200 +++ new/xwmfs-0.84/src/x11/property.hxx 2019-07-21 00:36:21.000000000 +0200 @@ -280,6 +280,29 @@ } }; +template <> +//! property type specialization for arrays of Window identifiers +class XPropTraits< std::vector<XAtom> > +{ +public: // constants + + static const Atom x_type = XA_ATOM; + static const unsigned long fixed_size = 0; + static const char format = 32; + typedef long* XPtrType; + +public: // functions + + static + void x2native(std::vector<XAtom> &v, XPtrType data, unsigned int count) + { + for( unsigned int e = 0; e < count; e++ ) + { + v.push_back(XAtom(data[e])); + } + } +}; + /** * \brief * A type used for differentiation between a plain ASCII string and an diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwmfs-0.83/tests/Makefile.in new/xwmfs-0.84/tests/Makefile.in --- old/xwmfs-0.83/tests/Makefile.in 2019-05-15 19:12:50.000000000 +0200 +++ new/xwmfs-0.84/tests/Makefile.in 2020-03-24 12:17:49.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -442,8 +442,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -581,7 +581,7 @@ fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -631,7 +631,10 @@ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \
