rpms/control-center/devel control-center.spec, 1.420, 1.421 gnome-control-center-2.25.2-gecos.patch, 1.2, 1.3
Matthias Clasen
mclasen at fedoraproject.org
Wed Dec 17 02:37:08 UTC 2008
- Previous message (by thread): rpms/vala/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 vala.spec, 1.33, 1.34
- Next message (by thread): rpms/libwnck/devel .cvsignore, 1.68, 1.69 libwnck.spec, 1.103, 1.104 sources, 1.68, 1.69
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27324
Modified Files:
control-center.spec gnome-control-center-2.25.2-gecos.patch
Log Message:
drop eel dep
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- control-center.spec 9 Dec 2008 00:30:29 -0000 1.420
+++ control-center.spec 17 Dec 2008 02:36:38 -0000 1.421
@@ -22,7 +22,7 @@
Summary: Utilities to configure the GNOME desktop
Name: control-center
Version: 2.25.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -99,7 +99,6 @@
BuildRequires: libXcursor-devel
BuildRequires: alsa-lib-devel
BuildRequires: nautilus-devel
-BuildRequires: eel2-devel
BuildRequires: gettext
BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
BuildRequires: gnome-panel-devel
@@ -352,6 +351,9 @@
%dir %{_datadir}/gnome-control-center/keybindings
%changelog
+* Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-7
+- Drop eel dependency
+
* Mon Dec 8 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-6
- Rebuild to reduce pkg-config-induced dependency bloat
gnome-control-center-2.25.2-gecos.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 gnome-control-center-2.25.2-gecos.patch
Index: gnome-control-center-2.25.2-gecos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-gecos.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-control-center-2.25.2-gecos.patch 4 Dec 2008 18:25:42 -0000 1.2
+++ gnome-control-center-2.25.2-gecos.patch 17 Dec 2008 02:36:38 -0000 1.3
@@ -1,11 +1,5824 @@
+diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.c
+--- /dev/null 2008-12-16 15:36:17.645108819 -0500
++++ gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.c 2008-12-16 21:16:16.000000000 -0500
+@@ -0,0 +1,413 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* eel-accessibility.h - Utility functions for accessibility
++
++ Copyright (C) 2002 Anders Carlsson, Sun Microsystems, Inc.
++
++ The Eel Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public License as
++ published by the Free Software Foundation; either version 2 of the
++ License, or (at your option) any later version.
++
++ The Eel Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with the Eel Library; see the file COPYING.LIB. If not,
++ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ Boston, MA 02111-1307, USA.
++
++ Authors:
++ Anders Carlsson <andersca at gnu.org>
++ Michael Meeks <michael at ximian.com>
++*/
++#include <config.h>
++#include <gtk/gtk.h>
++#include <atk/atkrelationset.h>
++#include "eel-accessibility.h"
++
++void
++eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget)
++{
++ AtkObject *atk_widget, *atk_label;
++
++ atk_label = gtk_widget_get_accessible (label);
++ atk_widget = gtk_widget_get_accessible (widget);
++
++ /* Create the label -> widget relation */
++ atk_object_add_relationship (atk_label, ATK_RELATION_LABEL_FOR, atk_widget);
++
++ /* Create the widget -> label relation */
++ atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
++}
++
++/*
++ * Hacks to make re-using gail somewhat easier.
++ */
++
++/**
++ * eel_accessibility_create_derived_type:
++ * @type_name: the name for the new accessible type eg. NautilusIconCanvasItemAccessible
++ * @existing_gobject_with_proxy: the GType of an object that has a registered factory that
++ * manufactures the type we want to inherit from. ie. to inherit from a GailCanvasItem
++ * we need to pass GNOME_TYPE_CANVAS_ITEM - since GailCanvasItem is registered against
++ * that type.
++ * @opt_gail_parent_class: the name of the Gail class to derive from eg. GailCanvasItem
++ * @class_init: the init function to run for this class
++ *
++ * This should be run to register the type, it can subsequently be run with
++ * the same name and will not re-register it, but simply return it.
++ *
++ * NB. to do instance init, you prolly want to override AtkObject::initialize
++ *
++ * Return value: the registered type, or 0 on failure.
++ **/
++GType
++eel_accessibility_create_derived_type (const char *type_name,
++ GType existing_gobject_with_proxy,
++ EelAccessibilityClassInitFn class_init)
++{
++ GType type;
++ GType parent_atk_type;
++ GTypeInfo tinfo = { 0 };
++ GTypeQuery query;
++ AtkObjectFactory *factory;
++
++ if ((type = g_type_from_name (type_name))) {
++ return type;
++ }
++
++ factory = atk_registry_get_factory
++ (atk_get_default_registry (),
++ existing_gobject_with_proxy);
++ if (!factory) {
++ return G_TYPE_INVALID;
++ }
++
++ parent_atk_type = atk_object_factory_get_accessible_type (factory);
++ if (!parent_atk_type) {
++ return G_TYPE_INVALID;
++ }
++
++ /*
++ * Figure out the size of the class and instance
++ * we are deriving from
++ */
++ g_type_query (parent_atk_type, &query);
++
++ if (class_init) {
++ tinfo.class_init = (GClassInitFunc) class_init;
++ }
++
++ tinfo.class_size = query.class_size;
++ tinfo.instance_size = query.instance_size;
++
++ /* Register the type */
++ type = g_type_register_static (
++ parent_atk_type, type_name, &tinfo, 0);
++
++ return type;
++}
++
++
++static GQuark
++get_quark_accessible (void)
++{
++ static GQuark quark_accessible_object = 0;
++
++ if (!quark_accessible_object) {
++ quark_accessible_object = g_quark_from_static_string
++ ("accessible-object");
++ }
++
++ return quark_accessible_object;
++}
++
++static GQuark
++get_quark_gobject (void)
++{
++ static GQuark quark_accessible_gobject = 0;
++
++ if (!quark_accessible_gobject) {
++ quark_accessible_gobject = g_quark_from_static_string
++ ("object-for-accessible");
++ }
++
++ return quark_accessible_gobject;
++}
++
++/**
++ * eel_accessibility_get_atk_object:
++ * @object: a GObject of some sort
++ *
++ * gets an AtkObject associated with a GObject
++ *
++ * Return value: the associated accessible if one exists or NULL
++ **/
++AtkObject *
++eel_accessibility_get_atk_object (gpointer object)
++{
++ return g_object_get_qdata (object, get_quark_accessible ());
++}
++
++/**
++ * eel_accessibilty_for_object:
++ * @object: a GObject of some sort
++ *
++ * gets an AtkObject associated with a GObject and if it doesn't
++ * exist creates a suitable accessible object.
++ *
++ * Return value: an associated accessible.
++ **/
++AtkObject *
++eel_accessibility_for_object (gpointer object)
++{
++ if (GTK_IS_WIDGET (object))
++ return gtk_widget_get_accessible (object);
++
++ return atk_gobject_accessible_for_object (object);
++}
++
++/**
++ * eel_accessibility_get_gobject:
++ * @object: an AtkObject
++ *
++ * gets the GObject associated with the AtkObject, for which
++ * @object provides accessibility support.
++ *
++ * Return value: the accessible's associated GObject
++ **/
++gpointer
++eel_accessibility_get_gobject (AtkObject *object)
++{
++ return g_object_get_qdata (G_OBJECT (object), get_quark_gobject ());
++}
++
++static void
[...5519 lines suppressed...]
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* BOOLEAN:BOXED (eelmarshal.list:2) */
++extern void eel_marshal_BOOLEAN__BOXED (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* BOOLEAN:POINTER,POINTER (eelmarshal.list:3) */
++extern void eel_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* BOOLEAN:VOID (eelmarshal.list:4) */
++extern void eel_marshal_BOOLEAN__VOID (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* ENUM:INT,INT (eelmarshal.list:5) */
++extern void eel_marshal_ENUM__INT_INT (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* INT:INT (eelmarshal.list:6) */
++extern void eel_marshal_INT__INT (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* INT:POINTER,STRING (eelmarshal.list:7) */
++extern void eel_marshal_INT__POINTER_STRING (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* STRING:POINTER (eelmarshal.list:8) */
++extern void eel_marshal_STRING__POINTER (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* STRING:VOID (eelmarshal.list:9) */
++extern void eel_marshal_STRING__VOID (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* VOID:ENUM,INT (eelmarshal.list:10) */
++extern void eel_marshal_VOID__ENUM_INT (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* VOID:ENUM,INT,BOOLEAN (eelmarshal.list:11) */
++extern void eel_marshal_VOID__ENUM_INT_BOOLEAN (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* VOID:INT,INT,INT,INT (eelmarshal.list:12) */
++extern void eel_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++/* VOID:OBJECT,POINTER (eelmarshal.list:13) */
++extern void eel_marshal_VOID__OBJECT_POINTER (GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data);
++
++G_END_DECLS
++
++#endif /* __eel_marshal_MARSHAL_H__ */
++
diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.gecos 2008-12-04 13:21:20.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c 2008-12-04 13:21:20.000000000 -0500
+--- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.gecos 2008-12-16 21:16:16.000000000 -0500
++++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c 2008-12-16 21:16:16.000000000 -0500
@@ -39,6 +39,8 @@
#endif
#include "e-image-chooser.h"
-+#include <eel/eel-editable-label.h>
++#include "eel-editable-label.h"
+#include <gdk/gdkkeysyms.h>
#include "gnome-about-me-fingerprint.h"
#include "marshal.h"
@@ -292,7 +6105,7 @@
diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade
--- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade.gecos 2008-12-01 08:32:12.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade 2008-12-04 13:21:20.000000000 -0500
++++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade 2008-12-16 21:16:16.000000000 -0500
@@ -101,23 +101,30 @@
</child>
@@ -343,8 +6156,8 @@
<property name="expand">False</property>
diff -up gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos gnome-control-center-2.25.2/capplets/about-me/Makefile.am
--- gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos 2008-12-02 11:52:42.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/Makefile.am 2008-12-04 13:24:48.000000000 -0500
-@@ -9,9 +9,6 @@ pixmap_files = \
++++ gnome-control-center-2.25.2/capplets/about-me/Makefile.am 2008-12-16 21:16:16.000000000 -0500
+@@ -9,13 +9,16 @@ pixmap_files = \
gnome-about-me-lock-open.png
gnome_about_me_SOURCES = \
@@ -354,26 +6167,36 @@
gnome-about-me-password.c \
gnome-about-me-password.h \
e-image-chooser.c \
-@@ -28,7 +25,7 @@ bin_PROGRAMS = gnome-about-me
+ e-image-chooser.h \
++ eel-accessibility.c \
++ eel-accessibility.h \
++ eel-editable-label.c \
++ eel-editable-label.h \
++ eel-marshal.h \
++ eel-marshal.c \
+ gnome-about-me-fingerprint.c \
+ gnome-about-me-fingerprint.h \
+ $(MARSHALFILES) \
+@@ -28,7 +31,7 @@ bin_PROGRAMS = gnome-about-me
pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = $(pixmap_files)
-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS)
-+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(EEL_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS)
++gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) $(GAIL_LIBS)
gnome_about_me_LDFLAGS = -export-dynamic
@INTLTOOL_DESKTOP_RULE@
-@@ -43,6 +40,7 @@ INCLUDES = \
+@@ -43,6 +46,7 @@ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
$(LIBEBOOK_CFLAGS) \
$(POLKIT_GNOME_CFLAGS) \
-+ $(EEL_CFLAGS) \
++ $(GAIL_CFLAGS) \
-DDATADIR="\"$(datadir)\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
diff -up gnome-control-center-2.25.2/configure.in.gecos gnome-control-center-2.25.2/configure.in
---- gnome-control-center-2.25.2/configure.in.gecos 2008-12-04 13:21:20.000000000 -0500
-+++ gnome-control-center-2.25.2/configure.in 2008-12-04 13:21:20.000000000 -0500
+--- gnome-control-center-2.25.2/configure.in.gecos 2008-12-16 21:16:16.000000000 -0500
++++ gnome-control-center-2.25.2/configure.in 2008-12-16 21:16:16.000000000 -0500
@@ -97,6 +97,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
@@ -382,12 +6205,12 @@
gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
-@@ -182,6 +183,8 @@ dnl ====================================
- dnl About-me
- dnl ==============================================
+@@ -200,6 +201,8 @@ if test "x$enable_aboutme" = "xyes"; the
+ has_polkit=false)
+ fi
-+PKG_CHECK_MODULES(EEL, eel-2.0)
++PKG_CHECK_MODULES(GAIL, [gail])
+
- AC_MSG_CHECKING([whether to enable About Me])
- AC_ARG_ENABLE([aboutme],
- AC_HELP_STRING([--enable-aboutme],
+ AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
+
+ dnl ==============================================
- Previous message (by thread): rpms/vala/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 vala.spec, 1.33, 1.34
- Next message (by thread): rpms/libwnck/devel .cvsignore, 1.68, 1.69 libwnck.spec, 1.103, 1.104 sources, 1.68, 1.69
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list