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

Accepting request 82333 from home:vuntz:branches:GNOME:Factory

Browse Source 
Update to 3.1.90

OBS-URL: https://build.opensuse.org/request/show/82333
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=58
This commit is contained in:
Vincent Untz 2011-09-18 08:30:10 +00:00 committed by Git OBS Bridge
parent 1b1373a7de
commit 314fa0097e
5 changed files with 72 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk+-3.1.18.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e6f1afcdf87932cb3fb78f65b9459b3e5bae44481d8c9f0ca3be9c388c0ad975
size 17397213

3
gtk+-3.1.90.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed4e36693e8b05c75fe1a843341c032518dd9ab726d4f62d31d52ccdc800c44a
size 16882913

62
gtk3-bnc129753-localize-font-style-name.patch
View File

@ -1,21 +1,34 @@
Index: gtk+-2.19.0/gtk/gtkfontbutton.c Index: gtk+-3.1.90/gtk/gtkfontbutton.c
=================================================================== ===================================================================
--- gtk+-2.19.0.orig/gtk/gtkfontbutton.c --- gtk+-3.1.90.orig/gtk/gtkfontbutton.c
+++ gtk+-2.19.0/gtk/gtkfontbutton.c +++ gtk+-3.1.90/gtk/gtkfontbutton.c
@@ -893,7 +893,7 @@ gtk_font_button_update_font_info (GtkFon @@ -1175,7 +1175,7 @@ gtk_font_button_update_font_info (GtkFon
if (style == NULL || !g_ascii_strcasecmp (style, "Regular")) {
family_style = g_strdup (family); family_style = g_strdup_printf ("%s %s",
else pango_font_family_get_name (priv->font_family),
- family_style = g_strdup_printf ("%s %s", family, style); - pango_font_face_get_face_name (priv->font_face));
+ family_style = g_strdup_printf ("%s %s", family, _(style)); + _(pango_font_face_get_face_name (priv->font_face)));
gtk_label_set_text (GTK_LABEL (font_button->priv->font_label), family_style);
Index: gtk+-2.19.0/gtk/gtkfontsel.c }
Index: gtk+-3.1.90/gtk/gtkfontchooserwidget.c
=================================================================== ===================================================================
--- gtk+-2.19.0.orig/gtk/gtkfontsel.c --- gtk+-3.1.90.orig/gtk/gtkfontchooserwidget.c
+++ gtk+-2.19.0/gtk/gtkfontsel.c +++ gtk+-3.1.90/gtk/gtkfontchooserwidget.c
@@ -76,6 +76,21 @@ @@ -767,7 +767,7 @@ populate_list (GtkFontChooserWidget *fon
continue;
pango_desc = pango_font_face_describe (faces[j]);
- face_name = pango_font_face_get_face_name (faces[j]);
+ face_name = _(pango_font_face_get_face_name (faces[j]));
font_desc = pango_font_description_to_string (pango_desc);
family_and_face = g_strconcat (fam_name, " ", face_name, NULL);
Index: gtk+-3.1.90/gtk/gtkfontsel.c
===================================================================
--- gtk+-3.1.90.orig/gtk/gtkfontsel.c
+++ gtk+-3.1.90/gtk/gtkfontsel.c
@@ -126,6 +126,21 @@ struct _GtkFontSelectionDialogPrivate
#define DEFAULT_FONT_NAME "Sans 10" #define DEFAULT_FONT_NAME "Sans 10"
@ -37,12 +50,21 @@ Index: gtk+-2.19.0/gtk/gtkfontsel.c
/* This is the initial and maximum height of the preview entry (it expands /* This is the initial and maximum height of the preview entry (it expands
when large font sizes are selected). Initial height is also the minimum. */ when large font sizes are selected). Initial height is also the minimum. */
#define INITIAL_PREVIEW_HEIGHT 44 #define INITIAL_PREVIEW_HEIGHT 44
@@ -869,7 +884,7 @@ gtk_font_selection_show_available_styles @@ -982,7 +997,7 @@ gtk_font_selection_show_available_styles
for (i=0; i < n_faces; i++)
{
GtkTreeIter iter;
- const gchar *str = pango_font_face_get_face_name (faces[i]);
+ const gchar *str = _(pango_font_face_get_face_name (faces[i]));
gtk_list_store_append (model, &iter); gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, gtk_list_store_set (model, &iter,
FACE_COLUMN, faces[i], @@ -1016,7 +1031,7 @@ gtk_font_selection_show_available_styles
- FACE_NAME_COLUMN, str, if (match_face)
+ FACE_NAME_COLUMN, _(str), {
-1); #ifdef INCLUDE_FONT_ENTRIES
- const gchar *str = pango_font_face_get_face_name (priv->face);
+ const gchar *str = _(pango_font_face_get_face_name (priv->face));
if (i == 0) gtk_entry_set_text (GTK_ENTRY (priv->font_style_entry), str);
#endif

24
gtk3.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Wed Sep 14 07:29:20 UTC 2011 - vuntz@opensuse.org
- Update to version 3.1.90:
+ GtkAppChooserButton: A new function has been added that makes
it possible to have the button select the default app (as
opposed to the most-recently-used app).
+ A lot of feedback on the the tree model refactoring has been
incorporated via new test cases and bug fixes
+ The filechooser search has been ported to tracker 0.12 and is
using the tracker DBus API directly now.
+ The new fontchooser API has been reworked a bit to make it
follow the same pattern we use else where. GtkFontChooser is
now an interface that is implemented by GtkFontChooserButton,
GtkFontChooserDialog and GtkFontChooserWidget (to which the
original GtkFontChooser has been renamed).
+ Bugs fixed: bgo#514843, bgo#617583, bgo#642706, bgo#657353,
bgo#657627, bgo#658272, bgo#658379, bgo#658398, bgo#658507,
bgo#658600, bgo#658696, bgo#658774.
+ Updated translations.
- Update gtk3-bnc129753-localize-font-style-name.patch: rebase the
patch, and localize font style names in new font-related widgets
too.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 6 09:13:56 UTC 2011 - vuntz@opensuse.org Tue Sep 6 09:13:56 UTC 2011 - vuntz@opensuse.org

4
gtk3.spec
View File

@ -24,7 +24,7 @@
Name: gtk3 Name: gtk3
%define _name gtk+ %define _name gtk+
Version: 3.1.18 Version: 3.1.90
Release: 1 Release: 1
License: LGPLv2.1+ License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 3) Summary: The GTK+ toolkit library (version 3)
@ -39,7 +39,7 @@ Source99: baselibs.conf
Patch0: gtk3-GTK_PATH64.patch Patch0: gtk3-GTK_PATH64.patch
# PATCH-FIX-OPENSUSE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 # PATCH-FIX-OPENSUSE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
Patch1: gtk3-path-local.patch Patch1: gtk3-path-local.patch
# PATCH-FEATURE-UPSTREAM gtk3-bnc129753-localize-font-style-name.patch bnc129753 bgo319484 mfabian@novell.com - Translate the font styles in the GUI # PATCH-FEATURE-UPSTREAM gtk3-bnc129753-localize-font-style-name.patch bnc129753 bgo#319484 bgo#95731 bgo#123498 mfabian@novell.com - Translate the font styles in the GUI
Patch2: gtk3-bnc129753-localize-font-style-name.patch Patch2: gtk3-bnc129753-localize-font-style-name.patch
# 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