Accepting request 77802 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/77802
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=22
This commit is contained in:
Sascha Peilicke 2011-08-03 14:07:23 +00:00 committed by Git OBS Bridge
commit 23c48d6983
6 changed files with 39 additions and 39 deletions

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

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

View File

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

View File

@ -1,27 +0,0 @@
commit 7741f5a09a841c4dc93727b990defc303510ed2c
Author: Florian Müllner <fmuellner@gnome.org>
Date: Fri Jul 15 20:45:59 2011 +0200
theming-engine: Adjust register_property() to recent glib change
GParamSpec now uses an intern'ed string for 'name', so the code
in gtk_theming_engine_register_property() which prefixes the name
with a namespace has to be adjusted.
https://bugzilla.gnome.org/show_bug.cgi?id=654695
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 66adad6..64a2bc5 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -391,8 +391,8 @@ gtk_theming_engine_register_property (const gchar *name_space,
/* FIXME: hack hack hack, replacing pspec->name to include namespace */
name = g_strdup_printf ("-%s-%s", name_space, pspec->name);
- g_free (pspec->name);
- pspec->name = name;
+ pspec->name = (char *)g_intern_string (name);
+ g_free (name);
gtk_style_properties_register_property (parse_func, pspec);
}

View File

@ -71,7 +71,7 @@ Index: gtk/Makefile.am
endif
+suse_hack_lib=`echo $(libdir) | sed 's:.*/::'`
INCLUDES = \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gtk\" \
+ -DSUSE_HACK_LIB=\"$(suse_hack_lib)\" \
-DGTK_LIBDIR=\"$(libdir)\" \
@ -86,7 +86,7 @@ Index: gtk/Makefile.in
@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
+suse_hack_lib=`echo $(libdir) | sed 's:.*/::'`
INCLUDES = \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gtk\" \
+ -DSUSE_HACK_LIB=\"$(suse_hack_lib)\" \
-DGTK_LIBDIR=\"$(libdir)\" \

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Sun Jul 24 10:41:11 CEST 2011 - vuntz@opensuse.org
- Update to version 3.1.10:
+ Assorted file chooser improvements/redesign:
- Remove the expander in Save mode
- Move the path bar up in Save mode
- Remember the last opened directory
- Start in recently-used mode when no folder is set
- Update recent-files when confirming in the file chooser
+ Accessibility:
- Gail has been merged into GTK+ and is no longer a module
- A testsuite for a11y functionality has been added
+ Theming:
- Icon view cells can now have a border
+ GtkMountOperation can now show processes on OpenBSD
+ Gdk input devices now expose their XInput2 device ID via
gdk_x11_device_get_id()
+ Bugs fixed: bgo#653450, bgo#653705, bgo#653947, bgo#654125,
bgo#654179, bgo#654428, bgo#654678, bgo#654695, bgo#654720,
bgo#655009, bgo#654266.
+ Updated translations.
- Drop gtk3-fix-crash-recent-glib.patch: fixed upstream.
- Rebase gtk3-path-local.patch.
- Manually create %{_libdir}/gtk-3.0/modules: it used to exist
because of the libgail module, but now that the module is gone,
we need to manually create the directory for external modules
that will be installed there.
-------------------------------------------------------------------
Thu Jul 21 13:10:03 CEST 2011 - vuntz@opensuse.org

View File

@ -24,8 +24,8 @@
Name: gtk3
%define _name gtk+
Version: 3.1.8
Release: 3
Version: 3.1.10
Release: 1
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 3)
Url: http://www.gtk.org/
@ -43,8 +43,6 @@ Patch1: gtk3-path-local.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
Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch
# PATCH-FIX-UPSTREAM gtk3-fix-crash-recent-glib.patch vuntz@opensuse.org -- Fix crash with glib 2.29.12, taken from git
Patch4: gtk3-fix-crash-recent-glib.patch
BuildRequires: fdupes
BuildRequires: cups-devel
BuildRequires: gnome-patch-translation
@ -291,7 +289,6 @@ cp -a %{S:1} .
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
gnome-patch-translation-update
%build
@ -319,6 +316,9 @@ touch %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
mv %{buildroot}%{_bindir}/gtk-query-immodules-3.0 %{buildroot}%{_bindir}/gtk-query-immodules-3.0-64
mv %{buildroot}%{_mandir}/man1/gtk-query-immodules-3.0.1 %{buildroot}%{_mandir}/man1/gtk-query-immodules-3.0-64.1
%endif
# create modules directory that should have been created during the build
test ! -d %{buildroot}%{_libdir}/gtk-3.0/modules
mkdir %{buildroot}%{_libdir}/gtk-3.0/modules
# create theming-engines directory that should have been created during the build
test ! -d %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
@ -464,7 +464,6 @@ fi
%dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines/
%ghost %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
%dir %{_libdir}/gtk-3.0/modules
%{_libdir}/gtk-3.0/modules/libgail.so
%{_libdir}/libgailutil-3.so.*
%{_libdir}/libgdk-3.so.*
%{_libdir}/libgtk-3.so.*
@ -537,7 +536,6 @@ fi
%{_datadir}/gtk-3.0/demo/
%{_includedir}/gail-3.0/
%{_includedir}/gtk-3.0/
%{_libdir}/gtk-3.0/modules/libferret.so
%{_libdir}/pkgconfig/gail-3.0.pc
%{_libdir}/pkgconfig/gdk-3.0.pc
%if %{build_broadway_backend}