diff -Nru geeqie-1.5/aclocal.m4 geeqie-1.5.1/aclocal.m4 --- geeqie-1.5/aclocal.m4 2019-07-26 18:19:11.000000000 +0000 +++ geeqie-1.5.1/aclocal.m4 2019-08-20 19:01:23.000000000 +0000 @@ -913,221 +913,6 @@ rm -f conf.gtktest ]) -# Configure paths for GTK+ -# Owen Taylor 1997-2001 - -# Version number used by aclocal, see `info automake Serials`. -# Increment on every change. -#serial 1 - -dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GTK_3_0], -[m4_warn([obsolete], [AM_PATH_GTK_3_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk+-3.0]) instead]) -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - min_gtk_version=ifelse([$1], [], [3.0.0], [$1]) - - pkg_config_args="gtk+-3.0 >= $min_gtk_version" - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - PKG_PROG_PKG_CONFIG([0.16]) - - if test -z "$PKG_CONFIG"; then - no_gtk=yes - fi - - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - - if test -n "$PKG_CONFIG"; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.gtktest", "w")); - - if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test -z "$PKG_CONFIG"; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) - -dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Tests for BACKEND-NAME in the GTK targets list -dnl -AC_DEFUN([GTK_CHECK_BACKEND], -[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0]) or similar instead]) - pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0) - min_gtk_version=ifelse([$2],,3.0.0,$2) - pkg_config_args="$pkg_config_args >= $min_gtk_version" - - PKG_PROG_PKG_CONFIG([0.16]) - AS_IF([test -z "$PKG_CONFIG"], [AC_MSG_ERROR([No pkg-config found])]) - - if $PKG_CONFIG $pkg_config_args ; then - target_found=yes - else - target_found=no - fi - - if test "x$target_found" = "xno"; then - ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4]) - else - ifelse([$3],,[:],[$3]) - fi -]) - dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 42 IT_PROG_INTLTOOL diff -Nru geeqie-1.5/ChangeLog geeqie-1.5.1/ChangeLog --- geeqie-1.5/ChangeLog 2019-07-26 18:19:11.000000000 +0000 +++ geeqie-1.5.1/ChangeLog 2019-08-20 19:01:23.000000000 +0000 @@ -1,4 +1,84 @@ -commit c029c5f0 +commit bd1ecdb6 +Author: Colin Clark +Date: Mon Aug 12 10:25:26 2019 +0100 + + Fix ZoneDetect licence bug + + ZoneDetect licence was not displayed + +commit 18afee58 +Author: Colin Clark +Date: Tue Aug 6 12:49:55 2019 +0100 + + Bug fix #626: Animated GIFS lead to high CPU load + + https://github.com/BestImageViewer/geeqie/issues/626 + + Cure a memory leak. + A less significant memory leak remains. + +commit bc94f215 +Author: Colin Clark +Date: Mon Aug 5 12:56:48 2019 +0100 + + Bug fix: Eliminate runtime error + + Eliminate runtime error: "gdk_pixbuf_format_get_name: assertion 'format + != NULL' failed" + +commit 538c3261 +Author: Colin Clark +Date: Sun Aug 4 17:08:01 2019 +0100 + + Fix #626: Animated GIFS lead to high CPU load + + https://github.com/BestImageViewer/geeqie/issues/626 + + File is read asynchronously, so no longer blocks while the file is read. + Cpu load is still high, but this is unavoidable. + +commit d7d01330 +Author: Dmitry Marakasov <> +Date: Sat Aug 3 12:34:42 2019 +0100 + + Fix #703: Fix build on non-glibc platforms + + https://github.com/BestImageViewer/geeqie/pull/703 + +commit 662438ad +Author: Colin Clark +Date: Sat Aug 3 12:25:16 2019 +0100 + + Fix #683: Build fails on macOS due to use of _NL_TIME_FIRST_WEEKDAY + + https://github.com/BestImageViewer/geeqie/issues/683 + +commit ce3619e6 +Author: Klaus Ethgen +Date: Sat Jul 27 09:30:15 2019 +0100 + + Compatibility function for lua > 5.1 + +commit 28221d2f +Author: Klaus Ethgen +Date: Sun Jul 28 20:24:06 2019 +0100 + + Make the zoom lable a bit bigger + + Thanks Sami Farin for reporting and patch. + + Closes #686. + +commit 87e76531 +Author: Klaus Ethgen +Date: Sun Jul 28 23:14:39 2019 +0100 + + Limiting to more recent version of glib and fix travis + + g_utf8_make_valid was implemented with glib 2.52. That also causes + builds on ubuntu trusty fail. + +commit 17dfa054 Author: Colin Clark Date: Thu Jul 25 09:25:28 2019 +0100 @@ -6,7 +86,7 @@ Improved error detection -commit 66aa92c5 +commit 69b6794d Author: Colin Clark Date: Wed Jul 24 16:47:06 2019 +0100 @@ -17,19 +97,19 @@ European locales use a comma as a decimal separator. The XMP spec. specifies a dot as a decimal separator. -commit 931cfae9 +commit e3f1bab5 Author: Виктор Майстренко <> Date: Fri Jul 12 10:43:56 2019 +0100 Update Russian translation -commit cf2c3d52 +commit 435502b0 Author: Colin Clark Date: Fri Jul 12 10:34:37 2019 +0100 Remove references to obsolete desktop files -commit 85fe8e1f +commit 99a30398 Author: Colin Clark Date: Sun Jun 30 12:22:19 2019 +0100 @@ -43,7 +123,7 @@ The output of the script should of course be text. -commit ff0019ae +commit 2038ab56 Author: Colin Clark Date: Sat Jun 22 16:37:40 2019 +0100 @@ -52,7 +132,7 @@ When the Start-up directory radio buttons were initialized, the setting always reverted to No change. -commit 7dc08907 +commit cc9a39ff Author: Colin Clark Date: Mon Jun 17 11:32:22 2019 +0100 diff -Nru geeqie-1.5/ChangeLog.html geeqie-1.5.1/ChangeLog.html --- geeqie-1.5/ChangeLog.html 2019-07-26 18:19:11.000000000 +0000 +++ geeqie-1.5.1/ChangeLog.html 2019-08-20 19:01:23.000000000 +0000 @@ -1,39 +1,84 @@
    -
  • view commit

    • Author: Colin Clark
    Date: 2019-07-25


    +
  • view commit

    • Author: Colin Clark
    Date: 2019-08-06


    +
  • view commit

    • Author: Colin Clark
    Date: 2019-08-05


    +
  • view commit

    • Author: Colin Clark
    Date: 2019-08-04


    +
  • view commit

    • Author: Dmitry Marakasov
    Date: 2019-08-03


    +
  • view commit

    • Author: Colin Clark
    Date: 2019-08-03


    +
  • view commit

    • Author: Klaus Ethgen
    Date: 2019-07-27


    +
  • view commit

    • Author: Klaus Ethgen
    Date: 2019-07-28


    +
  • view commit

    • Author: Klaus Ethgen
    Date: 2019-07-28


    +
  • view commit

    • Author: Colin Clark
    Date: 2019-07-25


    -
  • view commit

    • Author: Colin Clark
    Date: 2019-07-24


    -
  • view commit

    • Author: Виктор Майстренко
    Date: 2019-07-12


    -
  • view commit

    • Author: Colin Clark
    Date: 2019-07-12


    -
  • view commit

    • Author: Colin Clark
    Date: 2019-06-30


    -
  • view commit

    • Author: Colin Clark
    Date: 2019-06-22


    -
  • view commit

    • Author: Colin Clark
    Date: 2019-06-17


    -
  • view commit

    • Author: Colin Clark
    Date: 2018-10-21


  • view commit

    • Author: Colin Clark
    Date: 2018-03-29


    -
  • view commit

    • Author: Colin Clark
    Date: 2018-01-22


  • view commit

    • Author: Colin Clark
    Date: 2017-11-13