Hello community,
here is the log from the commit of package xfce4-screenshooter for
openSUSE:Factory checked in at 2019-04-01 12:39:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-screenshooter (Old)
and /work/SRC/openSUSE:Factory/.xfce4-screenshooter.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-screenshooter"
Mon Apr 1 12:39:27 2019 rev:31 rq:690096 version:1.9.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-screenshooter/xfce4-screenshooter.changes
2019-03-19 10:03:33.699770872 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-screenshooter.new.25356/xfce4-screenshooter.changes
2019-04-01 12:39:28.741947062 +0200
@@ -1,0 +2,7 @@
+Sat Mar 30 21:32:47 UTC 2019 - Vinzenz Vietzke <v...@vinzv.de>
+
+- Update to version 1.9.5
+ * Bug fixed:
+ - Panel plugin: allow it to save files (bxo#15187)
+
+-------------------------------------------------------------------
Old:
----
xfce4-screenshooter-1.9.4.tar.bz2
New:
----
xfce4-screenshooter-1.9.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-screenshooter.spec ++++++
--- /var/tmp/diff_new_pack.f8KvgL/_old 2019-04-01 12:39:29.981947665 +0200
+++ /var/tmp/diff_new_pack.f8KvgL/_new 2019-04-01 12:39:30.009947678 +0200
@@ -20,7 +20,7 @@
%define panel_version 4.12.0
Name: xfce4-screenshooter
-Version: 1.9.4
+Version: 1.9.5
Release: 0
Summary: Screenshot Tool for the Xfce Desktop
License: GPL-2.0-or-later
++++++ xfce4-screenshooter-1.9.4.tar.bz2 -> xfce4-screenshooter-1.9.5.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/ChangeLog
new/xfce4-screenshooter-1.9.5/ChangeLog
--- old/xfce4-screenshooter-1.9.4/ChangeLog 2019-03-09 03:26:40.000000000
+0100
+++ new/xfce4-screenshooter-1.9.5/ChangeLog 2019-03-30 22:09:35.000000000
+0100
@@ -1,3 +1,67 @@
+commit d5b5c8035b2321e162b5e7b6b2c683cce47d2edc
+Author: Andre Miranda <andre...@xfce.org>
+Date: Sat Mar 30 18:08:28 2019 -0300
+
+ Updates for release
+
+commit 37a344f02ce8d1fb7e2bcaaec75ceeff57af0774
+Author: Andre Miranda <andre...@xfce.org>
+Date: Mon Mar 25 22:06:34 2019 -0300
+
+ Fix panel plugin: allow it to save files (Bug #15187)
+
+commit 0008b179e49365fe1f5b1ecce376a9f51b94df50
+Author: Andre Miranda <andre...@xfce.org>
+Date: Sun Mar 17 14:05:31 2019 -0300
+
+ Bump dependencies
+
+commit 2dccba6808abb015bbe3709bdc40178f44c25445
+Author: Andre Miranda <andre...@xfce.org>
+Date: Sun Mar 17 14:01:57 2019 -0300
+
+ Move get_active_window functions to utils
+
+commit b2791fa2576fef699ac54bcb83c27d032f7a62b2
+Author: Andre Miranda <andre...@xfce.org>
+Date: Sun Mar 17 14:00:24 2019 -0300
+
+ Remove unused function
+
+commit 510e6f098ee184a4d37a9a0ccb7a2fda2b5e755e
+Author: Olivier Duchateau <duchateau.oliv...@gmail.com>
+Date: Wed Mar 13 18:12:23 2019 +0100
+
+ Replace deprecated 'gdk_screen_get_active_window' by Xlib functions
+
+commit ae3551c2ca465861d2696336c1da79176b712e2e
+Author: Andre Miranda <andre...@xfce.org>
+Date: Fri Mar 8 23:43:32 2019 -0300
+
+ Ignore remaining deprecations
+
+ Because there are no direct replacements.
+
+ gdk_screen_get_active_window:
+ Either we have to use X11 directly or iterate over the window list
+ from gdk_screen_get_window_stack.
+
+ gdk_window_process_all_updates:
+ Apparently it's fine to remove this function call, but let's keep
+ it for now, better safe than sorry.
+
+commit b9695e52a16831fba51b524afd19f668059a4c0e
+Author: Andre Miranda <andre...@xfce.org>
+Date: Fri Mar 8 23:37:36 2019 -0300
+
+ Replace deprecated gdk_screen_width / gdk_screen_height
+
+commit 2cf1495523c6994aceb0e2c1db1b25a416cab904
+Author: Andre Miranda <andre...@xfce.org>
+Date: Fri Mar 8 23:31:31 2019 -0300
+
+ Post release tag bump
+
commit ed666323e68730414d38cb9a1a3695c0e3628274
Author: Andre Miranda <andre...@xfce.org>
Date: Fri Mar 8 23:25:30 2019 -0300
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/Makefile.am
new/xfce4-screenshooter-1.9.5/Makefile.am
--- old/xfce4-screenshooter-1.9.4/Makefile.am 2019-03-06 17:24:44.000000000
+0100
+++ new/xfce4-screenshooter-1.9.5/Makefile.am 2019-03-17 17:47:19.000000000
+0100
@@ -41,11 +41,14 @@
-I$(top_builddir)/lib \
@EXO_CFLAGS@ \
@GTK_CFLAGS@ \
+ @GDK_CFLAGS@ \
+ @GDKX11_CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCE4UI_CFLAGS@ \
@LIBXML_CFLAGS@ \
@SOUP_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
@XFIXES_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
@@ -53,6 +56,8 @@
-lm \
@EXO_LIBS@ \
@GTK_LIBS@ \
+ @GDK_LIBS@ \
+ @GDKX11_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBXFCE4UI_LIBS@ \
@GLIB_LIBS@ \
@@ -60,6 +65,7 @@
@LIBXML_LIBS@ \
@LIBXEXT_LIBS@ \
@LIBX11_LIBS@ \
+ @LIBX11_LDFLAGS@ \
@XFIXES_LIBS@
lib_libscreenshooter_built_sources = \
@@ -94,21 +100,28 @@
-I$(top_builddir)/lib \
@EXO_CFLAGS@ \
@GTK_CFLAGS@ \
+ @GDK_CFLAGS@ \
+ @GDKX11_CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCE4UI_CFLAGS@ \
@GTHREAD_CFLAGS@ \
@SOUP_CFLAGS@ \
@LIBXML_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
src_xfce4_screenshooter_LDFLAGS = \
@EXO_LIBS@ \
@GTK_LIBS@ \
+ @GDK_LIBS@ \
+ @GDKX11_LIBS@ \
@GLIB_LIBS@ \
@GTHREAD_LIBS@ \
@SOUP_LIBS@ \
@LIBXML_LIBS@ \
+ @LIBX11_LIBS@ \
+ @LIBX11_LDFLAGS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBXFCE4UI_LIBS@
@@ -150,6 +163,7 @@
@LIBXFCE4UI_CFLAGS@ \
@GTHREAD_CFLAGS@ \
@LIBXML_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
@SOUP_CFLAGS@
panel_plugin_libscreenshooterplugin_la_LDFLAGS = \
@@ -165,6 +179,8 @@
@GTHREAD_LIBS@ \
@SOUP_LIBS@ \
@LIBXML_LIBS@ \
+ @LIBX11_LIBS@ \
+ @LIBX11_LDFLAGS@ \
@LIBXFCE4UI_LIBS@ \
lib/libscreenshooter.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/Makefile.in
new/xfce4-screenshooter-1.9.5/Makefile.in
--- old/xfce4-screenshooter-1.9.4/Makefile.in 2019-03-09 03:26:34.000000000
+0100
+++ new/xfce4-screenshooter-1.9.5/Makefile.in 2019-03-30 22:07:52.000000000
+0100
@@ -358,6 +358,14 @@
EXO_REQUIRED_VERSION = @EXO_REQUIRED_VERSION@
EXO_VERSION = @EXO_VERSION@
FGREP = @FGREP@
+GDKX11_CFLAGS = @GDKX11_CFLAGS@
+GDKX11_LIBS = @GDKX11_LIBS@
+GDKX11_REQUIRED_VERSION = @GDKX11_REQUIRED_VERSION@
+GDKX11_VERSION = @GDKX11_VERSION@
+GDK_CFLAGS = @GDK_CFLAGS@
+GDK_LIBS = @GDK_LIBS@
+GDK_REQUIRED_VERSION = @GDK_REQUIRED_VERSION@
+GDK_VERSION = @GDK_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
@@ -556,11 +564,14 @@
-I$(top_builddir)/lib \
@EXO_CFLAGS@ \
@GTK_CFLAGS@ \
+ @GDK_CFLAGS@ \
+ @GDKX11_CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCE4UI_CFLAGS@ \
@LIBXML_CFLAGS@ \
@SOUP_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
@XFIXES_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
@@ -568,6 +579,8 @@
-lm \
@EXO_LIBS@ \
@GTK_LIBS@ \
+ @GDK_LIBS@ \
+ @GDKX11_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBXFCE4UI_LIBS@ \
@GLIB_LIBS@ \
@@ -575,6 +588,7 @@
@LIBXML_LIBS@ \
@LIBXEXT_LIBS@ \
@LIBX11_LIBS@ \
+ @LIBX11_LDFLAGS@ \
@XFIXES_LIBS@
lib_libscreenshooter_built_sources = \
@@ -591,21 +605,28 @@
-I$(top_builddir)/lib \
@EXO_CFLAGS@ \
@GTK_CFLAGS@ \
+ @GDK_CFLAGS@ \
+ @GDKX11_CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCE4UI_CFLAGS@ \
@GTHREAD_CFLAGS@ \
@SOUP_CFLAGS@ \
@LIBXML_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
src_xfce4_screenshooter_LDFLAGS = \
@EXO_LIBS@ \
@GTK_LIBS@ \
+ @GDK_LIBS@ \
+ @GDKX11_LIBS@ \
@GLIB_LIBS@ \
@GTHREAD_LIBS@ \
@SOUP_LIBS@ \
@LIBXML_LIBS@ \
+ @LIBX11_LIBS@ \
+ @LIBX11_LDFLAGS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBXFCE4UI_LIBS@
@@ -631,6 +652,7 @@
@LIBXFCE4UI_CFLAGS@ \
@GTHREAD_CFLAGS@ \
@LIBXML_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
@SOUP_CFLAGS@
panel_plugin_libscreenshooterplugin_la_LDFLAGS = \
@@ -646,6 +668,8 @@
@GTHREAD_LIBS@ \
@SOUP_LIBS@ \
@LIBXML_LIBS@ \
+ @LIBX11_LIBS@ \
+ @LIBX11_LDFLAGS@ \
@LIBXFCE4UI_LIBS@ \
lib/libscreenshooter.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/NEWS
new/xfce4-screenshooter-1.9.5/NEWS
--- old/xfce4-screenshooter-1.9.4/NEWS 2019-03-09 03:23:46.000000000 +0100
+++ new/xfce4-screenshooter-1.9.5/NEWS 2019-03-30 22:07:17.000000000 +0100
@@ -1,3 +1,7 @@
+=== Version 1.9.5 ===
+ * Bugs fixed:
+ - Panel plugin: allow it to save files (bug #15187)
+
=== Version 1.9.4 ===
* Enhancements:
- Extended save function to also take files (bug #14156, thanks to Arthur
Jansen)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/configure
new/xfce4-screenshooter-1.9.5/configure
--- old/xfce4-screenshooter-1.9.4/configure 2019-03-09 03:26:34.000000000
+0100
+++ new/xfce4-screenshooter-1.9.5/configure 2019-03-30 22:07:52.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-screenshooter 1.9.4.
+# Generated by GNU Autoconf 2.69 for xfce4-screenshooter 1.9.5.
#
# Report bugs to <http://bugzilla.xfce.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='xfce4-screenshooter'
PACKAGE_TARNAME='xfce4-screenshooter'
-PACKAGE_VERSION='1.9.4'
-PACKAGE_STRING='xfce4-screenshooter 1.9.4'
+PACKAGE_VERSION='1.9.5'
+PACKAGE_STRING='xfce4-screenshooter 1.9.5'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
@@ -687,6 +687,14 @@
GLIB_LIBS
GLIB_CFLAGS
GLIB_VERSION
+GDKX11_REQUIRED_VERSION
+GDKX11_LIBS
+GDKX11_CFLAGS
+GDKX11_VERSION
+GDK_REQUIRED_VERSION
+GDK_LIBS
+GDK_CFLAGS
+GDK_VERSION
GTK_REQUIRED_VERSION
GTK_LIBS
GTK_CFLAGS
@@ -1435,7 +1443,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 xfce4-screenshooter 1.9.4 to adapt to many kinds of
systems.
+\`configure' configures xfce4-screenshooter 1.9.5 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1510,7 +1518,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-screenshooter 1.9.4:";;
+ short | recursive ) echo "Configuration of xfce4-screenshooter 1.9.5:";;
esac
cat <<\_ACEOF
@@ -1640,7 +1648,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-screenshooter configure 1.9.4
+xfce4-screenshooter configure 1.9.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2009,7 +2017,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-screenshooter $as_me 1.9.4, which was
+It was created by xfce4-screenshooter $as_me 1.9.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2873,7 +2881,7 @@
# Define the identity of the package.
PACKAGE='xfce4-screenshooter'
- VERSION='1.9.4'
+ VERSION='1.9.5'
cat >>confdefs.h <<_ACEOF
@@ -13384,9 +13392,9 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >=
4.10.0" >&5
-$as_echo_n "checking for libxfce4util-1.0 >= 4.10.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4util-1.0" >/dev/null
2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >=
4.12.0" >&5
+$as_echo_n "checking for libxfce4util-1.0 >= 4.12.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=4.12.0" "libxfce4util-1.0" >/dev/null
2>&1; then
LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5
$as_echo "$LIBXFCE4UTIL_VERSION" >&6; }
@@ -13403,7 +13411,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5
$as_echo "$LIBXFCE4UTIL_LIBS" >&6; }
- LIBXFCE4UTIL_REQUIRED_VERSION=4.10.0
+ LIBXFCE4UTIL_REQUIRED_VERSION=4.12.0
@@ -13419,7 +13427,7 @@
echo "*** The required package libxfce4util-1.0 was found on your
system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.10.0, or
adjust"
+ echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.12.0, or
adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -13431,7 +13439,7 @@
echo "*** The required package libxfce4util-1.0 was not found on your
system."
- echo "*** Please install libxfce4util-1.0 (atleast version 4.10.0) or
adjust"
+ echo "*** Please install libxfce4util-1.0 (atleast version 4.12.0) or
adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -13774,9 +13782,9 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread-2.0 >= 2.16.0"
>&5
-$as_echo_n "checking for gthread-2.0 >= 2.16.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=2.16.0" "gthread-2.0" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread-2.0 >= 2.42.0"
>&5
+$as_echo_n "checking for gthread-2.0 >= 2.42.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=2.42.0" "gthread-2.0" >/dev/null 2>&1; then
GTHREAD_VERSION=`$PKG_CONFIG --modversion "gthread-2.0"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTHREAD_VERSION" >&5
$as_echo "$GTHREAD_VERSION" >&6; }
@@ -13793,7 +13801,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTHREAD_LIBS" >&5
$as_echo "$GTHREAD_LIBS" >&6; }
- GTHREAD_REQUIRED_VERSION=2.16.0
+ GTHREAD_REQUIRED_VERSION=2.42.0
@@ -13809,7 +13817,7 @@
echo "*** The required package gthread-2.0 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade gthread-2.0 to atleast version 2.16.0, or
adjust"
+ echo "*** Please upgrade gthread-2.0 to atleast version 2.42.0, or
adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -13821,7 +13829,7 @@
echo "*** The required package gthread-2.0 was not found on your system."
- echo "*** Please install gthread-2.0 (atleast version 2.16.0) or adjust"
+ echo "*** Please install gthread-2.0 (atleast version 2.42.0) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -13969,9 +13977,9 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.20.0" >&5
-$as_echo_n "checking for gtk+-3.0 >= 3.20.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=3.20.0" "gtk+-3.0" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.22.0" >&5
+$as_echo_n "checking for gtk+-3.0 >= 3.22.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=3.22.0" "gtk+-3.0" >/dev/null 2>&1; then
GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-3.0"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5
$as_echo "$GTK_VERSION" >&6; }
@@ -13988,7 +13996,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5
$as_echo "$GTK_LIBS" >&6; }
- GTK_REQUIRED_VERSION=3.20.0
+ GTK_REQUIRED_VERSION=3.22.0
@@ -14004,7 +14012,7 @@
echo "*** The required package gtk+-3.0 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade gtk+-3.0 to atleast version 3.20.0, or adjust"
+ echo "*** Please upgrade gtk+-3.0 to atleast version 3.22.0, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -14016,7 +14024,7 @@
echo "*** The required package gtk+-3.0 was not found on your system."
- echo "*** Please install gtk+-3.0 (atleast version 3.20.0) or adjust"
+ echo "*** Please install gtk+-3.0 (atleast version 3.22.0) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -14164,9 +14172,399 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.16.0" >&5
-$as_echo_n "checking for glib-2.0 >= 2.16.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=2.16.0" "glib-2.0" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-3.0 >= 3.22.0" >&5
+$as_echo_n "checking for gdk-3.0 >= 3.22.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=3.22.0" "gdk-3.0" >/dev/null 2>&1; then
+ GDK_VERSION=`$PKG_CONFIG --modversion "gdk-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_VERSION" >&5
+$as_echo "$GDK_VERSION" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GDK_CFLAGS" >&5
+$as_echo_n "checking GDK_CFLAGS... " >&6; }
+ GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_CFLAGS" >&5
+$as_echo "$GDK_CFLAGS" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GDK_LIBS" >&5
+$as_echo_n "checking GDK_LIBS... " >&6; }
+ GDK_LIBS=`$PKG_CONFIG --libs "gdk-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_LIBS" >&5
+$as_echo "$GDK_LIBS" >&6; }
+
+ GDK_REQUIRED_VERSION=3.22.0
+
+
+
+
+
+
+
+ elif $PKG_CONFIG --exists "gdk-3.0" >/dev/null 2>&1; then
+ xdt_cv_version=`$PKG_CONFIG --modversion "gdk-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but
$xdt_cv_version" >&5
+$as_echo "found, but $xdt_cv_version" >&6; }
+
+
+ echo "*** The required package gdk-3.0 was found on your system,"
+ echo "*** but the installed version ($xdt_cv_version) is too old."
+ echo "*** Please upgrade gdk-3.0 to atleast version 3.22.0, or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+ echo "*** the new version of the package in a nonstandard prefix so"
+ echo "*** pkg-config is able to find it."
+ exit 1
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+
+ echo "*** The required package gdk-3.0 was not found on your system."
+ echo "*** Please install gdk-3.0 (atleast version 3.22.0) or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you"
+ echo "*** installed the package in a nonstandard prefix so that"
+ echo "*** pkg-config is able to find it."
+ exit 1
+
+ fi
+
+
+
+ # minimum supported version of pkg-config
+ xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with
args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the
test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not
prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at
least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... "
>&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+fi
+
+ if test x"$PKG_CONFIG" = x""; then
+ echo
+ echo "*** Your version of pkg-config is too old. You need atleast"
+ echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can
download pkg-config"
+ echo "*** from the freedesktop.org software repository at"
+ echo "***"
+ echo "*** http://www.freedesktop.org/software/pkgconfig";
+ echo "***"
+ exit 1;
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-x11-3.0 >= 3.22.0"
>&5
+$as_echo_n "checking for gdk-x11-3.0 >= 3.22.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=3.22.0" "gdk-x11-3.0" >/dev/null 2>&1; then
+ GDKX11_VERSION=`$PKG_CONFIG --modversion "gdk-x11-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDKX11_VERSION" >&5
+$as_echo "$GDKX11_VERSION" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GDKX11_CFLAGS" >&5
+$as_echo_n "checking GDKX11_CFLAGS... " >&6; }
+ GDKX11_CFLAGS=`$PKG_CONFIG --cflags "gdk-x11-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDKX11_CFLAGS" >&5
+$as_echo "$GDKX11_CFLAGS" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GDKX11_LIBS" >&5
+$as_echo_n "checking GDKX11_LIBS... " >&6; }
+ GDKX11_LIBS=`$PKG_CONFIG --libs "gdk-x11-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDKX11_LIBS" >&5
+$as_echo "$GDKX11_LIBS" >&6; }
+
+ GDKX11_REQUIRED_VERSION=3.22.0
+
+
+
+
+
+
+
+ elif $PKG_CONFIG --exists "gdk-x11-3.0" >/dev/null 2>&1; then
+ xdt_cv_version=`$PKG_CONFIG --modversion "gdk-x11-3.0"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but
$xdt_cv_version" >&5
+$as_echo "found, but $xdt_cv_version" >&6; }
+
+
+ echo "*** The required package gdk-x11-3.0 was found on your system,"
+ echo "*** but the installed version ($xdt_cv_version) is too old."
+ echo "*** Please upgrade gdk-x11-3.0 to atleast version 3.22.0, or
adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+ echo "*** the new version of the package in a nonstandard prefix so"
+ echo "*** pkg-config is able to find it."
+ exit 1
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+
+ echo "*** The required package gdk-x11-3.0 was not found on your system."
+ echo "*** Please install gdk-x11-3.0 (atleast version 3.22.0) or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you"
+ echo "*** installed the package in a nonstandard prefix so that"
+ echo "*** pkg-config is able to find it."
+ exit 1
+
+ fi
+
+
+
+ # minimum supported version of pkg-config
+ xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with
args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the
test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not
prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at
least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... "
>&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+fi
+
+ if test x"$PKG_CONFIG" = x""; then
+ echo
+ echo "*** Your version of pkg-config is too old. You need atleast"
+ echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can
download pkg-config"
+ echo "*** from the freedesktop.org software repository at"
+ echo "***"
+ echo "*** http://www.freedesktop.org/software/pkgconfig";
+ echo "***"
+ exit 1;
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.42.0" >&5
+$as_echo_n "checking for glib-2.0 >= 2.42.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=2.42.0" "glib-2.0" >/dev/null 2>&1; then
GLIB_VERSION=`$PKG_CONFIG --modversion "glib-2.0"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_VERSION" >&5
$as_echo "$GLIB_VERSION" >&6; }
@@ -14183,7 +14581,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_LIBS" >&5
$as_echo "$GLIB_LIBS" >&6; }
- GLIB_REQUIRED_VERSION=2.16.0
+ GLIB_REQUIRED_VERSION=2.42.0
@@ -14199,7 +14597,7 @@
echo "*** The required package glib-2.0 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade glib-2.0 to atleast version 2.16.0, or adjust"
+ echo "*** Please upgrade glib-2.0 to atleast version 2.42.0, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -14211,7 +14609,7 @@
echo "*** The required package glib-2.0 was not found on your system."
- echo "*** Please install glib-2.0 (atleast version 2.16.0) or adjust"
+ echo "*** Please install glib-2.0 (atleast version 2.42.0) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -14749,9 +15147,9 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-2 >= 0.11.0" >&5
-$as_echo_n "checking for exo-2 >= 0.11.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=0.11.0" "exo-2" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-2 >= 0.12.0" >&5
+$as_echo_n "checking for exo-2 >= 0.12.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=0.12.0" "exo-2" >/dev/null 2>&1; then
EXO_VERSION=`$PKG_CONFIG --modversion "exo-2"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_VERSION" >&5
$as_echo "$EXO_VERSION" >&6; }
@@ -14768,7 +15166,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_LIBS" >&5
$as_echo "$EXO_LIBS" >&6; }
- EXO_REQUIRED_VERSION=0.11.0
+ EXO_REQUIRED_VERSION=0.12.0
@@ -14784,7 +15182,7 @@
echo "*** The required package exo-2 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade exo-2 to atleast version 0.11.0, or adjust"
+ echo "*** Please upgrade exo-2 to atleast version 0.12.0, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -14796,7 +15194,7 @@
echo "*** The required package exo-2 was not found on your system."
- echo "*** Please install exo-2 (atleast version 0.11.0) or adjust"
+ echo "*** Please install exo-2 (atleast version 0.12.0) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -17526,7 +17924,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-screenshooter $as_me 1.9.4, which was
+This file was extended by xfce4-screenshooter $as_me 1.9.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17592,7 +17990,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xfce4-screenshooter config.status 1.9.4
+xfce4-screenshooter config.status 1.9.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/configure.ac
new/xfce4-screenshooter-1.9.5/configure.ac
--- old/xfce4-screenshooter-1.9.4/configure.ac 2019-03-09 03:26:29.000000000
+0100
+++ new/xfce4-screenshooter-1.9.5/configure.ac 2019-03-30 22:07:47.000000000
+0100
@@ -10,9 +10,9 @@
m4_define([xfce4_screenshooter_version_major], [1])
m4_define([xfce4_screenshooter_version_minor], [9])
-m4_define([xfce4_screenshooter_version_micro], [4])
+m4_define([xfce4_screenshooter_version_micro], [5])
m4_define([xfce4_screenshooter_version_nano], []) dnl leave this empty to
have no nano version
-m4_define([xfce4_screenshooter_version_build], [ed66632])
+m4_define([xfce4_screenshooter_version_build], [37a344f])
m4_define([xfce4_screenshooter_version_tag], [])
m4_define([xfce4_screenshooter_version],
[xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(),
[], [],
[.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(),
[git], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()],
[xfce4_screenshooter_version_tag()])])
@@ -51,14 +51,16 @@
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0])
+XDT_CHECK_PACKAGE([GDK], [gdk-3.0], [3.22.0])
+XDT_CHECK_PACKAGE([GDKX11], [gdk-x11-3.0], [3.22.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
XDT_CHECK_PACKAGE([SOUP], [libsoup-2.4], [2.26.0])
XDT_CHECK_PACKAGE([LIBXML], [libxml-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.0])
+XDT_CHECK_PACKAGE([EXO], [exo-2], [0.12.0])
XDT_CHECK_PACKAGE([LIBXEXT], [xext], [1.0.0])
XDT_CHECK_OPTIONAL_PACKAGE([XFIXES], [xfixes], [4.0.0], [xfixes], [XFIXES
extension support])
XDT_CHECK_LIBX11()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-screenshooter-1.9.4/lib/screenshooter-capture.c
new/xfce4-screenshooter-1.9.5/lib/screenshooter-capture.c
--- old/xfce4-screenshooter-1.9.4/lib/screenshooter-capture.c 2019-03-09
03:15:24.000000000 +0100
+++ new/xfce4-screenshooter-1.9.5/lib/screenshooter-capture.c 2019-03-17
17:58:53.000000000 +0100
@@ -18,6 +18,7 @@
*/
#include "screenshooter-capture.h"
+#include "screenshooter-utils.h"
#define BACKGROUND_TRANSPARENCY 0.4
@@ -61,11 +62,6 @@
/* Prototypes */
-
-
-static GdkWindow *get_active_window (GdkScreen
*screen,
- gboolean
*needs_unref,
- gboolean
*border);
static void free_pixmap_data (guchar *pixels,
gpointer data);
static GdkPixbuf *get_cursor_pixbuf (GdkDisplay
*display,
@@ -107,64 +103,6 @@
-static GdkWindow
-*get_active_window (GdkScreen *screen,
- gboolean *needs_unref,
- gboolean *border)
-{
- GdkWindow *window, *window2;
-
- TRACE ("Get the active window");
-
- window = gdk_screen_get_active_window (screen);
-
- /* If there is no active window, we fallback to the whole screen. */
- if (G_UNLIKELY (window == NULL))
- {
- TRACE ("No active window, fallback to the root window");
-
- window = gdk_get_default_root_window ();
- *needs_unref = FALSE;
- *border = FALSE;
- }
- else if (G_UNLIKELY (gdk_window_is_destroyed (window)))
- {
- TRACE ("The active window is destroyed, fallback to the root window.");
-
- g_object_unref (window);
- window = gdk_get_default_root_window ();
- *needs_unref = FALSE;
- *border = FALSE;
- }
- else if (gdk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_DESKTOP)
- {
- /* If the active window is the desktop, grab the whole screen */
- TRACE ("The active window is the desktop, fallback to the root window");
-
- g_object_unref (window);
-
- window = gdk_get_default_root_window ();
- *needs_unref = FALSE;
- *border = FALSE;
- }
- else
- {
- /* Else we find the toplevel window to grab the decorations. */
- TRACE ("Active window is a normal window, grab the toplevel window");
-
- window2 = gdk_window_get_toplevel (window);
-
- g_object_unref (window);
-
- window = window2;
- *border = TRUE;
- }
-
- return window;
-}
-
-
-
static Window
find_wm_window (Window xid)
{
@@ -306,6 +244,7 @@
gint scale;
GdkRectangle rectangle;
+ GdkRectangle screen_geometry;
/* Get the root window */
TRACE ("Get the root window");
@@ -314,9 +253,9 @@
if (border)
{
- Window xwindow = GDK_WINDOW_XID (window);
+ Window xwindow = GDK_WINDOW_XID (window);
window = gdk_x11_window_foreign_new_for_display (gdk_window_get_display
(window),
- find_wm_window
(xwindow));
+ find_wm_window
(xwindow));
}
scale = gdk_window_get_scale_factor (window);
@@ -334,6 +273,8 @@
width = rectangle.width;
height = rectangle.height;
+ screenshooter_get_screen_geometry (&screen_geometry);
+
if (x_orig < 0)
{
width = width + x_orig;
@@ -346,11 +287,11 @@
y_orig = 0;
}
- if (x_orig + width > gdk_screen_width ())
- width = gdk_screen_width () - x_orig;
+ if (x_orig + width > screen_geometry.width)
+ width = screen_geometry.width - x_orig;
- if (y_orig + height > gdk_screen_height ())
- height = gdk_screen_height () - y_orig;
+ if (y_orig + height > screen_geometry.height)
+ height = screen_geometry.height - y_orig;
/* Capture the screenshot from the root GdkWindow, to grab things such as
* menus. */
@@ -421,11 +362,11 @@
rec_y = 0;
}
- if (x_orig + rec_x + rec_width > gdk_screen_width () * scale)
- rec_width = gdk_screen_width () * scale - x_orig - rec_x;
+ if (x_orig + rec_x + rec_width > screen_geometry.width * scale)
+ rec_width = screen_geometry.width * scale - x_orig - rec_x;
- if (y_orig + rec_y + rec_height > gdk_screen_height () * scale)
- rec_height = gdk_screen_height () * scale - y_orig - rec_y;
+ if (y_orig + rec_y + rec_height > screen_geometry.height * scale)
+ rec_height = screen_geometry.height * scale - y_orig - rec_y;
for (y = rec_y; y < rec_y + rec_height; y++)
{
@@ -927,6 +868,7 @@
GdkSeat *seat;
GdkCursor *xhair_cursor;
GdkDisplay *display;
+ GdkRectangle screen_geometry;
/* Initialize the rubber band data */
rbdata.left_pressed = FALSE;
@@ -970,10 +912,12 @@
display = gdk_display_get_default ();
gtk_widget_realize (window);
xhair_cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
+
+ screenshooter_get_screen_geometry (&screen_geometry);
+
gdk_window_set_override_redirect (gtk_widget_get_window (window), TRUE);
gtk_widget_set_size_request (window,
- gdk_screen_get_width (gdk_screen_get_default
()),
- gdk_screen_get_height (gdk_screen_get_default
()));
+ screen_geometry.width, screen_geometry.height);
gdk_window_raise (gtk_widget_get_window (window));
gtk_widget_show_now (window);
gtk_widget_grab_focus (window);
@@ -1423,7 +1367,9 @@
display = gdk_display_get_default ();
gdk_display_sync (display);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_window_process_all_updates ();
+G_GNUC_END_IGNORE_DEPRECATIONS
/* Get the window/desktop we want to screenshot*/
if (region == FULLSCREEN)
@@ -1438,7 +1384,7 @@
{
TRACE ("We grab the active window");
- window = get_active_window (screen, &needs_unref, &border);
+ window = screenshooter_get_active_window (screen, &needs_unref, &border);
}
if (region == FULLSCREEN || region == ACTIVE_WINDOW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/lib/screenshooter-utils.c
new/xfce4-screenshooter-1.9.5/lib/screenshooter-utils.c
--- old/xfce4-screenshooter-1.9.4/lib/screenshooter-utils.c 2019-03-09
03:15:24.000000000 +0100
+++ new/xfce4-screenshooter-1.9.5/lib/screenshooter-utils.c 2019-03-17
18:01:48.000000000 +0100
@@ -17,10 +17,70 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
#include "screenshooter-utils.h"
#include <libxfce4ui/libxfce4ui.h>
+
+/* Internals */
+
+
+
+/* Replacement for gdk_screen_get_active_window */
+static Window
+get_active_window_from_xlib (void)
+{
+ GdkDisplay *display;
+ Display *dsp;
+ Atom active_win, type;
+ int status, format;
+ unsigned long n_items, bytes_after;
+ unsigned char *prop;
+ Window window;
+
+ display = gdk_display_get_default ();
+ dsp = gdk_x11_display_get_xdisplay (display);
+
+ active_win = XInternAtom (dsp, "_NET_ACTIVE_WINDOW", True);
+ if (active_win == None)
+ return None;
+
+ gdk_x11_display_error_trap_push (display);
+
+ status = XGetWindowProperty (dsp, DefaultRootWindow (dsp),
+ active_win, 0, G_MAXLONG, False,
+ XA_WINDOW, &type, &format, &n_items,
+ &bytes_after, &prop);
+
+ if (status != Success || type != XA_WINDOW)
+ {
+ if (prop)
+ XFree (prop);
+
+ gdk_x11_display_error_trap_pop_ignored (display);
+ return None;
+ }
+
+ if (gdk_x11_display_error_trap_pop (display) != Success)
+ {
+ if (prop)
+ XFree (prop);
+
+ return None;
+ }
+
+ window = *(Window *) prop;
+ XFree (prop);
+ return window;
+}
+
+
+
/* Public */
@@ -258,21 +318,6 @@
-gchar *rot13 (gchar *string)
-{
- gchar *result = string;
-
- for (; *string; string++)
- if (*string >= 'a' && *string <= 'z')
- *string = (*string - 'a' + 13) % 26 + 'a';
- else if (*string >= 'A' && *string <= 'Z')
- *string = (*string - 'A' + 13) % 26 + 'A';
-
- return result;
-}
-
-
-
/**
* screenshooter_error:
* @format: printf()-style format string
@@ -346,3 +391,98 @@
return FALSE;
}
+
+
+
+/* Replacement for gdk_screen_width/gdk_screen_height */
+void
+screenshooter_get_screen_geometry (GdkRectangle *geometry)
+{
+ GdkDisplay *display = gdk_display_get_default ();
+ int num_monitors = gdk_display_get_n_monitors (display);
+
+ gint x, y, w, h;
+
+ x = y = G_MAXINT;
+ w = h = G_MININT;
+
+ for (int i = 0; i < num_monitors; i++)
+ {
+ GdkRectangle rect;
+ GdkMonitor *monitor = gdk_display_get_monitor (display, i);
+ gdk_monitor_get_geometry (monitor, &rect);
+
+ x = MIN (x, rect.x);
+ y = MIN (y, rect.y);
+ w = MAX (w, rect.x + rect.width);
+ h = MAX (h, rect.y + rect.height);
+ }
+
+ geometry->width = w - x;
+ geometry->height = h - y;
+}
+
+
+
+GdkWindow*
+screenshooter_get_active_window (GdkScreen *screen,
+ gboolean *needs_unref,
+ gboolean *border)
+{
+ GdkWindow *window, *window2;
+ Window xwindow;
+ GdkDisplay *display;
+
+ TRACE ("Get the active window");
+
+ display = gdk_display_get_default ();
+ xwindow = get_active_window_from_xlib ();
+ if (xwindow != None)
+ window = gdk_x11_window_foreign_new_for_display (display, xwindow);
+ else
+ window = NULL;
+
+ /* If there is no active window, we fallback to the whole screen. */
+ if (G_UNLIKELY (window == NULL))
+ {
+ TRACE ("No active window, fallback to the root window");
+
+ window = gdk_get_default_root_window ();
+ *needs_unref = FALSE;
+ *border = FALSE;
+ }
+ else if (G_UNLIKELY (gdk_window_is_destroyed (window)))
+ {
+ TRACE ("The active window is destroyed, fallback to the root window.");
+
+ g_object_unref (window);
+ window = gdk_get_default_root_window ();
+ *needs_unref = FALSE;
+ *border = FALSE;
+ }
+ else if (gdk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_DESKTOP)
+ {
+ /* If the active window is the desktop, grab the whole screen */
+ TRACE ("The active window is the desktop, fallback to the root window");
+
+ g_object_unref (window);
+
+ window = gdk_get_default_root_window ();
+ *needs_unref = FALSE;
+ *border = FALSE;
+ }
+ else
+ {
+ /* Else we find the toplevel window to grab the decorations. */
+ TRACE ("Active window is a normal window, grab the toplevel window");
+
+ window2 = gdk_window_get_toplevel (window);
+
+ g_object_unref (window);
+
+ window = window2;
+ *border = TRUE;
+ }
+
+ return window;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/lib/screenshooter-utils.h
new/xfce4-screenshooter-1.9.5/lib/screenshooter-utils.h
--- old/xfce4-screenshooter-1.9.4/lib/screenshooter-utils.h 2019-03-09
03:15:24.000000000 +0100
+++ new/xfce4-screenshooter-1.9.5/lib/screenshooter-utils.h 2019-03-17
18:00:07.000000000 +0100
@@ -36,24 +36,27 @@
-void screenshooter_copy_to_clipboard (GdkPixbuf *screenshot);
-void screenshooter_read_rc_file (const gchar *file,
- ScreenshotData *sd);
-void screenshooter_write_rc_file (const gchar *file,
- ScreenshotData *sd);
-void screenshooter_open_screenshot (const gchar *screenshot_path,
- const gchar *application,
- GAppInfo *app_info);
-gchar *screenshooter_get_home_uri (void);
-gchar *screenshooter_get_xdg_image_dir_uri (void);
-gboolean screenshooter_is_remote_uri (const gchar *uri);
-gchar *rot13 (gchar *string);
-void screenshooter_error (const gchar *format,
- ...);
-gchar *screenshooter_get_datetime (const gchar *format);
-void screenshooter_open_help (GtkWindow *parent);
-gboolean screenshooter_f1_key (GtkWidget *widget,
- GdkEventKey *event,
- gpointer user_data);
+void screenshooter_copy_to_clipboard (GdkPixbuf *screenshot);
+void screenshooter_read_rc_file (const gchar *file,
+ ScreenshotData *sd);
+void screenshooter_write_rc_file (const gchar *file,
+ ScreenshotData *sd);
+void screenshooter_open_screenshot (const gchar
*screenshot_path,
+ const gchar *application,
+ GAppInfo *app_info);
+gchar *screenshooter_get_home_uri (void);
+gchar *screenshooter_get_xdg_image_dir_uri (void);
+gboolean screenshooter_is_remote_uri (const gchar *uri);
+void screenshooter_error (const gchar *format,
+ ...);
+gchar *screenshooter_get_datetime (const gchar *format);
+void screenshooter_open_help (GtkWindow *parent);
+gboolean screenshooter_f1_key (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data);
+void screenshooter_get_screen_geometry (GdkRectangle *geometry);
+GdkWindow *screenshooter_get_active_window (GdkScreen *screen,
+ gboolean *needs_unref,
+ gboolean *border);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-screenshooter-1.9.4/panel-plugin/screenshooter-plugin.c
new/xfce4-screenshooter-1.9.5/panel-plugin/screenshooter-plugin.c
--- old/xfce4-screenshooter-1.9.4/panel-plugin/screenshooter-plugin.c
2019-03-06 17:24:44.000000000 +0100
+++ new/xfce4-screenshooter-1.9.5/panel-plugin/screenshooter-plugin.c
2019-03-26 02:04:56.000000000 +0100
@@ -356,6 +356,7 @@
PluginData *pd = g_new0 (PluginData, 1);
ScreenshotData *sd = g_new0 (ScreenshotData, 1);
sd->app_info = NULL;
+ sd->path_is_dir = TRUE;
pd->sd = sd;
pd->plugin = plugin;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-screenshooter-1.9.4/xfce4-screenshooter.1
new/xfce4-screenshooter-1.9.5/xfce4-screenshooter.1
--- old/xfce4-screenshooter-1.9.4/xfce4-screenshooter.1 2019-03-09
03:26:44.000000000 +0100
+++ new/xfce4-screenshooter-1.9.5/xfce4-screenshooter.1 2019-03-30
22:08:05.000000000 +0100
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8.
-.TH XFCE4-SCREENSHOOTER "1" "March 2019" "xfce4-screenshooter 1.9.4" "User
Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10.
+.TH XFCE4-SCREENSHOOTER "1" "March 2019" "xfce4-screenshooter 1.9.5" "User
Commands"
.SH NAME
-xfce4-screenshooter \- manual page for xfce4-screenshooter 1.9.4
+xfce4-screenshooter \- manual page for xfce4-screenshooter 1.9.5
.SH DESCRIPTION
.SS "Usage:"
.IP
