From 032e69d59575d6b4eb8b2b7968b3fd765e6f119f2405ea126bb65b2b98a3a934 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 18 Sep 2010 13:32:42 +0000 Subject: [PATCH] Accepting request 48410 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/48410 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=31 --- gnome-shell-fix-recent-gtk3.patch | 85 +++++++++++++++++++++++++++++++ gnome-shell.changes | 8 +++ gnome-shell.spec | 1 - 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/gnome-shell-fix-recent-gtk3.patch b/gnome-shell-fix-recent-gtk3.patch index 27fe777..b30f3f7 100644 --- a/gnome-shell-fix-recent-gtk3.patch +++ b/gnome-shell-fix-recent-gtk3.patch @@ -25,3 +25,88 @@ index 978880c..067c0bf 100644 colormap = gdk_screen_get_rgba_colormap (screen); else if (visual == gdk_screen_get_system_visual (screen)) colormap = gdk_screen_get_system_colormap (screen); +-- +From 178c8c50a0ad42fd58496fc70ca17597f8c20754 Mon Sep 17 00:00:00 2001 +From: Maxim Ermilov +Date: Thu, 09 Sep 2010 14:25:30 +0000 +Subject: Fix build with recent gtk3 + +use new keysyms names +https://bugzilla.gnome.org/show_bug.cgi?id=629128 +--- +diff --git a/configure.ac b/configure.ac +index d46260a..f3b1a45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,7 +61,7 @@ CLUTTER_MIN_VERSION=1.2.8 + GOBJECT_INTROSPECTION_MIN_VERSION=0.6.11 + GJS_MIN_VERSION=0.7 + MUTTER_MIN_VERSION=2.31.4 +-GTK_MIN_VERSION=2.90.4 ++GTK_MIN_VERSION=2.90.7 + GIO_MIN_VERSION=2.25.9 + + # Collect more than 20 libraries for a prize! +diff --git a/src/st/st-im-text.c b/src/st/st-im-text.c +index 29fd71e..23657ae 100644 +--- a/src/st/st-im-text.c ++++ b/src/st/st-im-text.c +@@ -231,31 +231,31 @@ key_is_modifier (guint16 keyval) + + switch (keyval) + { +- case GDK_Shift_L: +- case GDK_Shift_R: +- case GDK_Control_L: +- case GDK_Control_R: +- case GDK_Caps_Lock: +- case GDK_Shift_Lock: +- case GDK_Meta_L: +- case GDK_Meta_R: +- case GDK_Alt_L: +- case GDK_Alt_R: +- case GDK_Super_L: +- case GDK_Super_R: +- case GDK_Hyper_L: +- case GDK_Hyper_R: +- case GDK_ISO_Lock: +- case GDK_ISO_Level2_Latch: +- case GDK_ISO_Level3_Shift: +- case GDK_ISO_Level3_Latch: +- case GDK_ISO_Level3_Lock: +- case GDK_ISO_Level5_Shift: +- case GDK_ISO_Level5_Latch: +- case GDK_ISO_Level5_Lock: +- case GDK_ISO_Group_Shift: +- case GDK_ISO_Group_Latch: +- case GDK_ISO_Group_Lock: ++ case GDK_KEY_Shift_L: ++ case GDK_KEY_Shift_R: ++ case GDK_KEY_Control_L: ++ case GDK_KEY_Control_R: ++ case GDK_KEY_Caps_Lock: ++ case GDK_KEY_Shift_Lock: ++ case GDK_KEY_Meta_L: ++ case GDK_KEY_Meta_R: ++ case GDK_KEY_Alt_L: ++ case GDK_KEY_Alt_R: ++ case GDK_KEY_Super_L: ++ case GDK_KEY_Super_R: ++ case GDK_KEY_Hyper_L: ++ case GDK_KEY_Hyper_R: ++ case GDK_KEY_ISO_Lock: ++ case GDK_KEY_ISO_Level2_Latch: ++ case GDK_KEY_ISO_Level3_Shift: ++ case GDK_KEY_ISO_Level3_Latch: ++ case GDK_KEY_ISO_Level3_Lock: ++ case GDK_KEY_ISO_Level5_Shift: ++ case GDK_KEY_ISO_Level5_Latch: ++ case GDK_KEY_ISO_Level5_Lock: ++ case GDK_KEY_ISO_Group_Shift: ++ case GDK_KEY_ISO_Group_Latch: ++ case GDK_KEY_ISO_Group_Lock: + return TRUE; + default: + return FALSE; +-- +cgit v0.8.3.1 diff --git a/gnome-shell.changes b/gnome-shell.changes index 2aa8223..ab4ec5d 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 18 13:30:33 CEST 2010 - vuntz@opensuse.org + +- Drop gir-repository BuildRequires: this was only needed for the + DBusGLib gir, which is now part of gobject-introspection. +- Update gnome-shell-fix-recent-gtk3.patch to fix build with GTK+ + 2.90.7. + ------------------------------------------------------------------- Thu Sep 9 23:24:35 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index 5c86ca0..c6ba4d2 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -30,7 +30,6 @@ Source1: gnome-shell-session Source2: gnome3.desktop # PATCH-FIX-UPSTREAM gnome-shell-fix-recent-gtk3.patch vuntz@opensuse.org -- Fix build with recent GTK+ 3, taken from git Patch0: gnome-shell-fix-recent-gtk3.patch -BuildRequires: gir-repository BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: pkgconfig(clutter-1.0)