[Pkg-xfce-commits] [Git][xfce-team/goodies/xfce4-screenshooter][debian/master] 3 commits: New upstream version 1.10.3.
Unit 193 (@unit193)
gitlab at salsa.debian.org
Tue Jan 17 07:44:59 GMT 2023
Unit 193 pushed to branch debian/master at xfce / goodies / xfce4-screenshooter
Commits:
6a0e360f by Unit 193 at 2023-01-17T02:39:36-05:00
New upstream version 1.10.3.
- - - - -
b5c4185d by Unit 193 at 2023-01-17T02:39:39-05:00
Update upstream source from tag 'upstream/1.10.3'
Update to upstream version '1.10.3'
with Debian dir 5bf71ef72d98c36aa641beeccf79ad51c67efd0b
- - - - -
46ddc8ae by Unit 193 at 2023-01-17T02:40:26-05:00
Update changelog for release.
- - - - -
8 changed files:
- ChangeLog
- NEWS
- configure
- configure.ac
- debian/changelog
- lib/screenshooter-capture.c
- lib/screenshooter-utils.c
- lib/screenshooter-utils.h
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,29 @@
+commit debc98a2047624d0524d6b1c49f5321b8fdcb135
+Author: Andre Miranda <andreldm at xfce.org>
+Date: Thu Jan 12 23:57:30 2023 +0100
+
+ Lower minimal Xfce dependecies back to 4.16
+
+ It allows 4.16 users to benefit from a recent critical bug fix.
+
+commit bf5b24a07b9b917c75f5084331bb5b074e078877
+Author: Andre Miranda <andreldm at xfce.org>
+Date: Mon Jan 2 19:23:05 2023 +0100
+
+ Remove fallback code
+
+commit 7013361520d616aced379b9b527f8c72a4e8e127
+Author: Andre Miranda <andreldm at xfce.org>
+Date: Mon Jan 2 19:17:54 2023 +0100
+
+ Back to development
+
+commit b2209a8ef61b96ffbb1674709a91aba509e39e64
+Author: Andre Miranda <andreldm at xfce.org>
+Date: Mon Jan 2 19:12:37 2023 +0100
+
+ Updates for release
+
commit f0cd19584418f32522a1faa387e4bb2770b4368d
Author: Andre Miranda <andreldm at xfce.org>
Date: Sun Jan 1 22:59:02 2023 +0100
=====================================
NEWS
=====================================
@@ -1,3 +1,9 @@
+1.10.3 (2023-01-12)
+======
+- Lower minimal Xfce dependecies back to 4.16
+- Remove fallback code
+
+
1.10.2 (2023-01-02)
======
- Fix capture of CSD windows
=====================================
configure
=====================================
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xfce4-screenshooter 1.10.2.
+# Generated by GNU Autoconf 2.71 for xfce4-screenshooter 1.10.3.
#
# Report bugs to <https://gitlab.xfce.org/apps/xfce4-screenshooter>.
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-screenshooter'
PACKAGE_TARNAME='xfce4-screenshooter'
-PACKAGE_VERSION='1.10.2'
-PACKAGE_STRING='xfce4-screenshooter 1.10.2'
+PACKAGE_VERSION='1.10.3'
+PACKAGE_STRING='xfce4-screenshooter 1.10.3'
PACKAGE_BUGREPORT='https://gitlab.xfce.org/apps/xfce4-screenshooter'
PACKAGE_URL=''
@@ -1487,7 +1487,7 @@ if test "$ac_init_help" = "long"; then
# 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.10.2 to adapt to many kinds of systems.
+\`configure' configures xfce4-screenshooter 1.10.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1563,7 +1563,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-screenshooter 1.10.2:";;
+ short | recursive ) echo "Configuration of xfce4-screenshooter 1.10.3:";;
esac
cat <<\_ACEOF
@@ -1696,7 +1696,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-screenshooter configure 1.10.2
+xfce4-screenshooter configure 1.10.3
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
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.10.2, which was
+It was created by xfce4-screenshooter $as_me 1.10.3, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3222,7 +3222,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-screenshooter'
- VERSION='1.10.2'
+ VERSION='1.10.3'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -13737,9 +13737,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-2.0 >= 4.18.0" >&5
-printf %s "checking for libxfce4panel-2.0 >= 4.18.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=4.18.0" "libxfce4panel-2.0" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-2.0 >= 4.16.0" >&5
+printf %s "checking for libxfce4panel-2.0 >= 4.16.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=4.16.0" "libxfce4panel-2.0" >/dev/null 2>&1; then
LIBXFCE4PANEL_VERSION=`$PKG_CONFIG --modversion "libxfce4panel-2.0"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_VERSION" >&5
printf "%s\n" "$LIBXFCE4PANEL_VERSION" >&6; }
@@ -13756,7 +13756,7 @@ printf %s "checking LIBXFCE4PANEL_LIBS... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_LIBS" >&5
printf "%s\n" "$LIBXFCE4PANEL_LIBS" >&6; }
- LIBXFCE4PANEL_REQUIRED_VERSION=4.18.0
+ LIBXFCE4PANEL_REQUIRED_VERSION=4.16.0
@@ -13780,7 +13780,7 @@ printf "%s\n" "found, but $xdt_cv_version" >&6; }
echo "*** The required package libxfce4panel-2.0 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade libxfce4panel-2.0 to atleast version 4.18.0, or adjust"
+ echo "*** Please upgrade libxfce4panel-2.0 to atleast version 4.16.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."
@@ -13792,7 +13792,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package libxfce4panel-2.0 was not found on your system."
- echo "*** Please install libxfce4panel-2.0 (atleast version 4.18.0) or adjust"
+ echo "*** Please install libxfce4panel-2.0 (atleast version 4.16.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."
@@ -13950,9 +13950,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.18.0" >&5
-printf %s "checking for libxfce4util-1.0 >= 4.18.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=4.18.0" "libxfce4util-1.0" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.16.0" >&5
+printf %s "checking for libxfce4util-1.0 >= 4.16.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=4.16.0" "libxfce4util-1.0" >/dev/null 2>&1; then
LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5
printf "%s\n" "$LIBXFCE4UTIL_VERSION" >&6; }
@@ -13969,7 +13969,7 @@ printf %s "checking LIBXFCE4UTIL_LIBS... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5
printf "%s\n" "$LIBXFCE4UTIL_LIBS" >&6; }
- LIBXFCE4UTIL_REQUIRED_VERSION=4.18.0
+ LIBXFCE4UTIL_REQUIRED_VERSION=4.16.0
@@ -13993,7 +13993,7 @@ printf "%s\n" "found, but $xdt_cv_version" >&6; }
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.18.0, or adjust"
+ echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.16.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."
@@ -14005,7 +14005,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package libxfce4util-1.0 was not found on your system."
- echo "*** Please install libxfce4util-1.0 (atleast version 4.18.0) or adjust"
+ echo "*** Please install libxfce4util-1.0 (atleast version 4.16.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."
@@ -14163,9 +14163,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-2 >= 4.18.0" >&5
-printf %s "checking for libxfce4ui-2 >= 4.18.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=4.18.0" "libxfce4ui-2" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-2 >= 4.16.0" >&5
+printf %s "checking for libxfce4ui-2 >= 4.16.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=4.16.0" "libxfce4ui-2" >/dev/null 2>&1; then
LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-2"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5
printf "%s\n" "$LIBXFCE4UI_VERSION" >&6; }
@@ -14182,7 +14182,7 @@ printf %s "checking LIBXFCE4UI_LIBS... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5
printf "%s\n" "$LIBXFCE4UI_LIBS" >&6; }
- LIBXFCE4UI_REQUIRED_VERSION=4.18.0
+ LIBXFCE4UI_REQUIRED_VERSION=4.16.0
@@ -14206,7 +14206,7 @@ printf "%s\n" "found, but $xdt_cv_version" >&6; }
echo "*** The required package libxfce4ui-2 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade libxfce4ui-2 to atleast version 4.18.0, or adjust"
+ echo "*** Please upgrade libxfce4ui-2 to atleast version 4.16.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."
@@ -14218,7 +14218,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package libxfce4ui-2 was not found on your system."
- echo "*** Please install libxfce4ui-2 (atleast version 4.18.0) or adjust"
+ echo "*** Please install libxfce4ui-2 (atleast version 4.16.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."
@@ -16518,9 +16518,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.18.0" >&5
-printf %s "checking for libxfconf-0 >= 4.18.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=4.18.0" "libxfconf-0" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.16.0" >&5
+printf %s "checking for libxfconf-0 >= 4.16.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=4.16.0" "libxfconf-0" >/dev/null 2>&1; then
XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5
printf "%s\n" "$XFCONF_VERSION" >&6; }
@@ -16537,7 +16537,7 @@ printf %s "checking XFCONF_LIBS... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5
printf "%s\n" "$XFCONF_LIBS" >&6; }
- XFCONF_REQUIRED_VERSION=4.18.0
+ XFCONF_REQUIRED_VERSION=4.16.0
@@ -16561,7 +16561,7 @@ printf "%s\n" "found, but $xdt_cv_version" >&6; }
echo "*** The required package libxfconf-0 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade libxfconf-0 to atleast version 4.18.0, or adjust"
+ echo "*** Please upgrade libxfconf-0 to atleast version 4.16.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."
@@ -16573,7 +16573,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package libxfconf-0 was not found on your system."
- echo "*** Please install libxfconf-0 (atleast version 4.18.0) or adjust"
+ echo "*** Please install libxfconf-0 (atleast version 4.16.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."
@@ -19008,7 +19008,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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.10.2, which was
+This file was extended by xfce4-screenshooter $as_me 1.10.3, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19076,7 +19076,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-xfce4-screenshooter config.status 1.10.2
+xfce4-screenshooter config.status 1.10.3
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
=====================================
configure.ac
=====================================
@@ -10,9 +10,9 @@ dnl
m4_define([xfce4_screenshooter_version_major], [1])
m4_define([xfce4_screenshooter_version_minor], [10])
-m4_define([xfce4_screenshooter_version_micro], [2])
+m4_define([xfce4_screenshooter_version_micro], [3])
m4_define([xfce4_screenshooter_version_nano], []) dnl leave this empty to have no nano version
-m4_define([xfce4_screenshooter_version_build], [f0cd195])
+m4_define([xfce4_screenshooter_version_build], [debc98a])
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()])])
@@ -50,9 +50,9 @@ AC_HEADER_STDC
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.18.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.18.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.18.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.16.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.16.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.16.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.24.0])
XDT_CHECK_PACKAGE([GDK], [gdk-3.0], [3.24.0])
@@ -63,7 +63,7 @@ XDT_CHECK_PACKAGE([EXO], [exo-2], [0.12.0])
XDT_CHECK_PACKAGE([LIBXEXT], [xext], [1.0.0])
XDT_CHECK_PACKAGE([PANGO], [pango], [1.44.0])
XDT_CHECK_PACKAGE([XINPUT2], [xi], [1.7.8])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.18.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.16.0])
XDT_CHECK_OPTIONAL_PACKAGE([XFIXES], [xfixes], [4.0.0], [xfixes], [XFIXES extension support])
XDT_CHECK_LIBX11()
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+xfce4-screenshooter (1.10.3-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version 1.10.3.
+
+ -- Unit 193 <unit193 at debian.org> Tue, 17 Jan 2023 02:40:10 -0500
+
xfce4-screenshooter (1.10.2-1) unstable; urgency=medium
* Team upload.
=====================================
lib/screenshooter-capture.c
=====================================
@@ -335,7 +335,7 @@ static GdkPixbuf
root = gdk_get_default_root_window ();
- if ((has_extents = screenshooter_get_gtk_frame_extents (window, &extents)))
+ if ((has_extents = xfce_has_gtk_frame_extents (window, &extents)))
border = FALSE;
if (border) {
=====================================
lib/screenshooter-utils.c
=====================================
@@ -580,64 +580,6 @@ screenshooter_get_active_window (GdkScreen *screen,
-gboolean
-screenshooter_get_gtk_frame_extents (GdkWindow *window,
- GtkBorder *extents)
-{
-#if LIBXFCE4UI_CHECK_VERSION (4,16,0)
- return xfce_has_gtk_frame_extents (window, extents);
-#else
- /* Code adapted from gnome-flashback:
- * Copyright (C) 2015-2017 Alberts Muktupāvels
- * https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/f884127
- */
-
- GdkDisplay *display;
- Display *xdisplay;
- Window xwindow;
- Atom gtk_frame_extents;
- Atom type;
- gint format;
- gulong n_items;
- gulong bytes_after;
- guchar *data;
- gint result;
- gulong *borders;
-
- display = gdk_display_get_default ();
- xdisplay = gdk_x11_display_get_xdisplay (display);
- xwindow = gdk_x11_window_get_xid (window);
- gtk_frame_extents = XInternAtom (xdisplay, "_GTK_FRAME_EXTENTS", False);
-
- gdk_x11_display_error_trap_push (display);
- result = XGetWindowProperty (xdisplay, xwindow, gtk_frame_extents,
- 0, G_MAXLONG, False, XA_CARDINAL,
- &type, &format, &n_items, &bytes_after, &data);
- gdk_x11_display_error_trap_pop_ignored (display);
-
- if (data == NULL)
- return FALSE;
-
- if (result != Success || type != XA_CARDINAL || format != 32 || n_items != 4)
- {
- XFree (data);
- return FALSE;
- }
-
- borders = (gulong *) data;
-
- extents->left = borders[0];
- extents->right = borders[1];
- extents->top = borders[2];
- extents->bottom = borders[3];
-
- XFree (data);
- return TRUE;
-#endif
-}
-
-
-
void
screenshooter_show_file_in_folder (const gchar *save_location)
{
=====================================
lib/screenshooter-utils.h
=====================================
@@ -61,8 +61,6 @@ void screenshooter_get_screen_geometry (GdkRectangle *geometry);
GdkWindow *screenshooter_get_active_window (GdkScreen *screen,
gboolean *needs_unref,
gboolean *border);
-gboolean screenshooter_get_gtk_frame_extents (GdkWindow *window,
- GtkBorder *extents);
void screenshooter_show_file_in_folder (const gchar *save_location);
gboolean screenshooter_is_format_supported (const gchar *format);
gboolean screenshooter_is_directory_writable (const gchar *path);
View it on GitLab: https://salsa.debian.org/xfce-team/goodies/xfce4-screenshooter/-/compare/155239f12abc5474d098387b4fec3bd145d0f505...46ddc8ae0e7aacfa43412fc93125789cbb42aaea
--
View it on GitLab: https://salsa.debian.org/xfce-team/goodies/xfce4-screenshooter/-/compare/155239f12abc5474d098387b4fec3bd145d0f505...46ddc8ae0e7aacfa43412fc93125789cbb42aaea
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20230117/9e226098/attachment-0001.htm>
More information about the Pkg-xfce-commits
mailing list