Script 'mail_helper' called by obssrc
Hello community,

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

Package is "seadrive-gui"

Thu Apr 29 01:38:01 2021 rev:4 rq:888929 version:2.0.13

Changes:
--------
--- /work/SRC/openSUSE:Factory/seadrive-gui/seadrive-gui.changes        
2021-04-01 14:19:51.780200041 +0200
+++ /work/SRC/openSUSE:Factory/.seadrive-gui.new.12324/seadrive-gui.changes     
2021-04-29 01:39:03.678634645 +0200
@@ -1,0 +2,5 @@
+Wed Apr 28 05:43:50 UTC 2021 - Paolo Stivanin <[email protected]>
+
+- Add seadrive-gui_fix-compilation-glib2_68.patch
+
+-------------------------------------------------------------------

New:
----
  seadrive-gui_fix-compilation-glib2_68.patch

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

Other differences:
------------------
++++++ seadrive-gui.spec ++++++
--- /var/tmp/diff_new_pack.EPwmZJ/_old  2021-04-29 01:39:04.150635314 +0200
+++ /var/tmp/diff_new_pack.EPwmZJ/_new  2021-04-29 01:39:04.154635319 +0200
@@ -23,6 +23,8 @@
 License:        GPL-3.0-only
 URL:            https://github.com/haiwen/seadrive-gui/
 Source0:        
https://github.com/haiwen/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM https://github.com/haiwen/seadrive-gui/pull/292
+Patch0:         seadrive-gui_fix-compilation-glib2_68.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
@@ -66,6 +68,9 @@
 
 %prep
 %setup -q
+%if 0%{?suse_version} > 1500
+%patch0 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags} -fPIE -pie"

++++++ seadrive-gui_fix-compilation-glib2_68.patch ++++++
>From 3671098cba2ce709be86545fcbbf91560666f9ce Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <[email protected]>
Date: Fri, 19 Feb 2021 15:27:26 +0000
Subject: [PATCH] Remove `extern "C"` around glib headers

Glib release 2.67.3 started conditionally using some C++ code in the
public headers and it's no longer legal to include "glib.h" or anything
that includes it transitively from `extern "C"` block.
---
 src/daemon-mgr.cpp     | 2 --
 src/rpc/rpc-client.cpp | 4 ----
 src/rpc/rpc-server.cpp | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/daemon-mgr.cpp b/src/daemon-mgr.cpp
index 50cd73ff..e0e73816 100644
--- a/src/daemon-mgr.cpp
+++ b/src/daemon-mgr.cpp
@@ -1,7 +1,5 @@
-extern "C" {
 #include <searpc-client.h>
 #include <searpc-named-pipe-transport.h>
-}
 
 #if defined(_MSC_VER)
 #include <windows.h>
diff --git a/src/rpc/rpc-client.cpp b/src/rpc/rpc-client.cpp
index 09d4dc26..fa57e779 100644
--- a/src/rpc/rpc-client.cpp
+++ b/src/rpc/rpc-client.cpp
@@ -1,10 +1,6 @@
-extern "C" {
-
 #include <searpc-client.h>
 #include <searpc-named-pipe-transport.h>
 
-}
-
 #include <QtDebug>
 #include <QMutexLocker>
 
diff --git a/src/rpc/rpc-server.cpp b/src/rpc/rpc-server.cpp
index 0fd12c28..d678074b 100644
--- a/src/rpc/rpc-server.cpp
+++ b/src/rpc/rpc-server.cpp
@@ -1,10 +1,10 @@
-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"
 

Reply via email to