Hello community, here is the log from the commit of package xfdesktop for openSUSE:Factory checked in at 2019-05-16 22:08:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfdesktop (Old) and /work/SRC/openSUSE:Factory/.xfdesktop.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfdesktop" Thu May 16 22:08:32 2019 rev:37 rq:703177 version:4.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/xfdesktop/xfdesktop.changes 2018-06-20 15:26:07.457466014 +0200 +++ /work/SRC/openSUSE:Factory/.xfdesktop.new.5148/xfdesktop.changes 2019-05-16 22:08:32.846364014 +0200 @@ -1,0 +2,5 @@ +Wed May 8 02:03:26 UTC 2019 - Maurizio Galli <[email protected]> + +- Added wallpaper-scaling.patch. Fixes boo#1134125 + +------------------------------------------------------------------- New: ---- wallpaper-scaling.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfdesktop.spec ++++++ --- /var/tmp/diff_new_pack.XtZzMD/_old 2019-05-16 22:08:34.174362807 +0200 +++ /var/tmp/diff_new_pack.XtZzMD/_new 2019-05-16 22:08:34.174362807 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfdesktop # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -30,12 +30,14 @@ Patch1: xfdesktop-default-background-image.patch # PATCH-FIX-UPSTREAM 0001-Use-the-new-Thunarx-3-API.patch [email protected] -- backport from 4.13 for thunarx-3 Patch2: 0001-Use-the-new-Thunarx-3-API.patch +# PATCH-FIX-UPSTREAM wallpaper-scaling.patch [email protected] -- fixes wallpaper failing to scale if image contains EXIF markup for rotation (boo#1134125) +Patch3: wallpaper-scaling.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(exo-1) >= 0.7.0 +BuildRequires: pkgconfig(exo-2) BuildRequires: pkgconfig(garcon-1) >= 0.1.2 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -83,10 +85,7 @@ %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build xdt-autogen ++++++ wallpaper-scaling.patch ++++++ Fixes boo#1134125 Wallpaper scaling fails if image contains EXIF markup for rotation =================================================================== diff -rub a/src/xfce-backdrop.c b/src/xfce-backdrop.c --- a/src/xfce-backdrop.c 2017-06-26 21:48:02.000000000 +0800 +++ b/src/xfce-backdrop.c 2019-05-07 11:43:37.000000000 +0800 @@ -1749,6 +1749,7 @@ gint dx, dy, xo, yo; gdouble xscale, yscale; GdkInterpType interp; + gboolean rotated = FALSE; TRACE("entering"); @@ -1763,6 +1764,8 @@ image = gdk_pixbuf_loader_get_pixbuf(loader); if(image) { + gint iw_orig = gdk_pixbuf_get_width(image); + /* If the image is supposed to be rotated, do that now */ GdkPixbuf *temp = gdk_pixbuf_apply_embedded_orientation (image); /* Do not unref image, gdk_pixbuf_loader_get_pixbuf is transfer none */ @@ -1770,6 +1773,8 @@ iw = gdk_pixbuf_get_width(image); ih = gdk_pixbuf_get_height(image); + + rotated = (iw_orig != iw); } if(backdrop->priv->width == 0 || backdrop->priv->height == 0) { @@ -1878,7 +1883,9 @@ dy = yo; gdk_pixbuf_composite(image, final_image, dx, dy, - iw * xscale, ih * yscale, xo, yo, 1, 1, + iw * xscale, ih * yscale, xo, yo, + rotated ? xscale : 1, + rotated ? yscale : 1, interp, 255); break;
