Index: PKGBUILD =================================================================== --- PKGBUILD (revision 159680) +++ PKGBUILD (working copy) @@ -31,7 +31,8 @@ "git+https://cr.deepin.io/dbus-factory.git#tag=$_dbusfactoryver" "git+https://cr.deepin.io/go-gir-generator.git#tag=$_girgeneratorver" 'deepin-daemon.sysusers' - 'polkit-gnome-authentication-agent-1-deepin.desktop') + 'polkit-gnome-authentication-agent-1-deepin.desktop' + 'dont-sync-gnome-background.patch') sha256sums=('SKIP' 'SKIP' 'SKIP' @@ -38,7 +39,8 @@ 'SKIP' 'SKIP' '4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25' - '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7') + '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7' + 'e7f1108c86df633798cbcfa4918cd88bb03aacdbb285c9d0b5a6b3ce8cda930d') prepare() { sed -i "s|\"\${GOLDFLAGS}\"|\"\${GOLDFLAGS} $CFLAGS $LDFLAGS\"|" dde-daemon/Makefile @@ -53,6 +55,10 @@ github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \ github.com/BurntSushi/freetype-go/freetype github.com/BurntSushi/freetype-go/freetype/truetype \ github.com/BurntSushi/graphics-go/graphics + + cd "$srcdir/dde-daemon" + # don't sync background with GNOME + patch -Np1 -i ../dont-sync-gnome-background.patch } build() { Index: dont-sync-gnome-background.patch =================================================================== --- dont-sync-gnome-background.patch (nonexistent) +++ dont-sync-gnome-background.patch (working copy) @@ -0,0 +1,71 @@ +diff -Naur dde-daemon.orig/appearance/handle_gsetting.go dde-daemon/appearance/handle_gsetting.go +--- dde-daemon.orig/appearance/handle_gsetting.go 2016-01-31 14:19:52.174253000 +0100 ++++ dde-daemon/appearance/handle_gsetting.go 2016-01-31 15:25:41.681454609 +0100 +@@ -2,7 +2,6 @@ + + import ( + "gir/gio-2.0" +- "time" + ) + + func (m *Manager) listenGSettingChanged() { +@@ -31,21 +30,4 @@ + logger.Debug("[Wrap background] changed OVER ENDDDDDDDDDDD:", key, uri) + }) + m.wrapBgSetting.GetString(gsKeyBackground) +- +- if m.gnomeBgSetting == nil { +- return +- } +- m.gnomeBgSetting.Connect("changed::picture-uri", func(s *gio.Settings, key string) { +- // Wait for file copy finished +- time.Sleep(time.Millisecond * 500) +- uri := m.gnomeBgSetting.GetString(gsKeyBackground) +- logger.Debug("[Gnome background] sync wrap bg:", uri, m.wrapBgSetting.GetString(gsKeyBackground)) +- if uri == m.wrapBgSetting.GetString(gsKeyBackground) { +- return +- } +- +- m.wrapBgSetting.SetString(gsKeyBackground, uri) +- logger.Debug("[Gnome background] sync wrap bg OVER ENDDDDDDDD:", uri, m.wrapBgSetting.GetString(gsKeyBackground)) +- }) +- m.gnomeBgSetting.GetString(gsKeyBackground) + } +diff -Naur dde-daemon.orig/appearance/manager.go dde-daemon/appearance/manager.go +--- dde-daemon.orig/appearance/manager.go 2016-01-31 14:19:52.174253000 +0100 ++++ dde-daemon/appearance/manager.go 2016-01-31 14:22:24.477099255 +0100 +@@ -31,7 +31,6 @@ + dthemeCustomId = "Custom" + + wrapBgSchema = "com.deepin.wrap.gnome.desktop.background" +- gnomeBgSchema = "org.gnome.desktop.background" + gsKeyBackground = "picture-uri" + + appearanceSchema = "com.deepin.dde.appearance" +@@ -52,7 +51,6 @@ + setting *gio.Settings + + wrapBgSetting *gio.Settings +- gnomeBgSetting *gio.Settings + + watcher *fsnotify.Watcher + endWatcher chan struct{} +@@ -65,7 +63,6 @@ + m.setPropFontSize(m.setting.GetInt(gsKeyFontSize)) + + m.wrapBgSetting, _ = dutils.CheckAndNewGSettings(wrapBgSchema) +- m.gnomeBgSetting, _ = dutils.CheckAndNewGSettings(gnomeBgSchema) + + var err error + m.watcher, err = fsnotify.NewWatcher() +@@ -87,10 +84,6 @@ + m.wrapBgSetting.Unref() + } + +- if m.gnomeBgSetting != nil { +- m.gnomeBgSetting.Unref() +- } +- + if m.watcher != nil { + close(m.endWatcher) + m.watcher.Close()