ChangeLog

+commit dbd860208bccaf38d2713236b1c35900973a9109
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Mon Apr 22 06:30:05 2019 +0200
+
+    I18n: Update translation ko (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 11fab89749608bbb67ffa45a9ffeca1de209ebf4
+Author: Anonymous <noreply@xfce.org>
+Date:   Fri Apr 19 12:30:08 2019 +0200
+
+    I18n: Update translation bg (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 4bbf138fd9aeb819848c145518ced45a180b59a0
+Author: Romain Bouvier <skunnyk@alteroot.org>
+Date:   Thu Apr 18 23:30:16 2019 +0200
+
+    Bug #15199: Really allow libexo-1 to be disabled
+    
+    - Be able to build exo without gtk2 support
+    - Update some autohell macros to 2019
+    - For now, we can't build the doc without gtk2 support
+
+commit 5266166ba6145037ac7224327576655c256fc092
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Apr 16 18:30:03 2019 +0200
+
+    I18n: Update translation bg (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 6e22e2150d8742ae5aaf9af81c8193fcc7abd8e8
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Apr 16 12:30:03 2019 +0200
+
+    I18n: Update translation bg (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit c853d80cf046960fa1ed044c3b900679b5734999
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Apr 14 18:34:46 2019 -0300
+
+    Renable expansion-to-define flag
+
+commit 31cfb6ddb6a3b0fa91243013a03454965bbbf66b
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Fri Mar 29 00:09:58 2019 -0400
+
+    Remove library version from the perl script since it doesn't depend on the library
+
+commit 5ff10d0a9f1114755f752e21e2a943aa0a94a210
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Thu Mar 28 23:26:59 2019 -0400
+
+    Move pixmaps to unversioned common area for both versions of the library
+
+commit 2242b3adc207a1f83562686c161aa9ccffe13bff
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Thu Mar 28 21:56:42 2019 -0400
+
+    Tidy and sort .gitignore
+
+commit de2d50f242299b8d6ea9945b91eff23585e6f091
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Thu Mar 28 21:29:41 2019 -0400
+
+    Install helpers in exo-2 paths
+
+commit d2a013245bb59a5bc5a6855680c7f0ca07d04777
+Author: Pjotr <pjotrvertaalt@gmail.com>
+Date:   Mon Mar 25 00:30:03 2019 +0100
+
+    I18n: Update translation nl (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit bbb9f3b931f3b535b230ebe84d96a3cac398f407
+Author: Ardjuna <Asyura.x@gmail.com>
+Date:   Sat Mar 16 12:30:06 2019 +0100
+
+    I18n: Update translation id (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit ae706f0be78bfc117973818a6a8c55168090349d
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sat Mar 16 06:21:09 2019 -0400
+
+    Fix typehead in ExoIconView (bug #15100)
+
+commit a98456f1234303a5e439e47a67e0e2bab3c5f437
+Author: Ardjuna <Asyura.x@gmail.com>
+Date:   Sat Mar 16 06:30:03 2019 +0100
+
+    I18n: Update translation id (98%).
+    
+    296 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2ea97bb3285a50cb5b37a7276464e3bab5b2de53
+Author: Besnik <besnik@programeshqip.org>
+Date:   Fri Mar 15 12:30:03 2019 +0100
+
+    I18n: Update translation sq (98%).
+    
+    296 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit ae72c644d2edb48ef0a64680ae74d4d51ab1c9da
+Author: Alfredo Quintero <alfredomob@gmail.com>
+Date:   Wed Mar 13 06:30:04 2019 +0100
+
+    I18n: Update translation es (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit e628d6e1497eb18718c0bb1834ae242d48a3be64
+Author: Anonymous <noreply@xfce.org>
+Date:   Thu Mar 7 18:30:04 2019 +0100
+
+    I18n: Update translation da (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 1b9a552131fd2ec886362bad15a56e500b2369c7
+Author: Anonymous <noreply@xfce.org>
+Date:   Thu Mar 7 12:30:02 2019 +0100
+
+    I18n: Update translation da (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 166cc19c029d95f4d4deda82e8741bde84833799
+Author: Pasi Lallinaho <pasi@shimmerproject.org>
+Date:   Tue Feb 19 12:30:04 2019 +0100
+
+    I18n: Update translation fi (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2097708c789a11b98e40a4aa49adc803613d57c0
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Feb 17 07:54:41 2019 -0500
+
+    Allow libexo-1 to be disabled (bug #15138)
+
+commit fd24156e1d5cdd84ea6e93fdbc0c0693e99fcc0a
+Author: Andre Miranda <andre42m@gmail.com>
+Date:   Mon Jan 21 00:30:03 2019 +0100
+
+    I18n: Update translation en_GB (97%).
+    
+    293 translated messages, 6 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit d301110e3f60ae59266d1ca99191a490db036edd
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sat Jan 19 20:15:33 2019 -0500
+
+    Post release updates
+
+commit a8e34279e48b8708928a531e5273fc158641d213
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sat Jan 19 20:04:20 2019 -0500
+
+    Updates for release
+
 commit f8404bb974b66c72d4036913015bbca41e9c8c73
 Author: Sean Davis <smd.seandavis@gmail.com>
 Date:   Sat Jan 19 09:42:47 2019 -0500

Makefile.in

@@ -255,6 +255,10 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 GTHREAD_VERSION = @GTHREAD_VERSION@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@
+GTK2_VERSION = @GTK2_VERSION@
 GTK3_CFLAGS = @GTK3_CFLAGS@
 GTK3_LIBS = @GTK3_LIBS@
 GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@
@@ -265,11 +269,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
-GTK_VERSION = @GTK_VERSION@
 HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -290,6 +289,7 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBEXO2_VERSION_API = @LIBEXO2_VERSION_API@
 LIBEXO_VERINFO = @LIBEXO_VERINFO@
 LIBEXO_VERSION_API = @LIBEXO_VERSION_API@
 LIBEXO_VERSION_MAJOR = @LIBEXO_VERSION_MAJOR@
@@ -305,10 +305,6 @@ LIBXFCE4UI2_CFLAGS = @LIBXFCE4UI2_CFLAGS@
 LIBXFCE4UI2_LIBS = @LIBXFCE4UI2_LIBS@
 LIBXFCE4UI2_REQUIRED_VERSION = @LIBXFCE4UI2_REQUIRED_VERSION@
 LIBXFCE4UI2_VERSION = @LIBXFCE4UI2_VERSION@
-LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@
-LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@
-LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@
-LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@
 LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
 LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
 LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@

NEWS

+0.12.5
+======
+- Bug Fixes:
+  - Fix typehead in ExoIconView (Xfce #15100)
+- Build Updates:
+  - Building libexo-1 can now be disabled (Xfce #15138, #15199)
+    - Building documentation still requires libexo-1 since some older
+      symbols exists only in the GTK+ 2 library
+  - Several components were moved around to align with the correct
+    library versions:
+    - Helpers are now installed in exo-2 paths, and exo-helper-1 has
+      been renamed to exo-helper-2 to follow the library version
+    - Pixmaps were moved to an unversioned path (pixmaps/exo) since
+      they are used by both versions of the library
+    - exo-compose-mail has dropped the library version since it
+      does not depend on either version of the library
+  - The expansion-to-defined flag was re-enabled
+- Translation Updates: Albanian, Bulgarian, Danish, Dutch, 
+  English (United Kingdom), Finnish, Indonesian, Korean, Spanish
+
 0.12.4
 ======
 - General:

aclocal.m4

@@ -6346,7 +6346,8 @@ _LT_EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -6986,6 +6987,12 @@ m4_if([$1], [CXX], [
 	_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*)

config.h.in

@@ -50,6 +50,9 @@
 /* Define if gio-unix-2.0 >= 2.42.0 present */
 #undef HAVE_GIO_UNIX
 
+/* Define if gtk+-2.0 >= 2.24.0 present */
+#undef HAVE_GTK2
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 

configure.ac

@@ -5,6 +5,7 @@ dnl
 
 dnl
 dnl Copyright (c) 2004-2009 os-cillation.
+dnl Copyright (c) 2009-2019 Xfce Development Team <xfce4-dev@xfce.org>
 dnl All rights reserved.
 dnl
 dnl Written by Benedikt Meurer <benny@xfce.org>.
@@ -15,11 +16,12 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([libexo_verinfo], [1:0:1])
 m4_define([libexo_version_api], [1])
+m4_define([libexo2_version_api], [2])
 m4_define([libexo_version_major], [0])
 m4_define([libexo_version_minor], [12])
-m4_define([libexo_version_micro], [4])
+m4_define([libexo_version_micro], [5])
 m4_define([libexo_version_nano], [])
-m4_define([libexo_version_build], [f8404bb])
+m4_define([libexo_version_build], [dbd8602])
 m4_define([libexo_version_tag], [])
 m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [git], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])])
 
@@ -37,11 +39,11 @@ dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2004-2010 os-cillation.
-Copyright (c) 2004-2018 Xfce Development Team])
+Copyright (c) 2004-2019 Xfce Development Team])
 AC_INIT([exo], [libexo_version], [https://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
 AC_CONFIG_MACRO_DIR([m4])
-AC_REVISION([f8404bb])
+AC_REVISION([dbd8602])
 AC_CANONICAL_TARGET()
 
 dnl ***************************
@@ -50,7 +52,7 @@ dnl ***************************
 AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar no-dist-gzip])
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE()
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
 dnl **************************
 dnl *** Libtool versioning ***
@@ -62,10 +64,12 @@ dnl ****************************
 dnl *** Subst libexo version ***
 dnl ****************************
 LIBEXO_VERSION_API=libexo_version_api()
+LIBEXO2_VERSION_API=libexo2_version_api()
 LIBEXO_VERSION_MAJOR=libexo_version_major()
 LIBEXO_VERSION_MINOR=libexo_version_minor()
 LIBEXO_VERSION_MICRO=libexo_version_micro()
 AC_SUBST([LIBEXO_VERSION_API])
+AC_SUBST([LIBEXO2_VERSION_API])
 AC_SUBST([LIBEXO_VERSION_MAJOR])
 AC_SUBST([LIBEXO_VERSION_MINOR])
 AC_SUBST([LIBEXO_VERSION_MICRO])
@@ -170,14 +174,20 @@ dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
 XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
 
+dnl ***********************************************************
+dnl *** Optional support for a GTK+2 version of the library ***
+dnl ***********************************************************
+XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
+                           [gtk+-2.0], [2.24.0], [gtk2],
+                           [GTK+ 2 support])
+AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
+
 dnl *********************
 dnl *** Check for X11 ***
 dnl *********************
@@ -232,17 +242,6 @@ if test x"$have_gnuc_visibility" = x"yes"; then
 fi
 AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test x"$have_gnuc_visibility" = x"yes"])
 
-dnl *************************************
-dnl *** Compensate for broken gtk-doc ***
-dnl *************************************
-XDT_SUPPORTED_FLAGS([GTK_DOC_EXTRA_CFLAGS], [-Wno-sign-compare])
-AC_SUBST([GTK_DOC_EXTRA_CFLAGS])
-
-dnl **********************************************
-dnl *** Disable -Wexpansion-to-defined (gcc 7) ***
-dnl **********************************************
-XDT_SUPPORTED_FLAGS([CFLAGS], [-Wno-expansion-to-defined])
-
 dnl *************************************
 dnl *** Use GSEAL if possible         ***
 dnl *************************************
@@ -279,4 +278,9 @@ echo "Build Configuration:"
 echo
 echo "* Debug Support:        $enable_debug"
 echo "* GNU Visibility:       $have_gnuc_visibility"
+if test x"$GTK2_FOUND" = x"yes"; then
+echo "* GTK+ 2 Support:       yes"
+else
+echo "* GTK+ 2 Support:       no"
+fi
 echo

debian/changelog

+exo (0.12.5-1) UNRELEASED; urgency=medium
+
+  * New upstream version 0.12.5
+  * d/patches: rebase against new upstream version
+  * move exo-helper from libexo-1 to libexo-2
+  * d/libexo-helpers: drop version number from exo-compose-email
+  * move pixmaps to libexo-common
+  * d/rules: update exo-compose-mail name in sed rule
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 07 May 2019 13:05:27 +0200
+
 exo (0.12.4-1) unstable; urgency=medium
 
   * New upstream version 0.12.4

debian/libexo-1-0.install

 usr/lib/*/libexo-1*.so.*
-usr/lib/*/xfce4/exo-1/exo-helper-1
 usr/share/locale/*/*/exo-1.mo
-usr/share/pixmaps/exo-1

debian/libexo-2-0.install

 usr/lib/*/libexo-2*.so.*
+usr/lib/*/xfce4/exo-2/exo-helper-2

debian/libexo-common.install

 etc
 usr/share/icons
+usr/share/pixmaps

debian/libexo-helpers.install

 usr/share/xfce4
-usr/lib/*/xfce4/exo-1/exo-compose-mail-1 usr/share/xfce4/exo-1/
+usr/lib/*/xfce4/exo/exo-compose-mail usr/share/xfce4/exo/

debian/patches/0001-use-u-b-perl-instead-of-env-as-interpreter-path.patch

@@ -3,16 +3,16 @@ Date: Wed, 8 Aug 2018 13:10:29 +0200
 Subject: use /u/b/perl instead of env as interpreter path
 
 ---
- exo-helper/helpers/exo-compose-mail-1 | 2 +-
+ exo-helper/helpers/exo-compose-mail | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/exo-helper/helpers/exo-compose-mail-1 b/exo-helper/helpers/exo-compose-mail-1
-index fead65c..b98a0d6 100755
---- a/exo-helper/helpers/exo-compose-mail-1
-+++ b/exo-helper/helpers/exo-compose-mail-1
+diff --git a/exo-helper/helpers/exo-compose-mail b/exo-helper/helpers/exo-compose-mail
+index fae339f..1b887e7 100755
+--- a/exo-helper/helpers/exo-compose-mail
++++ b/exo-helper/helpers/exo-compose-mail
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  #
- # exo-compose-mail-1 - Perl script to parse mailto:-URIs and invoke the
+ # exo-compose-mail - Perl script to parse mailto:-URIs and invoke the
  #                    various included MailReaders with the appropriate

debian/rules

@@ -28,8 +28,8 @@ override_dh_install:
 		>debian/tmp/usr/share/xfce4/helpers/muttng.desktop
 
 	# Drop multi-arch path from mail helpers since we install the perl script
-	# exo-compose-mail-1 in a non-multiarch directory (/u/s/xfce4/exo-1)
-	sed -i -e '/X-XFCE-CommandsWithParameter=.*exo-compose-mail-1/ s#lib/$(DEB_HOST_MULTIARCH)#share#' \
+	# exo-compose-mail in a non-multiarch directory (/u/s/xfce4/exo)
+	sed -i -e '/X-XFCE-CommandsWithParameter=.*exo-compose-mail/ s#lib/$(DEB_HOST_MULTIARCH)#share#' \
 		debian/tmp/usr/share/xfce4/helpers/*.desktop
 
 	dh_install -X .la

docs/Makefile.in

@@ -233,6 +233,10 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 GTHREAD_VERSION = @GTHREAD_VERSION@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@
+GTK2_VERSION = @GTK2_VERSION@
 GTK3_CFLAGS = @GTK3_CFLAGS@
 GTK3_LIBS = @GTK3_LIBS@
 GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@
@@ -243,11 +247,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
-GTK_VERSION = @GTK_VERSION@
 HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -268,6 +267,7 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBEXO2_VERSION_API = @LIBEXO2_VERSION_API@
 LIBEXO_VERINFO = @LIBEXO_VERINFO@
 LIBEXO_VERSION_API = @LIBEXO_VERSION_API@
 LIBEXO_VERSION_MAJOR = @LIBEXO_VERSION_MAJOR@
@@ -283,10 +283,6 @@ LIBXFCE4UI2_CFLAGS = @LIBXFCE4UI2_CFLAGS@
 LIBXFCE4UI2_LIBS = @LIBXFCE4UI2_LIBS@
 LIBXFCE4UI2_REQUIRED_VERSION = @LIBXFCE4UI2_REQUIRED_VERSION@
 LIBXFCE4UI2_VERSION = @LIBXFCE4UI2_VERSION@
-LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@
-LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@
-LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@
-LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@
 LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
 LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
 LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@

docs/reference/Makefile.am

@@ -48,16 +48,18 @@ content_files = 							\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS =	 							\
+# We need to use GTK2 exo flags because the GTK3 version does not have
+# all symbols (exo_toolbars etc)
+# We can't build the doc with --disable-gtk2 for now
+GTKDOC_CFLAGS =	 							\
 	-I$(top_srcdir) 						\
 	-I$(top_builddir) 						\
-	$(GTK_CFLAGS)							\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(GTK_DOC_EXTRA_CFLAGS)
+	$(GTK2_CFLAGS)							\
+	$(LIBXFCE4UTIL_CFLAGS)
 
 GTKDOC_LIBS =  								\
 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la \
-	$(GTK_LIBS)
+	$(GTK2_LIBS)
 
 include $(top_srcdir)/gtk-doc.make
 

docs/reference/Makefile.in

@@ -229,6 +229,10 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 GTHREAD_VERSION = @GTHREAD_VERSION@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@
+GTK2_VERSION = @GTK2_VERSION@
 GTK3_CFLAGS = @GTK3_CFLAGS@
 GTK3_LIBS = @GTK3_LIBS@
 GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@
@@ -239,11 +243,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
-GTK_VERSION = @GTK_VERSION@
 HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -264,6 +263,7 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBEXO2_VERSION_API = @LIBEXO2_VERSION_API@
 LIBEXO_VERINFO = @LIBEXO_VERINFO@
 LIBEXO_VERSION_API = @LIBEXO_VERSION_API@
 LIBEXO_VERSION_MAJOR = @LIBEXO_VERSION_MAJOR@
@@ -279,10 +279,6 @@ LIBXFCE4UI2_CFLAGS = @LIBXFCE4UI2_CFLAGS@
 LIBXFCE4UI2_LIBS = @LIBXFCE4UI2_LIBS@
 LIBXFCE4UI2_REQUIRED_VERSION = @LIBXFCE4UI2_REQUIRED_VERSION@
 LIBXFCE4UI2_VERSION = @LIBXFCE4UI2_VERSION@
-LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@
-LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@
-LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@
-LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@
 LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
 LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
 LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@
@@ -445,16 +441,18 @@ content_files = \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = \
+# We need to use GTK2 exo flags because the GTK3 version does not have
+# all symbols (exo_toolbars etc)
+# We can't build the doc with --disable-gtk2 for now
+GTKDOC_CFLAGS = \
 	-I$(top_srcdir) 						\
 	-I$(top_builddir) 						\
-	$(GTK_CFLAGS)							\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(GTK_DOC_EXTRA_CFLAGS)
+	$(GTK2_CFLAGS)							\
+	$(LIBXFCE4UTIL_CFLAGS)
 
 GTKDOC_LIBS = \
 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la \
-	$(GTK_LIBS)
+	$(GTK2_LIBS)
 
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

docs/reference/exo-csource.1

@@ -2,12 +2,12 @@
 .\"     Title: exo-csource
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2018
+.\"      Date: 03/28/2019
 .\"    Manual: Xfce User\*(Aqs Manual
 .\"    Source: Xfce
 .\"  Language: English
 .\"
-.TH "EXO\-CSOURCE" "1" "10/15/2018" "Xfce" "Xfce User\*(Aqs Manual"
+.TH "EXO\-CSOURCE" "1" "03/28/2019" "Xfce" "Xfce User\*(Aqs Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/reference/exo-open.1

@@ -2,12 +2,12 @@
 .\"     Title: exo-open
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2018
+.\"      Date: 03/28/2019
 .\"    Manual: Xfce User\*(Aqs Manual
 .\"    Source: Xfce
 .\"  Language: English
 .\"
-.TH "EXO\-OPEN" "1" "10/15/2018" "Xfce" "Xfce User\*(Aqs Manual"
+.TH "EXO\-OPEN" "1" "03/28/2019" "Xfce" "Xfce User\*(Aqs Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/reference/html/index.html

@@ -37,7 +37,7 @@
 <div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:bluesabre@xfce.org">bluesabre@xfce.org</a>&gt;</code></p></div></div>
 </div>
 </div></div>
-<div><p class="releaseinfo">Version 0.12.4
+<div><p class="releaseinfo">Version 0.12.5
 </p></div>
 <div><p class="copyright">Copyright © 2004, 2005, 2006, 2007 os-cillation e.K.</p></div>
 <div><p class="copyright">Copyright © 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Xfce Development Team</p></div>