Author: wiget Date: Sun Feb 13 00:20:36 2011 GMT Module: packages Tag: DEVEL ---- Log message: - fix building with gtk+ 3.0.0
---- Files affected: packages/gnome-shell: gnome-shell.spec (1.13.2.14 -> 1.13.2.15) , gtk3.patch (1.1.2.1 -> 1.1.2.2) ---- Diffs: ================================================================ Index: packages/gnome-shell/gnome-shell.spec diff -u packages/gnome-shell/gnome-shell.spec:1.13.2.14 packages/gnome-shell/gnome-shell.spec:1.13.2.15 --- packages/gnome-shell/gnome-shell.spec:1.13.2.14 Thu Feb 3 22:11:09 2011 +++ packages/gnome-shell/gnome-shell.spec Sun Feb 13 01:20:31 2011 @@ -2,7 +2,7 @@ Summary: Window manager and application launcher for GNOME Name: gnome-shell Version: 2.91.6 -Release: 1 +Release: 2 License: GPL v2+ Group: X11/Window Managers Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.91/%{name}-%{version}.tar.bz2 @@ -24,7 +24,7 @@ BuildRequires: gobject-introspection-devel >= 0.9.0 BuildRequires: gstreamer-devel >= 0.10.16 BuildRequires: gstreamer-plugins-base-devel >= 0.10.16 -BuildRequires: gtk+3-devel >= 2.91.7 +BuildRequires: gtk+3-devel >= 3.0.0 BuildRequires: intltool >= 0.26 BuildRequires: libcanberra-devel BuildRequires: libcroco-devel @@ -42,7 +42,6 @@ Requires: gnome-settings-daemon >= 2.91.8 Requires: gsettings-desktop-schemas Requires: mutter >= 2.91.4 -Suggests: gtk3-engines-themes BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -115,6 +114,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13.2.15 2011/02/13 00:20:31 wiget +- fix building with gtk+ 3.0.0 + Revision 1.13.2.14 2011/02/03 21:11:09 atler - BR: gjs-devel >= 0.7.8 ================================================================ Index: packages/gnome-shell/gtk3.patch diff -u packages/gnome-shell/gtk3.patch:1.1.2.1 packages/gnome-shell/gtk3.patch:1.1.2.2 --- packages/gnome-shell/gtk3.patch:1.1.2.1 Wed Dec 29 10:17:34 2010 +++ packages/gnome-shell/gtk3.patch Sun Feb 13 01:20:31 2011 @@ -1,11 +1,22 @@ ---- gnome-shell-2.91.4/configure.ac.wiget 2010-12-29 10:07:01.323398682 +0100 -+++ gnome-shell-2.91.4/configure.ac 2010-12-29 10:07:14.108291539 +0100 -@@ -71,7 +71,7 @@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 - mutter-plugins >= $MUTTER_MIN_VERSION - gjs-internals-1.0 >= $GJS_MIN_VERSION - libgnome-menu $recorder_modules gconf-2.0 -- gdk-x11-3.0 -+ gdk-3.0 - clutter-x11-1.0 >= $CLUTTER_MIN_VERSION - clutter-glx-1.0 >= $CLUTTER_MIN_VERSION - libstartup-notification-1.0 +commit ce91d85bc0810bdb3a47b188b9ec63fa285032af +Author: Jasper St. Pierre <[email protected]> +Date: Thu Feb 10 17:25:32 2011 -0500 + + Require gtk+3 3.0.0 and drop checks for minor versions. + +diff --git a/src/shell-doc-system.c b/src/shell-doc-system.c +index a80e816..78b1637 100644 +--- a/src/shell-doc-system.c ++++ b/src/shell-doc-system.c +@@ -261,11 +261,7 @@ shell_doc_system_open (ShellDocSystem *system, + else + { + char *app_name; +-#if GTK_MINOR_VERSION >= 18 + const char *app_exec; +-#else +- char *app_exec; +-#endif + char *app_exec_quoted; + guint count; + time_t time; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-shell/gnome-shell.spec?r1=1.13.2.14&r2=1.13.2.15&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-shell/gtk3.patch?r1=1.1.2.1&r2=1.1.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
