cheeselee pushed to deepin-daemon (rawhide). "[packit] 5.12.52
upstream release (..more)"
by notifications@fedoraproject.org
Notification time stamped 2021-07-31 16:59:00 UTC
From 88164ee35e1827960298f79ff173aefa48f62884 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Jul 31 2021 15:13:43 +0000
Subject: [packit] 5.12.52 upstream release
Upstream tag: 5.12.52
Upstream commit: 475c33d9
Signed-off-by: Robin Lee <cheeselee(a)fedoraproject.org>
---
diff --git a/0007-build-different-golang-binaries-with-different-build.patch b/0007-build-different-golang-binaries-with-different-build.patch
new file mode 100644
index 0000000..28c19cf
--- /dev/null
+++ b/0007-build-different-golang-binaries-with-different-build.patch
@@ -0,0 +1,33 @@
+From 475c33d98b427d35b040edb87b167efbf5f5d001 Mon Sep 17 00:00:00 2001
+From: Robin Lee <cheeselee(a)fedoraproject.org>
+Date: Sat, 31 Jul 2021 22:43:31 +0800
+Subject: [PATCH 7/7] build different golang binaries with different build-id
+
+---
+ rpm/dde-daemon.spec | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/rpm/dde-daemon.spec b/rpm/dde-daemon.spec
+index 515922cb..adbefe94 100644
+--- a/rpm/dde-daemon.spec
++++ b/rpm/dde-daemon.spec
+@@ -166,8 +166,15 @@ sed -i 's/google-chrome/chromium-browser/g' misc/dde-daemon/mime/data.json
+ %build
+ BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')"
+ %if 0%{?fedora}
+-export GOPATH="$(pwd)/build:%{gopath}"
++export GOPATH="$(pwd)/gopath:%{gopath}"
+ export %{gomodulesmode}
++# build different golang binaries with different build-id
++make prepare
++for cmd in bin/* ; do
++ if ! [ -f $cmd/main.c ]; then
++ %gobuild -o out/bin/$(basename $cmd) pkg.deepin.io/dde/daemon/$cmd
++ fi
++done
+ %else
+ export GOPATH=/usr/share/gocode
+ %endif
+--
+2.31.1
+
diff --git a/README.packit b/README.packit
index 3e034bc..3011685 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 0.27.0.
+The file was generated using packit 0.34.0.
diff --git a/deepin-daemon.spec b/deepin-daemon.spec
index cb57c6c..7f9ca1d 100644
--- a/deepin-daemon.spec
+++ b/deepin-daemon.spec
@@ -58,6 +58,10 @@ Patch0005: 0005-fix-uadpagent.patch
# Author: Robin Lee <cheeselee(a)fedoraproject.org>
Patch0006: 0006-fix-rpm-add-missed-requirements.patch
+# build different golang binaries with different build-id
+# Author: Robin Lee <cheeselee(a)fedoraproject.org>
+Patch0007: 0007-build-different-golang-binaries-with-different-build.patch
+
BuildRequires: python3
%if 0%{?fedora}
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
@@ -190,8 +194,15 @@ sed -i 's/google-chrome/chromium-browser/g' misc/dde-daemon/mime/data.json
%build
BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')"
%if 0%{?fedora}
-export GOPATH="$(pwd)/build:%{gopath}"
+export GOPATH="$(pwd)/gopath:%{gopath}"
export %{gomodulesmode}
+# build different golang binaries with different build-id
+make prepare
+for cmd in bin/* ; do
+ if ! [ -f $cmd/main.c ]; then
+ %gobuild -o out/bin/$(basename $cmd) pkg.deepin.io/dde/daemon/$cmd
+ fi
+done
%else
export GOPATH=/usr/share/gocode
%endif
@@ -290,6 +301,9 @@ fi
%endif
%changelog
+* Sat Jul 31 2021 Robin Lee <cheeselee(a)fedoraproject.org> - 5.12.52-3
+- Fix FTBFS since build-id duplication
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.12.52-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
https://src.fedoraproject.org/rpms/deepin-daemon/c/88164ee35e1827960298f7...
2 years, 10 months
nonamedotc pushed to xfce4-session (epel8). "Drop xscreensaver
autostart since we are using xfce4-screensaver (Fixes #1957658)"
by notifications@fedoraproject.org
Notification time stamped 2021-07-31 16:47:38 UTC
From c5d9eef79d386ddee6ed7ebdbae437100dd64e75 Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc(a)gmail.com>
Date: Jul 31 2021 16:47:33 +0000
Subject: Drop xscreensaver autostart since we are using xfce4-screensaver (Fixes #1957658)
---
diff --git a/.gitignore b/.gitignore
index 0bc329b..f24abd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ xfce4-session-4.6.2.tar.bz2
/xfce4-session-4.14.0.tar.bz2
/xfce4-session-4.14.1.tar.bz2
/xfce4-session-4.14.2.tar.bz2
+/xfce4-session-4.16.0.tar.bz2
diff --git a/sources b/sources
index 88ac8e7..ebce5cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xfce4-session-4.14.2.tar.bz2) = ab67cb576ac4880f41cf8eec05539a733da066c50913c9c2c9116ed3129b342aa3ca005ea5b46a733780cd062a4454d530240d89660b6c48a2045c821f7c490f
+SHA512 (xfce4-session-4.16.0.tar.bz2) = fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
diff --git a/xfce4-session.spec b/xfce4-session.spec
index b2f96b0..f769f96 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -1,8 +1,8 @@
-%global xfceversion 4.14
+%global xfceversion 4.16
Name: xfce4-session
-Version: 4.14.2
-Release: 1%{?dist}
+Version: 4.16.0
+Release: 3%{?dist}
Summary: Xfce session manager
License: GPLv2+
@@ -10,12 +10,13 @@ URL: http://www.xfce.org/
#VCS git:git://git.xfce.org/xfce/xfce4-session
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version...
# Add a xfce-mimeapps.list to allow setting mime handlers for Xfce apps
-#
+
Source2: xfce-mimeapps.list
# Patch startxfce4 to keep it on the same vty for logind
# https://bugzilla.redhat.com/show_bug.cgi?id=1117682
Patch1: xfce-session-4.10-startxfce4.patch
+BuildRequires: make
BuildRequires: dbus-devel >= 1.1.0
BuildRequires: dbus-glib-devel >= 0.84
BuildRequires: glib2-devel >= 2.24.0
@@ -25,7 +26,7 @@ BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: startup-notification-devel
BuildRequires: xfce4-panel-devel >= %{xfceversion}
BuildRequires: xfconf-devel >= %{xfceversion}
-BuildRequires: xorg-x11-server-utils
+BuildRequires: iceauth xrdb xset
# Build tools
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -35,7 +36,7 @@ BuildRequires: libxslt
BuildRequires: systemd-devel >= 195
BuildRequires: polkit-devel
BuildRequires: libtool
-Requires: xorg-x11-server-utils
+Requires: iceauth xrdb xset
Requires: xfce-polkit >= 0.2-2
Requires: systemd >= 195
# Needed for exo desktop preferred applications
@@ -53,12 +54,9 @@ Obsoletes: xfce4-session-devel <= 4.13.3
%description
xfce4-session is the session manager for the Xfce desktop environment.
-
-
%prep
%autosetup -p1
-
%build
%configure --disable-static
@@ -71,6 +69,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%install
%make_install
+# remove xscreensaver autostart file
+rm -fr %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
+
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}
@@ -81,10 +82,9 @@ cp -a %{SOURCE2} %{buildroot}%{_datadir}/applications/xfce-mimeapps.list
%files -f %{name}.lang
%license COPYING
-%doc AUTHORS BUGS ChangeLog NEWS README TODO
+%doc AUTHORS BUGS ChangeLog NEWS TODO
%doc doc/FAQ doc/NEWS.pre-4.3 doc/README.Kiosk
%{_sysconfdir}/xdg/xfce4
-%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
%{_bindir}/*
%dir %{_libdir}/xfce4/session/
%{_libdir}/xfce4/session/xfsm-shutdown-helper
@@ -96,6 +96,18 @@ cp -a %{SOURCE2} %{buildroot}%{_datadir}/applications/xfce-mimeapps.list
%{_mandir}/man1/*
%changelog
+* Sat Jun 05 2021 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.16.0-3
+- Drop xscreensaver autostart since we are using xfce4-screensaver (Fixes #1957658)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Dec 23 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.16.0-1
+- Update to 4.16.0
+
+* Tue Jul 28 2020 Adam Jackson <ajax(a)redhat.com> - 4.14.2-2
+- {Build,}Require iceauth xrdb xset, not xorg-x11-server-utils
+
* Sun Mar 29 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.14.2-1
- Update to 4.14.2
https://src.fedoraproject.org/rpms/xfce4-session/c/c5d9eef79d386ddee6ed7e...
2 years, 10 months
nonamedotc pushed to xfdesktop (epel8). "Apply fedora default
background correctly"
by notifications@fedoraproject.org
Notification time stamped 2021-07-31 16:46:31 UTC
From 688f7d1582664fae3975e6609d0df5fe5b4f138a Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc(a)gmail.com>
Date: Jul 31 2021 16:46:26 +0000
Subject: Apply fedora default background correctly
---
diff --git a/.gitignore b/.gitignore
index 822378b..ac2d5e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@ xfdesktop-4.6.2.tar.bz2
/xfdesktop-4.13.5.tar.bz2
/xfdesktop-4.13.6.tar.bz2
/xfdesktop-4.14.1.tar.bz2
+/xfdesktop-4.14.2.tar.bz2
+/xfdesktop-4.14.3.tar.bz2
+/xfdesktop-4.16.0.tar.bz2
diff --git a/sources b/sources
index 92fe03b..ab631b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xfdesktop-4.14.1.tar.bz2) = 05e8e79efe9683d46e69375eb5c3f1d923b5e875bc7dbb8f9405338e44ae0c48172af119c5e7b141595c38b8de00c58c21f7b7d218737f5ddc2428fd7aa4bc6c
+SHA512 (xfdesktop-4.16.0.tar.bz2) = e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129
diff --git a/xfdesktop-4.10.3-backdrop-change-fix.patch b/xfdesktop-4.10.3-backdrop-change-fix.patch
deleted file mode 100644
index 068bde7..0000000
--- a/xfdesktop-4.10.3-backdrop-change-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur xfdesktop-4.10.3.org/common/xfdesktop-common.c xfdesktop-4.10.3/common/xfdesktop-common.c
---- xfdesktop-4.10.3.org/common/xfdesktop-common.c 2014-11-16 07:20:57.000000000 +0100
-+++ xfdesktop-4.10.3/common/xfdesktop-common.c 2014-12-11 08:58:23.511865532 +0100
-@@ -102,26 +102,38 @@
- items = 0;
- files = g_strsplit(contents, "\n", -1);
-
-+ g_free(contents); /* not needed anymore */
-+
- /* Since the first line is the file identifier, we need to skip it.
- * Additionally, we want to skip blank lines. */
-- for(i = 1; files[i] != NULL; i++) {
-- if(g_strcmp0(files[i], "") != 0) {
-- g_free(files[items]);
-- files[items] = g_strdup(files[i]);
-- DBG("files[items] %s", files[items]);
-- items++;
-+
-+ /* a file with just the header will have only one line */
-+
-+ if(files[0] != NULL)
-+ {
-+ g_free(files[0]); /* that's the only non-empty line we need to remove */
-+ files[0] = NULL;
-+ for(i = 1; files[i] != NULL; i++) {
-+ if(g_strcmp0(files[i], "") != 0) {
-+ files[items]=files[i]; /* move the string to the current item slot */
-+
-+ items++;
-+ } else {
-+ g_free(files[i]); /* free the irrelevant empty string */
-+ }
- }
-+ files[items] = NULL; /* set the sentinel */
-+
-+ /* resize */
-+
-+ files = g_realloc(files, sizeof(gchar *) * (items+1));
- }
-- files[items+1] = NULL;
-
-- files = g_realloc(files, sizeof(gchar *) * (items+1));
-
- DBG("items %d", items);
- if(n_items)
- *n_items = items;
-
-- g_free(contents);
--
- return files;
- }
-
diff --git a/xfdesktop-4.9.3-backdrop-image.patch b/xfdesktop-4.9.3-backdrop-image.patch
deleted file mode 100644
index e7456dd..0000000
--- a/xfdesktop-4.9.3-backdrop-image.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur xfdesktop-4.9.3.orig/common/xfdesktop-common.h xfdesktop-4.9.3/common/xfdesktop-common.h
---- xfdesktop-4.9.3.orig/common/xfdesktop-common.h 2012-04-14 02:00:51.000000000 -0600
-+++ xfdesktop-4.9.3/common/xfdesktop-common.h 2012-04-14 14:12:58.292166992 -0600
-@@ -32,7 +32,7 @@
- #include <X11/Xlib.h>
-
- #define XFDESKTOP_CHANNEL "xfce4-desktop"
--#define DEFAULT_BACKDROP DATADIR "/backgrounds/xfce/xfce-blue.jpg"
-+#define DEFAULT_BACKDROP DATADIR "/backgrounds/images/default.png"
- #define DEFAULT_BACKDROP_LIST "xfce4/desktop/backdrop.list"
- #define DEFAULT_ICON_FONT_SIZE 12
- #define DEFAULT_ICON_SIZE 32
diff --git a/xfdesktop.spec b/xfdesktop.spec
index 8cf8a23..18fc10a 100644
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -1,7 +1,7 @@
-%global xfceversion 4.14
+%global xfceversion 4.16
Name: xfdesktop
-Version: 4.14.1
+Version: 4.16.0
Release: 3%{?dist}
Summary: Desktop manager for the Xfce Desktop Environment
@@ -10,6 +10,7 @@ URL: http://www.xfce.org/
#VCS: git:git://git.xfce.org/xfce/xfdesktop
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version...
+BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: gettext
@@ -38,7 +39,7 @@ This package includes a desktop manager for the Xfce Desktop Environment.
%setup -q
# change default background for Fedora
-sed -i 's|/backgrounds/xfce/xfce-stripes.png|/backgrounds/images/default.png|' common/xfdesktop-common.h
+sed -i 's|/backgrounds/xfce/xfce-verticals.png|/backgrounds/images/default.png|' common/xfdesktop-common.h
%build
%configure
@@ -58,7 +59,7 @@ desktop-file-validate \
%files -f %{name}.lang
%license COPYING
-%doc README TODO ChangeLog NEWS AUTHORS
+%doc TODO ChangeLog NEWS AUTHORS
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*
@@ -68,8 +69,30 @@ desktop-file-validate \
%changelog
-* Wed Dec 18 2019 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.14.1-3
-- Drop requires on backgrounds-compat for EPEL
+* Fri Feb 26 2021 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.16.0-3
+- Apply fedora default background correctly
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Dec 23 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.16.0-1
+- Update to 4.16.0
+
+* Mon Nov 02 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.14.3-1
+- Update to 4.14.3
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.14.2-4
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.14.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.14.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 14 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.14.2-1
+- Update to 4.14.2
* Thu Sep 12 2019 Kevin Fenzi <kevin(a)scrye.com> - 4.14.1-2
- Fix the default background. Upstream changed default, we need to adjust our change.
https://src.fedoraproject.org/rpms/xfdesktop/c/688f7d1582664fae3975e6609d...
2 years, 10 months
cheeselee pushed to deepin-gir-generator (rawhide). "Follow Arch
2.0.2-5 to fix FTBFS of startdde and deepin-daemon"
by notifications@fedoraproject.org
Notification time stamped 2021-07-31 16:45:08 UTC
From 9b93045a42f1cc39666f7a075d2a1b97157767bd Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Jul 31 2021 15:27:55 +0000
Subject: Follow Arch 2.0.2-5 to fix FTBFS of startdde and deepin-daemon
---
diff --git a/0001-Fix-undefined-reference-to-_GCompareDataFunc_c_wrapp.patch b/0001-Fix-undefined-reference-to-_GCompareDataFunc_c_wrapp.patch
deleted file mode 100644
index 78d8c86..0000000
--- a/0001-Fix-undefined-reference-to-_GCompareDataFunc_c_wrapp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 335977845938806ba02b14437c25500669debcbf Mon Sep 17 00:00:00 2001
-From: Li Rui Bin <lirb(a)winhong.com>
-Date: Thu, 4 Mar 2021 14:13:33 +0800
-Subject: [PATCH] Fix undefined reference to _GCompareDataFunc_c_wrapper
-
----
- lib.in/glib-2.0/config.json | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib.in/glib-2.0/config.json b/lib.in/glib-2.0/config.json
-index b6108e7..8a4baae 100644
---- a/lib.in/glib-2.0/config.json
-+++ b/lib.in/glib-2.0/config.json
-@@ -46,6 +46,9 @@
- "Bytes": [
- "unref_to_array"
- ],
-+ "Tree": [
-+ "new_full"
-+ ],
- "Variant": [
- // hasn't implement error to GError converting
- "parse_error_print_context",
---
-2.26.2
-
diff --git a/0001-fix-gir-generator-wrong-return-type-for-callback-fun.patch b/0001-fix-gir-generator-wrong-return-type-for-callback-fun.patch
new file mode 100644
index 0000000..6dd23af
--- /dev/null
+++ b/0001-fix-gir-generator-wrong-return-type-for-callback-fun.patch
@@ -0,0 +1,41 @@
+From 847d94d4373ccbe13957da1c1849614fa6b787c7 Mon Sep 17 00:00:00 2001
+From: zsien <i(a)zsien.cn>
+Date: Wed, 28 Apr 2021 16:28:02 +0800
+Subject: [PATCH] fix(gir-generator): wrong return type for callback functions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+为回调函数的 extern 声明添加返回类型
+
+Log: 修复回调函数声明返回类型错误
+Change-Id: I157f074c456d254e41ee3b346cc133e5d6cdf542
+---
+ src/gir-generator/binding_generator.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gir-generator/binding_generator.go b/src/gir-generator/binding_generator.go
+index 0def201..f2c8848 100644
+--- a/src/gir-generator/binding_generator.go
++++ b/src/gir-generator/binding_generator.go
+@@ -302,13 +302,15 @@ func (this *binding_generator) c_forward_declaration10(bi *gi.BaseInfo) {
+ pc := printer_to(this.out_c)
+ ctype := c_type_for_interface(bi, type_none)
+
++ ci := gi.ToCallableInfo(bi)
++
+ // type doesn't matter here, it's just a pointer after all
+ p("typedef void* %s;\n", ctype)
+
+ // and wrapper declarations for .c file only (cgo has problems
+ // with that)
+- pc("extern void _%s_c_wrapper();\n", ctype)
+- pc("extern void _%s_c_wrapper_once();\n", ctype)
++ pc("extern %s _%s_c_wrapper();\n", c_type(ci.ReturnType(), type_none), ctype)
++ pc("extern %s _%s_c_wrapper_once();\n", c_type(ci.ReturnType(), type_none), ctype)
+ }
+ }
+
+--
+2.31.1
+
diff --git a/SettingsBackendLike.patch b/SettingsBackendLike.patch
deleted file mode 100644
index a90b954..0000000
--- a/SettingsBackendLike.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 55ad8df560b2a8aec3462e61edff781f11cf86a9 Mon Sep 17 00:00:00 2001
-From: jouyouyun <jouyouwen717(a)gmail.com>
-Date: Mon, 24 Oct 2016 19:43:32 +0800
-Subject: [PATCH] Fix 'SettingsBackendLike' undefined
-
-Change-Id: I9b817b3a6ec26ce8023e26a6b2c7abc67074d53f
----
-
-diff --git a/lib.in/gio-2.0/config.json b/lib.in/gio-2.0/config.json
-index aaf75ed..7733140 100644
---- a/lib.in/gio-2.0/config.json
-+++ b/lib.in/gio-2.0/config.json
-@@ -35,6 +35,7 @@
- "AppLaunchContext",
- "Emblem",
- "Settings",
-+ "SettingsBackend",
- "FileMonitor",
- "FileInfo",
- "InputStream",
-@@ -52,7 +53,6 @@
- "FileAttributeInfoList",
- "FileAttributeMatcher",
- "ActionEntry",
-- "SettingsBackend",
- "MountIface",
- "OutputVector"
- //"SettingsSchema"
-diff --git a/lib.in/glib-2.0/config.json b/lib.in/glib-2.0/config.json
-index 88a8314..4290004 100644
---- a/lib.in/glib-2.0/config.json
-+++ b/lib.in/glib-2.0/config.json
-@@ -11,7 +11,8 @@
- "KeyFile",
- "Variant",
- "VariantType",
-- "PollFD"
-+ "PollFD",
-+ "Tree"
- ],
- "functions": [
- "get_user_cache_dir",
diff --git a/deepin-gir-generator.spec b/deepin-gir-generator.spec
index 2578f1c..81b87ef 100644
--- a/deepin-gir-generator.spec
+++ b/deepin-gir-generator.spec
@@ -20,19 +20,16 @@ Generate static golang bindings for GObject.}
%global godocs CHANGELOG.md README.md
Name: %{goname}
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Generate static golang bindings for GObject
License: GPLv3
URL: %{gourl}
Source0: %{gosource}
-# Our gobject-introspection is too new
-# https://cr.deepin.io/#/c/16880/
-Patch0: https://raw.githubusercontent.com/archlinux/svntogit-community/1a0c490a8a...
# flix build with glib 2.63
-Patch1: https://github.com/linuxdeepin/go-gir-generator/pull/11.patch
-# fix undefined reference to `_GCompareDataFunc_c_wrapper' when building startdde
-Patch2: 0001-Fix-undefined-reference-to-_GCompareDataFunc_c_wrapp.patch
+Patch0: https://github.com/linuxdeepin/go-gir-generator/pull/11.patch
+# applied in upstream git 847d94d43
+Patch1: 0001-fix-gir-generator-wrong-return-type-for-callback-fun.patch
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gudev-1.0)
@@ -50,7 +47,6 @@ BuildRequires: make
%goprep
%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Should be fixed upstream
mkdir -p out/src/pkg.deepin.io/gir/{glib-2.0,gio-2.0,gobject-2.0,gudev-1.0}
@@ -81,6 +77,9 @@ rm -rf lib.in out src test
%{gopath}/src/pkg.deepin.io/
%changelog
+* Sat Jul 31 2021 Robin Lee <cheeselee(a)fedoraproject.org> - 2.0.2-10
+- Follow Arch 2.0.2-5 to fix FTBFS of startdde and deepin-daemon
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
https://src.fedoraproject.org/rpms/deepin-gir-generator/c/9b93045a42f1cc3...
2 years, 10 months
eclipseo pushed to golang-github-acme-lego-3 (rawhide). "Fix FTBFS
Close: rhbz#1987512"
by notifications@fedoraproject.org
Notification time stamped 2021-07-31 16:44:26 UTC
From 83349fac8655bfb07b85c58ee66c10669cc59bc3 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Jul 31 2021 16:44:11 +0000
Subject: Fix FTBFS Close: rhbz#1987512
---
diff --git a/0001-chore-update-dependencies.patch b/0001-chore-update-dependencies.patch
new file mode 100644
index 0000000..8dd5575
--- /dev/null
+++ b/0001-chore-update-dependencies.patch
@@ -0,0 +1,180 @@
+From 773ed46b107fa368f577d389e07567d73ddf093d Mon Sep 17 00:00:00 2001
+From: Ludovic Fernandez <ldez(a)users.noreply.github.com>
+Date: Wed, 10 Mar 2021 10:42:00 +0100
+Subject: [PATCH] chore: update dependencies (#1370)
+
+---
+ providers/dns/alidns/alidns.go | 4 +-
+ providers/dns/cloudflare/client.go | 13 +-
+ providers/dns/cloudflare/cloudflare.go | 5 +-
+ providers/dns/rfc2136/rfc2136.go | 4 +-
+ providers/dns/rfc2136/rfc2136_test.go | 4 +-
+ providers/dns/transip/transip_test.go | 10 +-
+ 7 files changed, 232 insertions(+), 102 deletions(-)
+
+diff --git a/providers/dns/alidns/alidns.go b/providers/dns/alidns/alidns.go
+index a05d54b426..d48a076cbb 100644
+--- a/providers/dns/alidns/alidns.go
++++ b/providers/dns/alidns/alidns.go
+@@ -156,7 +156,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
+ func (d *DNSProvider) getHostedZone(domain string) (string, error) {
+ request := alidns.CreateDescribeDomainsRequest()
+
+- var domains []alidns.Domain
++ var domains []alidns.DomainInDescribeDomains
+ startPage := 1
+
+ for {
+@@ -181,7 +181,7 @@ func (d *DNSProvider) getHostedZone(domain string) (string, error) {
+ return "", err
+ }
+
+- var hostedZone alidns.Domain
++ var hostedZone alidns.DomainInDescribeDomains
+ for _, zone := range domains {
+ if zone.DomainName == dns01.UnFqdn(authZone) || zone.PunyCode == dns01.UnFqdn(authZone) {
+ hostedZone = zone
+diff --git a/providers/dns/cloudflare/client.go b/providers/dns/cloudflare/client.go
+index c98ba45f77..937662cfdd 100644
+--- a/providers/dns/cloudflare/client.go
++++ b/providers/dns/cloudflare/client.go
+@@ -1,6 +1,7 @@
+ package cloudflare
+
+ import (
++ "context"
+ "sync"
+
+ "github.com/cloudflare/cloudflare-go"
+@@ -58,16 +59,16 @@ func newClient(config *Config) (*metaClient, error) {
+ }, nil
+ }
+
+-func (m *metaClient) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
+- return m.clientEdit.CreateDNSRecord(zoneID, rr)
++func (m *metaClient) CreateDNSRecord(ctx context.Context, zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
++ return m.clientEdit.CreateDNSRecord(ctx, zoneID, rr)
+ }
+
+-func (m *metaClient) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
+- return m.clientEdit.DNSRecords(zoneID, rr)
++func (m *metaClient) DNSRecords(ctx context.Context, zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
++ return m.clientEdit.DNSRecords(ctx, zoneID, rr)
+ }
+
+-func (m *metaClient) DeleteDNSRecord(zoneID, recordID string) error {
+- return m.clientEdit.DeleteDNSRecord(zoneID, recordID)
++func (m *metaClient) DeleteDNSRecord(ctx context.Context, zoneID, recordID string) error {
++ return m.clientEdit.DeleteDNSRecord(ctx, zoneID, recordID)
+ }
+
+ func (m *metaClient) ZoneIDByName(fdqn string) (string, error) {
+diff --git a/providers/dns/cloudflare/cloudflare.go b/providers/dns/cloudflare/cloudflare.go
+index 6684a69b49..5e57e9b328 100644
+--- a/providers/dns/cloudflare/cloudflare.go
++++ b/providers/dns/cloudflare/cloudflare.go
+@@ -2,6 +2,7 @@
+ package cloudflare
+
+ import (
++ "context"
+ "errors"
+ "fmt"
+ "net/http"
+@@ -140,7 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
+ TTL: d.config.TTL,
+ }
+
+- response, err := d.client.CreateDNSRecord(zoneID, dnsRecord)
++ response, err := d.client.CreateDNSRecord(context.Background(), zoneID, dnsRecord)
+ if err != nil {
+ return fmt.Errorf("cloudflare: failed to create TXT record: %w", err)
+ }
+@@ -180,7 +181,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
+ return fmt.Errorf("cloudflare: unknown record ID for '%s'", fqdn)
+ }
+
+- err = d.client.DeleteDNSRecord(zoneID, recordID)
++ err = d.client.DeleteDNSRecord(context.Background(), zoneID, recordID)
+ if err != nil {
+ log.Printf("cloudflare: failed to delete TXT record: %w", err)
+ }
+diff --git a/providers/dns/rfc2136/rfc2136.go b/providers/dns/rfc2136/rfc2136.go
+index aa3258bebf..6d1d1ac556 100644
+--- a/providers/dns/rfc2136/rfc2136.go
++++ b/providers/dns/rfc2136/rfc2136.go
+@@ -45,7 +45,7 @@ type Config struct {
+ // NewDefaultConfig returns a default configuration for the DNSProvider.
+ func NewDefaultConfig() *Config {
+ return &Config{
+- TSIGAlgorithm: env.GetOrDefaultString(EnvTSIGAlgorithm, dns.HmacMD5),
++ TSIGAlgorithm: env.GetOrDefaultString(EnvTSIGAlgorithm, dns.HmacSHA1),
+ TTL: env.GetOrDefaultInt(EnvTTL, dns01.DefaultTTL),
+ PropagationTimeout: env.GetOrDefaultSecond(EnvPropagationTimeout, env.GetOrDefaultSecond("RFC2136_TIMEOUT", 60*time.Second)),
+ PollingInterval: env.GetOrDefaultSecond(EnvPollingInterval, 2*time.Second),
+@@ -93,7 +93,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
+ }
+
+ if config.TSIGAlgorithm == "" {
+- config.TSIGAlgorithm = dns.HmacMD5
++ config.TSIGAlgorithm = dns.HmacSHA1
+ }
+
+ // Append the default DNS port if none is specified.
+diff --git a/providers/dns/rfc2136/rfc2136_test.go b/providers/dns/rfc2136/rfc2136_test.go
+index fd0647d9ca..6e0260cfb5 100644
+--- a/providers/dns/rfc2136/rfc2136_test.go
++++ b/providers/dns/rfc2136/rfc2136_test.go
+@@ -213,7 +213,7 @@ func serverHandlerReturnSuccess(w dns.ResponseWriter, req *dns.Msg) {
+ if t := req.IsTsig(); t != nil {
+ if w.TsigStatus() == nil {
+ // Validated
+- m.SetTsig(fakeZone, dns.HmacMD5, 300, time.Now().Unix())
++ m.SetTsig(fakeZone, dns.HmacSHA1, 300, time.Now().Unix())
+ }
+ }
+
+@@ -239,7 +239,7 @@ func serverHandlerPassBackRequest(reqChan chan *dns.Msg) func(w dns.ResponseWrit
+ if t := req.IsTsig(); t != nil {
+ if w.TsigStatus() == nil {
+ // Validated
+- m.SetTsig(fakeZone, dns.HmacMD5, 300, time.Now().Unix())
++ m.SetTsig(fakeZone, dns.HmacSHA1, 300, time.Now().Unix())
+ }
+ }
+
+diff --git a/providers/dns/transip/transip_test.go b/providers/dns/transip/transip_test.go
+index 281f93087b..119aa63a47 100644
+--- a/providers/dns/transip/transip_test.go
++++ b/providers/dns/transip/transip_test.go
+@@ -1,7 +1,6 @@
+ package transip
+
+ import (
+- "errors"
+ "fmt"
+ "os"
+ "strings"
+@@ -93,9 +92,7 @@ func TestNewDNSProvider(t *testing.T) {
+ })
+
+ _, err := NewDNSProvider()
+- if !errors.Is(err, os.ErrNotExist) {
+- t.Fatalf("Expected an os.ErrNotExists error, actual: %v", err)
+- }
++ assert.ErrorIs(t, err, os.ErrNotExist)
+ })
+ }
+
+@@ -154,10 +151,7 @@ func TestNewDNSProviderConfig(t *testing.T) {
+ config.PrivateKeyPath = "./fixtures/non/existent/private.key"
+
+ _, err := NewDNSProviderConfig(config)
+-
+- if !errors.Is(err, os.ErrNotExist) {
+- t.Fatalf("Expected an os.ErrNotExists error, actual: %v", err)
+- }
++ assert.ErrorIs(t, err, os.ErrNotExist)
+ })
+ }
+
diff --git a/golang-github-acme-lego-3.spec b/golang-github-acme-lego-3.spec
index f29dc1c..bd8765e 100644
--- a/golang-github-acme-lego-3.spec
+++ b/golang-github-acme-lego-3.spec
@@ -22,6 +22,8 @@ URL: %{gourl}
Source0: %{gosource}
# Remove version which is not provided anymore by linodego
Patch0: 0001-Remove-version-which-is-not-provided-anymore-by-lino.patch
+# To use newer Cloudfare
+Patch1: 0001-chore-update-dependencies.patch
BuildRequires: golang(cloud.google.com/go/compute/metadata)
BuildRequires: golang(github.com/akamai/AkamaiOPEN-edgegrid-golang/configdns-v1)
@@ -113,8 +115,9 @@ BuildRequires: golang(gopkg.in/yaml.v2)
%gopkg
%prep
-%goprep
+%goprep
%patch0 -p1
+%patch1 -p1
sed -i "s|github.com/oracle/oci-go-sdk|github.com/oracle/oci-go-sdk-24|" $(find . -name "*.go" -type f)
%install
@@ -125,7 +128,8 @@ sed -i "s|github.com/oracle/oci-go-sdk|github.com/oracle/oci-go-sdk-24|" $(find
# Needs network
%gocheck -d challenge/dns01 \
-t providers/dns \
- -d platform/wait
+ -d platform/wait \
+ -d challenge/resolver
%endif
%gopkgfiles
https://src.fedoraproject.org/rpms/golang-github-acme-lego-3/c/83349fac86...
2 years, 10 months