diff options
Diffstat (limited to 'port_to_kf5.patch')
-rw-r--r-- | port_to_kf5.patch | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/port_to_kf5.patch b/port_to_kf5.patch deleted file mode 100644 index fd16a713e16b..000000000000 --- a/port_to_kf5.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2013-01-13 05:04:17.000000000 +0800 -+++ b/CMakeLists.txt 2015-11-30 20:24:59.296150854 +0800 -@@ -1,9 +1,17 @@ - cmake_minimum_required(VERSION 2.6) - project(kde_cdemu) - --find_package(KDE4 REQUIRED) --include(KDE4Defaults) --add_definitions(${KDE4_DEFINITIONS}) -+find_package(ECM 0.0.11 REQUIRED NO_MODULE) -+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+include(KDEInstallDirs) -+include(KDECMakeSettings) -+include(KDECompilerSettings) -+include(FeatureSummary) -+ -+find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(KF5 REQUIRED COMPONENTS KDELibs4Support) #CoreAddons Solid -+ - - set(KDE_CDEMU_VERSION "0.5.0") - -diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2010-09-05 06:47:43.000000000 +0800 -+++ b/src/CMakeLists.txt 2015-11-30 20:30:07.878598397 +0800 -@@ -3,20 +3,22 @@ - - configure_file(kdecdemuversion.h.in ${PROJECT_BINARY_DIR}/kdecdemuversion.h) - --find_package(KDE4 REQUIRED) --include(KDE4Defaults) -+find_package(ECM 0.0.11 REQUIRED NO_MODULE) -+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - --add_definitions(${KDE4_DEFINITIONS}) --include_directories(${KDE4_INCLUDES} ${PROJECT_BINARY_DIR}) -+include(KDEInstallDirs) -+include(KDECMakeSettings) -+include(KDECompilerSettings) -+include(FeatureSummary) - - set(kde_cdemu_SRCS main.cpp kdecdemu.cpp mainwindow.cpp cdemu.cpp messagebox.cpp) - --kde4_add_ui_files(kde_cdemu_SRCS mainwindow.ui) --kde4_add_executable(kde_cdemu ${kde_cdemu_SRCS}) -+ki18n_wrap_ui(kde_cdemu_SRCS mainwindow.ui) -+add_executable(kde_cdemu ${kde_cdemu_SRCS}) - --target_link_libraries(kde_cdemu ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) -+target_link_libraries(kde_cdemu KF5::KDELibs4Support KF5::KIOCore Qt5::Widgets) - - install(TARGETS kde_cdemu DESTINATION ${BIN_INSTALL_DIR}) --install(FILES kde_cdemuui.rc DESTINATION ${DATA_INSTALL_DIR}/kde_cdemu) -+install(FILES kde_cdemuui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kde_cdemu) - install(FILES kde_cdemu_mount.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) - install(FILES kde_cdemu.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -diff -Naur a/src/main.cpp b/src/main.cpp ---- a/src/main.cpp 2013-01-13 06:16:12.000000000 +0800 -+++ b/src/main.cpp 2015-11-30 20:29:06.613459670 +0800 -@@ -21,18 +21,24 @@ - #include <KAboutData> - #include <KCmdLineArgs> - #include <KUniqueApplication> -+#include <klocalizedstring.h> -+//kdelibs4support -+#include <k4aboutdata.h> - - #include "kdecdemu.h" - #include "kdecdemuversion.h" - - int main (int argc, char *argv[]) - { -- KAboutData aboutData("kde_cdemu", "konqueror", ki18n("KDE CDEmu Manager"), KDE_CDEMU_VERSION, ki18n("A KDE Frontend to CDEmu"), -- KAboutData::License_GPL_V3, ki18n("Copyright (c) 2009-2013 Marcel Hasler")); -+ KLocalizedString::setApplicationDomain("kde_cdemu"); -+ K4AboutData aboutData("kde_cdemu", 0, ki18n("KDE CDEmu Manager"), KDE_CDEMU_VERSION, ki18n("A KDE Frontend to CDEmu"), K4AboutData::License_GPL_V3, -+ ki18n("Copyright (c) 2009-2013 Marcel Hasler"), KLocalizedString(), -+ "http://kde-apps.org/content/show.php?content=99752&forumpage=5"); -+ - aboutData.addAuthor(ki18n("Marcel Hasler"), ki18n("Developer & Maintainer"), "mahasler@gmail.com"); - aboutData.setProgramIconName("media-optical"); - -- KLocale::setMainCatalog("kde_cdemu"); -+ KLocalizedString::setApplicationDomain("kde_cdemu"); - - KCmdLineArgs::init(argc, argv, &aboutData); - -diff -Naur a/src/mainwindow.cpp b/src/mainwindow.cpp ---- a/src/mainwindow.cpp 2013-01-13 05:14:30.000000000 +0800 -+++ b/src/mainwindow.cpp 2015-11-30 20:24:59.296150854 +0800 -@@ -32,6 +32,7 @@ - #include <KMessageBox> - #include <KStandardAction> - #include <KStatusBar> -+#include <KUrl> - - static QString fileTypes("*.iso *.cue *.toc *.nrg *.mds *.daa *.cif *.b6t *.c2d *.cdi *.ccd"); - |