Version 0.6.1

4 files changed, 32 insertions, 283 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fedcc67caf8f..2ae31ae1f617 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = kde-cdemu-manager-kf5
 	pkgdesc = KDE CDEmu Manager is a simple frontend for CDEmu.KF5 version
-	pkgver = 0.5
-	pkgrel = 3
-	url = http://www.kde-apps.org/content/show.php/KDE+CDEmu+Manager?content=99752
+	pkgver = 0.6.1
+	pkgrel = 1
+	url = https://github.com/Real-Gecko/KDE-CDEmu
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = cmake
-	depends = kdelibs4support
+	makedepends = extra-cmake-modules
+	makedepends = kdoctools
+	makedepends = qt5-tools
+	makedepends = python
+	depends = kxmlgui
+	depends = knotifications
 	depends = cdemu-daemon>=2.0
 	provides = kde-cdemu-manager
 	conflicts = kde-cdemu-manager
-	source = http://www.kde-apps.org/CONTENT/content-files/99752-kde_cdemu-0.5.0.tar.bz2
-	source = port_to_kf5.patch
-	md5sums = c0e56401e2c2f2c4652915a44af128b8
-	md5sums = 8d6c70628bbfd664efe0f1462708244d
+	source = https://github.com/Real-Gecko/KDE-CDEmu/archive/0.6.1.tar.gz
+	md5sums = a134b8090a7107884ca9f3d89e295eb9
 
 pkgname = kde-cdemu-manager-kf5
 
diff --git a/PKGBUILD b/PKGBUILD
index 405cef738eb7..b9094cffe32d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,40 @@
 # Contributor: ReNoM <renom@list.ru>
 # Contributor: ava1ar <mail(dot)avatar(at)gmail(dot)com>
+# Contributor: RealGecko <realgecko@realgecko.com>
 
 pkgname=kde-cdemu-manager-kf5
-pkgver=0.5
-pkgrel=3
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="KDE CDEmu Manager is a simple frontend for CDEmu.KF5 version"
 arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php/KDE+CDEmu+Manager?content=99752"
-license="GPL"
-depends=('kdelibs4support' 'cdemu-daemon>=2.0')
+url="https://github.com/Real-Gecko/KDE-CDEmu"
+license=('GPL')
+depends=('kxmlgui' 'knotifications')
+depends=('cdemu-daemon>=2.0')
 provides=('kde-cdemu-manager')
 conflicts=('kde-cdemu-manager')
