Accepting request 382893 from home:Dremor:branches:GNOME:Factory

Forgot to change the patch name in changes file.

OBS-URL: https://build.opensuse.org/request/show/382893
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=225
This commit is contained in:
Bjørn Lie 2016-04-01 18:39:31 +00:00 committed by Git OBS Bridge
parent 6698e04219
commit 51e79e06c6
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,28 @@
@@ -, +, @@
required
gtk/gtkwindow.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--- a/gtk/gtkwindow.c
+++ a/gtk/gtkwindow.c
@@ -10036,14 +10036,16 @@ gtk_window_update_fixed_size (GtkWindow *window,
if (info->default_width > -1)
{
- new_geometry->min_width = MAX (default_width_csd, new_width);
- new_geometry->max_width = new_geometry->min_width;
+ gint w = MAX (MAX (default_width_csd, new_width), new_geometry->min_width);
+ new_geometry->min_width = w;
+ new_geometry->max_width = w;
}
if (info->default_height > -1)
{
- new_geometry->min_height = MAX (default_height_csd, new_height);
- new_geometry->max_height = new_geometry->min_height;
+ gint h = MAX (MAX (default_height_csd, new_height), new_geometry->min_height);
+ new_geometry->min_height = h;
+ new_geometry->max_height = h;
}
}
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 1 08:30:39 UTC 2016 - egeorget@openmailbox.org
- Add "gtk3-bgo764174-boo973416-no-undersize.patch":
+ Bug fixed : bgo#764174, boo#973416.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 31 09:09:21 UTC 2016 - zaitor@opensuse.org Thu Mar 31 09:09:21 UTC 2016 - zaitor@opensuse.org

View File

@ -47,6 +47,7 @@ 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-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 # 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 Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch
Patch4: gtk3-bgo764174-boo973416-no-undersize.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes BuildRequires: fdupes
@ -339,6 +340,7 @@ cp -a %{S:1} .
%patch1 -p0 %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. ## 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 #%%patch3 -p1
%patch4 -p1
%build %build
# Needed for patch1 # Needed for patch1