rpms/eog/devel eog-gsettings1.patch, NONE, 1.1 eog-gsettings2.patch, NONE, 1.1 eog-gsettings3.patch, NONE, 1.1 eog.spec, 1.169, 1.170

Matthias Clasen mclasen at fedoraproject.org
Wed Jun 16 23:42:05 UTC 2010 

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30966

Modified Files:
	eog.spec 
Added Files:
	eog-gsettings1.patch eog-gsettings2.patch eog-gsettings3.patch 
Log Message:
make installed gsettings schema compile


eog-gsettings1.patch:
 data/Makefile.am                     |    3 +--
 data/org.gnome.eog.gschema.xml.in.in |   26 +++++++++++++-------------
 src/eog-config-keys.h                |   25 ++++++++++++-------------
 3 files changed, 26 insertions(+), 28 deletions(-)

--- NEW FILE eog-gsettings1.patch ---
>From afac01c63d764fc1b111698ef0b76473e8cfc96d Mon Sep 17 00:00:00 2001
From: Felix Riemann <friemann at gnome.org>
Date: Sat, 12 Jun 2010 16:46:28 +0000
Subject: Make GSettings keys follow the new naming conventions

This caused build failures for other modules, so we had to do it now.
Fixes bug #621370.
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 1bf1c2a..11fa246 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,8 +14,7 @@ gsettings_SCHEMAS = org.gnome.eog.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
-# Allow key names to not follow the new naming scheme until we fixed them
-GLIB_COMPILE_SCHEMAS +=  --allow-any-name
+
 schemas_in_files = eog.schemas.in
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
diff --git a/data/org.gnome.eog.gschema.xml.in.in b/data/org.gnome.eog.gschema.xml.in.in
index c0a44a9..6bde338 100644
--- a/data/org.gnome.eog.gschema.xml.in.in
+++ b/data/org.gnome.eog.gschema.xml.in.in
@@ -1,7 +1,7 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog" path="/apps/eog/">
     <child name="view" schema="org.gnome.eog.view"/>
-    <child name="full_screen" schema="org.gnome.eog.full_screen"/>
+    <child name="fullscreen" schema="org.gnome.eog.fullscreen"/>
     <child name="ui" schema="org.gnome.eog.ui"/>
     <child name="plugins" schema="org.gnome.eog.plugins"/>
   </schema>
@@ -31,17 +31,17 @@
       <_summary>Transparency indicator</_summary>
       <_description>Determines how transparency should be indicated. Valid values are CHECK_PATTERN, COLOR and NONE. If COLOR is choosen, then the trans_color key determines the used color value.</_description>
     </key>
-    <key name="scroll_wheel_zoom" type="b">
+    <key name="scroll-wheel-zoom" type="b">
       <default>true</default>
       <_summary>Scroll wheel zoom</_summary>
       <_description>Whether the scroll wheel should be used for zooming.</_description>
     </key>
-    <key name="zoom_multiplier" type="d">
+    <key name="zoom-multiplier" type="d">
       <default>0.05</default>
       <_summary>Zoom multiplier</_summary>
       <_description>The multiplier to be applied when using the mouse scroll wheel  for zooming. This value defines the zooming step used for each scroll  event. For example, 0.05 results in a 5% zoom increment for each  scroll event and 1.00 result in a 100% zoom increment.</_description>
     </key>
-    <key name="trans_color" type="s">
+    <key name="trans-color" type="s">
       <default>'#000000'</default>
       <_summary>Transparency color</_summary>
       <_description>If the transparency key has the value COLOR, then this  key determines the color which is used for indicating transparency.</_description>
@@ -52,7 +52,7 @@
 	<_description>If this is active the color set by the background-color key will be used to fill the area behind the image. If it is not set the current GTK theme will determine the fill color.</_description>
     </key>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog.full_screen" path="/apps/eog/full_screen/">
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog.fullscreen" path="/apps/eog/full_screen/">
     <key name="loop" type="b">
       <default>true</default>
       <_summary>Loop through the image sequence</_summary>
@@ -78,15 +78,15 @@
       <default>true</default>
       <_summary>Show/Hide the window statusbar.</_summary>
     </key>
-    <key name="image_collection" type="b">
+    <key name="image-collection" type="b">
       <default>false</default>
       <_summary>Show/Hide the image collection pane.</_summary>
     </key>
-    <key name="image_collection_position" type="i">
+    <key name="image-collection-position" type="i">
       <default>0</default>
       <_summary>Image collection pane position. Set to 0 for bottom;  1 for left; 2 for top; 3 for right.</_summary>
     </key>
-    <key name="image_collection_resizable" type="b">
+    <key name="image-collection-resizable" type="b">
       <default>false</default>
       <_summary>Whether the image collection pane should be resizable.</_summary>
     </key>
