Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:branches:windows:mingw:win64
mingw64-kio
fix-conflict-of-kio_http_cache_cleaner-with-kde...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-conflict-of-kio_http_cache_cleaner-with-kde4.patch of Package mingw64-kio
From fbc7731ea9a93187db9236b5db737784ac7e1849 Mon Sep 17 00:00:00 2001 From: Ralf Habacker <ralf.habacker@freenet.de> Date: Wed, 12 Aug 2020 13:55:39 +0200 Subject: [PATCH] Install kio_http_cache_cleaner5 to avoid conflicts with KDE4 counterpart --- src/ioslaves/http/CMakeLists.txt | 1 + src/ioslaves/http/http.cpp | 6 +++--- src/ioslaves/http/http_cache_cleaner.cpp | 4 ++-- src/ioslaves/http/http_cache_cleaner.desktop | 2 +- src/kcms/kio/cache.cpp | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt index acfbb744..94288d53 100644 --- a/src/ioslaves/http/CMakeLists.txt +++ b/src/ioslaves/http/CMakeLists.txt @@ -39,6 +39,7 @@ set(kio_http_cache_cleaner_SRCS add_executable(kio_http_cache_cleaner ${kio_http_cache_cleaner_SRCS}) +set_target_properties(kio_http_cache_cleaner PROPERTIES OUTPUT_NAME kio_http_cache_cleaner5) # Mark it as non-gui so we won't create an app bundle on Mac OS X ecm_mark_nongui_executable(kio_http_cache_cleaner) diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp index 5f9cd7c5..a5e099d7 100644 --- a/src/ioslaves/http/http.cpp +++ b/src/ioslaves/http/http.cpp @@ -4967,7 +4967,7 @@ void HTTPProtocol::sendCacheCleanerCommand(const QByteArray &command) return; Q_ASSERT(command.size() == BinaryCacheFileHeader::size + s_hashedUrlNibbles + sizeof(quint32)); if (m_cacheCleanerConnection.state() != QLocalSocket::ConnectedState) { - QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + QLatin1String("kio_http_cache_cleaner"); + QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + QLatin1String("kio_http_cache_cleaner5"); m_cacheCleanerConnection.connectToServer(socketFileName, QIODevice::WriteOnly); if (m_cacheCleanerConnection.state() == QLocalSocket::UnconnectedState) { @@ -4979,9 +4979,9 @@ void HTTPProtocol::sendCacheCleanerCommand(const QByteArray &command) << QCoreApplication::applicationDirPath() // then look where our application binary is located << QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) // look where libexec path is (can be set in qt.conf) << QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location - const QString exe = QStandardPaths::findExecutable(QStringLiteral("kio_http_cache_cleaner"), searchPaths); + const QString exe = QStandardPaths::findExecutable(QStringLiteral("kio_http_cache_cleaner5"), searchPaths); if (exe.isEmpty()) { - qCWarning(KIO_HTTP) << "kio_http_cache_cleaner not found in" << searchPaths; + qCWarning(KIO_HTTP) << "kio_http_cache_cleaner5 not found in" << searchPaths; return; } qCDebug(KIO_HTTP) << "starting" << exe; diff --git a/src/ioslaves/http/http_cache_cleaner.cpp b/src/ioslaves/http/http_cache_cleaner.cpp index e735a9c1..d9778f01 100644 --- a/src/ioslaves/http/http_cache_cleaner.cpp +++ b/src/ioslaves/http/http_cache_cleaner.cpp @@ -53,7 +53,7 @@ int g_maxCacheAge; qint64 g_maxCacheSize; static const char appFullName[] = "org.kio5.kio_http_cache_cleaner"; -static const char appName[] = "kio_http_cache_cleaner"; +static const char appName[] = "kio_http_cache_cleaner5"; // !START OF SYNC! // Keep the following in sync with the cache code in http.cpp @@ -787,7 +787,7 @@ int main(int argc, char **argv) } QLocalServer lServer; - const QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1String("/kio_http_cache_cleaner"); + const QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1String("/kio_http_cache_cleaner5"); // we need to create the file by opening the socket, otherwise it won't work QFile::remove(socketFileName); if (!lServer.listen(socketFileName)) { diff --git a/src/ioslaves/http/http_cache_cleaner.desktop b/src/ioslaves/http/http_cache_cleaner.desktop index e014c978..24e84219 100644 --- a/src/ioslaves/http/http_cache_cleaner.desktop +++ b/src/ioslaves/http/http_cache_cleaner.desktop @@ -52,7 +52,7 @@ Name[x-test]=xxHTTP Cache Cleanerxx Name[zh_CN]=HTTP 缓存清除程序 Name[zh_HK]=HTTP 快取清除程式 Name[zh_TW]=HTTP 快取清除程式 -Exec=kio_http_cache_cleaner +Exec=kio_http_cache_cleaner5 Comment=Cleans up old entries from the HTTP cache Comment[ar]=ينظّف خبيئة HTTP من المُدخلات القديمة Comment[ast]=Llimpia les entraes vieyes de la caché HTTP diff --git a/src/kcms/kio/cache.cpp b/src/kcms/kio/cache.cpp index 39da7097..2b0a8c14 100644 --- a/src/kcms/kio/cache.cpp +++ b/src/kcms/kio/cache.cpp @@ -125,7 +125,7 @@ void CacheConfigModule::configChanged() void CacheConfigModule::clearCache() { - const QString exe = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kio_http_cache_cleaner"); + const QString exe = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kio_http_cache_cleaner5"); if (QFile::exists(exe)) { QProcess::startDetached(exe, QStringList(QStringLiteral("--clear-all"))); -- 2.26.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor