Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package seafile-client for openSUSE:Factory 
checked in at 2021-04-29 01:38:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/seafile-client (Old)
 and      /work/SRC/openSUSE:Factory/.seafile-client.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "seafile-client"

Thu Apr 29 01:38:03 2021 rev:6 rq:888930 version:7.0.10

Changes:
--------
--- /work/SRC/openSUSE:Factory/seafile-client/seafile-client.changes    
2020-10-13 15:44:06.761410005 +0200
+++ /work/SRC/openSUSE:Factory/.seafile-client.new.12324/seafile-client.changes 
2021-04-29 01:39:04.302635529 +0200
@@ -1,0 +2,5 @@
+Wed Apr 28 05:45:50 UTC 2021 - Paolo Stivanin <[email protected]>
+
+- Add seafile-client_fix-compilation-glib2_68.patch
+
+-------------------------------------------------------------------

New:
----
  seafile-client_fix-compilation-glib2_68.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ seafile-client.spec ++++++
--- /var/tmp/diff_new_pack.MLKrli/_old  2021-04-29 01:39:04.790636221 +0200
+++ /var/tmp/diff_new_pack.MLKrli/_new  2021-04-29 01:39:04.794636226 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package seafile-client
 #
-# Copyright (c) 2020 SUSE LLC
+# 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
@@ -27,6 +27,8 @@
 Patch0:         01-fix-no-return-in-nonvoid.patch
 Patch1:         fix_qpainterpath.patch
 Patch2:         fix-cmake-name.patch
+#PATCH-FIX-UPSTREAM https://github.com/haiwen/seadrive-gui/pull/292
+Patch3:         seafile-client_fix-compilation-glib2_68.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
@@ -81,6 +83,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%if 0%{?suse_version} > 1500
+%patch3 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags} -fPIE -pie"

++++++ seafile-client_fix-compilation-glib2_68.patch ++++++
diff -ru old/src/open-local-helper.cpp new/src/open-local-helper.cpp
--- old/src/open-local-helper.cpp       2021-04-28 08:02:48.192595377 +0200
+++ new/src/open-local-helper.cpp       2021-04-28 08:03:11.732766082 +0200
@@ -7,15 +7,12 @@
 #include <QUrlQuery>
 #include <QVariant>
 
-extern "C" {
 #include <searpc-client.h>
 
 #include <searpc.h>
 #include <seafile/seafile.h>
 #include <seafile/seafile-object.h>
 
-}
-
 #include "utils/utils.h"
 #include "seafile-applet.h"
 #include "ui/main-window.h"
diff -ru old/src/rpc/rpc-client.cpp new/src/rpc/rpc-client.cpp
--- old/src/rpc/rpc-client.cpp  2021-04-28 08:02:48.192595377 +0200
+++ new/src/rpc/rpc-client.cpp  2021-04-28 08:03:23.492851190 +0200
@@ -1,5 +1,3 @@
-extern "C" {
-
 #include <searpc-client.h>
 #include <searpc-named-pipe-transport.h>
 
@@ -7,8 +5,6 @@
 #include <seafile/seafile.h>
 #include <seafile/seafile-object.h>
 
-}
-
 #include <QtDebug>
 #include <QMutexLocker>
 
diff -ru old/src/rpc/rpc-client.h new/src/rpc/rpc-client.h
--- old/src/rpc/rpc-client.h    2021-04-28 08:02:48.192595377 +0200
+++ new/src/rpc/rpc-client.h    2021-04-28 08:03:40.088971311 +0200
@@ -6,14 +6,10 @@
 #include <QObject>
 #include <QMutex>
 
-extern "C" {
-
 struct _GList;
 // Can't forward-declare type SearpcClient here because it is an anonymous 
typedef struct
 #include <searpc-client.h>
 
-}
-
 // Here we can't forward-declare type json_t because it is an anonymous typedef
 // struct, and unlike libsearpc we have no way to rewrite its definition to 
give
 // it a name.
diff -ru old/src/rpc/rpc-server.cpp new/src/rpc/rpc-server.cpp
--- old/src/rpc/rpc-server.cpp  2021-04-28 08:02:48.192595377 +0200
+++ new/src/rpc/rpc-server.cpp  2021-04-28 08:04:15.493227483 +0200
@@ -1,13 +1,11 @@
-extern "C" {
-
 #include <searpc.h>
 #include <searpc-client.h>
 #include <searpc-server.h>
 #include <searpc-named-pipe-transport.h>
 
+extern "C" {
 #include "searpc-signature.h"
 #include "searpc-marshal.h"
-
 }
 
 #include <QCoreApplication>
diff -ru old/src/utils/uninstall-helpers.cpp new/src/utils/uninstall-helpers.cpp
--- old/src/utils/uninstall-helpers.cpp 2021-04-28 08:02:48.196595405 +0200
+++ new/src/utils/uninstall-helpers.cpp 2021-04-28 08:04:27.749316151 +0200
@@ -1,12 +1,9 @@
-extern "C" {
 #include <searpc-client.h>
 
 #include <searpc.h>
 #include <seafile/seafile.h>
 #include <seafile/seafile-object.h>
 
-}
-
 #include <QtGlobal>
 
 #if defined(Q_OS_WIN32)

Reply via email to