@@ -94,28 +94,28 @@
       <default>true</default>
       <_summary>Show/Hide the window side pane.</_summary>
     </key>
-    <key name="scroll_buttons" type="b">
+    <key name="scroll-buttons" type="b">
       <default>true</default>
       <_summary>Show/Hide the image collection pane scroll buttons.</_summary>
     </key>
-    <key name="disable_trash_confirmation" type="b">
+    <key name="disable-trash-confirmation" type="b">
       <default>false</default>
       <_summary>Trash images without asking</_summary>
       <_description>If activated Eye of GNOME wont ask for confirmation when moving images to the trash. It will still ask if any of the files cannot be moved to the trash and would be deleted instead.</_description>
     </key>
-    <key name="filechooser_xdg_fallback" type="b">
+    <key name="filechooser-xdg-fallback" type="b">
       <default>true</default>
       <_summary>Whether the file chooser should show the user's pictures folder if no images are loaded.</_summary>
       <_description>If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up it will show the current working directory.</_description>
     </key>
-    <key name="propsdialog_netbook_mode" type="b">
+    <key name="propsdialog-netbook-mode" type="b">
       <default>true</default>
       <_summary>Whether the metadata list in the properties dialog should have its own page.</_summary>
       <_description>If activated the detailed metadata list in the properties dialog will be moved to its own page in the dialog. This should make the dialog more usable on smaller screens, e.g. as used by netbooks. If disabled the widget will be embedded on the "Metadata" page.</_description>
     </key>
   </schema>
   <schema id="org.gnome.eog.plugins" path="/apps/eog/plugins/">
-    <key name="active_plugins" type="as">
+    <key name="active-plugins" type="as">
       <default>[]</default>
       <_summary>Active plugins</_summary>
       <_description>List of active plugins. It doesn't contain the "Location" of the active plugins.  See the .eog-plugin file for obtaining the "Location" of a given plugin.</_description>
diff --git a/src/eog-config-keys.h b/src/eog-config-keys.h
index ee99a92..81c6c21 100644
--- a/src/eog-config-keys.h
+++ b/src/eog-config-keys.h
@@ -27,7 +27,7 @@
 #define __EOG_CONFIG_KEYS_H__
 
 #define EOG_CONF_DOMAIN				"org.gnome.eog"
-#define EOG_CONF_FULLSCREEN			EOG_CONF_DOMAIN".full_screen"
+#define EOG_CONF_FULLSCREEN			EOG_CONF_DOMAIN".fullscreen"
 #define EOG_CONF_PLUGINS			EOG_CONF_DOMAIN".plugins"
 #define EOG_CONF_UI				EOG_CONF_DOMAIN".ui"
 #define EOG_CONF_VIEW				EOG_CONF_DOMAIN".view"
@@ -40,11 +40,11 @@
 #define EOG_CONF_VIEW_BACKGROUND_COLOR		"background-color"
 #define EOG_CONF_VIEW_INTERPOLATE		"interpolate"
 #define EOG_CONF_VIEW_EXTRAPOLATE		"extrapolate"
-#define EOG_CONF_VIEW_SCROLL_WHEEL_ZOOM		"scroll_wheel_zoom"
-#define EOG_CONF_VIEW_ZOOM_MULTIPLIER		"zoom_multiplier"
+#define EOG_CONF_VIEW_SCROLL_WHEEL_ZOOM		"scroll-wheel-zoom"
+#define EOG_CONF_VIEW_ZOOM_MULTIPLIER		"zoom-multiplier"
 #define EOG_CONF_VIEW_AUTOROTATE                "autorotate"
 #define EOG_CONF_VIEW_TRANSPARENCY		"transparency"
-#define EOG_CONF_VIEW_TRANS_COLOR		"trans_color"
+#define EOG_CONF_VIEW_TRANS_COLOR		"trans-color"
 #define EOG_CONF_VIEW_USE_BG_COLOR		"use-background-color"
 
 #define EOG_CONF_FULLSCREEN_LOOP		"loop"
@@ -53,15 +53,15 @@
 
 #define EOG_CONF_UI_TOOLBAR			"toolbar"
 #define EOG_CONF_UI_STATUSBAR			"statusbar"
-#define EOG_CONF_UI_IMAGE_COLLECTION		"image_collection"
-#define EOG_CONF_UI_IMAGE_COLLECTION_POSITION	"image_collection_position"
-#define EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE	"image_collection_resizable"
+#define EOG_CONF_UI_IMAGE_COLLECTION		"image-collection"
+#define EOG_CONF_UI_IMAGE_COLLECTION_POSITION	"image-collection-position"
+#define EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE	"image-collection-resizable"
 #define EOG_CONF_UI_SIDEBAR			"sidebar"
