Wed Jun 23 19:40:37 UTC 2010

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22133

Modified Files:
	control-center.spec 
Added Files:
	0001-Convert-from-libunique-to-GtkApplication-to-remove-t.patch 
	0001-Use-gnome-desktop-3.0-not-2.0.patch 
	0001-Use-gtk-3.0.patch 
	0001-You-can-t-mix-GTK2-and-GTK3-so-depend-on-gtk-3.0-ver.patch 
Removed Files:
	best-shapes.patch default-applications.patch 
	default-layout-toggle.patch gcc-pam-fprintd-avail.patch 
	gnome-control-center-2.25.2-gecos.patch 
	gnome-control-center-2.25.2-passwd.patch icon-names.patch 
	make-default.patch shell-common-tasks.patch shell-markup.patch 
	single-panel.patch slab-icon-names.patch 
Log Message:
* Wed Jun 23 2010 Bastien Nocera <bnocera at redhat.com> 2.31.3-2
- Add patches to compile against GTK+ 3.x


0001-Convert-from-libunique-to-GtkApplication-to-remove-t.patch:
 configure.ac           |    2 -
 shell/control-center.c |   76 ++++++++++---------------------------------------
 2 files changed, 18 insertions(+), 60 deletions(-)

--- NEW FILE 0001-Convert-from-libunique-to-GtkApplication-to-remove-t.patch ---
>From ae7944a0c8e3e6b516073dd8484b774a5ad191a6 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Sun, 20 Jun 2010 22:07:05 +0100
Subject: [PATCH] Convert from libunique to GtkApplication to remove the final gtk-2.0 library

---
 configure.ac           |    2 +-
 shell/control-center.c |   75 +++++++++++-------------------------------------
 2 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8cc80d4..226e4d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ COMMON_MODULES="gtk+-3.0 >= 2.90.0 dnl
  gnome-desktop-3.0 >= 2.29.4"
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
-PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu unique-1.0 gio-unix-2.0)
+PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu gio-unix-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
diff --git a/shell/control-center.c b/shell/control-center.c
index 1451e0a..6f5fe18 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -28,34 +28,22 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-
-#include <unique/unique.h>
-
-
-enum
-{
-  CC_SHELL_RAISE_COMMAND = 1
-};
-
-
-static UniqueResponse
-message_received (UniqueApp          *app,
-                  gint                command,
-                  UniqueMessageData  *message_data,
-                  guint               time_,
-                  GnomeControlCenter *shell)
+static void
+application_prepare_action_cb (GApplication *application, GVariant *arguments,
+                               GVariant *platform_data, GnomeControlCenter *shell)
 {
-  const gchar *id;
-  gsize len;
+  GVariantIter iter;
+  GVariant *temp = NULL;
 
   gnome_control_center_present (shell);
 
-  id = (gchar*) unique_message_data_get (message_data, &len);
-
-  if (id)
+  /* we only care about the first argv */
+  g_variant_iter_init (&iter, arguments);
+  temp = g_variant_iter_next_value (&iter);
+  if (temp != NULL)
     {
       GError *err = NULL;
-
+      const gchar *id = g_variant_get_byte_array (temp, NULL);
       if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), id, &err))
         {
           if (err)
@@ -63,19 +51,16 @@ message_received (UniqueApp          *app,
               g_warning ("Could not load setting panel \"%s\": %s", id,
                          err->message);
               g_error_free (err);
-              err = NULL;
             }
         }
     }
