From eff0672c8eaf7a22d542eafc07ed16cc6bf638c954e20f0fff9e1d2ffbe5a2b4 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 27 Sep 2011 11:16:08 +0000 Subject: [PATCH] Accepting request 84805 from home:vuntz:branches:GNOME:Factory Update to 3.2.0 OBS-URL: https://build.opensuse.org/request/show/84805 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=60 --- gtk+-3.1.92.tar.bz2 | 3 - gtk+-3.2.0.tar.bz2 | 3 + gtk3-bnc129753-localize-font-style-name.patch | 70 ------------------- gtk3.changes | 20 ++++++ gtk3.spec | 10 +-- 5 files changed, 25 insertions(+), 81 deletions(-) delete mode 100644 gtk+-3.1.92.tar.bz2 create mode 100644 gtk+-3.2.0.tar.bz2 delete mode 100644 gtk3-bnc129753-localize-font-style-name.patch diff --git a/gtk+-3.1.92.tar.bz2 b/gtk+-3.1.92.tar.bz2 deleted file mode 100644 index c30e46b..0000000 --- a/gtk+-3.1.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e131fd2f3b1a38960d37aaf517c183905e52c255d4f4e028233a2d3bfb81a729 -size 16876130 diff --git a/gtk+-3.2.0.tar.bz2 b/gtk+-3.2.0.tar.bz2 new file mode 100644 index 0000000..0d4aa09 --- /dev/null +++ b/gtk+-3.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b285074ffefb4ff4364f6dd50fe68c7e85b11293e0c1dd3bdeac56052344dadb +size 17435504 diff --git a/gtk3-bnc129753-localize-font-style-name.patch b/gtk3-bnc129753-localize-font-style-name.patch deleted file mode 100644 index 9d1acda..0000000 --- a/gtk3-bnc129753-localize-font-style-name.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: gtk+-3.1.90/gtk/gtkfontbutton.c -=================================================================== ---- gtk+-3.1.90.orig/gtk/gtkfontbutton.c -+++ gtk+-3.1.90/gtk/gtkfontbutton.c -@@ -1175,7 +1175,7 @@ gtk_font_button_update_font_info (GtkFon - { - family_style = g_strdup_printf ("%s %s", - pango_font_family_get_name (priv->font_family), -- pango_font_face_get_face_name (priv->font_face)); -+ _(pango_font_face_get_face_name (priv->font_face))); - - - } -Index: gtk+-3.1.90/gtk/gtkfontchooserwidget.c -=================================================================== ---- gtk+-3.1.90.orig/gtk/gtkfontchooserwidget.c -+++ gtk+-3.1.90/gtk/gtkfontchooserwidget.c -@@ -767,7 +767,7 @@ populate_list (GtkFontChooserWidget *fon - gchar *font_desc; - - 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" - -+/* These are the commonly used font styles, listed here only for -+ translations. */ -+#define FONT_STYLE_ULTRA_LIGHT N_("Ultra-Light") -+#define FONT_STYLE_LIGHT N_("Light") -+#define FONT_STYLE_MEDIUM N_("Medium") -+#define FONT_STYLE_NORMAL N_("Normal") -+#define FONT_STYLE_REGULAR N_("Regular") -+#define FONT_STYLE_ITALIC N_("Italic") -+#define FONT_STYLE_OBLIQUE N_("Oblique") -+#define FONT_STYLE_SEMI_BOLD N_("Semi-Bold") -+#define FONT_STYLE_BOLD N_("Bold") -+#define FONT_STYLE_ULTRA_BOLD N_("Ultra-Bold") -+#define FONT_STYLE_HEAVY N_("Heavy") -+#define FONT_STYLE_BOLD_ITALIC N_("Bold Italic") -+ - /* 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. */ - #define INITIAL_PREVIEW_HEIGHT 44 -@@ -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_set (model, &iter, -@@ -1016,7 +1031,7 @@ gtk_font_selection_show_available_styles - if (match_face) - { - #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)); - - gtk_entry_set_text (GTK_ENTRY (priv->font_style_entry), str); - #endif diff --git a/gtk3.changes b/gtk3.changes index 8d10cbf..b602787 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Sep 26 06:43:28 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.2.0: + + GtkFontChooser: More speed ups. The font chooser will now load + instanteously, even if you have thousands of fonts + + Bug fixes, including bgo#659826, bgo#659966, bgo#640741. + + Updated translations. +- Drop gtk3-bnc129753-localize-font-style-name.patch: GTK+ 3 now + heavily relies on pango to display the font style name, so we + can't have a patch like this one without fixing pango, which + implies solving the real issue (and therefore removing the need + for the patch). See bgo#95731 and bgo#123498 for the upstream + pango bug. +- Remove gnome-patch-translation support as there is no string + added by patches anymore: + + Remove gnome-patch-translation BuildRequires. + + Remove call to gnome-patch-translation-prepare and + gnome-patch-translation-update in %prep. + ------------------------------------------------------------------- Tue Sep 20 07:18:10 UTC 2011 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index add72b4..1238d96 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -24,13 +24,13 @@ Name: gtk3 %define _name gtk+ -Version: 3.1.92 +Version: 3.2.0 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) Url: http://www.gtk.org/ Group: System/Libraries -Source: http://download.gnome.org/sources/gtk+/3.1/%{_name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gtk+/3.2/%{_name}-%{version}.tar.bz2 Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 @@ -39,13 +39,10 @@ Source99: baselibs.conf Patch0: gtk3-GTK_PATH64.patch # PATCH-FIX-OPENSUSE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 Patch1: gtk3-path-local.patch -# 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 # 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 BuildRequires: fdupes BuildRequires: cups-devel -BuildRequires: gnome-patch-translation BuildRequires: pkgconfig(atk) >= 2.1.5 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(colord) @@ -281,15 +278,12 @@ This package contains the development files for GTK+ 3.x. %lang_package %prep %setup -q -n %{_name}-%{version} -gnome-patch-translation-prepare %if "%_lib" == "lib64" cp -a %{S:1} . %patch0 -p1 %endif %patch1 -p0 -%patch2 -p1 %patch3 -p1 -gnome-patch-translation-update %build %configure \