Add patch to install the kxmlui file to the correct directory

3 files changed, 24 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca177f922791..9c0cea43d0b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jan  5 16:08:21 UTC 2017
+# Sat Sep 15 13:54:39 UTC 2018
 pkgbase = k9copy
 	pkgdesc = A small utility to copy DVD
 	pkgver = 3.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sourceforge.net/projects/k9copy-reloaded/
 	arch = i686
 	arch = x86_64
@@ -32,6 +32,7 @@ pkgbase = k9copy
 	source = k9copy-tempdir.patch
 	source = unbundled_dvdread_dvdnav.patch
 	source = set_cancel_button_fix.patch
+	source = k9copy-install-xmluifile-fix.patch
 	sha256sums = 4f1f8bc1ed22464a72382924aa23420c0bb94c2360af750a03454f187936e036
 	sha256sums = e6ea13c74b39e160d5eee7c106b2122f4a289aae37981ee176bc74ed8c959812
 	sha256sums = 61900fabe8534c506432ffc51a4e0bb49f231bdc04e2182b79383067404db703
@@ -40,6 +41,7 @@ pkgbase = k9copy
 	sha256sums = 4eaabf10b3bfd3cce0b1ac176a2e4e038f03d0ca4d0f96b67897c20cdfc756f9
 	sha256sums = 6c3c72b03a4d4ff1c961416ad8030977e6f41d2d3304f8be181866ee546b5439
 	sha256sums = f03945f611650f2cfb76e479ce49aeb0b1815634025e35585d805f0ae5dcbdb5
+	sha256sums = 624041e871bcc57b000be0eb4dbea6dc176bb05650ebb7f7f7e318ac6e312e36
 
 pkgname = k9copy
 
diff --git a/PKGBUILD b/PKGBUILD
index 5941786e1727..31f545c799ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=k9copy
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A small utility to copy DVD"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/k9copy-reloaded/"
@@ -19,7 +19,8 @@ source=("http://sourceforge.net/projects/k9copy-reloaded/files/$pkgname-$pkgver.
         'k9copy-qt5.patch'
         'k9copy-tempdir.patch'
         'unbundled_dvdread_dvdnav.patch'
-        'set_cancel_button_fix.patch')
+        'set_cancel_button_fix.patch'
+        'k9copy-install-xmluifile-fix.patch')
 
 sha256sums=('4f1f8bc1ed22464a72382924aa23420c0bb94c2360af750a03454f187936e036'
             'e6ea13c74b39e160d5eee7c106b2122f4a289aae37981ee176bc74ed8c959812'
@@ -28,7 +29,8 @@ sha256sums=('4f1f8bc1ed22464a72382924aa23420c0bb94c2360af750a03454f187936e036'
             'e16536294c41446dc141572f52cc5efd67fcb4fb99e082804786c64fe2fa4729'
             '4eaabf10b3bfd3cce0b1ac176a2e4e038f03d0ca4d0f96b67897c20cdfc756f9'
             '6c3c72b03a4d4ff1c961416ad8030977e6f41d2d3304f8be181866ee546b5439'
-            'f03945f611650f2cfb76e479ce49aeb0b1815634025e35585d805f0ae5dcbdb5')
+            'f03945f611650f2cfb76e479ce49aeb0b1815634025e35585d805f0ae5dcbdb5'
+            '624041e871bcc57b000be0eb4dbea6dc176bb05650ebb7f7f7e318ac6e312e36')
 
 prepare() {
 	# Apply Fedora patches (https://github.com/rpmfusion/k9copy)
@@ -54,6 +56,9 @@ prepare() {
 
 	msg "Applying patch unbundled_dvdread_dvdnav.patch"
 	patch -uNp2 -r- -i ../set_cancel_button_fix.patch
+	
+	msg "Applying patch k9copy-install-xmluifile-fix.patch"
+	patch -uNp2 -r- -i ../k9copy-install-xmluifile-fix.patch
 }
 
 build(){
diff --git a/k9copy-install-xmluifile-fix.patch b/k9copy-install-xmluifile-fix.patch
new file mode 100644
index 000000000000..5cb48955957e
--- /dev/null
+++ b/k9copy-install-xmluifile-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur ./k9copy.orig/CMakeLists.txt ./k9copy/CMakeLists.txt
+--- ./k9copy.orig/CMakeLists.txt	2018-09-15 09:44:40.515572351 -0400
++++ ./k9copy/CMakeLists.txt	2018-09-15 09:46:35.369915488 -0400
+@@ -569,7 +569,7 @@
+ 
+ install( FILES k9copy.desktop k9copy_assistant.desktop DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+ #install( FILES k9copy.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
+-install( FILES k9copyui.rc  DESTINATION  ${DATA_INSTALL_DIR}/k9copy )
++install( FILES k9copyui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/k9copy )
+ 
+ install(FILES k9copy_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
+ install(FILES k9copy_assistant_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)