-#define EOG_CONF_UI_SCROLL_BUTTONS		"scroll_buttons"
-#define EOG_CONF_UI_DISABLE_TRASH_CONFIRMATION	"disable_trash_confirmation"
-#define EOG_CONF_UI_FILECHOOSER_XDG_FALLBACK	"filechooser_xdg_fallback"
-#define EOG_CONF_UI_PROPSDIALOG_NETBOOK_MODE	"propsdialog_netbook_mode"
+#define EOG_CONF_UI_SCROLL_BUTTONS		"scroll-buttons"
+#define EOG_CONF_UI_DISABLE_TRASH_CONFIRMATION	"disable-trash-confirmation"
+#define EOG_CONF_UI_FILECHOOSER_XDG_FALLBACK	"filechooser-xdg-fallback"
+#define EOG_CONF_UI_PROPSDIALOG_NETBOOK_MODE	"propsdialog-netbook-mode"
 
-#define EOG_CONF_PLUGINS_ACTIVE_PLUGINS         "active_plugins"
+#define EOG_CONF_PLUGINS_ACTIVE_PLUGINS         "active-plugins"
 
 #endif /* __EOG_CONFIG_KEYS_H__ */
--
cgit v0.8.3.1

eog-gsettings2.patch:
 eog-window.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE eog-gsettings2.patch ---
>From 6cb2ce2c72ce91f4f56d9110d7326e5ede86d7f9 Mon Sep 17 00:00:00 2001
From: Felix Riemann <friemann at gnome.org>
Date: Sat, 12 Jun 2010 16:48:54 +0000
Subject: Make forgotten GSettings keys use the key macros

---
diff --git a/src/eog-window.c b/src/eog-window.c
index 0dd6ab4..6289584 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -424,10 +424,11 @@ eog_window_collection_mode_changed_cb (GSettings *settings,
 
 	priv = EOG_WINDOW (user_data)->priv;
 
-	position = g_settings_get_int (settings, "image_collection_position");
+	position = g_settings_get_int (settings,
+				       EOG_CONF_UI_IMAGE_COLLECTION_POSITION);
 
 	resizable = g_settings_get_boolean (settings,
-					    "image_collection_resizable");
+					    EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE);
 
 	if (priv->collection_position == position &&
 	    priv->collection_resizable == resizable)
--
cgit v0.8.3.1

eog-gsettings3.patch:
 eog.schemas.in |   59 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

--- NEW FILE eog-gsettings3.patch ---
>From ea478326b68a8eba0a119eec92ac5374c00fe2b3 Mon Sep 17 00:00:00 2001
From: Felix Riemann <friemann at gnome.org>
Date: Sat, 12 Jun 2010 16:52:12 +0000
Subject: Make GConf keys match the new GSettings keys

---
diff --git a/data/eog.schemas.in b/data/eog.schemas.in
index e37c3c7..501bc5c 100644
--- a/data/eog.schemas.in
+++ b/data/eog.schemas.in
@@ -51,14 +51,14 @@
 	<short>Transparency indicator</short>
 	<long>Determines how transparency should be indicated. Valid values
         are CHECK_PATTERN, COLOR and NONE. If COLOR is choosen, then
-        the trans_color key determines the used color value.
+        the trans-color key determines the used color value.
         </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/view/scroll_wheel_zoom</key>
-      <applyto>/apps/eog/view/scroll_wheel_zoom</applyto>
+      <key>/schemas/apps/eog/view/scroll-wheel-zoom</key>
+      <applyto>/apps/eog/view/scroll-wheel-zoom</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>1</default>
@@ -69,8 +69,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/view/zoom_multiplier</key>
-      <applyto>/apps/eog/view/zoom_multiplier</applyto>
+      <key>/schemas/apps/eog/view/zoom-multiplier</key>
+      <applyto>/apps/eog/view/zoom-multiplier</applyto>
       <owner>eog</owner>
       <type>float</type>
       <default>0.05</default>
@@ -84,8 +84,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/view/trans_color</key>
-      <applyto>/apps/eog/view/trans_color</applyto>
+      <key>/schemas/apps/eog/view/trans-color</key>
+      <applyto>/apps/eog/view/trans-color</applyto>
       <owner>eog</owner>
       <type>string</type>
       <default>#000000</default>
@@ -98,8 +98,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/full_screen/loop</key>
-      <applyto>/apps/eog/full_screen/loop</applyto>
+      <key>/schemas/apps/eog/full-screen/loop</key>
+      <applyto>/apps/eog/full-screen/loop</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>1</default>
@@ -111,8 +111,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/full_screen/upscale</key>
-      <applyto>/apps/eog/full_screen/upscale</applyto>
+      <key>/schemas/apps/eog/full-screen/upscale</key>
+      <applyto>/apps/eog/full-screen/upscale</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>1</default>
@@ -124,8 +124,8 @@
     </schema>
 	
     <schema>
