Accepting request 85681 from GNOME:Factory
Pushing G:F OBS-URL: https://build.opensuse.org/request/show/85681 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=24
This commit is contained in:
Lars Vogdt
Git OBS Bridge
commit
bc63a949b4
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e6f1afcdf87932cb3fb78f65b9459b3e5bae44481d8c9f0ca3be9c388c0ad975
|
||||
size 17397213
|
||||
3
gtk+-3.2.0.tar.bz2
Normal file
3
gtk+-3.2.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b285074ffefb4ff4364f6dd50fe68c7e85b11293e0c1dd3bdeac56052344dadb
|
||||
size 17435504
|
||||
@ -1,48 +0,0 @@
|
||||
Index: gtk+-2.19.0/gtk/gtkfontbutton.c
|
||||
===================================================================
|
||||
--- gtk+-2.19.0.orig/gtk/gtkfontbutton.c
|
||||
+++ gtk+-2.19.0/gtk/gtkfontbutton.c
|
||||
@@ -893,7 +893,7 @@ gtk_font_button_update_font_info (GtkFon
|
||||
if (style == NULL || !g_ascii_strcasecmp (style, "Regular"))
|
||||
family_style = g_strdup (family);
|
||||
else
|
||||
- family_style = g_strdup_printf ("%s %s", family, style);
|
||||
+ family_style = g_strdup_printf ("%s %s", family, _(style));
|
||||
|
||||
gtk_label_set_text (GTK_LABEL (font_button->priv->font_label), family_style);
|
||||
|
||||
Index: gtk+-2.19.0/gtk/gtkfontsel.c
|
||||
===================================================================
|
||||
--- gtk+-2.19.0.orig/gtk/gtkfontsel.c
|
||||
+++ gtk+-2.19.0/gtk/gtkfontsel.c
|
||||
@@ -76,6 +76,21 @@
|
||||
|
||||
#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
|
||||
@@ -869,7 +884,7 @@ gtk_font_selection_show_available_styles
|
||||
gtk_list_store_append (model, &iter);
|
||||
gtk_list_store_set (model, &iter,
|
||||
FACE_COLUMN, faces[i],
|
||||
- FACE_NAME_COLUMN, str,
|
||||
+ FACE_NAME_COLUMN, _(str),
|
||||
-1);
|
||||
|
||||
if (i == 0)
|
||||
55
gtk3.changes
55
gtk3.changes
@ -1,3 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Update to version 3.1.92:
|
||||
+ GtkIconView: Cells will now be prelighted, if you set the
|
||||
GtkCellRendererPixbuf::follow-state property.
|
||||
+ GtkFontChooser: Speed up population of the font list somewhat.
|
||||
+ Bugs fixed: bgo#615501, bgo#658981, bgo#659241, bgo#659247.
|
||||
+ Updated translations.
|
||||
- Rebase gtk3-bnc129753-localize-font-style-name.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
10
gtk3.spec
10
gtk3.spec
@ -24,13 +24,13 @@
|
||||
|
||||
Name: gtk3
|
||||
%define _name gtk+
|
||||
Version: 3.1.18
|
||||
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 bgo319484 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 \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user