-
-  return GTK_RESPONSE_OK;
 }
 
 int
 main (int argc, char **argv)
 {
   GnomeControlCenter *shell;
-  UniqueApp *unique;
+  GtkApplication *application;
 
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -85,39 +70,12 @@ main (int argc, char **argv)
   g_thread_init (NULL);
   gtk_init (&argc, &argv);
 
-
-  /* use Unique to enforce single instance of this application */
-  unique = unique_app_new_with_commands ("org.gnome.ControlCenter",
-                                         NULL,
-                                         "raise",
-                                         CC_SHELL_RAISE_COMMAND,
-                                         NULL);
-
-  /* check if the application is already running */
-  if (unique_app_is_running (unique))
-    {
-      UniqueMessageData *data;
-
-      if (argc == 2)
-        {
-          data = unique_message_data_new ();
-          unique_message_data_set (data, (guchar*) argv[1],
-                                   strlen(argv[1]) + 1);
-        }
-      else
-        data = NULL;
-
-      unique_app_send_message (unique, 1, data);
-
-      gdk_notify_startup_complete ();
-      return 0;
-    }
-
-
   shell = gnome_control_center_new ();
 
-  g_signal_connect (unique, "message-received", G_CALLBACK (message_received),
-                    shell);
+  /* enforce single instance of this application */
+  application = gtk_application_new ("org.gnome.ControlCenter", &argc, &argv);
+  g_signal_connect (application, "prepare-activation",
+                    G_CALLBACK (application_prepare_action_cb), shell);
 
   if (argc == 2)
     {
@@ -138,9 +96,10 @@ main (int argc, char **argv)
         }
     }
 
-  gtk_main ();
+  gtk_application_run (application);
 
   g_object_unref (shell);
+  g_object_unref (application);
 
   return 0;
 }
-- 
1.7.0.1


0001-Use-gnome-desktop-3.0-not-2.0.patch:
 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Use-gnome-desktop-3.0-not-2.0.patch ---
>From de11d12d5233795d6ced8602c49e466b7bdda10b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 23 Jun 2010 20:30:03 +0100
Subject: [PATCH] Use gnome-desktop 3.0, not 2.0

As we compile against GTK+ 3.x now.
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 226e4d9..5c70c20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
 PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu gio-unix-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
-PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
+PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
 PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-3.0)
-- 
1.7.0.1


0001-Use-gtk-3.0.patch:
 configure.ac |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE 0001-Use-gtk-3.0.patch ---
>From c09f693575b5559d0c72af71fbe1c5626f802df8 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo at gnome-db.org>
Date: Thu, 10 Jun 2010 23:06:11 +0200
Subject: [PATCH] Use gtk+-3.0

---
 configure.ac |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 67882a3..3d5657a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@ dnl ==============================================
 dnl Check that we meet the  dependencies
 dnl ==============================================
 
-COMMON_MODULES="gtk+-2.0 >= 2.21.1 dnl
+COMMON_MODULES="gtk+-3.0 >= 2.90.0 dnl
  glib-2.0 >= 2.17.4 dnl
  gthread-2.0 dnl
  gio-2.0 dnl
@@ -120,13 +120,13 @@ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
 PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
-PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
+PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-3.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 PKG_CHECK_MODULES(GIO, gio-2.0)
 
-gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
-gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
-GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines"
+gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-3.0`
+gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-3.0`
+GTK_ENGINE_DIR="$gtk_lib_dir/gtk-3.0/$gtk_binary_version/engines"
 AC_SUBST(GTK_ENGINE_DIR)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0)
-- 
1.7.0.1


0001-You-can-t-mix-GTK2-and-GTK3-so-depend-on-gtk-3.0-ver.patch:
 configure.ac |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-You-can-t-mix-GTK2-and-GTK3-so-depend-on-gtk-3.0-ver.patch ---
>From f4ef1914628de1c9853834cffdaee61ad3cff4cb Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Sat, 19 Jun 2010 21:13:10 +0100
Subject: [PATCH] You can't mix GTK2 and GTK3, so depend on gtk-3.0 versions of libraries

---
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3d5657a..8cc80d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
 AC_SUBST(TYPING_BREAK)
 AC_SUBST(SCREENSAVER_LIBS)
 
-PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, [
+PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk3, [
   CANBERRA_GTK=1
   AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
   AC_SUBST(LIBCANBERRA_GTK_LIBS)
@@ -112,7 +112,7 @@ COMMON_MODULES="gtk+-3.0 >= 2.90.0 dnl
  gio-2.0 dnl
  gconf-2.0 dnl
  libxml-2.0 dnl
- gnome-desktop-2.0 >= 2.29.4"
+ gnome-desktop-3.0 >= 2.29.4"
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
 PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu unique-1.0 gio-unix-2.0)
-- 
1.7.0.1



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- control-center.spec	8 Jun 2010 16:29:50 -0000	1.521
+++ control-center.spec	23 Jun 2010 19:40:34 -0000	1.522
@@ -1,14 +1,9 @@
 %define gettext_package gnome-control-center-2.0
 
 %define glib2_version 2.13.0
-%define gtk2_version 2.11.6
+%define gtk3_version 2.11.6
 %define gconf2_version 1.2.0
 %define gnome_desktop_version 2.29.3-2
-%define libgnome_version 2.3.0
-%define libbonobo_version 2.3.0
-%define libgnomeui_version 2.3.0
-%define libbonoboui_version 2.3.0
-%define gnome_vfs2_version 2.3.0
 %define desktop_file_utils_version 0.9
 %define xft_version 2.1.7
 %define fontconfig_version 1.0.0
@@ -23,7 +18,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.31.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -45,26 +40,18 @@ Requires: libXrandr >= %{libXrandr_versi
 
 BuildRequires: pango-devel
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: librsvg2-devel
+BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: librsvg3-devel
 BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libgnome-devel >= %{libgnome_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
+BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: metacity-devel >= %{metacity_version}
 BuildRequires: libxklavier-devel >= %{libxklavier_version}
 BuildRequires: libXcursor-devel
 BuildRequires: libXrandr-devel >= %{libXrandr_version}
-BuildRequires: alsa-lib-devel
-BuildRequires: nautilus-devel
 BuildRequires: gettext
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
-BuildRequires: gnome-panel-devel
 BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
 BuildRequires: gnome-settings-daemon-devel
 BuildRequires: intltool >= 0.37.1
@@ -73,8 +60,6 @@ BuildRequires: libXxf86misc-devel
 BuildRequires: libxkbfile-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gnome-doc-utils
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: libglade2-devel
 BuildRequires: libxml2-devel
 BuildRequires: hal-devel >= 0.5.6
@@ -82,7 +67,6 @@ BuildRequires: dbus-devel >= 0.90
 BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: scrollkeeper
 BuildRequires: libcanberra-devel
-BuildRequires: unique-devel
 BuildRequires: gnome-common
 
 Requires(preun): GConf2
@@ -96,6 +80,12 @@ Requires(postun): shared-mime-info
 Provides: control-center-extra = %{epoch}:%{version}-%{release}
 Obsoletes: control-center-extra < 1:2.30.3-3
 
+# For GTK+ 3.x support
+Patch0: 0001-Use-gtk-3.0.patch
+Patch1: 0001-You-can-t-mix-GTK2-and-GTK3-so-depend-on-gtk-3.0-ver.patch
+Patch2: 0001-Convert-from-libunique-to-GtkApplication-to-remove-t.patch
+Patch3: 0001-Use-gnome-desktop-3.0-not-2.0.patch
+
 %description
 This package contains configuration utilities for the GNOME desktop, which
 allow to configure accessibility options, desktop fonts, keyboard and mouse
@@ -131,6 +121,10 @@ utilities.
 
 %prep
 %setup -q -n gnome-control-center-%{version}
+%patch0 -p1 -b .gtk3
+%patch1 -p1 -b .gd1
+%patch2 -p1 -b .gtk-app
+%patch3 -p1 -b .gd2
 
 %build
 %configure \
@@ -254,6 +248,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Jun 23 2010 Bastien Nocera <bnocera at redhat.com> 2.31.3-2
+- Add patches to compile against GTK+ 3.x
+
 * Tue Jun  8 2010 Matthias Clasen <mclasen at redhat.com> 2.31.3-1
 - Update to 2.31.3
 


--- best-shapes.patch DELETED ---


--- default-applications.patch DELETED ---


--- default-layout-toggle.patch DELETED ---


--- gcc-pam-fprintd-avail.patch DELETED ---


--- gnome-control-center-2.25.2-gecos.patch DELETED ---


--- gnome-control-center-2.25.2-passwd.patch DELETED ---


--- icon-names.patch DELETED ---


--- make-default.patch DELETED ---


--- shell-common-tasks.patch DELETED ---


--- shell-markup.patch DELETED ---


--- single-panel.patch DELETED ---


--- slab-icon-names.patch DELETED ---

