diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-11 11:19:21 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-11 11:19:21 (GMT) |
| commit | fbdc05fa6c65fe5f3eed50876d51037a3f52ed43 (patch) | |
| tree | c449c5426bcda560c359d26a91c92bbb67fc45f1 | |
| parent | 7f30cecd6173fd9c0b4f41244181193254bd8c1d (diff) | |
Add gconf-dbus and patch it to store settings in the sugar profile.
| -rw-r--r-- | config/modulesets/glucose-external.modules | 9 | ||||
| -rw-r--r-- | config/modulesets/glucose.modules | 1 | ||||
| -rw-r--r-- | config/modulesets/patches/gconf-dbus-defaultpath.patch | 11 | ||||
| -rw-r--r-- | scripts/config.py | 1 |
4 files changed, 21 insertions, 1 deletions
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules index b830363..b7b596f 100644 --- a/config/modulesets/glucose-external.modules +++ b/config/modulesets/glucose-external.modules @@ -196,5 +196,12 @@ <dependencies> <dep package="poppler"/> </dependencies> - </autotools> + </autotools> + <tarball id="GConf-dbus"> + <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2" + version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/> + <patches> + <patch file="gconf-dbus-defaultpath.patch" strip="0"/> + </patches> + </tarball> </moduleset> diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules index dfc0d51..32b0a22 100644 --- a/config/modulesets/glucose.modules +++ b/config/modulesets/glucose.modules @@ -24,6 +24,7 @@ <autotools id="sugar"> <branch/> <dependencies> + <dep package="GConf-dbus"/> <dep package="sugar-base"/> <dep package="sugar-toolkit"/> <dep package="artwork"/> diff --git a/config/modulesets/patches/gconf-dbus-defaultpath.patch b/config/modulesets/patches/gconf-dbus-defaultpath.patch new file mode 100644 index 0000000..f792566 --- /dev/null +++ b/config/modulesets/patches/gconf-dbus-defaultpath.patch @@ -0,0 +1,11 @@ +--- gconf/default.path.in.orig 2008-10-11 13:12:47.000000000 +0200 ++++ gconf/default.path.in 2008-10-11 13:13:30.000000000 +0200 +@@ -18,7 +18,7 @@ + include "$(HOME)/.gconf.path" + + # Give users a default storage location, ~/.gconf +-xml:readwrite:$(HOME)/.gconf ++xml:readwrite:$(HOME)/.sugar/$(ENV_SUGAR_PROFILE)/gconf + + # To read in any defaults settings that the Sys Admin may have created + # prior to a desktop system upgrade. The SysAdmin can stick default values diff --git a/scripts/config.py b/scripts/config.py index 5694d91..5619cd4 100644 --- a/scripts/config.py +++ b/scripts/config.py @@ -82,6 +82,7 @@ class Config(jhbuild.config.Config): os.environ['SUGAR_PREFIX'] = self.prefix os.environ['SUGAR_PATH'] = os.path.join(self.prefix, 'share', 'sugar') os.environ['SUGAR_LOGGER_LEVEL'] = 'debug' + os.environ['SUGAR_PROFILE'] = 'default' # Enable debug log of the Telepathy components os.environ['GABBLE_DEBUG'] = 'all' |