From 1e5ddc045d44e5ed84c8b3fe49e0c749ae419955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 20 Mar 2018 17:42:35 +0100 Subject: [PATCH] kdelibs4support-native: refresh patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-a-configure-option-we-cannot-run-co.patch | 5 ++- ...2-fix-build-for-QT_NO_SESSIONMANAGER.patch | 25 +++++------ ...003-only-build-kf5-config-for-native.patch | 43 ++++++++++--------- 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch index 81b474cd..6f7a5fc4 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch @@ -10,15 +10,16 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [cross] Signed-off-by: Andreas Müller + --- src/ConfigureChecks.cmake | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake -index 73a2df3..dc8d8b8 100644 +index 9edbff7..d44aca6 100644 --- a/src/ConfigureChecks.cmake +++ b/src/ConfigureChecks.cmake -@@ -83,27 +83,8 @@ check_struct_has_member("struct sockaddr" sa_len "sys/types.h;sys/socket.h" HAVE +@@ -85,27 +85,8 @@ check_struct_has_member("struct sockaddr" sa_len "sys/types.h;sys/socket.h" HAVE check_struct_has_member(dirent d_type dirent.h HAVE_DIRENT_D_TYPE LANGUAGE CXX) check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO) diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch index 7e41e54b..aa7b97a1 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit Upstream-Status: pending Signed-off-by: Andreas Müller + --- src/kdeui/kapplication.cpp | 10 ++++++++++ src/kdeui/ksessionmanager.cpp | 2 ++ @@ -17,10 +18,10 @@ Signed-off-by: Andreas Müller 4 files changed, 18 insertions(+) diff --git a/src/kdeui/kapplication.cpp b/src/kdeui/kapplication.cpp -index 6ffaf6e..7e872ee 100644 +index f42d6bd..83452f1 100644 --- a/src/kdeui/kapplication.cpp +++ b/src/kdeui/kapplication.cpp -@@ -500,7 +500,11 @@ KApplication *KApplication::kApplication() +@@ -502,7 +502,11 @@ KApplication *KApplication::kApplication() KConfig *KApplication::sessionConfig() { @@ -32,7 +33,7 @@ index 6ffaf6e..7e872ee 100644 } void KApplication::reparseConfiguration() -@@ -550,6 +554,7 @@ void KApplication::commitData(QSessionManager &sm) +@@ -552,6 +556,7 @@ void KApplication::commitData(QSessionManager &sm) d->session_save = true; bool canceled = false; @@ -40,7 +41,7 @@ index 6ffaf6e..7e872ee 100644 foreach (KSessionManager *it, KSessionManager::sessionClients()) { if ((canceled = !it->commitData(sm))) { break; -@@ -612,9 +612,11 @@ void KApplication::commitData(QSessionManager &sm) +@@ -605,9 +610,11 @@ void KApplication::commitData(QSessionManager &sm) if (canceled) { sm.cancel(); } @@ -52,7 +53,7 @@ index 6ffaf6e..7e872ee 100644 #if HAVE_X11 && QT_VERSION < QT_VERSION_CHECK(5, 0, 0) static void checkRestartVersion(QSessionManager &sm) { -@@ -634,6 +641,7 @@ static void checkRestartVersion(QSessionManager &sm) +@@ -642,6 +649,7 @@ static void checkRestartVersion(QSessionManager &sm) } } #endif // HAVE_X11 @@ -60,7 +61,7 @@ index 6ffaf6e..7e872ee 100644 void KApplication::saveState(QSessionManager &sm) { -@@ -641,6 +649,7 @@ void KApplication::saveState(QSessionManager &sm) +@@ -649,6 +657,7 @@ void KApplication::saveState(QSessionManager &sm) #ifdef __GNUC__ #warning TODO: QSessionManager::handle() is gone in Qt5! #endif @@ -68,16 +69,16 @@ index 6ffaf6e..7e872ee 100644 #if HAVE_X11 && QT_VERSION < QT_VERSION_CHECK(5, 0, 0) static bool firstTime = true; mySmcConnection = (SmcConn) sm.handle(); -@@ -715,6 +724,7 @@ void KApplication::saveState(QSessionManager &sm) - sm.cancel(); - } +@@ -725,6 +734,7 @@ void KApplication::saveState(QSessionManager &sm) + #else + Q_UNUSED(sm); #endif +#endif // QT_NO_SESSIONMANAGER d->session_save = false; } diff --git a/src/kdeui/ksessionmanager.cpp b/src/kdeui/ksessionmanager.cpp -index f6fb4e9..8b5fb8e 100644 +index 3d5edd5..f6cf6ee 100644 --- a/src/kdeui/ksessionmanager.cpp +++ b/src/kdeui/ksessionmanager.cpp @@ -32,6 +32,7 @@ KSessionManager::~KSessionManager() @@ -117,10 +118,10 @@ index e7462a4..bea2243 100644 static QList &sessionClients(); diff --git a/src/kdeui/kuniqueapplication.cpp b/src/kdeui/kuniqueapplication.cpp -index 713c6f4..0b81eee 100644 +index 1d7b3f0..b225f8b 100644 --- a/src/kdeui/kuniqueapplication.cpp +++ b/src/kdeui/kuniqueapplication.cpp -@@ -344,7 +344,11 @@ void KUniqueApplication::Private::_k_newInstanceNoFork() +@@ -349,7 +349,11 @@ void KUniqueApplication::Private::_k_newInstanceNoFork() bool KUniqueApplication::restoringSession() { diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch index 11d6e4c1..f9e4cb2b 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch @@ -9,16 +9,17 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [cross-specific] Signed-off-by: Andreas Müller + --- - CMakeLists.txt | 28 ++--------------------- - src/CMakeLists.txt | 198 +----------------------------------------- + CMakeLists.txt | 29 +------ + src/CMakeLists.txt | 197 +----------------------------------------- src/kdecore/kglobal.cpp | 18 ---- src/kdecore/klocale_kde.cpp | 4 - src/kdecore/kstandarddirs.cpp | 1 - - 5 files changed, 4 insertions(+), 243 deletions(-) + 5 files changed, 4 insertions(+), 245 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8dd22f3..5b659ab 100644 +index a3ea743..237b801 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,30 +20,11 @@ include(GenerateExportHeader) @@ -30,7 +31,6 @@ index 8dd22f3..5b659ab 100644 -find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) -+ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5DesignerPlugin ${KF5_DEP_VERSION} REQUIRED) @@ -38,6 +38,7 @@ index 8dd22f3..5b659ab 100644 -find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) ++ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) @@ -54,7 +55,7 @@ index 8dd22f3..5b659ab 100644 if(WIN32) find_package(KDEWin REQUIRED) -@@ -55,7 +35,6 @@ endif() +@@ -55,7 +36,6 @@ endif() set(HAVE_X11 ${X11_FOUND}) if (HAVE_X11) add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication") @@ -62,7 +63,7 @@ index 8dd22f3..5b659ab 100644 endif () if (APPLE) cmake_find_frameworks(CoreFoundation) -@@ -151,13 +130,8 @@ install( +@@ -151,13 +131,8 @@ install( @@ -77,7 +78,7 @@ index 8dd22f3..5b659ab 100644 if (BUILD_TESTING) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 64a53d8..9f2e8ac 100644 +index ab0b246..e134bd9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,4 @@ @@ -95,7 +96,7 @@ index 64a53d8..9f2e8ac 100644 find_package(OpenSSL) set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Support for secure network communications (SSL and TLS)" URL "http://openssl.org" -@@ -45,6 +44,7 @@ else() +@@ -51,6 +50,7 @@ else() endif() @@ -103,7 +104,7 @@ index 64a53d8..9f2e8ac 100644 set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdecore/k4aboutdata.cpp -@@ -52,39 +52,9 @@ set(libkdelibs4support_SRCS +@@ -58,39 +58,9 @@ set(libkdelibs4support_SRCS kdecore/kcurrencycode.cpp kdecore/kdebug.cpp kdecore/kdebugdbusiface.cpp @@ -143,7 +144,7 @@ index 64a53d8..9f2e8ac 100644 kdecore/kcalendarera.cpp kdecore/kcalendarsystem.cpp kdecore/kcalendarsystemcoptic.cpp -@@ -115,95 +115,6 @@ set(libkdelibs4support_SRCS +@@ -115,95 +85,6 @@ set(libkdelibs4support_SRCS kdecore/klocale.cpp kdecore/klocale_kde.cpp @@ -239,7 +240,7 @@ index 64a53d8..9f2e8ac 100644 ) set_source_files_properties( solid/org.freedesktop.PowerManagement.xml -@@ -205,36 +85,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml +@@ -211,36 +92,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml solid/org.kde.Solid.PowerManagement.PolicyAgent.xml PROPERTIES NO_NAMESPACE TRUE) @@ -276,7 +277,7 @@ index 64a53d8..9f2e8ac 100644 if (APPLE) set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} -@@ -260,10 +110,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da +@@ -266,10 +117,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da configure_file(kdecore/config-localization.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-localization.h) @@ -287,7 +288,7 @@ index 64a53d8..9f2e8ac 100644 check_function_exists(mmap HAVE_MMAP) check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE) configure_file(config-kdelibs4support.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdelibs4support.h ) -@@ -309,32 +155,12 @@ endif() +@@ -315,32 +162,12 @@ endif() target_link_libraries(KF5KDELibs4Support PUBLIC @@ -320,7 +321,7 @@ index 64a53d8..9f2e8ac 100644 ${platformLinkLibraries} ) -@@ -362,26 +188,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES +@@ -368,26 +195,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES ) @@ -348,7 +349,7 @@ index 64a53d8..9f2e8ac 100644 add_subdirectory(pics) diff --git a/src/kdecore/kglobal.cpp b/src/kdecore/kglobal.cpp -index d493314..5373b4e 100644 +index bd2ba59..f06f73e 100644 --- a/src/kdecore/kglobal.cpp +++ b/src/kdecore/kglobal.cpp @@ -42,7 +42,6 @@ @@ -375,8 +376,8 @@ index d493314..5373b4e 100644 class KGlobalPrivate { @@ -66,10 +63,6 @@ public: - : dirs(0), - stringDict(0) + : dirs(nullptr), + stringDict(nullptr) { - // the umask is read here before any threads are created to avoid race conditions - mode_t tmp = 0; @@ -386,7 +387,7 @@ index d493314..5373b4e 100644 inline ~KGlobalPrivate() @@ -126,17 +119,6 @@ bool KGlobal::hasLocale() - return QCoreApplication::instance() != 0; + return QCoreApplication::instance() != nullptr; } -KCharsets *KGlobal::charsets() @@ -404,7 +405,7 @@ index d493314..5373b4e 100644 { return KComponentData::activeComponent(); diff --git a/src/kdecore/klocale_kde.cpp b/src/kdecore/klocale_kde.cpp -index 8203855..2c571f4 100644 +index d7e45ed..278cf0c 100644 --- a/src/kdecore/klocale_kde.cpp +++ b/src/kdecore/klocale_kde.cpp @@ -42,7 +42,6 @@ @@ -426,7 +427,7 @@ index 8203855..2c571f4 100644 QString calendarType; readConfigEntry("CalendarSystem", "gregorian", calendarType); diff --git a/src/kdecore/kstandarddirs.cpp b/src/kdecore/kstandarddirs.cpp -index 4161425..6bb6a69 100644 +index 01560dc..344aa43 100644 --- a/src/kdecore/kstandarddirs.cpp +++ b/src/kdecore/kstandarddirs.cpp @@ -35,7 +35,6 @@