From 28c707991fb2acab68bc389e45bbb8edee0e83d7 Mon Sep 17 00:00:00 2001 From: liuzhilin Date: Tue, 9 Apr 2024 14:24:36 +0800 Subject: [PATCH 1/2] fix build error for dccutils-2.0 --- 0001-fix-build-error-ddcutil2.0.patch | 28 +++++++++++++++++++++++++++ dde-daemon.spec | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 0001-fix-build-error-ddcutil2.0.patch diff --git a/0001-fix-build-error-ddcutil2.0.patch b/0001-fix-build-error-ddcutil2.0.patch new file mode 100644 index 0000000..c07a6d8 --- /dev/null +++ b/0001-fix-build-error-ddcutil2.0.patch @@ -0,0 +1,28 @@ +From 0a74c621ff343c337c78a636b4eff3866292ef60 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Tue, 2 Apr 2024 17:15:55 +0800 +Subject: [PATCH] fix-build-error-ddcutil2.0 + +--- + bin/backlight_helper/ddcci/ddcci.go | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go +index 2165345..302fe73 100644 +--- a/bin/backlight_helper/ddcci/ddcci.go ++++ b/bin/backlight_helper/ddcci/ddcci.go +@@ -103,11 +103,6 @@ func newDDCCI() (*ddcci, error) { + displayHandleMap: make(map[string]*displayHandle), + } + +- status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5) +- if status < C.int(0) { +- return nil, fmt.Errorf("brightness: Error setting retries: %d", status) +- } +- + err := ddc.RefreshDisplays() + if err != nil { + return nil, err +-- +2.39.3 + diff --git a/dde-daemon.spec b/dde-daemon.spec index f7b6cab..17e4034 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -12,7 +12,7 @@ Name: dde-daemon Version: 5.14.122 -Release: 1 +Release: 2 Summary: Daemon handling the DDE session settings License: GPLv3 URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/ @@ -22,7 +22,7 @@ Source2: %{sname}.sysusers Patch1: 0001-fix-fonts-gb-st-super.patch Patch2: 0002-donot-set-cpu-mode-while-initlizing.patch Patch3: 0003-dde-daemon-uos-fix-failed-to-start-accounts-service.patch - +Patch4: 0001-fix-build-error-ddcutil2.0.patch BuildRequires: python3 BuildRequires: golang @@ -214,6 +214,9 @@ fi %{_datadir}/dsg/configs/org.deepin.dde.daemon/ %changelog +* Tue Apr 09 2024 liuzhilin - 5.14.122-2 +- fix build error for dccutils-2.0 + * Mon Jul 31 2023 leeffo - 5.14.122-1 - upgrade to version 5.14.122 -- Gitee From 55e3d2f080b941ca3f857c3b0fd878f850c891ff Mon Sep 17 00:00:00 2001 From: songmingliang Date: Thu, 26 Sep 2024 13:55:35 +0800 Subject: [PATCH 2/2] solve I1T6U5, use accessible URL --- dde-daemon.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dde-daemon.spec b/dde-daemon.spec index 17e4034..1915310 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -12,11 +12,11 @@ Name: dde-daemon Version: 5.14.122 -Release: 2 +Release: 3 Summary: Daemon handling the DDE session settings License: GPLv3 -URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/ -Source0: %{name}-%{version}.tar.gz +URL: https://github.com/linuxdeepin/dde-daemon +Source0: https://github.com/linuxdeepin/dde-daemon/archive/refs/tags/%{name}-%{version}.tar.gz Source1: vendor.tar.gz Source2: %{sname}.sysusers Patch1: 0001-fix-fonts-gb-st-super.patch @@ -214,6 +214,9 @@ fi %{_datadir}/dsg/configs/org.deepin.dde.daemon/ %changelog +* Thu Sep 26 2024 songmingliang - 5.14.122-3 +- solve I1T6U5, use accessible URL + * Tue Apr 09 2024 liuzhilin - 5.14.122-2 - fix build error for dccutils-2.0 -- Gitee