Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-desktop-schemas for
openSUSE:Factory checked in at 2023-10-17 20:24:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-desktop-schemas (Old)
and /work/SRC/openSUSE:Factory/.deepin-desktop-schemas.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-desktop-schemas"
Tue Oct 17 20:24:23 2023 rev:9 rq:1118027 version:5.10.11
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-desktop-schemas/deepin-override-tool.changes
2023-05-08 17:24:32.856788751 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-desktop-schemas.new.20540/deepin-override-tool.changes
2023-10-17 20:24:27.826159187 +0200
@@ -1,0 +2,5 @@
+Sun Oct 15 14:07:45 UTC 2023 - Bernhard Wiedemann <[email protected]>
+
+- Add reproducible.patch to sort for reproducible builds
+
+-------------------------------------------------------------------
New:
----
reproducible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-override-tool.spec ++++++
--- /var/tmp/diff_new_pack.OiDt8G/_old 2023-10-17 20:24:28.354177672 +0200
+++ /var/tmp/diff_new_pack.OiDt8G/_new 2023-10-17 20:24:28.358177812 +0200
@@ -30,6 +30,8 @@
Group: System/GUI/Other
URL: https://github.com/linuxdeepin/deepin-desktop-schemas
Source0:
https://github.com/linuxdeepin/deepin-desktop-schemas/archive/%{version}/%{repo}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
https://github.com/linuxdeepin/deepin-desktop-schemas/pull/98
https://github.com/linuxdeepin/deepin-desktop-schemas/pull/100
+Patch0: reproducible.patch
BuildRequires: golang-github-linuxdeepin-go-lib
BuildRequires: golang-packaging
Requires: dconf
@@ -54,7 +56,7 @@
use import path with github.com/linuxdeepin/deepin-desktop-schemas prefix.
%prep
-%setup -q -n %{repo}-%{version}
+%autosetup -p1 -n %{repo}-%{version}
%build
export GO111MODULE=off
++++++ reproducible.patch ++++++
https://github.com/linuxdeepin/deepin-desktop-schemas/pull/98
>From d8cbcb36198b31616698b8ca99c0a7615f36cd14 Mon Sep 17 00:00:00 2001
From: ShootingStarDragons <[email protected]>
Date: Fri, 4 Aug 2023 15:01:48 +0800
Subject: [PATCH] fix: everytime output file key is in random sort
Log:
---
.gitignore | 1 +
tools/override/main.go | 29 +++++++++++++++++++++++++----
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index b2be92b..764b18a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
result
+/bin
diff --git a/tools/override/main.go b/tools/override/main.go
index 049e5c7..de01167 100644
--- a/tools/override/main.go
+++ b/tools/override/main.go
@@ -10,6 +10,7 @@ import (
"log"
"os"
"path/filepath"
+ "sort"
"strings"
"github.com/linuxdeepin/go-lib/keyfile"
@@ -139,6 +140,24 @@ func getValue(value string, kf *keyfile.KeyFile, section0
string) string {
return value
}
+type ConfigKVUnit struct {
+ key string
+ val string
+}
+
+func mapToSortedList(basket map[string]string) []ConfigKVUnit {
+ keys := make([]string, 0, len(basket))
+ for k := range basket {
+ keys = append(keys, k)
+ }
+ sort.Strings(keys)
+ out := []ConfigKVUnit{}
+ for _, k := range keys {
+ out = append(out, ConfigKVUnit{key: k, val: basket[k]})
+ }
+ return out
+}
+
func combineFiles(inputFiles []string, outputFile string) (err error) {
log.Printf("inputFiles: %+v -> outputFile: %s\n", inputFiles,
outputFile)
combinedKf := keyfile.NewKeyFile()
@@ -151,11 +170,13 @@ func combineFiles(inputFiles []string, outputFile string)
(err error) {
return
}
sections := kf.GetSections()
+ sort.Strings(sections)
+
for _, section := range sections {
- sectionMap, _ := kf.GetSection(section)
- for key, val := range sectionMap {
- val = getValue(val, kf, section)
- combinedKf.SetValue(section, key, val)
+ sectionMapPre, _ := kf.GetSection(section)
+ sortedList := mapToSortedList(sectionMapPre)
+ for i := range sortedList {
+ combinedKf.SetValue(section, sortedList[i].key,
sortedList[i].val)
}
}
}
https://github.com/linuxdeepin/deepin-desktop-schemas/pull/100
>From a7c8a240b9a1d58183f0369c63106415d667bd91 Mon Sep 17 00:00:00 2001
From: chenhongtao <[email protected]>
Date: Fri, 11 Aug 2023 16:03:04 +0800
Subject: [PATCH] fix: key is empty after generated
Log:
---
tools/override/main.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/override/main.go b/tools/override/main.go
index de01167..3df68dd 100644
--- a/tools/override/main.go
+++ b/tools/override/main.go
@@ -176,7 +176,8 @@ func combineFiles(inputFiles []string, outputFile string)
(err error) {
sectionMapPre, _ := kf.GetSection(section)
sortedList := mapToSortedList(sectionMapPre)
for i := range sortedList {
- combinedKf.SetValue(section, sortedList[i].key,
sortedList[i].val)
+ val := getValue(sortedList[i].val, kf, section)
+ combinedKf.SetValue(section, sortedList[i].key,
val)
}
}
}
