Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.26
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25403
Modified Files:
gconf-editor.info
Added Files:
gconf-editor.patch
Log Message:
with .patch goodness
Index: gconf-editor.info
===================================================================
RCS file:
/cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.26/gconf-editor.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gconf-editor.info 28 May 2009 16:10:29 -0000 1.2
+++ gconf-editor.info 28 May 2009 17:13:34 -0000 1.3
@@ -110,10 +110,6 @@
gtk-update-icon-cache -f -t %p/share/icons/hicolor || :
<<
DescPackaging: <<
-# Source dist is missing some image files for the docs, so
-# download them from the bug report about this problem. See:
-# http://bugzilla.gnome.org/show_bug.cgi?id=500308
-
Upstream patch to make polkit optional. See:
http://bugzilla.gnome.org/show_bug.cgi?id=579096
Disable it because fink doesn't have it and fink's gconf
--- NEW FILE: gconf-editor.patch ---
diff -Nurd -x'*~' gconf-editor-2.26.0.orig/configure.in
gconf-editor-2.26.0/configure.in
--- gconf-editor-2.26.0.orig/configure.in 2009-03-17 10:30:40.000000000
-0400
+++ gconf-editor-2.26.0/configure.in 2009-05-28 11:43:56.000000000 -0400
@@ -34,9 +34,7 @@
PKG_CHECK_MODULES(GCONF_EDITOR,
gconf-2.0 >= 2.9.2
- gtk+-2.0 >= 2.12.0
- polkit-dbus >= 0.7
- dbus-glib-1 >= 0.71)
+ gtk+-2.0 >= 2.12.0)
if test "$enable_maintainer_mode" = "yes"; then
DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED \
@@ -55,6 +53,22 @@
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
+dnl Enable or not the policykit support
+AC_ARG_WITH([policykit],
+ AC_HELP_STRING([--with-policykit],
+ [Compile with policykit support @<:@default=yes@:>@]),
+ [with_polkit=$withval],
+ [with_polkit=yes])
+
+if test x$with_polkit = xyes; then
+ AC_DEFINE([HAVE_POLICYKIT], 1, [PolicyKit support is required])
+ PKG_CHECK_MODULES(GCONF_EDITOR_POLKIT,
+ polkit-dbus >= 0.7
+ dbus-glib-1 >= 0.71)
+fi
+
+AM_CONDITIONAL([HAVE_POLICYKIT], [test x$with_polkit = xyes])
+
dnl Get the GConf defaults source, and sed it to make the mandatory source.
GCONF_DEFAULTS_SOURCE=`gconftool-2 --get-default-source`
AC_ARG_WITH(gconf-defaults-source,
@@ -86,5 +100,6 @@
echo "
Configuration Sources:
-GConf default values source: ${GCONF_DEFAULTS_SOURCE}
-GConf mandatory values source: ${GCONF_MANDATORY_SOURCE}"
+GConf default values source: ${GCONF_DEFAULTS_SOURCE}
+GConf mandatory values source: ${GCONF_MANDATORY_SOURCE}
+PolicyKit support: ${with_polkit}"
diff -Nurd -x'*~' gconf-editor-2.26.0.orig/src/Makefile.am
gconf-editor-2.26.0/src/Makefile.am
--- gconf-editor-2.26.0.orig/src/Makefile.am 2009-03-17 10:29:30.000000000
-0400
+++ gconf-editor-2.26.0/src/Makefile.am 2009-05-28 11:43:56.000000000 -0400
@@ -3,14 +3,15 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DICONDIR="\"$(pkgdatadir)/icons\"" \
$(DISABLE_DEPRECATED_CFLAGS) \
- $(GCONF_EDITOR_CFLAGS)
+ $(GCONF_EDITOR_CFLAGS) \
+ $(GCONF_EDITOR_POLKIT_CFLAGS)
bin_PROGRAMS = gconf-editor
gconf_editor_built_headers = gconf-marshal.h
gconf_editor_built_cfiles = gconf-marshal.c
-gconf_editor_SOURCES = \
+gconf_editor_SOURCES = \
gconf-bookmarks.c \
gconf-bookmarks.h \
gconf-bookmarks-dialog.c \
@@ -33,8 +34,6 @@
gconf-util.h \
gedit-output-window.c \
gedit-output-window.h \
- gconf-policykit.c \
- gconf-policykit.h \
gconf-search.h \
gconf-search.c \
gconf-search-dialog.h \
@@ -43,6 +42,11 @@
$(gconf_editor_built_headers) \
$(gconf_editor_built_cfiles)
+if HAVE_POLICYKIT
+gconf_editor_SOURCES += gconf-policykit.h \
+ gconf-policykit.c
+endif
+
## we just punt on built sources, and check them into svn, manually updating
## when required.
regenerate-built-sources:
@@ -54,7 +58,8 @@
gconf_editor_LDADD = \
- $(GCONF_EDITOR_LIBS)
+ $(GCONF_EDITOR_LIBS) \
+ $(GCONF_EDITOR_POLKIT_LIBS)
EXTRA_DIST = \
gconf-marshal.list
diff -Nurd -x'*~' gconf-editor-2.26.0.orig/src/gconf-editor-window.c
gconf-editor-2.26.0/src/gconf-editor-window.c
--- gconf-editor-2.26.0.orig/src/gconf-editor-window.c 2009-03-17
10:29:30.000000000 -0400
+++ gconf-editor-2.26.0/src/gconf-editor-window.c 2009-05-28
11:43:56.000000000 -0400
@@ -27,7 +27,9 @@
#include "gconf-cell-renderer.h"
#include "gconf-editor-application.h"
#include "gconf-key-editor.h"
-#include "gconf-policykit.h"
+#ifdef HAVE_POLICYKIT
+# include "gconf-policykit.h"
+#endif
#include "gconf-stock-icons.h"
#include "gconf-util.h"
#include "gedit-output-window.h"
@@ -640,26 +642,34 @@
gdk_display_flush (gtk_widget_get_display (GTK_WIDGET (gconfwindow)));
}
+#ifdef HAVE_POLICYKIT
+/* QA Warning: Only used with policykit support ,
+ so avoiding ' defined but not used' warning
+*/
static void
gconf_editor_popup_policykit_callback (GtkWindow *window, GError *error)
{
if (error)
gconf_editor_window_popup_error_dialog (window, _("Could not set value.
Error was:\n%s"), error);
}
+#endif
static void
gconf_editor_popup_window_set_as_default (GtkAction *action, GtkWidget
*callback_data)
{
GConfEditorWindow *gconfwindow = GCONF_EDITOR_WINDOW (callback_data);
- GtkWindow *window = GTK_WINDOW (callback_data);
GtkTreeIter iter;
GConfValue *value;
char *path = NULL;
+
+#ifdef HAVE_POLICYKIT
+ /* QA Warning: unsed variable if policykit is disable */
+ GtkWindow *window = GTK_WINDOW (callback_data);
gboolean can_use_pk;
can_use_pk = (gconfwindow->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL);
-
+#endif
gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW
(gconfwindow->list_view)),
NULL, &iter);
gtk_tree_model_get (gconfwindow->sorted_list_model, &iter,
@@ -680,12 +690,13 @@
if (!error)
return;
-
+#ifdef HAVE_POLICYKIT
if (!can_use_pk)
gconf_editor_window_popup_error_dialog (window, _("Could not sync
value. Error was:\n%s"), error);
+#endif
}
}
-
+#ifdef HAVE_POLICYKIT
if (can_use_pk) {
gconf_client_suggest_sync (gconfwindow->client, NULL);
gconf_pk_set_default_async (path,
@@ -693,21 +704,24 @@
(GFunc) gconf_editor_popup_policykit_callback,
g_object_ref (window), g_object_unref);
}
+#endif
}
static void
gconf_editor_popup_window_set_as_mandatory (GtkAction *action, GtkWidget
*callback_data)
{
GConfEditorWindow *gconfwindow = GCONF_EDITOR_WINDOW (callback_data);
- GtkWindow *window = GTK_WINDOW (callback_data);
GtkTreeIter iter;
GConfValue *value;
char *path = NULL;
+#ifdef HAVE_POLICYKIT
+ /* QA Warning */
+ GtkWindow *window = GTK_WINDOW (callback_data);
gboolean can_use_pk;
can_use_pk = (gconfwindow->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL);
-
+#endif
gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW
(gconfwindow->list_view)),
NULL, &iter);
gtk_tree_model_get (gconfwindow->sorted_list_model, &iter,
@@ -728,12 +742,13 @@
if (!error)
return;
-
+#ifdef HAVE_POLICYKIT
if (!can_use_pk)
gconf_editor_window_popup_error_dialog (window, _("Could not sync
value. Error was:\n%s"), error);
+#endif
}
}
-
+#ifdef HAVE_POLICYKIT
if (can_use_pk) {
gconf_client_suggest_sync (gconfwindow->client, NULL);
gconf_pk_set_mandatory_async (path,
@@ -741,6 +756,7 @@
(GFunc)
gconf_editor_popup_policykit_callback,
g_object_ref (window), g_object_unref);
}
+#endif
}
static GtkActionEntry entries[] = {
@@ -934,10 +950,20 @@
window->type !=
GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->ui_manager, "/GConfKeyPopupMenu/DefaultKey"),
(gconf_util_can_edit_defaults
() && window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS) ||
- (gconf_pk_can_set_default ()
&& window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+#ifdef HAVE_POLICYKIT
+ (gconf_pk_can_set_default ()
&&
+#else
+ (
+#endif
+ window->type ==
GCONF_EDITOR_WINDOW_TYPE_NORMAL));
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"),
(gconf_util_can_edit_mandatory () && window->type !=
GCONF_EDITOR_WINDOW_TYPE_MANDATORY) ||
- (gconf_pk_can_set_mandatory
() && window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+#ifdef HAVE_POLICYKIT
+ (gconf_pk_can_set_mandatory
() &&
+#else
+ (
+#endif
+window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
gtk_tree_path_free (path);
}
@@ -1037,10 +1063,20 @@
window->type !=
GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->ui_manager, "/GConfKeyPopupMenu/DefaultKey"),
(gconf_util_can_edit_defaults () &&
window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS) ||
- (gconf_pk_can_set_default () &&
window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+#ifdef HAVE_POLICYKIT
+ (gconf_pk_can_set_default () &&
+#else
+ (
+#endif
+window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"),
(gconf_util_can_edit_mandatory () &&
window->type != GCONF_EDITOR_WINDOW_TYPE_MANDATORY) ||
- (gconf_pk_can_set_mandatory () &&
window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+#ifdef HAVE_POLICYKIT
+ (gconf_pk_can_set_mandatory () &&
+#else
+ (
+#endif
+window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
}
else {
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
