From 9ea600ed8791b389d98c99585542aab8ba8ed3f0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jun 16 2010 23:42:04 +0000 Subject: make installed gsettings schema compile --- diff --git a/eog-gsettings1.patch b/eog-gsettings1.patch new file mode 100644 index 0000000..730834e --- /dev/null +++ b/eog-gsettings1.patch @@ -0,0 +1,172 @@ +From afac01c63d764fc1b111698ef0b76473e8cfc96d Mon Sep 17 00:00:00 2001 +From: Felix Riemann +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 @@ + + + +- ++ + + + +@@ -31,17 +31,17 @@ + <_summary>Transparency indicator + <_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. + +- ++ + true + <_summary>Scroll wheel zoom + <_description>Whether the scroll wheel should be used for zooming. + +- ++ + 0.05 + <_summary>Zoom multiplier + <_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. + +- ++ + '#000000' + <_summary>Transparency color + <_description>If the transparency key has the value COLOR, then this key determines the color which is used for indicating transparency. +@@ -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. + + +- ++ + + true + <_summary>Loop through the image sequence +@@ -78,15 +78,15 @@ + true + <_summary>Show/Hide the window statusbar. + +- ++ + false + <_summary>Show/Hide the image collection pane. + +- ++ + 0 + <_summary>Image collection pane position. Set to 0 for bottom; 1 for left; 2 for top; 3 for right. + +- ++ + false + <_summary>Whether the image collection pane should be resizable. + +@@ -94,28 +94,28 @@ + true + <_summary>Show/Hide the window side pane. + +- ++ + true + <_summary>Show/Hide the image collection pane scroll buttons. + +- ++ + false + <_summary>Trash images without asking + <_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. + +- ++ + true + <_summary>Whether the file chooser should show the user's pictures folder if no images are loaded. + <_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. + +- ++ + true + <_summary>Whether the metadata list in the properties dialog should have its own page. + <_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. + + + +- ++ + [] + <_summary>Active plugins + <_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. +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 diff --git a/eog-gsettings2.patch b/eog-gsettings2.patch new file mode 100644 index 0000000..900196f --- /dev/null +++ b/eog-gsettings2.patch @@ -0,0 +1,26 @@ +From 6cb2ce2c72ce91f4f56d9110d7326e5ede86d7f9 Mon Sep 17 00:00:00 2001 +From: Felix Riemann +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 diff --git a/eog-gsettings3.patch b/eog-gsettings3.patch new file mode 100644 index 0000000..5b02b69 --- /dev/null +++ b/eog-gsettings3.patch @@ -0,0 +1,173 @@ +From ea478326b68a8eba0a119eec92ac5374c00fe2b3 Mon Sep 17 00:00:00 2001 +From: Felix Riemann +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 @@ + Transparency indicator + 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. + + + + + +- /schemas/apps/eog/view/scroll_wheel_zoom +- /apps/eog/view/scroll_wheel_zoom ++ /schemas/apps/eog/view/scroll-wheel-zoom ++ /apps/eog/view/scroll-wheel-zoom + eog + bool + 1 +@@ -69,8 +69,8 @@ + + + +- /schemas/apps/eog/view/zoom_multiplier +- /apps/eog/view/zoom_multiplier ++ /schemas/apps/eog/view/zoom-multiplier ++ /apps/eog/view/zoom-multiplier + eog + float + 0.05 +@@ -84,8 +84,8 @@ + + + +- /schemas/apps/eog/view/trans_color +- /apps/eog/view/trans_color ++ /schemas/apps/eog/view/trans-color ++ /apps/eog/view/trans-color + eog + string + #000000 +@@ -98,8 +98,8 @@ + + + +- /schemas/apps/eog/full_screen/loop +- /apps/eog/full_screen/loop ++ /schemas/apps/eog/full-screen/loop ++ /apps/eog/full-screen/loop + eog + bool + 1 +@@ -111,8 +111,8 @@ + + + +- /schemas/apps/eog/full_screen/upscale +- /apps/eog/full_screen/upscale ++ /schemas/apps/eog/full-screen/upscale ++ /apps/eog/full-screen/upscale + eog + bool + 1 +@@ -124,8 +124,8 @@ + + + +- /schemas/apps/eog/full_screen/seconds +- /apps/eog/full_screen/seconds ++ /schemas/apps/eog/full-screen/seconds ++ /apps/eog/full-screen/seconds + eog + int + 5 +@@ -160,8 +160,8 @@ + + + +- /schemas/apps/eog/ui/image_collection +- /apps/eog/ui/image_collection ++ /schemas/apps/eog/ui/image-collection ++ /apps/eog/ui/image-collection + eog + bool + 0 +@@ -171,8 +171,8 @@ + + + +- /schemas/apps/eog/ui/image_collection_position +- /apps/eog/ui/image_collection_position ++ /schemas/apps/eog/ui/image-collection-position ++ /apps/eog/ui/image-collection-position + eog + int + 0 +@@ -183,8 +183,8 @@ + + + +- /schemas/apps/eog/ui/image_collection_resizable +- /apps/eog/ui/image_collection_resizable ++ /schemas/apps/eog/ui/image-collection-resizable ++ /apps/eog/ui/image-collection-resizable + eog + bool + 0 +@@ -205,8 +205,8 @@ + + + +- /schemas/apps/eog/ui/scroll_buttons +- /apps/eog/ui/scroll_buttons ++ /schemas/apps/eog/ui/scroll-buttons ++ /apps/eog/ui/scroll-buttons + eog + bool + 1 +@@ -216,8 +216,8 @@ + + + +- /schemas/apps/eog/ui/disable_trash_confirmation +- /apps/eog/ui/disable_trash_confirmation ++ /schemas/apps/eog/ui/disable-trash-confirmation ++ /apps/eog/ui/disable-trash-confirmation + eog + bool + 0 +@@ -230,8 +230,8 @@ + + + +- /schemas/apps/eog/ui/filechooser_xdg_fallback +- /apps/eog/ui/filechooser_xdg_fallback ++ /schemas/apps/eog/ui/filechooser-xdg-fallback ++ /apps/eog/ui/filechooser-xdg-fallback + eog + bool + 1 +@@ -242,8 +242,8 @@ + + + +- /schemas/apps/eog/ui/propsdialog_netbook_mode +- /apps/eog/ui/propsdialog_netbook_mode ++ /schemas/apps/eog/ui/propsdialog-netbook-mode ++ /apps/eog/ui/propsdialog-netbook-mode + eog + bool + 1 +@@ -257,8 +257,8 @@ + + + +- /schemas/apps/eog/plugins/active_plugins +- /apps/eog/plugins/active_plugins ++ /schemas/apps/eog/plugins/active-plugins ++ /apps/eog/plugins/active-plugins + eog + list + string +-- +cgit v0.8.3.1 diff --git a/eog.spec b/eog.spec index a52f171..07f0c91 100644 --- a/eog.spec +++ b/eog.spec @@ -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.0/schemas %{_datadir}/gtk-doc/html/eog %changelog +* Wed Jun 16 2010 Matthias Clasen 2.31.3-2 +- Make installed gsettings schema compile + * Tue Jun 8 2010 Matthias Clasen 2.31.3-1 - Update to 2.31.3