diff -Nru eiciel-0.9.13/aclocal.m4 eiciel-0.9.13.1/aclocal.m4 --- eiciel-0.9.13/aclocal.m4 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/aclocal.m4 2021-08-25 22:26:37.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,9 +20,9 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -296,7 +296,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -311,7 +311,7 @@ [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.16.1], [], +m4_if([$1], [1.16.3], [], [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.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.3])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-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 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_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -423,7 +423,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -454,7 +454,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -645,7 +645,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -684,7 +684,9 @@ 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 + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also 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 @@ -711,7 +713,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -908,7 +910,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -929,7 +931,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -950,7 +952,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -993,7 +995,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1014,12 +1016,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -1032,7 +1029,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1061,7 +1058,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1108,7 +1105,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1127,7 +1124,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1208,7 +1205,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1268,7 +1265,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1296,7 +1293,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1315,7 +1312,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru eiciel-0.9.13/compile eiciel-0.9.13.1/compile --- eiciel-0.9.13/compile 2020-08-24 12:51:04.000000000 +0000 +++ eiciel-0.9.13.1/compile 2021-08-25 20:05:29.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru eiciel-0.9.13/config.hpp.in eiciel-0.9.13.1/config.hpp.in --- eiciel-0.9.13/config.hpp.in 2020-08-24 13:29:15.000000000 +0000 +++ eiciel-0.9.13.1/config.hpp.in 2021-08-25 22:26:39.000000000 +0000 @@ -49,6 +49,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NAUTILUS_NAUTILUS_EXTENSION_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff -Nru eiciel-0.9.13/configure eiciel-0.9.13.1/configure --- eiciel-0.9.13/configure 2020-08-24 13:29:12.000000000 +0000 +++ eiciel-0.9.13.1/configure 2021-08-25 22:26:37.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for eiciel 0.9.13. +# Generated by GNU Autoconf 2.69 for eiciel 0.9.13.1. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='eiciel' PACKAGE_TARNAME='eiciel' -PACKAGE_VERSION='0.9.13' -PACKAGE_STRING='eiciel 0.9.13' +PACKAGE_VERSION='0.9.13.1' +PACKAGE_STRING='eiciel 0.9.13.1' PACKAGE_BUGREPORT='rofirrim@gmail.com' PACKAGE_URL='' @@ -1387,7 +1387,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 eiciel 0.9.13 to adapt to many kinds of systems. +\`configure' configures eiciel 0.9.13.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1459,7 +1459,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of eiciel 0.9.13:";; + short | recursive ) echo "Configuration of eiciel 0.9.13.1:";; esac cat <<\_ACEOF @@ -1605,7 +1605,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -eiciel configure 0.9.13 +eiciel configure 0.9.13.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2162,7 +2162,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by eiciel $as_me 0.9.13, which was +It was created by eiciel $as_me 0.9.13.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2830,12 +2830,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -3140,7 +3135,7 @@ # Define the identity of the package. PACKAGE='eiciel' - VERSION='0.9.13' + VERSION='0.9.13.1' cat >>confdefs.h <<_ACEOF @@ -8812,7 +8807,7 @@ fi : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} @@ -10533,8 +10528,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -10566,11 +10561,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + 10.0,*86*-darwin8*|10.0,*-darwin[912]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[012][,.]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -11535,6 +11530,12 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -18708,8 +18709,8 @@ $as_echo "$as_me: checking for dependencies for GNOME 3 version of eiciel" >&6;} pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKMM" >&5 -$as_echo_n "checking for GTKMM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtkmm-3.0 >= 3.0.0 giomm-2.4 >= 2.50.0" >&5 +$as_echo_n "checking for gtkmm-3.0 >= 3.0.0 giomm-2.4 >= 2.50.0... " >&6; } if test -n "$GTKMM_CFLAGS"; then pkg_cv_GTKMM_CFLAGS="$GTKMM_CFLAGS" @@ -18749,7 +18750,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18776,7 +18777,7 @@ and GTKMM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18800,8 +18801,8 @@ if test -z "$ENABLE_NAUTILUS_EXTENSION_TRUE"; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS_EXTENSION" >&5 -$as_echo_n "checking for NAUTILUS_EXTENSION... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnautilus-extension >= 3.0.0" >&5 +$as_echo_n "checking for libnautilus-extension >= 3.0.0... " >&6; } if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS" @@ -18841,7 +18842,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18868,7 +18869,7 @@ and NAUTILUS_EXTENSION_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18897,8 +18898,8 @@ $as_echo "$as_me: checking for dependencies for GNOME 2 version of eiciel" >&6;} pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKMM" >&5 -$as_echo_n "checking for GTKMM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0 giomm-2.4 >= 2.50.0" >&5 +$as_echo_n "checking for gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0 giomm-2.4 >= 2.50.0... " >&6; } if test -n "$GTKMM_CFLAGS"; then pkg_cv_GTKMM_CFLAGS="$GTKMM_CFLAGS" @@ -18938,7 +18939,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18965,7 +18966,7 @@ and GTKMM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18990,8 +18991,8 @@ if test -z "$ENABLE_NAUTILUS_EXTENSION_TRUE"; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS_EXTENSION" >&5 -$as_echo_n "checking for NAUTILUS_EXTENSION... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnautilus-extension >= 2.10.0 libnautilus-extension < 2.90" >&5 +$as_echo_n "checking for libnautilus-extension >= 2.10.0 libnautilus-extension < 2.90... " >&6; } if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS" @@ -19031,7 +19032,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19058,7 +19059,7 @@ and NAUTILUS_EXTENSION_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -19288,6 +19289,26 @@ fi +# This must be easier, right? +OLDCXXFLAGS="$CXXFLAGS" +OLDCPPFLAGS="$CPPFLAGS" +CXXFLAGS="$CXXFLAGS ${GTKMM_CFLAGS} ${NAUTILUS_EXTENSION_CFLAGS}" +CPPFLAGS="$CXXFLAGS ${GTKMM_CFLAGS} ${NAUTILUS_EXTENSION_CFLAGS}" +for ac_header in nautilus/nautilus-extension.h +do : + ac_fn_cxx_check_header_mongrel "$LINENO" "nautilus/nautilus-extension.h" "ac_cv_header_nautilus_nautilus_extension_h" "$ac_includes_default" +if test "x$ac_cv_header_nautilus_nautilus_extension_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NAUTILUS_NAUTILUS_EXTENSION_H 1 +_ACEOF + +fi + +done + +CXXFLAGS="$OLDCXXFLAGS" +CPPFLAGS="$OLDCPPFLAGS" + ac_config_files="$ac_config_files Makefile src/Makefile img/Makefile po/Makefile.in man/Makefile doc/Makefile doc/C/Makefile doc/C/figures/Makefile" cat >confcache <<\_ACEOF @@ -19832,7 +19853,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by eiciel $as_me 0.9.13, which was +This file was extended by eiciel $as_me 0.9.13.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19898,7 +19919,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -eiciel config.status 0.9.13 +eiciel config.status 0.9.13.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -21217,7 +21238,9 @@ { { $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 + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also 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; } diff -Nru eiciel-0.9.13/configure.ac eiciel-0.9.13.1/configure.ac --- eiciel-0.9.13/configure.ac 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/configure.ac 2021-08-25 22:26:14.000000000 +0000 @@ -1,5 +1,5 @@ dnl Set package name and maintainer -AC_INIT([eiciel],[0.9.13],[rofirrim@gmail.com]) +AC_INIT([eiciel],[0.9.13.1],[rofirrim@gmail.com]) dnl Where are we AC_CANONICAL_BUILD @@ -193,6 +193,15 @@ AC_SUBST(ACL_LIBS, [-lacl]) ],) +# This must be easier, right? +OLDCXXFLAGS="$CXXFLAGS" +OLDCPPFLAGS="$CPPFLAGS" +CXXFLAGS="$CXXFLAGS ${GTKMM_CFLAGS} ${NAUTILUS_EXTENSION_CFLAGS}" +CPPFLAGS="$CXXFLAGS ${GTKMM_CFLAGS} ${NAUTILUS_EXTENSION_CFLAGS}" +AC_CHECK_HEADERS([nautilus/nautilus-extension.h], [], [], []) +CXXFLAGS="$OLDCXXFLAGS" +CPPFLAGS="$OLDCPPFLAGS" + dnl Output files AC_CONFIG_FILES([Makefile src/Makefile diff -Nru eiciel-0.9.13/debian/changelog eiciel-0.9.13.1/debian/changelog --- eiciel-0.9.13/debian/changelog 2020-08-26 16:54:34.000000000 +0000 +++ eiciel-0.9.13.1/debian/changelog 2021-08-26 09:45:57.000000000 +0000 @@ -1,3 +1,15 @@ +eiciel (0.9.13.1-1) unstable; urgency=medium + + * New upstream version 0.9.13.1 + * Rebase patches + * Bump Standards-Version to 4.6.0 + * Set upstream metadata fields: Bug-Submit, Bug-Database, Repository, + Repository-Browse + * Bump debhelper-compat to 13 + * Fix encoding of AUTHORS file to be UTF-8 + + -- Michael Biebl Thu, 26 Aug 2021 11:45:57 +0200 + eiciel (0.9.13-1) unstable; urgency=medium * New upstream version 0.9.13 @@ -398,4 +410,3 @@ * Initial release. Closes: #314722 -- Michael Biebl Thu, 8 Sep 2005 01:10:51 +0200 - diff -Nru eiciel-0.9.13/debian/control eiciel-0.9.13.1/debian/control --- eiciel-0.9.13/debian/control 2020-08-26 16:54:34.000000000 +0000 +++ eiciel-0.9.13.1/debian/control 2021-08-26 09:45:57.000000000 +0000 @@ -2,7 +2,7 @@ Section: gnome Priority: optional Maintainer: Michael Biebl -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), libacl1-dev, libattr1-dev, libgtkmm-3.0-dev (>= 3.0.0), @@ -10,7 +10,7 @@ libnautilus-extension-dev (>= 3.21.92-3~), libtool, pkg-config, -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/debian/eiciel.git Vcs-Browser: https://salsa.debian.org/debian/eiciel diff -Nru eiciel-0.9.13/debian/patches/Add-missing-files-to-dist-tarball.patch eiciel-0.9.13.1/debian/patches/Add-missing-files-to-dist-tarball.patch --- eiciel-0.9.13/debian/patches/Add-missing-files-to-dist-tarball.patch 2020-08-26 16:54:34.000000000 +0000 +++ eiciel-0.9.13.1/debian/patches/Add-missing-files-to-dist-tarball.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -From: Michael Biebl -Date: Wed, 26 Aug 2020 18:42:20 +0200 -Subject: Add missing files to dist tarball - ---- - src/eiciel_participant_target.hpp | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - create mode 100644 src/eiciel_participant_target.hpp - -diff --git a/src/eiciel_participant_target.hpp b/src/eiciel_participant_target.hpp -new file mode 100644 -index 0000000..a8072b6 ---- /dev/null -+++ b/src/eiciel_participant_target.hpp -@@ -0,0 +1,29 @@ -+/* -+ Eiciel - GNOME editor of ACL file permissions. -+ Copyright (C) 2019 Roger Ferrer Ibáñez -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -+*/ -+ -+#ifndef EICIEL_PARTICIPANT_TARGET_HPP -+#define EICIEL_PARTICIPANT_TARGET_HPP -+ -+enum class AddParticipantTarget { -+ ADD_PARTICIPANT = 0, -+ ADD_PARTICIPANT_TO_DIRECTORY, -+ ADD_PARTICIPANT_TO_FILE, -+}; -+ -+#endif // EICIEL_PARTICIPANT_TARGET_HPP diff -Nru eiciel-0.9.13/debian/patches/Don-t-hardcode-pkg-config-in-configure.ac.patch eiciel-0.9.13.1/debian/patches/Don-t-hardcode-pkg-config-in-configure.ac.patch --- eiciel-0.9.13/debian/patches/Don-t-hardcode-pkg-config-in-configure.ac.patch 2020-08-26 16:54:34.000000000 +0000 +++ eiciel-0.9.13.1/debian/patches/Don-t-hardcode-pkg-config-in-configure.ac.patch 2021-08-26 09:45:57.000000000 +0000 @@ -10,7 +10,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f82ceb0..1ebb720 100644 +index 75a0ac5..01fed6d 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ fi diff -Nru eiciel-0.9.13/debian/patches/Fix-encoding-of-AUTHORS-file-to-be-UTF-8.patch eiciel-0.9.13.1/debian/patches/Fix-encoding-of-AUTHORS-file-to-be-UTF-8.patch --- eiciel-0.9.13/debian/patches/Fix-encoding-of-AUTHORS-file-to-be-UTF-8.patch 1970-01-01 00:00:00.000000000 +0000 +++ eiciel-0.9.13.1/debian/patches/Fix-encoding-of-AUTHORS-file-to-be-UTF-8.patch 2021-08-26 09:45:57.000000000 +0000 @@ -0,0 +1,48 @@ +From: Michael Biebl +Date: Thu, 26 Aug 2021 11:53:43 +0200 +Subject: Fix encoding of AUTHORS file to be UTF-8 + +Fixes the following error detected by lintian: + +W: eiciel: national-encoding usr/share/doc/eiciel/AUTHORS +N: +W: national-encoding +N: +N: A file is not valid UTF-8. +N: +N: Debian has used UTF-8 for many years. Support for national encodings +N: is being phased out. This file probably appears to users in mangled +N: characters (also called mojibake). +N: +N: Packaging control files must be encoded in valid UTF-8. +N: +N: Please convert the file to UTF-8 using iconv or a similar tool. +N: +N: Severity: warning +N: +N: Check: files/encoding +N: +N: Renamed from: national-encoding-in-text-file +N: debian-changelog-file-uses-obsolete-national-encoding +N: debian-control-file-uses-obsolete-national-encoding +N: debian-copyright-file-uses-obsolete-national-encoding +N: debian-news-file-uses-obsolete-national-encoding +N: debian-tests-control-uses-national-encoding +N: doc-base-file-uses-obsolete-national-encoding +N: national-encoding-in-debconf-template national-encoding-in-manpage +N: +--- + AUTHORS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/AUTHORS b/AUTHORS +index 9e72e81..518cb9a 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -1,5 +1,5 @@ + Eiciel - A graphical editor for POSIX ACL under GNOME 2 + +-Author: Roger Ferrer Ibez ++Author: Roger Ferrer Ibáñez + + Released under GPL license diff -Nru eiciel-0.9.13/debian/patches/series eiciel-0.9.13.1/debian/patches/series --- eiciel-0.9.13/debian/patches/series 2020-08-26 16:54:34.000000000 +0000 +++ eiciel-0.9.13.1/debian/patches/series 2021-08-26 09:45:57.000000000 +0000 @@ -1,2 +1,2 @@ Don-t-hardcode-pkg-config-in-configure.ac.patch -Add-missing-files-to-dist-tarball.patch +Fix-encoding-of-AUTHORS-file-to-be-UTF-8.patch diff -Nru eiciel-0.9.13/debian/upstream/metadata eiciel-0.9.13.1/debian/upstream/metadata --- eiciel-0.9.13/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ eiciel-0.9.13.1/debian/upstream/metadata 2021-08-26 09:45:57.000000000 +0000 @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/rofirrim/eiciel/issues +Bug-Submit: https://github.com/rofirrim/eiciel/issues/new +Repository: https://github.com/rofirrim/eiciel.git +Repository-Browse: https://github.com/rofirrim/eiciel diff -Nru eiciel-0.9.13/depcomp eiciel-0.9.13.1/depcomp --- eiciel-0.9.13/depcomp 2020-08-24 12:51:04.000000000 +0000 +++ eiciel-0.9.13.1/depcomp 2021-08-25 20:05:29.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru eiciel-0.9.13/doc/C/figures/Makefile.in eiciel-0.9.13.1/doc/C/figures/Makefile.in --- eiciel-0.9.13/doc/C/figures/Makefile.in 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/doc/C/figures/Makefile.in 2021-08-25 22:26:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru eiciel-0.9.13/doc/C/Makefile.in eiciel-0.9.13.1/doc/C/Makefile.in --- eiciel-0.9.13/doc/C/Makefile.in 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/doc/C/Makefile.in 2021-08-25 22:26:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru eiciel-0.9.13/doc/Makefile.in eiciel-0.9.13.1/doc/Makefile.in --- eiciel-0.9.13/doc/Makefile.in 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/doc/Makefile.in 2021-08-25 22:26:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru eiciel-0.9.13/img/Makefile.in eiciel-0.9.13.1/img/Makefile.in --- eiciel-0.9.13/img/Makefile.in 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/img/Makefile.in 2021-08-25 22:26:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru eiciel-0.9.13/install-sh eiciel-0.9.13.1/install-sh --- eiciel-0.9.13/install-sh 2020-08-24 12:51:04.000000000 +0000 +++ eiciel-0.9.13.1/install-sh 2021-08-25 20:05:29.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -451,7 +456,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -491,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -Nru eiciel-0.9.13/ltmain.sh eiciel-0.9.13.1/ltmain.sh --- eiciel-0.9.13/ltmain.sh 2020-08-24 12:50:59.000000000 +0000 +++ eiciel-0.9.13.1/ltmain.sh 2021-08-25 20:05:25.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-9" +VERSION="2.4.6 Debian-2.4.6-15" package_revision=2.4.6 @@ -387,7 +387,7 @@ # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -2141,7 +2141,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-9 + version: $progname $scriptversion Debian-2.4.6-15 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -7368,10 +7368,12 @@ # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*) + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff -Nru eiciel-0.9.13/m4/libtool.m4 eiciel-0.9.13.1/m4/libtool.m4 --- eiciel-0.9.13/m4/libtool.m4 2020-08-24 12:50:59.000000000 +0000 +++ eiciel-0.9.13.1/m4/libtool.m4 2021-08-25 20:05:25.000000000 +0000 @@ -1041,8 +1041,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1071,11 +1071,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -1492,7 +1492,7 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4704,6 +4704,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) diff -Nru eiciel-0.9.13/Makefile.in eiciel-0.9.13.1/Makefile.in --- eiciel-0.9.13/Makefile.in 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/Makefile.in 2021-08-25 22:26:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -144,8 +144,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.hpp.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.hpp.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -208,6 +208,8 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best DIST_TARGETS = dist-bzip2 dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -621,6 +623,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -663,6 +669,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -678,7 +686,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -840,7 +848,7 @@ am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ + dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ diff -Nru eiciel-0.9.13/man/Makefile.in eiciel-0.9.13.1/man/Makefile.in --- eiciel-0.9.13/man/Makefile.in 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/man/Makefile.in 2021-08-25 22:26:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru eiciel-0.9.13/missing eiciel-0.9.13.1/missing --- eiciel-0.9.13/missing 2020-08-24 12:51:04.000000000 +0000 +++ eiciel-0.9.13.1/missing 2021-08-25 20:05:29.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru eiciel-0.9.13/po/ar.po eiciel-0.9.13.1/po/ar.po --- eiciel-0.9.13/po/ar.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/ar.po 2021-08-25 22:27:56.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: eiciel\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2020-05-02 19:50+0000\n" "Last-Translator: mohammad alhargan \n" "Language-Team: Arabic \n" "Language-Team: Catalan \n" "Language-Team: Czech \n" @@ -94,11 +94,11 @@ msgid "About..." msgstr "O aplikaci…" -#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:129 +#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:135 msgid "Access Control List" msgstr "Seznam řízení přístupu (ACL)" -#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:145 +#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:151 msgid "Extended user attributes" msgstr "Rozšířené uživatelské atributy" diff -Nru eiciel-0.9.13/po/da.po eiciel-0.9.13.1/po/da.po --- eiciel-0.9.13/po/da.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/da.po 2021-08-25 22:27:56.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: eiciel 0.9.11\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2020-05-02 19:50+0000\n" "Last-Translator: scootergrisen \n" "Language-Team: Danish \n" "Language-Team: German \n" "Language-Team: LANGUAGE \n" @@ -95,11 +95,11 @@ msgid "About..." msgstr "" -#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:129 +#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:135 msgid "Access Control List" msgstr "" -#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:145 +#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:151 msgid "Extended user attributes" msgstr "" diff -Nru eiciel-0.9.13/po/en_GB.po eiciel-0.9.13.1/po/en_GB.po --- eiciel-0.9.13/po/en_GB.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/en_GB.po 2021-08-25 22:27:56.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2015-10-17 14:40+0200\n" "Last-Translator: Richard Brown \n" "Language-Team: English (United Kingdom) \n" "Language-Team: English\n" @@ -104,11 +104,11 @@ msgid "About..." msgstr "" -#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:129 +#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:135 msgid "Access Control List" msgstr "" -#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:145 +#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:151 msgid "Extended user attributes" msgstr "" diff -Nru eiciel-0.9.13/po/es.po eiciel-0.9.13.1/po/es.po --- eiciel-0.9.13/po/es.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/es.po 2021-08-25 22:27:56.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: eiciel\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2020-05-26 14:40+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish \n" "Language-Team: Persian \n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.6\n" +"X-Generator: Weblate 3.6.1\n" #: src/eiciel_xattr_window.cpp:40 msgid "Name" @@ -95,11 +95,11 @@ msgid "About..." msgstr "درباره..." -#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:129 +#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:135 msgid "Access Control List" msgstr "لیست کنترل دسترسی" -#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:145 +#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:151 msgid "Extended user attributes" msgstr "صفات تمدید شده ی کاربر" @@ -126,24 +126,23 @@ #: src/eiciel_enclosed_editor_window.cpp:24 msgid "Edit ACLs for enclosed files" -msgstr "" +msgstr "ویرایش ACL ها برای پرونده‌های محصور شده" #: src/eiciel_enclosed_editor_window.cpp:25 msgid "_Cancel" -msgstr "" +msgstr "لغو" #: src/eiciel_enclosed_editor_window.cpp:26 msgid "_Apply" -msgstr "" +msgstr "اعمال" #: src/eiciel_enclosed_editor_window.cpp:30 msgid "Participants in ACL for enclosed directories" -msgstr "" +msgstr "مشارکت کردن در ACL ها برای مسیر‌های محصور شده" #: src/eiciel_enclosed_editor_window.cpp:33 -#, fuzzy msgid "Participants in ACL for enclosed files" -msgstr "شرکت کنندگان کنونی در ACL" +msgstr "مشارکت‌کنندگان در ACL های پرونده‌های محصور شده" #: src/eiciel_enclosed_editor_window.cpp:36 src/eiciel_main_window.cpp:32 msgid "Available participants" @@ -167,7 +166,7 @@ #: src/eiciel_main_window.cpp:34 msgid "Edit ACLs for enclosed files..." -msgstr "" +msgstr "ویرایش ACL ها برای پرونده‌های محصور شده..." #: src/eiciel_participant_list.cpp:30 msgid "User" @@ -186,14 +185,12 @@ msgstr "اضافه کردن شرکت کننده در ACL" #: src/eiciel_participant_list.cpp:38 -#, fuzzy msgid "Add participant to directory ACL" -msgstr "اضافه کردن شرکت کننده در ACL" +msgstr "اضافه کردن شرکت کننده در ACL مسیر" #: src/eiciel_participant_list.cpp:39 -#, fuzzy msgid "Add participant to file ACL" -msgstr "اضافه کردن شرکت کننده در ACL" +msgstr "اضافه کردن شرکت‌کننده در ACL پرونده" #: src/eiciel_participant_list.cpp:40 msgid "Advanced features" diff -Nru eiciel-0.9.13/po/fr.po eiciel-0.9.13.1/po/fr.po --- eiciel-0.9.13/po/fr.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/fr.po 2021-08-25 22:27:56.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: eiciel\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2016-09-25 13:29+0000\n" "Last-Translator: Benoît Monin \n" "Language-Team: French \n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" +"PO-Revision-Date: 2020-10-13 07:49+0000\n" +"Last-Translator: Panwar \n" "Language-Team: Hindi \n" "Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.18\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Weblate 3.6.1\n" #: src/eiciel_xattr_window.cpp:40 msgid "Name" @@ -28,31 +28,31 @@ #: src/eiciel_xattr_window.cpp:163 msgid "Could not rename attribute name: " -msgstr "" +msgstr "गुण का नाम बदलना विफल : " #: src/eiciel_xattr_window.cpp:190 msgid "Could not change attribute value: " -msgstr "" +msgstr "गुण का मान बदलना विफल : " #: src/eiciel_xattr_window.cpp:217 msgid "Could not remove attribute: " -msgstr "" +msgstr "गुण हटाना विफल : " #: src/eiciel_xattr_window.cpp:242 src/eiciel_xattr_window.cpp:249 msgid "New attribute" -msgstr "" +msgstr "नया गुण" #: src/eiciel_xattr_window.cpp:275 msgid "New value" -msgstr "" +msgstr "नया मान" #: src/eiciel_xattr_window.cpp:287 msgid "Could not add attribute: " -msgstr "" +msgstr "गुण जोड़ना विफल : " #: src/eiciel_main_window_controller.cpp:118 src/eiciel_acl_list.cpp:366 msgid "Mask" -msgstr "" +msgstr "आवरण" #: src/eiciel_main_window_controller.cpp:125 msgid "Other" @@ -60,32 +60,32 @@ #: src/eiciel_main_window_controller.cpp:182 src/eiciel_acl_list.cpp:399 msgid "Default Mask" -msgstr "" +msgstr "डिफ़ॉल्ट आवरण" #: src/eiciel_main_window_controller.cpp:190 src/eiciel_acl_list.cpp:393 msgid "Default Other" -msgstr "" +msgstr "डिफ़ॉल्ट अन्य" #: src/eiciel_main_window_controller.cpp:267 msgid "Could not add ACL entry: " -msgstr "" +msgstr "अभिगम नियंत्रण सूची प्रविष्टि जोड़ना विफल : " #: src/eiciel_main_window_controller.cpp:314 msgid "Could not remove ACL entry: " -msgstr "" +msgstr "अभिगम नियंत्रण सूची प्रविष्टि हटाना विफल : " #: src/eiciel_main_window_controller.cpp:393 msgid "Could not modify ACL entry: " -msgstr "" +msgstr "अभिगम नियंत्रण सूची प्रविष्टि परिवर्तन विफल : " #: src/eiciel_main_window_controller.cpp:548 #: src/eiciel_enclosed_editor_window_controller.cpp:33 msgid "Are you sure you want to remove all ACL default entries?" -msgstr "" +msgstr "क्या आप निश्चित ही सभी डिफ़ॉल्ट अभिगम नियंत्रण सूची प्रविष्टियाँ हटाना चाहते हैं?" #: src/eiciel_container.cpp:26 msgid "File name" -msgstr "फ़ाइल का नाम" +msgstr "फाइल नाम" #: src/eiciel_container.cpp:27 src/eiciel_container.cpp:168 msgid "No file opened" @@ -96,151 +96,151 @@ msgid "About..." msgstr "बारे में..." -#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:129 +#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:135 msgid "Access Control List" msgstr "अभिगम नियंत्रण सूची" -#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:145 +#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:151 msgid "Extended user attributes" -msgstr "" +msgstr "विस्तृत उपयोक्ता गुण" #: src/eiciel_container.cpp:97 #, c-format msgid "Could not show the help file: %s" -msgstr "" +msgstr "सहायता फाइल दिखाना विफल : %s" #: src/eiciel_container.cpp:120 msgid "Choose a file or a directory" -msgstr "" +msgstr "फाइल या डायरेक्टरी चुनें" #: src/eiciel_container.cpp:137 msgid "Could not open the file \"" -msgstr "" +msgstr "फाइल खोलना विफल \"" #: src/eiciel_standalone.cpp:46 msgid "Print version information" -msgstr "" +msgstr "संस्करण सूचना दिखाएँ" #: src/eiciel_standalone.cpp:48 msgid "Access control list editor" -msgstr "" +msgstr "अभिगम नियंत्रण सूची संपादन" #: src/eiciel_enclosed_editor_window.cpp:24 msgid "Edit ACLs for enclosed files" -msgstr "" +msgstr "संलग्न फाइलों हेतु अभिगम नियंत्रण सूची संपादित करें" #: src/eiciel_enclosed_editor_window.cpp:25 msgid "_Cancel" -msgstr "" +msgstr "रद्द करें (_C)" #: src/eiciel_enclosed_editor_window.cpp:26 msgid "_Apply" -msgstr "" +msgstr "लागू करें (_A)" #: src/eiciel_enclosed_editor_window.cpp:30 msgid "Participants in ACL for enclosed directories" -msgstr "" +msgstr "संलग्न डायरेक्टरी हेतु अभिगम नियंत्रण सूची भागीदार" #: src/eiciel_enclosed_editor_window.cpp:33 msgid "Participants in ACL for enclosed files" -msgstr "" +msgstr "संलग्न फाइलों हेतु अभिगम नियंत्रण सूची भागीदार" #: src/eiciel_enclosed_editor_window.cpp:36 src/eiciel_main_window.cpp:32 msgid "Available participants" -msgstr "" +msgstr "उपलब्ध भागीदार" #: src/acl_manager.cpp:46 src/xattr_manager.cpp:32 msgid "Only regular files or directories supported" -msgstr "" +msgstr "केवल नियमित फाइलें या डायरेक्टरी ही समर्थित हैं" #: src/acl_manager.cpp:463 msgid "Textual representation of the ACL is wrong" -msgstr "" +msgstr "अभिगम नियंत्रण सूची का टेक्स्ट स्वरुप अनुचित है" #: src/acl_manager.cpp:484 msgid "Default textual representation of the ACL is wrong" -msgstr "" +msgstr "अभिगम नियंत्रण सूची का डिफ़ॉल्ट टेक्स्ट स्वरुप अनुचित है" #: src/eiciel_main_window.cpp:30 msgid "Current participants in ACL" -msgstr "" +msgstr "अभिगम नियंत्रण सूची में वर्तमान भागीदार" #: src/eiciel_main_window.cpp:34 msgid "Edit ACLs for enclosed files..." -msgstr "" +msgstr "संलग्न फाइलों हेतु अभिगम नियंत्रण सूची संपादन..." #: src/eiciel_participant_list.cpp:30 msgid "User" -msgstr "" +msgstr "उपयोक्ता" #: src/eiciel_participant_list.cpp:31 msgid "Group" -msgstr "" +msgstr "समूह" #: src/eiciel_participant_list.cpp:32 msgid "Default participant" -msgstr "" +msgstr "डिफ़ॉल्ट भागीदार" #: src/eiciel_participant_list.cpp:37 msgid "Add participant to ACL" -msgstr "" +msgstr "अभिगम नियंत्रण सूची में भागीदार जोड़ें" #: src/eiciel_participant_list.cpp:38 msgid "Add participant to directory ACL" -msgstr "" +msgstr "अभिगम नियंत्रण सूची डायरेक्टरी में भागीदार जोड़ें" #: src/eiciel_participant_list.cpp:39 msgid "Add participant to file ACL" -msgstr "" +msgstr "अभिगम नियंत्रण सूची फाइल में भागीदार जोड़ें" #: src/eiciel_participant_list.cpp:40 msgid "Advanced features" -msgstr "" +msgstr "विस्तृत विशेषताएँ" #: src/eiciel_participant_list.cpp:42 msgid "Name of participant" -msgstr "" +msgstr "भागीदार नाम" #: src/eiciel_participant_list.cpp:44 msgid "Also show system participants" -msgstr "" +msgstr "सिस्टम भागीदार भी दिखाएँ" #: src/eiciel_participant_list.cpp:80 msgid "Filter participants" -msgstr "" +msgstr "भागीदार निस्पंदन" #: src/eiciel_participant_list.cpp:105 msgid "Participant" -msgstr "" +msgstr "भागीदार" #: src/eiciel_participant_list.cpp:422 msgid "Participant not found" -msgstr "" +msgstr "भागीदार नहीं मिला" #: src/eiciel_acl_list.cpp:33 msgid "There are ineffective permissions" -msgstr "" +msgstr "अनुमतियाँ अप्रभावी हैं" #: src/eiciel_acl_list.cpp:35 msgid "Remove participant from ACL" -msgstr "" +msgstr "अभिगम नियंत्रण सूची से भागीदार हटाएँ" #: src/eiciel_acl_list.cpp:36 msgid "Edit default participants" -msgstr "" +msgstr "डिफ़ॉल्ट भागीदार संपादन" #: src/eiciel_acl_list.cpp:79 msgid "Entry" -msgstr "" +msgstr "प्रविष्टि" #: src/eiciel_acl_list.cpp:82 msgid "Read" -msgstr "" +msgstr "रीड" #: src/eiciel_acl_list.cpp:95 msgid "Write" -msgstr "" +msgstr "राइट" #: src/eiciel_acl_list.cpp:107 msgid "Execute" -msgstr "" +msgstr "निष्पादन" diff -Nru eiciel-0.9.13/po/hu.po eiciel-0.9.13.1/po/hu.po --- eiciel-0.9.13/po/hu.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/hu.po 2021-08-25 22:27:56.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: eiciel\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2018-01-29 17:03+0000\n" "Last-Translator: Robert Taisz \n" "Language-Team: Hungarian \n" "Language-Team: Indonesian \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Korean \n" "Language-Team: Dutch \n" @@ -94,11 +94,11 @@ msgid "About..." msgstr "Info..." -#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:129 +#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:135 msgid "Access Control List" msgstr "Toegangscontrolelijst" -#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:145 +#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:151 msgid "Extended user attributes" msgstr "Uitgebreide gebruikersattributen" diff -Nru eiciel-0.9.13/po/nn.po eiciel-0.9.13.1/po/nn.po --- eiciel-0.9.13/po/nn.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/nn.po 2021-08-25 22:27:56.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: eiciel 0.9.11\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2015-09-11 16:48+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -95,11 +95,11 @@ msgid "About..." msgstr "" -#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:129 +#: src/eiciel_container.cpp:47 src/eiciel_nautilus_page.cpp:135 msgid "Access Control List" msgstr "" -#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:145 +#: src/eiciel_container.cpp:56 src/eiciel_nautilus_page.cpp:151 msgid "Extended user attributes" msgstr "" diff -Nru eiciel-0.9.13/po/pl.po eiciel-0.9.13.1/po/pl.po --- eiciel-0.9.13/po/pl.po 2020-08-24 13:29:04.000000000 +0000 +++ eiciel-0.9.13.1/po/pl.po 2021-08-25 22:27:56.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: eiciel\n" "Report-Msgid-Bugs-To: rofirrim@gmail.com\n" -"POT-Creation-Date: 2020-08-24 15:11+0200\n" +"POT-Creation-Date: 2021-08-26 00:27+0200\n" "PO-Revision-Date: 2018-01-25 12:04+0000\n" "Last-Translator: Ewelina Michalowska \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Brazil) \n" "Language-Team: Russian \n" "Language-Team: Swedish \n" "Language-Team: Ukrainian \n" "Language-Team: Chinese (China) \n" "Language-Team: Chinese (Taiwan) #include #include + extern "C" { +#ifdef HAVE_NAUTILUS_NAUTILUS_EXTENSION_H #include +#else +#include +#include +#endif } #include "eiciel_main_window.hpp" diff -Nru eiciel-0.9.13/src/eiciel_participant_target.hpp eiciel-0.9.13.1/src/eiciel_participant_target.hpp --- eiciel-0.9.13/src/eiciel_participant_target.hpp 1970-01-01 00:00:00.000000000 +0000 +++ eiciel-0.9.13.1/src/eiciel_participant_target.hpp 2019-06-16 18:27:12.000000000 +0000 @@ -0,0 +1,29 @@ +/* + Eiciel - GNOME editor of ACL file permissions. + Copyright (C) 2019 Roger Ferrer Ibáñez + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#ifndef EICIEL_PARTICIPANT_TARGET_HPP +#define EICIEL_PARTICIPANT_TARGET_HPP + +enum class AddParticipantTarget { + ADD_PARTICIPANT = 0, + ADD_PARTICIPANT_TO_DIRECTORY, + ADD_PARTICIPANT_TO_FILE, +}; + +#endif // EICIEL_PARTICIPANT_TARGET_HPP diff -Nru eiciel-0.9.13/src/Makefile.am eiciel-0.9.13.1/src/Makefile.am --- eiciel-0.9.13/src/Makefile.am 2019-06-16 18:27:12.000000000 +0000 +++ eiciel-0.9.13.1/src/Makefile.am 2021-08-25 20:52:16.000000000 +0000 @@ -13,6 +13,7 @@ eiciel_participant_list.hpp \ eiciel_participant_list_controller.cpp \ eiciel_participant_list_controller.hpp \ + eiciel_participant_target.hpp \ eiciel_enclosed_editor_window_controller.hpp \ eiciel_enclosed_editor_window_controller.cpp \ eiciel_enclosed_editor_window.hpp \ diff -Nru eiciel-0.9.13/src/Makefile.in eiciel-0.9.13.1/src/Makefile.in --- eiciel-0.9.13/src/Makefile.in 2020-08-24 13:29:11.000000000 +0000 +++ eiciel-0.9.13.1/src/Makefile.in 2021-08-25 22:26:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -161,6 +161,7 @@ eiciel_participant_list.hpp \ eiciel_participant_list_controller.cpp \ eiciel_participant_list_controller.hpp \ + eiciel_participant_target.hpp \ eiciel_enclosed_editor_window_controller.hpp \ eiciel_enclosed_editor_window_controller.cpp \ eiciel_enclosed_editor_window.hpp \ @@ -207,6 +208,7 @@ eiciel_participant_list.hpp \ eiciel_participant_list_controller.cpp \ eiciel_participant_list_controller.hpp \ + eiciel_participant_target.hpp \ eiciel_enclosed_editor_window_controller.hpp \ eiciel_enclosed_editor_window_controller.cpp \ eiciel_enclosed_editor_window.hpp \ @@ -512,6 +514,7 @@ eiciel_participant_list.hpp \ eiciel_participant_list_controller.cpp \ eiciel_participant_list_controller.hpp \ + eiciel_participant_target.hpp \ eiciel_enclosed_editor_window_controller.hpp \ eiciel_enclosed_editor_window_controller.cpp \ eiciel_enclosed_editor_window.hpp \