2.90.3
This commit is contained in:
parent
2916533a7c
commit
15308e3ea9
@ -1 +1 @@
|
||||
gtk+-2.90.2.tar.bz2
|
||||
gtk+-2.90.3.tar.bz2
|
||||
|
49
0001-Prevent-concurrent-use-of-GTK-2-and-3.patch
Normal file
49
0001-Prevent-concurrent-use-of-GTK-2-and-3.patch
Normal file
@ -0,0 +1,49 @@
|
||||
From 2a2843c041d8d20da7ddd130812451bc93f83e42 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 18 Jun 2010 22:27:26 -0400
|
||||
Subject: [PATCH] Prevent concurrent use of GTK+ 2 and 3
|
||||
|
||||
If we detect a gtk2-only symbol, error out early.
|
||||
---
|
||||
gtk/gtkmain.c | 18 ++++++++++++++++++
|
||||
1 files changed, 18 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
|
||||
index 017d000..2220658 100644
|
||||
--- a/gtk/gtkmain.c
|
||||
+++ b/gtk/gtkmain.c
|
||||
@@ -608,6 +608,22 @@ setlocale_initialization (void)
|
||||
}
|
||||
|
||||
static void
|
||||
+check_mixed_deps (void)
|
||||
+{
|
||||
+ GModule *module;
|
||||
+ gpointer func;
|
||||
+
|
||||
+ module = g_module_open (NULL, 0);
|
||||
+
|
||||
+ if (g_module_symbol (module, "gtk_progress_get_type", &func))
|
||||
+ {
|
||||
+ g_error ("GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported");
|
||||
+ }
|
||||
+
|
||||
+ g_module_close (module);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
do_pre_parse_initialization (int *argc,
|
||||
char ***argv)
|
||||
{
|
||||
@@ -618,6 +634,8 @@ do_pre_parse_initialization (int *argc,
|
||||
|
||||
pre_initialized = TRUE;
|
||||
|
||||
+ check_mixed_deps ();
|
||||
+
|
||||
gdk_pre_parse_libgtk_only ();
|
||||
gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL);
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
13
gtk3.spec
13
gtk3.spec
@ -1,4 +1,4 @@
|
||||
%global glib2_version 2.25.8-1
|
||||
%global glib2_version 2.25.9-1
|
||||
%global pango_version 1.20.0-1
|
||||
%global atk_version 1.29.4-2
|
||||
%global cairo_version 1.6.0-1
|
||||
@ -10,8 +10,8 @@
|
||||
|
||||
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
||||
Name: gtk3
|
||||
Version: 2.90.2
|
||||
Release: 2%{?dist}
|
||||
Version: 2.90.3
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.gtk.org
|
||||
@ -27,6 +27,9 @@ Patch2: remove-connecting-reason.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=611313
|
||||
Patch3: window-dragging.patch
|
||||
|
||||
# upstream change
|
||||
Patch4: 0001-Prevent-concurrent-use-of-GTK-2-and-3.patch
|
||||
|
||||
|
||||
BuildRequires: atk-devel >= %{atk_version}
|
||||
BuildRequires: pango-devel >= %{pango_version}
|
||||
@ -121,6 +124,7 @@ widget toolkit.
|
||||
%patch1 -p1 -b .fresh-tooltips
|
||||
%patch2 -p1 -b .remove-connecting-reason
|
||||
%patch3 -p1 -b .window-dragging
|
||||
%patch4 -p1 -b .mixed-linking
|
||||
|
||||
%build
|
||||
%configure --with-xinput \
|
||||
@ -282,6 +286,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
|
||||
%doc tmpdocs/examples
|
||||
|
||||
%changelog
|
||||
* Fri Jun 18 2010 Matthias Clasen <mclasen@redhat.com> 2.90.3-1
|
||||
- Update to 2.90.3
|
||||
|
||||
* Sat Jun 12 2010 Matthias Clasen <mclasen@redhat.com> 2.90.2-2
|
||||
- Copy some tweaks from gtk2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user