commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2023-06-30 20:00:01 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.13546 (New) Package is "deepin-start" Fri Jun 30 20:00:01 2023 rev:10 rq:1096140 version:5.9.49 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2022-10-28 19:30:30.482925513 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.13546/deepin-start.changes 2023-06-30 20:00:29.470221215 +0200 @@ -1,0 +2,5 @@ +Fri Jun 30 13:15:08 UTC 2023 - Hillwood Yang + +- Update workaround-dde-kwin-crash.patch, use deepin-kwin + +--- Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.b8QrYO/_old 2023-06-30 20:00:30.742228781 +0200 +++ /var/tmp/diff_new_pack.b8QrYO/_new 2023-06-30 20:00:30.746228805 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-start # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ workaround-dde-kwin-crash.patch ++ --- /var/tmp/diff_new_pack.b8QrYO/_old 2023-06-30 20:00:30.810229185 +0200 +++ /var/tmp/diff_new_pack.b8QrYO/_new 2023-06-30 20:00:30.818229233 +0200 @@ -6,13 +6,13 @@ func shouldUseDDEKWin() bool { - _, err := os.Stat("/usr/bin/kwin_no_scale") -+ _, err := os.Stat("/usr/bin/kwin_x11") ++ _, err := os.Stat("/usr/bin/deepin-kwin_x11") return err == nil } const ( - cmdKWin= "/usr/bin/kwin_no_scale" -+ cmdKWin= "/usr/bin/kwin_x11" ++ cmdKWin= "/usr/bin/deepin-kwin_x11" cmdDdeSessionDaemon= "/usr/lib/deepin-daemon/dde-session-daemon" cmdDdeDock = "/usr/bin/dde-dock" cmdDdeDesktop = "/usr/bin/dde-desktop" @@ -24,7 +24,7 @@ t.Run("Test is should use DDE KWin", func(t *testing.T) { should := shouldUseDDEKWin() - exist := Exist("/usr/bin/kwin_no_scale") -+ exist := Exist("/usr/bin/kwin_x11") ++ exist := Exist("/usr/bin/deepin-kwin_x11") assert.Equal(t, exist, should) }) } @@ -36,7 +36,7 @@ const ( kWinServiceName = "org.kde.KWin" - ddeKWinCommand = "kwin_no_scale" -+ ddeKWinCommand = "kwin_x11" ++ ddeKWinCommand = "deepin-kwin_x11" ) func isDdeKWinRunning() (bool, error) { @@ -48,7 +48,7 @@ func isUseKwin() bool { - _, err := os.Stat("/usr/bin/kwin_no_scale") -+ _, err := os.Stat("/usr/bin/kwin_x11") ++ _, err := os.Stat("/usr/bin/deepin-kwin_x11") return err == nil }
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2022-10-28 19:30:03 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.2275 (New) Package is "deepin-start" Fri Oct 28 19:30:03 2022 rev:9 rq:1031554 version:5.9.49 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2022-09-01 22:11:31.560302391 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.2275/deepin-start.changes 2022-10-28 19:30:30.482925513 +0200 @@ -1,0 +2,6 @@ +Thu Oct 27 12:21:16 UTC 2022 - Hillwood Yang + +- Add workaround-dde-kwin-crash.patch for Tumbleweed, Workaround the + dde-kwin crash issue + +--- New: workaround-dde-kwin-crash.patch Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.HGmkoM/_old 2022-10-28 19:30:31.654931391 +0200 +++ /var/tmp/diff_new_pack.HGmkoM/_new 2022-10-28 19:30:31.662931431 +0200 @@ -32,6 +32,10 @@ # PATCH-FIX-OPENSUSE deepin-start-disable-gobuild-in-makefile.patch hillw...@opensuse.org # Use gobuild macro instead of makefile to build go binaries Patch0: deepin-start-disable-gobuild-in-makefile.patch +%if 0%{?suse_version} > 1500 +# PATCH-FIX-OPENSUSE workaround-dde-kwin-crash.patch hillw...@opensuse.org - Workaround the dde-kwin crash issue +Patch1: workaround-dde-kwin-crash.patch +%endif BuildRequires: fdupes BuildRequires: golang-github-linuxdeepin-dde-api BuildRequires: golang-github-linuxdeepin-go-dbus-factory ++ workaround-dde-kwin-crash.patch ++ diff -Nur startdde-5.9.49/main.go startdde-5.9.49-new/main.go --- startdde-5.9.49/main.go 2022-08-17 12:21:36.0 +0800 +++ startdde-5.9.49-new/main.go 2022-10-27 21:30:23.915940930 +0800 @@ -91,12 +91,12 @@ } func shouldUseDDEKWin() bool { - _, err := os.Stat("/usr/bin/kwin_no_scale") + _, err := os.Stat("/usr/bin/kwin_x11") return err == nil } const ( - cmdKWin= "/usr/bin/kwin_no_scale" + cmdKWin= "/usr/bin/kwin_x11" cmdDdeSessionDaemon= "/usr/lib/deepin-daemon/dde-session-daemon" cmdDdeDock = "/usr/bin/dde-dock" cmdDdeDesktop = "/usr/bin/dde-desktop" diff -Nur startdde-5.9.49/main_test.go startdde-5.9.49-new/main_test.go --- startdde-5.9.49/main_test.go2022-08-17 12:21:36.0 +0800 +++ startdde-5.9.49-new/main_test.go2022-10-27 21:30:23.915940930 +0800 @@ -28,7 +28,7 @@ func Test_ShouldUseDDEKWin(t *testing.T) { t.Run("Test is should use DDE KWin", func(t *testing.T) { should := shouldUseDDEKWin() - exist := Exist("/usr/bin/kwin_no_scale") + exist := Exist("/usr/bin/kwin_x11") assert.Equal(t, exist, should) }) } diff -Nur startdde-5.9.49/watchdog/dde_kwin.go startdde-5.9.49-new/watchdog/dde_kwin.go --- startdde-5.9.49/watchdog/dde_kwin.go2022-08-17 12:21:36.0 +0800 +++ startdde-5.9.49-new/watchdog/dde_kwin.go2022-10-27 21:30:23.915940930 +0800 @@ -6,7 +6,7 @@ const ( kWinServiceName = "org.kde.KWin" - ddeKWinCommand = "kwin_no_scale" + ddeKWinCommand = "kwin_x11" ) func isDdeKWinRunning() (bool, error) { diff -Nur startdde-5.9.49/watchdog/watchdog_test.go startdde-5.9.49-new/watchdog/watchdog_test.go --- startdde-5.9.49/watchdog/watchdog_test.go 2022-08-17 12:21:36.0 +0800 +++ startdde-5.9.49-new/watchdog/watchdog_test.go 2022-10-27 21:30:23.915940930 +0800 @@ -28,7 +28,7 @@ ) func isUseKwin() bool { - _, err := os.Stat("/usr/bin/kwin_no_scale") + _, err := os.Stat("/usr/bin/kwin_x11") return err == nil }
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2022-09-01 22:10:30 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.2083 (New) Package is "deepin-start" Thu Sep 1 22:10:30 2022 rev:8 rq:1000279 version:5.9.49 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2022-04-22 21:54:45.314840248 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.2083/deepin-start.changes 2022-09-01 22:11:31.560302391 +0200 @@ -1,0 +2,8 @@ +Thu Aug 25 02:36:36 UTC 2022 - Hillwood Yang + +- Update version to 5.9.49 + * Support DDCCI + * Use systemd-scope to launch application + * Fix bugs + +--- Old: startdde-5.9.15.1.tar.gz New: startdde-5.9.49.tar.gz Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.mBZkWt/_old 2022-09-01 22:11:32.740305618 +0200 +++ /var/tmp/diff_new_pack.mBZkWt/_new 2022-09-01 22:11:32.752305651 +0200 @@ -20,7 +20,7 @@ %define import_path github.com/linuxdeepin/startdde Name: deepin-start -Version:5.9.15.1 +Version:5.9.49 Release:0 Summary:Starter of deepin desktop License:GPL-3.0-or-later @@ -132,7 +132,7 @@ %doc README.md CHANGELOG.md %license LICENSE %{_bindir}/startdde -%{_bindir}/wl_display_daemon +# %{_bindir}/wl_display_daemon %{_bindir}/greeter-display-daemon %{_sbindir}/deepin-fix-xauthority-perm %{_datadir}/xsessions/deepin.desktop @@ -141,6 +141,10 @@ %{_datadir}/startdde/memchecker.json %{_datadir}/startdde/*.conf %{_datadir}/glib-2.0/schemas/com.deepin.*.xml +%dir %{_datadir}/dsg +%dir %{_datadir}/dsg/configs +%dir %{_datadir}/dsg/configs/org.deepin.startdde +%{_datadir}/dsg/configs/org.deepin.startdde/org.deepin.startdde.StartManager.json %dir %{_prefix}/lib/deepin-daemon %{_prefix}/lib/deepin-daemon/greeter-display-daemon %config %{_sysconfdir}/profile.d/deepin-xdg-dir.sh ++ deepin-start-disable-gobuild-in-makefile.patch ++ --- /var/tmp/diff_new_pack.mBZkWt/_old 2022-09-01 22:11:32.784305738 +0200 +++ /var/tmp/diff_new_pack.mBZkWt/_new 2022-09-01 22:11:32.788305749 +0200 @@ -1,20 +1,20 @@ -diff -Nur startdde-5.9.9.1/Makefile startdde-5.9.9.1-new/Makefile startdde-5.9.9.1/Makefile 2021-12-20 13:23:27.0 +0800 -+++ startdde-5.9.9.1-new/Makefile 2022-02-19 10:56:21.665007923 +0800 -@@ -22,10 +22,10 @@ +diff -Nur startdde-5.9.49/Makefile startdde-5.9.49-new/Makefile +--- startdde-5.9.49/Makefile 2022-08-17 12:21:36.0 +0800 startdde-5.9.49-new/Makefile 2022-08-25 10:31:35.740294370 +0800 +@@ -23,10 +23,10 @@ jq . misc/config/auto_launch.json >/dev/null startdde: -- env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o startdde -+# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o startdde +- env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o startdde ${GOBUILD_OPTIONS} ++# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o startdde ${GOBUILD_OPTIONS} fix-xauthority-perm: -- env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o fix-xauthority-perm ${GOPKG_PREFIX}/cmd/fix-xauthority-perm -+# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o fix-xauthority-perm ${GOPKG_PREFIX}/cmd/fix-xauthority-perm +- env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o fix-xauthority-perm ${GOBUILD_OPTIONS} ${GOPKG_PREFIX}/cmd/fix-xauthority-perm ++# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o fix-xauthority-perm ${GOBUILD_OPTIONS} ${GOPKG_PREFIX}/cmd/fix-xauthority-perm out/locale/%/LC_MESSAGES/startdde.mo: misc/po/%.po mkdir -p $(@D) -@@ -48,19 +48,19 @@ +@@ -49,19 +49,19 @@ GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" install: ++ startdde-5.9.15.1.tar.gz -> startdde-5.9.49.tar.gz ++ 10843 lines of diff (skipped)
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2022-04-22 21:53:54 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.1538 (New) Package is "deepin-start" Fri Apr 22 21:53:54 2022 rev:7 rq:971795 version:5.9.15.1 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2022-03-15 19:05:46.504982903 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.1538/deepin-start.changes 2022-04-22 21:54:45.314840248 +0200 @@ -1,0 +2,9 @@ +Wed Apr 6 03:20:04 UTC 2022 - Hillwood Yang + +- Update version to 5.9.15.1 + * Change pkg.deepin.io to github.com + * use go env cmd + * Add None mode for low-resolution tiling method + * Fix bugs + +--- Old: startdde-5.9.9.1.tar.gz New: startdde-5.9.15.1.tar.gz Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.VteGZx/_old 2022-04-22 21:54:46.542841648 +0200 +++ /var/tmp/diff_new_pack.VteGZx/_new 2022-04-22 21:54:46.550841656 +0200 @@ -17,10 +17,10 @@ %define _name startdde -%define import_path pkg.deepin.io/dde/startdde +%define import_path github.com/linuxdeepin/startdde Name: deepin-start -Version:5.9.9.1 +Version:5.9.15.1 Release:0 Summary:Starter of deepin desktop License:GPL-3.0-or-later @@ -97,9 +97,11 @@ %make_build %install -rm -rf $HOME/rpmbuild/BUILD/go/src/github.com \ +mv $HOME/rpmbuild/BUILD/go/src/github.com/linuxdeepin . +rm -rf $HOME/rpmbuild/BUILD/go/src/github.com/* \ $HOME/rpmbuild/BUILD/go/src/golang.org \ $HOME/rpmbuild/BUILD/go/src/gopkg.in +mv linuxdeepin $HOME/rpmbuild/BUILD/go/src/github.com/ %goinstall %gosrc %make_install @@ -144,6 +146,7 @@ %config %{_sysconfdir}/profile.d/deepin-xdg-dir.sh %config %{_sysconfdir}/X11/xinit/xinitrc.d/01deepin-profile %config %{_sysconfdir}/X11/xinit/xinitrc.d/00deepin-dde-env +%config %{_sysconfdir}/X11/xinit/xinitrc.d/94qt_env %files -n golang-github-linuxdeepin-startdde -f file.lst ++ startdde-5.9.9.1.tar.gz -> startdde-5.9.15.1.tar.gz ++ 4875 lines of diff (skipped)
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2022-03-15 19:04:57 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.25692 (New) Package is "deepin-start" Tue Mar 15 19:04:57 2022 rev:6 rq:961884 version:5.9.9.1 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2022-03-07 17:46:25.539128774 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.25692/deepin-start.changes 2022-03-15 19:05:46.504982903 +0100 @@ -1,0 +2,5 @@ +Tue Mar 15 13:04:34 UTC 2022 - Hillwood Yang + +- Change license tag to GPL-3.0-or-later + +--- Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.rkyqwC/_old 2022-03-15 19:05:47.756983752 +0100 +++ /var/tmp/diff_new_pack.rkyqwC/_new 2022-03-15 19:05:47.760983754 +0100 @@ -23,7 +23,7 @@ Version:5.9.9.1 Release:0 Summary:Starter of deepin desktop -License:GPL-3.0-only +License:GPL-3.0-or-later Group: System/Daemons URL:https://github.com/linuxdeepin/startdde Source0: https://github.com/linuxdeepin/startdde/archive/%{version}/%{_name}-%{version}.tar.gz
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2022-03-07 17:46:20 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.1958 (New) Package is "deepin-start" Mon Mar 7 17:46:20 2022 rev:5 rq:959470 version:5.9.9.1 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2022-01-31 22:57:22.161562405 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.1958/deepin-start.changes 2022-03-07 17:46:25.539128774 +0100 @@ -1,0 +2,19 @@ +Wed Feb 23 07:21:15 UTC 2022 - Hillwood Yang + +- Use last stable version of go to build + +--- +Sat Feb 19 03:16:58 UTC 2022 - Hillwood Yang + +- Update version to 5.9.9.1 + * Add some api for wayland + * Add custom-display-mode for wayland + * Update translations + * Fix bugs + +--- +Tue Feb 1 03:40:09 UTC 2022 - Hillwood Yang + +- Set deepin.desktop by xsessions default + +--- Old: startdde-5.8.55.tar.gz New: startdde-5.9.9.1.tar.gz Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.skXntb/_old 2022-03-07 17:46:26.903128381 +0100 +++ /var/tmp/diff_new_pack.skXntb/_new 2022-03-07 17:46:26.911128378 +0100 @@ -20,7 +20,7 @@ %define import_path pkg.deepin.io/dde/startdde Name: deepin-start -Version:5.8.55 +Version:5.9.9.1 Release:0 Summary:Starter of deepin desktop License:GPL-3.0-only @@ -33,9 +33,6 @@ # Use gobuild macro instead of makefile to build go binaries Patch0: deepin-start-disable-gobuild-in-makefile.patch BuildRequires: fdupes -%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 -BuildRequires: golang(API) = 1.15 -%endif BuildRequires: golang-github-linuxdeepin-dde-api BuildRequires: golang-github-linuxdeepin-go-dbus-factory BuildRequires: golang-packaging @@ -52,6 +49,7 @@ BuildRequires: pkgconfig(libsecret-unstable) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xi) +Requires(post): update-alternatives Requires: deepin-daemon # Requires: libcgroup-tools Provides: startdde @@ -93,6 +91,7 @@ sed -i 's|/lib/systemd|/usr/lib/systemd|g' Makefile %build +export GO111MODULE=off %goprep %{import_path} %gobuild ... %make_build @@ -111,17 +110,28 @@ install -d %{buildroot}%{_sbindir} mv %{buildroot}%{_bindir}/fix-xauthority-perm %{buildroot}%{_sbindir}/deepin-fix-xauthority-perm install -d %{buildroot}%{_prefix}/lib/deepin-daemon/ -mv %{buildroot}%{_bindir}/greeter-display-daemon %{buildroot}%{_prefix}/lib/deepin-daemon/greeter-display-daemon +ln -sf %{_bindir}/greeter-display-daemon %{buildroot}%{_prefix}/lib/deepin-daemon/greeter-display-daemon rm -rf %{buildroot}%{_datadir}/lightdm/ %fdupes %{buildroot}%{_datadir} %find_lang startdde +%post +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/deepin.desktop 20 + +%postun +if [ ! -f %{_datadir}/xsessions/deepin.desktop ]; then +%{_sbindir}/update-alternatives --remove default-xsession.desktop \ + %{_datadir}/xsessions/deepin.desktop +fi + %files %doc README.md CHANGELOG.md %license LICENSE %{_bindir}/startdde %{_bindir}/wl_display_daemon +%{_bindir}/greeter-display-daemon %{_sbindir}/deepin-fix-xauthority-perm %{_datadir}/xsessions/deepin.desktop %dir %{_datadir}/startdde ++ deepin-start-disable-gobuild-in-makefile.patch ++ --- /var/tmp/diff_new_pack.skXntb/_old 2022-03-07 17:46:26.943128368 +0100 +++ /var/tmp/diff_new_pack.skXntb/_new 2022-03-07 17:46:26.947128367 +0100 @@ -1,7 +1,7 @@ -diff -Nur startdde-5.8.55/Makefile startdde-5.8.55-new/Makefile startdde-5.8.55/Makefile 2021-10-15 16:02:17.0 +0800 -+++ startdde-5.8.55-new/Makefile 2021-12-16 20:08:59.186695438 +0800 -@@ -24,13 +24,13 @@ +diff -Nur startdde-5.9.9.1/Makefile startdde-5.9.9.1-new/Makefile +--- startdde-5.9.9.1/Makefile 2021-12-20 13:23:27.0 +0800 startdde-5.9.9.1-new/Makefile 2022-02-19 10:56:21.665007923 +0800 +@@ -22,10 +22,10 @@ jq . misc/config/auto_launch.json >/dev/null startdde: @@ -12,13 +12,9 @@ - env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o fix-xauthority-perm ${GOPKG_PREFIX}/cmd/fix-xauthority-perm +# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o fix-xauthority-perm ${GOPKG_PREFIX}/cmd/fix-xauthority-perm -
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2022-01-31 22:56:55 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.1898 (New) Package is "deepin-start" Mon Jan 31 22:56:55 2022 rev:4 rq:950212 version:5.8.55 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2021-08-16 10:14:16.214903899 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.1898/deepin-start.changes 2022-01-31 22:57:22.161562405 +0100 @@ -1,0 +2,7 @@ +Wed Oct 27 03:21:06 UTC 2021 - Hillwood Yang + +- Update version to 5.8.31 + * Fix bugs +- Fix build on Leap 15.4+ + +--- Old: startdde-5.8.22.tar.gz New: startdde-5.8.55.tar.gz Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.9Tjj7o/_old 2022-01-31 22:57:23.293554783 +0100 +++ /var/tmp/diff_new_pack.9Tjj7o/_new 2022-01-31 22:57:23.301554729 +0100 @@ -1,7 +1,7 @@ # # spec file for package deepin-start # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,10 +20,11 @@ %define import_path pkg.deepin.io/dde/startdde Name: deepin-start -Version:5.8.22 +Version:5.8.55 Release:0 Summary:Starter of deepin desktop License:GPL-3.0-only +Group: System/Daemons URL:https://github.com/linuxdeepin/startdde Source0: https://github.com/linuxdeepin/startdde/archive/%{version}/%{_name}-%{version}.tar.gz Source1:vendor.tar.gz @@ -31,9 +32,8 @@ # PATCH-FIX-OPENSUSE deepin-start-disable-gobuild-in-makefile.patch hillw...@opensuse.org # Use gobuild macro instead of makefile to build go binaries Patch0: deepin-start-disable-gobuild-in-makefile.patch -Group: System/Daemons BuildRequires: fdupes -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 BuildRequires: golang(API) = 1.15 %endif BuildRequires: golang-github-linuxdeepin-dde-api @@ -74,6 +74,15 @@ This package contains library source intended forbuilding other packages which use import path with pkg.deepin.io/dde/startdde prefix. +%package lang +Summary:Translations for package %{name} +Group: System/Localization +Requires: %{name} = %{version} +AutoReqProv:Off + +%description lang +Provides translations for the "%{name}" package. + %prep %autosetup -p1 -a1 -n %{_name}-%{version} mkdir -p $HOME/rpmbuild/BUILD/go/src/ @@ -106,6 +115,7 @@ rm -rf %{buildroot}%{_datadir}/lightdm/ %fdupes %{buildroot}%{_datadir} +%find_lang startdde %files %doc README.md CHANGELOG.md @@ -127,4 +137,6 @@ %files -n golang-github-linuxdeepin-startdde -f file.lst +%files lang -f startdde.lang + %changelog ++ deepin-start-disable-gobuild-in-makefile.patch ++ --- /var/tmp/diff_new_pack.9Tjj7o/_old 2022-01-31 22:57:23.325554568 +0100 +++ /var/tmp/diff_new_pack.9Tjj7o/_new 2022-01-31 22:57:23.329554541 +0100 @@ -1,7 +1,7 @@ -diff -Nur startdde-5.8.7/Makefile startdde-5.8.7-new/Makefile startdde-5.8.7/Makefile2021-03-18 18:01:16.0 +0800 -+++ startdde-5.8.7-new/Makefile2021-04-09 20:15:35.339442511 +0800 -@@ -22,13 +22,13 @@ +diff -Nur startdde-5.8.55/Makefile startdde-5.8.55-new/Makefile +--- startdde-5.8.55/Makefile 2021-10-15 16:02:17.0 +0800 startdde-5.8.55-new/Makefile 2021-12-16 20:08:59.186695438 +0800 +@@ -24,13 +24,13 @@ jq . misc/config/auto_launch.json >/dev/null startdde: @@ -16,9 +16,9 @@ - env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o greeter-display-daemon ${GOPKG_PREFIX}/cmd/greeter-display-daemon +# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o greeter-display-daemon ${GOPKG_PREFIX}/cmd/greeter-display-daemon - build: prepare startdde auto_launch_json fix-xauthority-perm greeter-display-daemon - -@@ -42,18 +42,18 @@ + out/locale/%/LC_MESSAGES/startdde.mo: misc/po/%.po + mkdir -p $(@D) +@@ -53,18 +53,18 @@ GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" install: @@ -42,7 +42,7 @@ mkdir -p ${DESTDIR}/etc/profile.d/ install -v -m0644 misc/profile.d/* ${DESTDIR}/etc/profile.d/ mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas -@@ -70,4 +70,4 @@ +@@ -85,4 +85,4 @@ check_code_quality: prepare env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" go vet ./... ++ startdde-5.8.22.tar.gz
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2021-08-16 10:09:15 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.1899 (New) Package is "deepin-start" Mon Aug 16 10:09:15 2021 rev:3 rq:910909 version:5.8.22 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2021-05-23 00:06:24.694535042 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.1899/deepin-start.changes 2021-08-16 10:14:16.214903899 +0200 @@ -1,0 +2,8 @@ +Sat Jul 24 08:29:01 UTC 2021 - Hillwood Yang + +- Update version to 5.8.22 + * Change go-dbus-factory struct as interface + * Disable touchscreen when associated output disabled + * Fix bugs + +--- Old: startdde-5.8.7.tar.gz New: startdde-5.8.22.tar.gz Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.jKQZ2O/_old 2021-08-16 10:14:17.126902734 +0200 +++ /var/tmp/diff_new_pack.jKQZ2O/_new 2021-08-16 10:14:17.130902730 +0200 @@ -20,7 +20,7 @@ %define import_path pkg.deepin.io/dde/startdde Name: deepin-start -Version:5.8.7 +Version:5.8.22 Release:0 Summary:Starter of deepin desktop License:GPL-3.0-only @@ -49,6 +49,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libsecret-unstable) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xi) Requires: deepin-daemon @@ -94,7 +95,7 @@ %goinstall %gosrc %make_install -install -m0644 display/listen.c %{buildroot}%{go_contribsrcdir}/%{import_path}/display/ +install -m0644 keyring/keyring.c %{buildroot}%{go_contribsrcdir}/%{import_path}/keyring/ install -m0644 iowait/xcursor_remap.c %{buildroot}%{go_contribsrcdir}/%{import_path}/iowait/ %gofilelist ++ startdde-5.8.7.tar.gz -> startdde-5.8.22.tar.gz ++ 3272 lines of diff (skipped)
commit deepin-start for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-start for openSUSE:Factory checked in at 2021-05-23 00:06:17 Comparing /work/SRC/openSUSE:Factory/deepin-start (Old) and /work/SRC/openSUSE:Factory/.deepin-start.new.2988 (New) Package is "deepin-start" Sun May 23 00:06:17 2021 rev:2 rq:894971 version:5.8.7 Changes: --- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes 2021-04-26 16:39:57.310108157 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-start.new.2988/deepin-start.changes 2021-05-23 00:06:24.694535042 +0200 @@ -1,0 +2,6 @@ +Sat May 22 11:54:21 UTC 2021 - Hillwood Yang + +- Keep golang version on 1.15 on Tumbleweed, the project does not support + golang 1.16+ + +--- Other differences: -- ++ deepin-start.spec ++ --- /var/tmp/diff_new_pack.66B0uG/_old 2021-05-23 00:06:25.498530764 +0200 +++ /var/tmp/diff_new_pack.66B0uG/_new 2021-05-23 00:06:25.502530743 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-start # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define _name startdde %define import_path pkg.deepin.io/dde/startdde @@ -22,7 +23,7 @@ Version:5.8.7 Release:0 Summary:Starter of deepin desktop -License:GPL-3.0 +License:GPL-3.0-only URL:https://github.com/linuxdeepin/startdde Source0: https://github.com/linuxdeepin/startdde/archive/%{version}/%{_name}-%{version}.tar.gz Source1:vendor.tar.gz @@ -32,21 +33,24 @@ Patch0: deepin-start-disable-gobuild-in-makefile.patch Group: System/Daemons BuildRequires: fdupes -# BuildRequires: golang(API) = 1.11 -BuildRequires: golang-packaging -BuildRequires: golang-github-linuxdeepin-go-dbus-factory +%if 0%{?suse_version} > 1500 +BuildRequires: golang(API) = 1.15 +%endif BuildRequires: golang-github-linuxdeepin-dde-api +BuildRequires: golang-github-linuxdeepin-go-dbus-factory +BuildRequires: golang-packaging +BuildRequires: jq +BuildRequires: xdg-user-dirs BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(libcanberra) +BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(gnome-keyring-1) -BuildRequires: jq Requires: deepin-daemon # Requires: libcgroup-tools Provides: startdde @@ -62,7 +66,6 @@ BuildArch: noarch Requires: golang-github-linuxdeepin-dde-api Requires: golang-github-linuxdeepin-go-dbus-factory -AutoReqProv:On AutoReq:Off %{go_provides} @@ -104,13 +107,11 @@ %fdupes %{buildroot}%{_datadir} %files -%defattr(-,root,root,-) %doc README.md CHANGELOG.md %license LICENSE %{_bindir}/startdde %{_bindir}/wl_display_daemon %{_sbindir}/deepin-fix-xauthority-perm -%dir %{_datadir}/xsessions %{_datadir}/xsessions/deepin.desktop %dir %{_datadir}/startdde %{_datadir}/startdde/auto_launch.json @@ -120,12 +121,9 @@ %dir %{_prefix}/lib/deepin-daemon %{_prefix}/lib/deepin-daemon/greeter-display-daemon %config %{_sysconfdir}/profile.d/deepin-xdg-dir.sh -%dir %{_sysconfdir}/X11/xinit -%dir %{_sysconfdir}/X11/xinit/xinitrc.d/ %config %{_sysconfdir}/X11/xinit/xinitrc.d/01deepin-profile %config %{_sysconfdir}/X11/xinit/xinitrc.d/00deepin-dde-env %files -n golang-github-linuxdeepin-startdde -f file.lst -%defattr(-,root,root,-) %changelog