pool/gsettings-desktop-schemas
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 68544 from home:fcrozat:branches:GNOME:Factory

Browse Source 
thanks

OBS-URL: https://build.opensuse.org/request/show/68544
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gsettings-desktop-schemas?expand=0&rev=16
This commit is contained in:
Vincent Untz 2011-04-27 12:07:24 +00:00 committed by Git OBS Bridge
parent b9142778ec
commit 9bbcbc15e5
5 changed files with 14 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gsettings-desktop-schemas-3.0.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b8d7f6141379f3ab58ca917baa3eb947e78d6425664b21dc199a35f99991af6
size 136730

3
gsettings-desktop-schemas-3.0.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e72158a0e70ae50b8bb992e1486dd2fda43207f4ec4eb03a0d769f210363fd9
size 136439

61
gsettings-desktop-schemas-overoptimistic-convert.patch
View File

@ -1,61 +0,0 @@
From 81e581e67962ecf290f886afd2fbf5767f1970ad Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 07 Apr 2011 14:06:24 +0000
Subject: Remove some questionable conversions
We can't convert picture-filename to picture-uri, since a filename
is not a uri, and then the other picture-related keys don't make sense
to migrate. And we really don't want to migrate show-desktop-icons
and draw-background. Or any of the GTK+ tweak keys.
https://bugzilla.gnome.org/show_bug.cgi?id=647039
---
diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert
index 960e6b4..dd8fb42 100644
--- a/schemas/gsettings-desktop-schemas.convert
+++ b/schemas/gsettings-desktop-schemas.convert
@@ -1,13 +1,7 @@
# From org.gnome.desktop.background.gschema.xml.in
-[org.gnome.desktop.background]
-draw-background = /desktop/gnome/background/draw_background
-picture-options = /desktop/gnome/background/picture_options
-picture-uri = /desktop/gnome/background/picture_filename
-picture-opacity = /desktop/gnome/background/picture_opacity
-primary-color = /desktop/gnome/background/primary_color
-secondary-color = /desktop/gnome/background/secondary_color
-color-shading-type = /desktop/gnome/background/color_shading_type
-show-desktop-icons = /apps/nautilus/preferences/show_desktop
+# [org.gnome.desktop.background]
+# Disabled as we don't want to migrate the default background
+# settings as we can't convert the picture filename
# From org.gnome.desktop-media-handling.gschema.xml.in
[org.gnome.desktop.media-handling]
@@ -35,14 +29,16 @@ exec-arg = /desktop/gnome/applications/terminal/exec_arg
[org.gnome.desktop.interface]
toolkit-accessibility = /desktop/gnome/interface/accessibility
enable-animations = /desktop/gnome/interface/enable_animations
-menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff
-can-change-accels = /desktop/gnome/interface/can_change_accels
-toolbar-style = /desktop/gnome/interface/toolbar_style
-menus-have-icons = /desktop/gnome/interface/menus_have_icons
-buttons-have-icons = /desktop/gnome/interface/buttons_have_icons
-menubar-detachable = /desktop/gnome/interface/menubar_detachable
-toolbar-detachable = /desktop/gnome/interface/toolbar_detachable
-toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size
+# Disabled, as we want users to use the new default:
+# https://bugzilla.gnome.org/show_bug.cgi?id=647039
+#menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff
+#can-change-accels = /desktop/gnome/interface/can_change_accels
+#toolbar-style = /desktop/gnome/interface/toolbar_style
+#menus-have-icons = /desktop/gnome/interface/menus_have_icons
+#buttons-have-icons = /desktop/gnome/interface/buttons_have_icons
+#menubar-detachable = /desktop/gnome/interface/menubar_detachable
+#toolbar-detachable = /desktop/gnome/interface/toolbar_detachable
+#toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size
# Disabled, as we want users to use the new default:
# https://bugzilla.gnome.org/show_bug.cgi?id=634639
# cursor-blink = /desktop/gnome/interface/cursor_blink
--
cgit v0.9

10
gsettings-desktop-schemas.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Apr 27 11:52:02 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.1:
+ Don't migrate background-related keys
+ Don't migrate custom GTK+ color schemes and various GTK+ tweaks
keys.
- Drop gsettings-desktop-schemas-overoptimistic-convert.patch:
fixed upstream.
-------------------------------------------------------------------
Fri Apr 8 16:05:15 UTC 2011 - dimstar@opensuse.org

5
gsettings-desktop-schemas.spec
View File

@ -19,15 +19,13 @@
Name: gsettings-desktop-schemas
Version: 3.0.0
Version: 3.0.1
Release: 1
License: LGPLv2+
Summary: Shared GSettings Schemas for the Desktop
Url: http://gnome.org/
Group: System/GUI/GNOME
Source0: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gsettings-desktop-schemas-overoptimistic-convert.patch bgo#647039 dimstar@opensuse.org -- Remove some questionable conversions, taken from git
Patch0: gsettings-desktop-schemas-overoptimistic-convert.patch
BuildRequires: glib2-devel
BuildRequires: intltool
%if 0%{?BUILD_FROM_VCS}
@ -59,7 +57,6 @@ This package contains development files.
%lang_package
%prep
%setup -q
%patch0 -p1
%if 0%{?BUILD_FROM_VCS}
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh