pool/gtk3
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 350887 from home:Zaitor

Browse Source 
Longshot... let it build on obs, as its untested

OBS-URL: https://build.opensuse.org/request/show/350887
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=211
This commit is contained in:
Bjørn Lie 2015-12-29 16:20:26 +00:00 committed by Git OBS Bridge
parent bfd2156612
commit b0062e5271
3 changed files with 99 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
gtk3-gdk_pixbuf_get_from_surface.patch Normal file
View File

@ -0,0 +1,91 @@
From 2cbc2972ea58ec9dae5481fc4930f0cd13f21da9 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 9 Dec 2015 17:48:26 +0100
Subject: gdk_pixbuf_get_from_surface: restore old behavior
A previous commit changed this function to return a pixbuf that is
larger than the passed (width, height) when the surface has a device
scale > 1. It's easy enough to take care of a scaled surface before
calling this function.
Revert to the old behaviour, but change gdk_pixbuf_get_from_window() to
return a scaled version when the underlying surface is scaled. We need
this because there's no other way to get to the unscaled window
contents.
https://bugzilla.gnome.org/show_bug.cgi?id=757147
---
gdk/gdkpixbuf-drawable.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 0647e3c..bae643a 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -56,8 +56,9 @@
* This allows you to efficiently read individual pixels on the client side.
*
* This function will create an RGB pixbuf with 8 bits per channel with
- * the same size specified by the @width and @height arguments. The pixbuf
- * will contain an alpha channel if the @window contains one.
+ * the size specified by the @width and @height arguments scaled by the
+ * scale factor of @window. The pixbuf will contain an alpha channel if
+ * the @window contains one.
*
* If the window is off the screen, then there is no image data in the
* obscured/offscreen regions to be placed in the pixbuf. The contents of
@@ -87,6 +88,8 @@ gdk_pixbuf_get_from_window (GdkWindow *src,
gint height)
{
cairo_surface_t *surface;
+ cairo_surface_t *copy;
+ cairo_t *cr;
GdkPixbuf *dest;
gint scale;
@@ -104,9 +107,22 @@ gdk_pixbuf_get_from_window (GdkWindow *src,
*/
cairo_surface_mark_dirty (surface);
- dest = gdk_pixbuf_get_from_surface (surface,
- scale * src_x, scale * src_y,
- scale * width, scale * height);
+ if (cairo_surface_get_content (surface) & CAIRO_CONTENT_ALPHA)
+ copy = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width * scale, height * scale);
+ else
+ copy = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width * scale, height * scale);
+
+ cairo_surface_set_device_scale (copy, scale, scale);
+
+ cr = cairo_create (copy);
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+ cairo_set_source_surface (cr, surface, -src_x, -src_y);
+ cairo_paint (cr);
+ cairo_destroy (cr);
+
+ dest = gdk_pixbuf_get_from_surface (copy, 0, 0, width * scale, height * scale);
+
+ cairo_surface_destroy (copy);
cairo_surface_destroy (surface);
return dest;
@@ -137,16 +153,11 @@ gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
{
cairo_surface_t *copy;
cairo_t *cr;
- double sx, sy;
-
- cairo_surface_get_device_scale (surface, &sx, &sy);
copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
width,
height);
- cairo_surface_set_device_scale (copy, sx, sy);
-
cr = cairo_create (copy);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_surface (cr, surface, -src_x, -src_y);
--
cgit v0.11.2

5
gtk3.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Dec 26 14:19:15 UTC 2015 - zaitor@opensuse.org
- Add gtk3-gdk_pixbuf_get_from_surface.patch: Restore old behavior.
-------------------------------------------------------------------
Sun Dec 6 11:57:43 UTC 2015 - zaitor@opensuse.org

3
gtk3.spec
View File

@ -47,6 +47,8 @@ Patch1: gtk3-path-local.patch
## PATCH-DISABLED gtk3-bnc130159-bgo319483-async-font-selection.patch - Upstream bug was closed as obsolete in 2011, lets see if anyone complains.
# PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch
# PATCH-FIX-UPSTREAM gtk3-gdk_pixbuf_get_from_surface.patch bgo#757147 zaitor@opensuse.org -- Restore old behavior to return a scaled version when the underlying surface is scaled. From upstream git.
Patch4: gtk3-gdk_pixbuf_get_from_surface.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -338,6 +340,7 @@ cp -a %{S:1} .
%patch1 -p0
## PATCH-DISABLED - Upstream bug was closed as obsolete in 2011, as there was a new fontchooser, lets disable the patch and see if anyone complains.
#%%patch3 -p1
%patch4 -p1
%build
# Needed for patch1