[neon/kf6/kf6-kio/Neon/unstable] debian/patches: Remove upstream applied kde6-renames patch

Scarlett Moore null at kde.org
Sat Sep 9 12:29:29 BST 2023


Git commit 8ec17fe8f0509872af32eb5bf23d9eb0d9a72fc6 by Scarlett Moore.
Committed on 09/09/2023 at 13:29.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Remove upstream applied kde6-renames patch

D  +0    -156  debian/patches/kde6_renames
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kf6/kf6-kio/-/commit/8ec17fe8f0509872af32eb5bf23d9eb0d9a72fc6

diff --git a/debian/patches/kde6_renames b/debian/patches/kde6_renames
deleted file mode 100644
index 7dc19bc..0000000
--- a/debian/patches/kde6_renames
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git a/src/core/ksslcertificatemanager.cpp b/src/core/ksslcertificatemanager.cpp
-index 04802af923b4f8aecc156490743144cabbe33302..e76cc14c8a59f8e378b0f7ed4ef2638efa2b4f2c 100644
---- a/src/core/ksslcertificatemanager.cpp
-+++ b/src/core/ksslcertificatemanager.cpp
-@@ -156,7 +156,7 @@ static QList<QSslCertificate> deduplicate(const QList<QSslCertificate> &certs)
- 
- KSslCertificateManagerPrivate::KSslCertificateManagerPrivate()
-     : config(QStringLiteral("ksslcertificatemanager"), KConfig::SimpleConfig)
--    , iface(new org::kde::KSSLDInterface(QStringLiteral("org.kde.kssld5"), QStringLiteral("/modules/kssld"), QDBusConnection::sessionBus()))
-+    , iface(new org::kde::KSSLDInterface(QStringLiteral("org.kde.kssld6"), QStringLiteral("/modules/kssld"), QDBusConnection::sessionBus()))
-     , isCertListLoaded(false)
-     , userCertDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/kssl/userCaCertificates/"))
- {
-diff --git a/src/kiod/CMakeLists.txt b/src/kiod/CMakeLists.txt
-index 11f48564fb4f7e768946526ac2edac3555dd6d51..5279d416e54ce13d3e8c2d55f9ba7e00cc6c7f01 100644
---- a/src/kiod/CMakeLists.txt
-+++ b/src/kiod/CMakeLists.txt
-@@ -1,13 +1,13 @@
- include(ECMMarkNonGuiExecutable)
- 
--add_executable(kiod5)
-+add_executable(kiod6)
- 
--target_sources(kiod5 PRIVATE
-+target_sources(kiod6 PRIVATE
-     kiod_main.cpp
- )
- 
- if (APPLE)
--    target_sources(kiod5 PRIVATE
-+    target_sources(kiod6 PRIVATE
-         kiod_agent.mm
-     )
- endif()
-@@ -20,7 +20,7 @@ ecm_qt_export_logging_category(
-     EXPORT KIO
- )
- 
--target_link_libraries(kiod5
-+target_link_libraries(kiod6
-    KF6::KIOCore     # ksslcertificatemanager
-    KF6::DBusAddons  # kdedmodule
-    KF6::CoreAddons  # kpluginfactory
-@@ -30,13 +30,13 @@ target_link_libraries(kiod5
- )
- 
- if (APPLE)
--    target_link_libraries(kiod5 "-framework AppKit -framework CoreFoundation")
-+    target_link_libraries(kiod6 "-framework AppKit -framework CoreFoundation")
- 
-     # Mark it as non-gui so we won't create an app bundle on Mac OS X
--    ecm_mark_nongui_executable(kiod5)
-+    ecm_mark_nongui_executable(kiod6)
- endif ()
- 
--install(TARGETS kiod5 DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF})
-+install(TARGETS kiod6 DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF})
- 
--kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kiod5 ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
-+kdbusaddons_generate_dbus_service_file(kiod6 org.kde.kiod6 ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
- 
-diff --git a/src/kiod/kiod_main.cpp b/src/kiod/kiod_main.cpp
-index 487b4106965f51d863da2c7d500ac01263ca6c49..59794f8dd944ccdf2e0cc7e8ccc1c83713bd2f01 100644
---- a/src/kiod/kiod_main.cpp
-+++ b/src/kiod/kiod_main.cpp
-@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
-     qunsetenv("SESSION_MANAGER"); // disable session management
- 
-     QApplication app(argc, argv); // GUI needed for kpasswdserver's dialogs
--    app.setApplicationName(QStringLiteral("kiod5"));
-+    app.setApplicationName(QStringLiteral("kiod6"));
-     app.setOrganizationDomain(QStringLiteral("kde.org"));
-     app.setQuitOnLastWindowClosed(false);
-     KDBusService service(KDBusService::Unique);
-@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
-     qDBusAddSpyHook(messageFilter);
- 
- #ifdef Q_OS_MACOS
--    // In the case of kiod5 we need to confirm the agent nature,
-+    // In the case of kiod6 we need to confirm the agent nature,
-     // possibly because of how things have been set up after creating
-     // the QApplication instance. Failure to do this will disable
-     // text input into dialogs we may post.
-diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt
-index e94b7ff0c1894af9d5e99e8ac096565919e09939..e9da27857eee22b569dc968f491e548da48cc087 100644
---- a/src/kioexec/CMakeLists.txt
-+++ b/src/kioexec/CMakeLists.txt
-@@ -21,7 +21,7 @@ ecm_qt_declare_logging_category(kioexecd
- 
- target_link_libraries(kioexecd KF6::I18n KF6::DBusAddons KF6::WidgetsAddons KF6::KIOCore)
- 
--kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kioexecd ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
-+kdbusaddons_generate_dbus_service_file(kiod6 org.kde.kioexecd6 ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
- 
- # next target
- 
-diff --git a/src/kioexec/kioexecd.json b/src/kioexec/kioexecd.json
-index a10492358d73f910281a9ea7522548ee449584d9..e769bb2e40fecd3f4697da914a69486c0a4312fa 100644
---- a/src/kioexec/kioexecd.json
-+++ b/src/kioexec/kioexecd.json
-@@ -1,3 +1,3 @@
- {
--    "X-KDE-DBus-ServiceName": "org.kde.kioexecd"
-+    "X-KDE-DBus-ServiceName": "org.kde.kioexecd6"
- }
-diff --git a/src/kioexec/main.cpp b/src/kioexec/main.cpp
-index 0a56a4ff10ab20194fe4b81f86f1e2c4cfe2b533..b4c7a6338b744af482632ed0ec0665acd6e38818 100644
---- a/src/kioexec/main.cpp
-+++ b/src/kioexec/main.cpp
-@@ -147,7 +147,7 @@ void KIOExec::slotResult(KJob *job)
-             // Tell kioexecd to watch the file for changes.
-             const QString dest = copyJob->srcUrl().toString();
-             qDebug() << "Telling kioexecd to watch path" << path << "dest" << dest;
--            OrgKdeKIOExecdInterface kioexecd(QStringLiteral("org.kde.kioexecd"), QStringLiteral("/modules/kioexecd"), QDBusConnection::sessionBus());
-+            OrgKdeKIOExecdInterface kioexecd(QStringLiteral("org.kde.kioexecd6"), QStringLiteral("/modules/kioexecd"), QDBusConnection::sessionBus());
-             kioexecd.watch(path, dest);
-             mUseDaemon = !kioexecd.lastError().isValid();
-             if (!mUseDaemon) {
-diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt
-index 1cd650ce9718c27d6bea3e5c8eed42da3f0b9e39..bc313c363b7e67e62271bb1b6a38db6ec8fd3d75 100644
---- a/src/kpasswdserver/CMakeLists.txt
-+++ b/src/kpasswdserver/CMakeLists.txt
-@@ -49,4 +49,4 @@ target_link_libraries(kiod_kpasswdserver
-    ${WALLET_LIB}
- )
- 
--kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kpasswdserver ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
-+kdbusaddons_generate_dbus_service_file(kiod6 org.kde.kpasswdserver6 ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
-diff --git a/src/kpasswdserver/kpasswdserver.json b/src/kpasswdserver/kpasswdserver.json
-index 82f32aed278535e8a628e20161322bcb4bfb5149..ab52c07bea045a87d3150d07cfa38d0fb9d01806 100644
---- a/src/kpasswdserver/kpasswdserver.json
-+++ b/src/kpasswdserver/kpasswdserver.json
-@@ -1,3 +1,3 @@
- {
--    "X-KDE-DBus-ServiceName": "org.kde.kpasswdserver"
-+    "X-KDE-DBus-ServiceName": "org.kde.kpasswdserver6"
- }
-diff --git a/src/kssld/CMakeLists.txt b/src/kssld/CMakeLists.txt
-index 6348482652628dba43db4bd4f16ba43b6abb9cc5..ce7001f476cd55bd7797011d87546272ea59ae32 100644
---- a/src/kssld/CMakeLists.txt
-+++ b/src/kssld/CMakeLists.txt
-@@ -20,4 +20,4 @@ PRIVATE
-    Qt6::DBus
- )
- 
--kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kssld5 ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
-+kdbusaddons_generate_dbus_service_file(kiod6 org.kde.kssld6 ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
-diff --git a/src/kssld/kssld.json b/src/kssld/kssld.json
-index 853f915c93d7b5e889375a93e7aaedc41faa60b6..a8366d928e316b70fe9a202f95c686c7f471a0b4 100644
---- a/src/kssld/kssld.json
-+++ b/src/kssld/kssld.json
-@@ -1,3 +1,3 @@
- {
--    "X-KDE-DBus-ServiceName": "org.kde.kssld5"
-+    "X-KDE-DBus-ServiceName": "org.kde.kssld6"
- }
diff --git a/debian/patches/series b/debian/patches/series
index d711f2c..0e4fb57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ wait_for_a_bit_longer
 Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
-kde6_renames
\ No newline at end of file


More information about the Neon-commits mailing list