-      <key>/schemas/apps/eog/full_screen/seconds</key>
-      <applyto>/apps/eog/full_screen/seconds</applyto>
+      <key>/schemas/apps/eog/full-screen/seconds</key>
+      <applyto>/apps/eog/full-screen/seconds</applyto>
       <owner>eog</owner>
       <type>int</type>
       <default>5</default>
@@ -160,8 +160,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/ui/image_collection</key>
-      <applyto>/apps/eog/ui/image_collection</applyto>
+      <key>/schemas/apps/eog/ui/image-collection</key>
+      <applyto>/apps/eog/ui/image-collection</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>0</default>
@@ -171,8 +171,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/ui/image_collection_position</key>
-      <applyto>/apps/eog/ui/image_collection_position</applyto>
+      <key>/schemas/apps/eog/ui/image-collection-position</key>
+      <applyto>/apps/eog/ui/image-collection-position</applyto>
       <owner>eog</owner>
       <type>int</type>
       <default>0</default>
@@ -183,8 +183,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/ui/image_collection_resizable</key>
-      <applyto>/apps/eog/ui/image_collection_resizable</applyto>
+      <key>/schemas/apps/eog/ui/image-collection-resizable</key>
+      <applyto>/apps/eog/ui/image-collection-resizable</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>0</default>
@@ -205,8 +205,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/ui/scroll_buttons</key>
-      <applyto>/apps/eog/ui/scroll_buttons</applyto>
+      <key>/schemas/apps/eog/ui/scroll-buttons</key>
+      <applyto>/apps/eog/ui/scroll-buttons</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>1</default>
@@ -216,8 +216,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/ui/disable_trash_confirmation</key>
-      <applyto>/apps/eog/ui/disable_trash_confirmation</applyto>
+      <key>/schemas/apps/eog/ui/disable-trash-confirmation</key>
+      <applyto>/apps/eog/ui/disable-trash-confirmation</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>0</default>
@@ -230,8 +230,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/ui/filechooser_xdg_fallback</key>
-      <applyto>/apps/eog/ui/filechooser_xdg_fallback</applyto>
+      <key>/schemas/apps/eog/ui/filechooser-xdg-fallback</key>
+      <applyto>/apps/eog/ui/filechooser-xdg-fallback</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>1</default>
@@ -242,8 +242,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/ui/propsdialog_netbook_mode</key>
-      <applyto>/apps/eog/ui/propsdialog_netbook_mode</applyto>
+      <key>/schemas/apps/eog/ui/propsdialog-netbook-mode</key>
+      <applyto>/apps/eog/ui/propsdialog-netbook-mode</applyto>
       <owner>eog</owner>
       <type>bool</type>
       <default>1</default>
@@ -257,8 +257,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/eog/plugins/active_plugins</key>
-      <applyto>/apps/eog/plugins/active_plugins</applyto>
+      <key>/schemas/apps/eog/plugins/active-plugins</key>
+      <applyto>/apps/eog/plugins/active-plugins</applyto>
       <owner>eog</owner>
       <type>list</type>
       <list_type>string</list_type>
--
cgit v0.8.3.1


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- eog.spec	9 Jun 2010 01:52:51 -0000	1.169
+++ eog.spec	16 Jun 2010 23:42:04 -0000	1.170
@@ -12,7 +12,7 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.31.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://projects.gnome.org/eog/
 #VCS: git:git://git.gnome.org/eog
 Source: http://download.gnome.org/sources/eog/2.31/%{name}-%{version}.tar.bz2
@@ -45,6 +45,11 @@ Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
+# upstream fixes
+Patch0: eog-gsettings1.patch
+Patch1: eog-gsettings2.patch
+Patch2: eog-gsettings3.patch
+
 %description
 The Eye of GNOME image viewer (eog) is the official image viewer for the
 GNOME desktop. It can view single image files in a variety of formats, as
@@ -69,6 +74,9 @@ functionality to eog.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gsettings1
+%patch1 -p1 -b .gsettings2
+%patch2 -p1 -b .gsettings3
 
 echo "NoDisplay=true" >> data/eog.desktop.in
 # just in case
@@ -156,6 +164,9 @@ glib-compile-schemas %{_datadir}/glib-2.
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Wed Jun 16 2010 Matthias Clasen <mclasen at redhat.com> 2.31.3-2
+- Make installed gsettings schema compile
+
 * Tue Jun  8 2010 Matthias Clasen <mclasen at redhat.com> 2.31.3-1
 - Update to 2.31.3

More information about the scm-commits mailing list