Forgot to sync patches. Did not build => no bump.

Spotted by nigel@, thanks!
This commit is contained in:
zhuk 2014-01-31 11:46:25 +00:00
parent ba839054d7
commit 6749e07814
2 changed files with 17 additions and 4 deletions

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2014/01/31 11:46:25 zhuk Exp $
Does not require C++0x, actually.
--- CMakeLists.txt.orig Fri Jan 31 15:44:22 2014
+++ CMakeLists.txt Fri Jan 31 15:44:33 2014
@@ -241,7 +241,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHE
# more aggressive warnings and C++11 support
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
# debugfull target
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline" CACHE STRING "Flags used by the C++ compiler during debugfull builds." FORCE)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-server_src_storage_dbconfigpostgresql_cpp,v 1.1.1.1 2013/04/24 09:05:59 zhuk Exp $
--- server/src/storage/dbconfigpostgresql.cpp.orig Sat Mar 2 15:51:18 2013
+++ server/src/storage/dbconfigpostgresql.cpp Sat Mar 23 14:48:12 2013
@@ -146,8 +146,13 @@ void DbConfigPostgresql::startInternalServer()
$OpenBSD: patch-server_src_storage_dbconfigpostgresql_cpp,v 1.2 2014/01/31 11:46:25 zhuk Exp $
--- server/src/storage/dbconfigpostgresql.cpp.orig Thu Nov 28 18:25:03 2013
+++ server/src/storage/dbconfigpostgresql.cpp Thu Jan 30 21:23:48 2014
@@ -155,8 +155,13 @@ void DbConfigPostgresql::startInternalServer()
// call 'initdb -D/home/user/.local/share/akonadi/data_db'
const QString command = QString::fromLatin1( "%1" ).arg( mInitDbPath );
QStringList arguments;