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

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

Browse Source 
Fix build

OBS-URL: https://build.opensuse.org/request/show/97454
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=161
This commit is contained in:
Vincent Untz 2011-12-21 04:12:25 +00:00 committed by Git OBS Bridge
parent fcd8fcda47
commit 673fa73eea
4 changed files with 71 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk2-use-gmodule.patch Normal file
View File

@ -0,0 +1,34 @@
From 26b749440bb61c59f79d8be93ddf7bc529085c3e Mon Sep 17 00:00:00 2001
From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 24 Nov 2011 15:31:47 +0000
Subject: build: Add gmodule-2.0 dependency for gtk-query-immodules-2.0
---
diff --git a/configure.in b/configure.in
index 1f81bf1..9577c54 100644
--- a/configure.in
+++ b/configure.in
@@ -392,6 +392,8 @@ fi
PKG_CHECK_MODULES(CAIRO_BACKEND,
[cairo-$cairo_backend >= cairo_required_version])
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
+
if test "$os_win32" != yes; then
# libtool option to control which symbols are exported
# right now, symbols starting with _ are not exported
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 15343df..cf3edd6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1076,7 +1076,7 @@ gtk-update-icon-cache.exe.manifest:
endif
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GMODULE_LIBS)
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
--
cgit v0.9.0.2

38
gtk2-window-dragging.patch
View File

@ -1,8 +1,7 @@
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 4788590..cb94c64 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -585,18 +585,45 @@ gtk_menu_shell_button_press (GtkWidget *widget,
diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenushell.c
--- gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging 2011-08-15 22:30:52.000000000 -0400
+++ gtk+-2.24.7/gtk/gtkmenushell.c 2011-10-17 19:50:52.180468086 -0400
@@ -589,18 +589,45 @@ gtk_menu_shell_button_press (GtkWidget
if (!menu_shell->active || !menu_shell->button)
{
@ -55,26 +54,20 @@ index 4788590..cb94c64 100644
}
}
}
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 8f065a7..c72a09f 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -2699,17 +2699,41 @@ static gboolean
diff -up gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging gtk+-2.24.7/gtk/gtktoolbar.c
--- gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging 2011-10-01 11:29:06.000000000 -0400
+++ gtk+-2.24.7/gtk/gtktoolbar.c 2011-10-17 19:52:56.104463657 -0400
@@ -2701,6 +2701,8 @@ static gboolean
gtk_toolbar_button_press (GtkWidget *toolbar,
GdkEventButton *event)
{
+ GtkWidget *window;
+
if (event->button == 3)
if (_gtk_button_event_triggers_context_menu (event))
{
gboolean return_value;
-
+
g_signal_emit (toolbar, toolbar_signals[POPUP_CONTEXT_MENU], 0,
(int)event->x_root, (int)event->y_root, event->button,
&return_value);
-
+
@@ -2711,7 +2713,29 @@ gtk_toolbar_button_press (GtkWidget
return return_value;
}
-
@ -104,11 +97,10 @@ index 8f065a7..c72a09f 100644
return FALSE;
}
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 58ce2db..921c22a 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2443,6 +2443,13 @@ gtk_widget_class_init (GtkWidgetClass *klass)
diff -up gtk+-2.24.7/gtk/gtkwidget.c.window-dragging gtk+-2.24.7/gtk/gtkwidget.c
--- gtk+-2.24.7/gtk/gtkwidget.c.window-dragging 2011-10-17 19:50:52.175468086 -0400
+++ gtk+-2.24.7/gtk/gtkwidget.c 2011-10-17 19:50:52.184468086 -0400
@@ -2467,6 +2467,13 @@ gtk_widget_class_init (GtkWidgetClass *k
0.0, 1.0, 0.04,
GTK_PARAM_READABLE));

11
gtk2.changes
View File

@ -1,7 +1,16 @@
-------------------------------------------------------------------
Wed Dec 21 03:28:49 UTC 2011 - vuntz@opensuse.org
- Add gtk2-use-gmodule.patch: fix build by linking
gtk-query-immodules-2.0 to gmodule-2.0; taken from git.
- Update gtk2-window-dragging.patch from Fedora, and really apply
it.
-------------------------------------------------------------------
Thu Dec 8 22:11:26 UTC 2011 - dimstar@opensuse.org
- Split typelib files in subpackage typelib-1_0-Gtk-2_0.
- Split typelib files into typelib-1_0-Gtk-2_0 subpackage.
- Add typelib-1_0-Gtk-2_0 Requires to devel subpackage.
-------------------------------------------------------------------
Tue Nov 15 11:10:55 UTC 2011 - vuntz@opensuse.org

