Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nextcloud-desktop for
openSUSE:Factory checked in at 2022-07-03 18:27:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nextcloud-desktop (Old)
and /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nextcloud-desktop"
Sun Jul 3 18:27:09 2022 rev:33 rq:986477 version:3.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/nextcloud-desktop/nextcloud-desktop.changes
2022-07-01 14:11:09.192971445 +0200
+++
/work/SRC/openSUSE:Factory/.nextcloud-desktop.new.1548/nextcloud-desktop.changes
2022-07-03 18:27:14.868766851 +0200
@@ -1,0 +2,8 @@
+Sun Jul 3 12:21:10 UTC 2022 - Ben Greiner <[email protected]>
+
+- Add nextcloud-remove-fortify-source-2.patch
+ * A more future-proof and distribution friendly fix for
+ boo#1201070
+ * Upstream issue: gh#nextcloud/desktop#4697
+
+-------------------------------------------------------------------
New:
----
nextcloud-remove-fortify-source-2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nextcloud-desktop.spec ++++++
--- /var/tmp/diff_new_pack.SxMbkB/_old 2022-07-03 18:27:15.404767642 +0200
+++ /var/tmp/diff_new_pack.SxMbkB/_new 2022-07-03 18:27:15.408767649 +0200
@@ -29,6 +29,8 @@
Source1: sysctl-sync-inotify.conf
# PATCH-FIX-OPENSUSE nextcloud-desktop-remove-datetime.patch
[email protected] -- Remove __TIME__ and __DATE__.
Patch1: nextcloud-desktop-remove-datetime.patch
+# PATCH-FIX-OPENSUSE nextcloud-remove-fortify-source-2.patch
[email protected] -- Remove hardcoding of _FORTIFY_SOURCE=2 in order to not
conflict with distribtion presets, boo#1201070, gh#nextcloud/desktop#4697
+Patch2: nextcloud-remove-fortify-source-2.patch
BuildRequires: AppStream
BuildRequires: cmake >= 3.2
BuildRequires: extra-cmake-modules
@@ -175,16 +177,11 @@
%endif
%prep
-%setup -q -n desktop-%{version}
-%patch1 -p1
+%autosetup -p1 -n desktop-%{version}
cp -a %{SOURCE1} sysctl-sync-inotify.conf
%build
-%if %{?suse_version} > 1500
-CFLAGS="-O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
-fstack-clash-protection -Werror=return-type"
-%endif
-
%cmake \
%if 0%{?is_opensuse}
-DWITH_DOC=ON \
++++++ nextcloud-remove-fortify-source-2.patch ++++++
Index: desktop-3.5.1/cmake/modules/DefineCompilerFlags.cmake
===================================================================
--- desktop-3.5.1.orig/cmake/modules/DefineCompilerFlags.cmake
+++ desktop-3.5.1/cmake/modules/DefineCompilerFlags.cmake
@@ -45,15 +45,6 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
endif (WITH_STACK_PROTECTOR AND NOT WIN32)
- if (CMAKE_BUILD_TYPE)
- string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
- if (CMAKE_BUILD_TYPE_LOWER MATCHES
"(release|relwithdebinfo|minsizerel)")
- check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2"
WITH_FORTIFY_SOURCE)
- if (WITH_FORTIFY_SOURCE)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
- endif (WITH_FORTIFY_SOURCE)
- endif()
- endif()
endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
if (UNIX AND NOT WIN32)
Index: desktop-3.5.1/src/CMakeLists.txt
===================================================================
--- desktop-3.5.1.orig/src/CMakeLists.txt
+++ desktop-3.5.1/src/CMakeLists.txt
@@ -32,8 +32,6 @@ if(NOT MSVC)
string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
endif()
if (CMAKE_CXX_COMPILER MATCHES "Clang")
