From 79dd8e90744f4ed6037128ac249863d9b01e8e56 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 15 Dec 2017 02:18:52 +0100 Subject: [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index a57124e37..597ac8a90 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -80,6 +80,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion -- cgit v1.2.3 From 298f1ab57000afd7acb8c0ddbddca8a1fc6cd92a Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 15 Dec 2017 09:16:59 +0100 Subject: Disable stack protection for mingw win32 builds in 2.4 Mingw builds could have it enabled! But we need to ship libssp and test this more. For the upcoming 2.4 release it should be disabled. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 172422988..70c66acc4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ if(NOT TOKEN_AUTH_ONLY) find_package(Qt5Keychain REQUIRED) endif() -if(NOT MSVC) +if(NOT WIN32) if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")) if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector --param=ssp-buffer-size=4") -- cgit v1.2.3