30
gtk2.spec
View File

@ -22,12 +22,12 @@
Name: gtk2
%define _name gtk+
Version: 2.24.8
Release: 1
Release: 0
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2)
Url: http://www.gtk.org/
License: LGPL-2.1+
Group: System/Libraries
Url: http://www.gtk.org/
Source: http://download.gnome.org/sources/gtk+/2.24/%{_name}-%{version}.tar.bz2
Source2: README.SuSE
Source3: gtkrc
@ -45,6 +45,8 @@ Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
Patch23: bugzilla-131498-allow-xim-for-all-languages.patch
# PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
# PATCH-FIX-UPSTREAM gtk2-use-gmodule.patch vuntz@opensuse.org -- fix build by linking gtk-query-immodules-2.0 to gmodule-2.0; taken from git
Patch25: gtk2-use-gmodule.patch
# Patches taken from upstream or slated to go upstream. We can expect these to become obsolete
# in future releases.
# Please don't delete this comment even if this section is empty -- "# empty" should
@ -53,11 +55,11 @@ Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.d
# be here instead.
# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
Patch53: gtk-path-local.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: atk-devel
BuildRequires: cairo-devel
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gdk-pixbuf-devel
# Needed for patches touching the build system
BuildRequires: gnome-common
@ -75,7 +77,6 @@ Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
%package -n libgtk-2_0-0
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2)
Group: System/Libraries
Requires(post): %{name}-tools
@ -113,7 +114,7 @@ Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
%package -n typelib-1_0-Gtk-2_0
Summary: The GTK+ toolkit library (version 2)
Summary: The GTK+ toolkit library (version 2) -- Introspection bindings
Group: System/Libraries
%description -n typelib-1_0-Gtk-2_0
@ -121,8 +122,9 @@ GTK+ is a multi-platform toolkit for creating graphical user interfaces.
Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
This package provides the GObject Introspection bindings for GTK+.
%package immodule-amharic
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Amharic Input Method
Group: System/Libraries
Requires: %{name} = %{version}
@ -138,7 +140,6 @@ ranging from small one-off projects to complete application suites.
This package provides an input method for Amharic.
%package immodule-inuktitut
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Inuktitut Input Method
Group: System/Libraries
Requires: %{name} = %{version}
@ -154,7 +155,6 @@ ranging from small one-off projects to complete application suites.
This package provides an input method for Inuktitut.
%package immodule-multipress
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Multipress Input Method
Group: System/Libraries
Requires: %{name} = %{version}
@ -170,7 +170,6 @@ This package provides an input method which allows text entry via the
multi-press method, as on a mobile phone.
%package immodule-thai
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Thai-Lao Input Method
Group: System/Libraries
Requires: %{name} = %{version}
@ -187,7 +186,6 @@ ranging from small one-off projects to complete application suites.
This package provides an input method for Thai-Lao.
%package immodules-tigrigna
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Tigrigna Input Methods
Group: System/Libraries
Requires: %{name} = %{version}
@ -203,7 +201,6 @@ ranging from small one-off projects to complete application suites.
This package provides two input methods for Tigrigna.
%package immodule-vietnamese
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Vietnamese Input Method
Group: System/Libraries
Requires: %{name} = %{version}
@ -219,7 +216,6 @@ ranging from small one-off projects to complete application suites.
This package provides an input method for Vietnamese.
%package immodule-xim
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- X Input Method
Group: System/Libraries
Requires: %{name} = %{version}
@ -238,7 +234,6 @@ ranging from small one-off projects to complete application suites.
This package provides an input method based on the X Input Method.
%package tools
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Tools
Group: System/Libraries
Requires(post): update-alternatives
@ -250,7 +245,6 @@ Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
%package data
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Data Files
Group: System/Libraries
BuildArch: noarch
@ -261,7 +255,6 @@ Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
%package branding-upstream
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Upstream theme configuration
Group: System/Libraries
Requires: libgtk-2_0-0 = %{version}
@ -279,7 +272,6 @@ Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
%package devel
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 2) -- Development Files
Group: Development/Libraries/X11
Requires: libgtk-2_0-0 = %{version}
@ -318,6 +310,7 @@ for LNG in po/*.po ; do
fi
done
gnome-patch-translation-prepare
%patch0 -p1
%if "%_lib" == "lib64"
cp -a %{S:2} .
# WARNING: This patch does not patch not installed demos and tests.
@ -327,6 +320,7 @@ cp -a %{S:2} .
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch53
gnome-patch-translation-update