-makedepends=('cmake' 'kdoctools' 'qt5-tools' 'extra-cmake-modules')
-source=(http://www.kde-apps.org/CONTENT/content-files/99752-kde_cdemu-$pkgver.0.tar.bz2
-        port_to_kf5.patch
-        zh_CN.po)
-md5sums=('c0e56401e2c2f2c4652915a44af128b8'
-        'SKIP'
-        'SKIP')
+makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools' 'python')
+source=(https://github.com/Real-Gecko/KDE-CDEmu/archive/$pkgver.tar.gz)
+md5sums=('a134b8090a7107884ca9f3d89e295eb9')
 
 prepare() {
-  cd $srcdir/kde_cdemu
-  patch -p1 < ../port_to_kf5.patch
-  cp ${srcdir}/zh_CN.po $srcdir/kde_cdemu/po
+  mkdir -p build
 }
+
 build() {
-  cd $srcdir/kde_cdemu
-  mkdir -p build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` \
+  cd build
+  cmake ../KDE-CDEmu-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_LIBDIR=lib \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DSYSCONF_INSTALL_DIR=/etc \
-    -DBUILD_TESTING=OFF \
-    ..
-    
+    -DBUILD_TESTING=OFF
+
   make
 }
 
-package()
-{
-  cd $srcdir/kde_cdemu/build
-  make DESTDIR=$pkgdir install
+package() {
+  make -C build DESTDIR=$pkgdir install
 }
 
+
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");
- 
diff --git a/zh_CN.po b/zh_CN.po
deleted file mode 100755
index 1414a7fef02e..000000000000
--- a/zh_CN.po
+++ /dev/null
@@ -1,147 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: mahasler@gmail.com\n"
-"POT-Creation-Date: 2013-01-12 23:09+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Lin Ziyun <ohmygod19993@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. i18n: file: src/mainwindow.ui:20
-#. i18n: ectx: property (windowTitle), widget (QMainWindow, MainWindow)
-#: po/rc.cpp:3 src/main.cpp:30 rc.cpp:3
-msgid "KDE CDEmu Manager"
-msgstr "KDE CDEmu 管理器"
-
-#. i18n: file: src/mainwindow.ui:58
-#. i18n: ectx: property (text), widget (QTreeWidget, DeviceList)
-#: po/rc.cpp:6 rc.cpp:6
-msgid "Device"
-msgstr "设备"
-
-#. i18n: file: src/mainwindow.ui:63
-#. i18n: ectx: property (text), widget (QTreeWidget, DeviceList)
-#: po/rc.cpp:9 src/mainwindow.cpp:58 rc.cpp:9
-msgid "File"
-msgstr "文件"
-
-#. i18n: file: src/mainwindow.ui:71
-#. i18n: ectx: property (title), widget (QGroupBox, SelectImageBox)
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Select image"
-msgstr "选择镜像"
-
-#. i18n: file: src/mainwindow.ui:80
-#. i18n: ectx: property (text), widget (KPushButton, SelectFileButton)
-#: po/rc.cpp:15 rc.cpp:15
-msgid "..."
-msgstr "..."
-
-#. i18n: file: src/mainwindow.ui:105
-#. i18n: ectx: property (text), widget (KPushButton, MountButton)
-#: po/rc.cpp:18 rc.cpp:18
-msgid "Mount"
-msgstr "挂载"
-
-#. i18n: file: src/mainwindow.ui:125
-#. i18n: ectx: property (text), widget (KPushButton, UnmountButton)
-#: po/rc.cpp:21 rc.cpp:21
-msgid "Unmount"
-msgstr "卸载"
-
-#: po/rc.cpp:22 rc.cpp:22
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "Lin Ziyun"
-
-#: po/rc.cpp:23 rc.cpp:23
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "ohmygod19993@gmail.com"
-
-#: src/main.cpp:30
-msgid "A KDE Frontend to CDEmu"
-msgstr "CDEmu的KDE前端"
-
-#: src/main.cpp:31
-msgid "Copyright (c) 2009-2013 Marcel Hasler"
-msgstr "Copyright (c) 2009-2013 Marcel Hasler"
-
-#: src/main.cpp:32
-msgid "Marcel Hasler"
-msgstr "Marcel Hasler"
-
-#: src/main.cpp:32
-msgid "Developer & Maintainer"
-msgstr "开发者与维护者"
-
-#: src/main.cpp:40
-msgid "Mount an image"
-msgstr "挂载一个镜像"
-
-#: src/main.cpp:41
-msgid "Unmount an image"
-msgstr "卸载一个镜像"
-
-#: src/main.cpp:42
-msgid "Show information about devices"
-msgstr "显示设备信息"
-
-#: src/mainwindow.cpp:103
-msgid "CDEmu daemon running."
-msgstr "CDEmu守护进程正在运行。"
-
-#: src/mainwindow.cpp:106
-msgid "CDEmu daemon not running."
-msgstr "CDEmu守护进程未运行。"
-
-#: src/mainwindow.cpp:121
-msgid "Please select a file first."
-msgstr "请先选择一个文件。"
-
-#: src/mainwindow.cpp:121 src/mainwindow.cpp:128 src/mainwindow.cpp:145
-#: src/messagebox.cpp:65
-msgid "Error"
-msgstr "错误"
-
-#: src/mainwindow.cpp:128 src/mainwindow.cpp:145
-msgid "Please select a device first."
-msgstr "请先选择一个设备。"
-
-#: src/messagebox.cpp:33
-msgid "Everything OK."
-msgstr "一切正常。"
-
-#: src/messagebox.cpp:37
-msgid "The selected virtual device is in use."
-msgstr "选中的设备被占用。"
-
-#: src/messagebox.cpp:41
-msgid "The selected virtual device is not available."
-msgstr "选中的设备不可用。"
-
-#: src/messagebox.cpp:45
-msgid "All virtual devices are in use."
-msgstr "所有虚拟设备均被占用。"
-
-#: src/messagebox.cpp:49
-msgid "The file doesn't exist."
-msgstr "文件不存在。"
-
-#: src/messagebox.cpp:53
-msgid "Unable to connect to the CDEmu daemon."
-msgstr "无法连接到CDEmu守护进程。"
-
-#: src/messagebox.cpp:57
-msgid "An unknown error occured."
-msgstr "未知错误。"