patch cmake for desktop file and icon

3 files changed, 48 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 232896c87ab7..36b9e1a0d282 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = babe-git
 	pkgdesc = Tiny Qt Babe Music Player
-	pkgver = r8.8283c99
+	pkgver = r16.gfc845fc
 	pkgrel = 1
-	url = https://milohr.github.io/BabeIt/
+	url = https://babe.kde.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -19,7 +19,9 @@ pkgbase = babe-git
 	conflicts = babe-qt
 	replaces = babe-qt
 	source = git+git://anongit.kde.org/babe.git
+	source = cmake.patch
 	sha256sums = SKIP
+	sha256sums = 246133348fe676df5411bda7b1df8dd801f377d2dc7c6f3344997b81d2eb9ae2
 
 pkgname = babe-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ea1a299080a4..525623e66d3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Josip Ponjavic <josipponjavic at gmail dot com>
  
 pkgname=babe-git
-pkgver=r8.8283c99
+pkgver=r16.gfc845fc
 pkgrel=1
 pkgdesc='Tiny Qt Babe Music Player'
 arch=('i686' 'x86_64')
-url="https://milohr.github.io/BabeIt/"
+url="https://babe.kde.org/"
 license=('GPL3')
 depends=('hicolor-icon-theme' 'knotifications' 'ki18n' 'taglib')
 makedepends=('extra-cmake-modules' 'git' 'python')
@@ -13,12 +13,17 @@ optdepends=('youtube-dl: youtube support')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}" 'babe-qt')
 replaces=('babe-qt')
-source=('git+git://anongit.kde.org/babe.git')
-sha256sums=('SKIP')
- 
+source=('git+git://anongit.kde.org/babe.git' 'cmake.patch')
+sha256sums=('SKIP' '246133348fe676df5411bda7b1df8dd801f377d2dc7c6f3344997b81d2eb9ae2')
+
 pkgver() {
   cd babe
-  printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd babe
+  patch -p1 < $srcdir/cmake.patch
 }
 
 build() {
@@ -28,10 +33,5 @@ build() {
 }
  
 package() {
-  cd babe
-  make DESTDIR="${pkgdir}/" install
-  install -Dm644 data/babe.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/babe.svg"
-  install -Dm755 org.kde.babe.desktop "$pkgdir/usr/share/applications/org.kde.babe.desktop"
-  sed -i 's|Exec=Babe|Exec=babe|' "${pkgdir}/usr/share/applications/org.kde.babe.desktop"
-  sed -i 's|Icon=Babe|Icon=babe|' "${pkgdir}/usr/share/applications/org.kde.babe.desktop"
+  make -C babe DESTDIR="${pkgdir}/" install
 }
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 000000000000..3e73b452bcf4
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,32 @@
+diff -ruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-04-16 05:38:47.000000000 +0200
++++ b/CMakeLists.txt	2017-04-16 06:09:30.000000000 +0200
+@@ -83,6 +83,10 @@
+ 
+    
+ install(FILES org.kde.babe.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
++install(FILES org.kde.babe.desktop DESTINATION ${KDE_INSTALL_APPDIR})
++install(FILES data/babe.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME Babe.svg)
++
++
+ # install_it.path = $$OUT_PWD
+ # install_it.files = data/*
+ #
+@@ -121,14 +125,14 @@
+    )
+ 
+ add_executable (
+-   babe
++   Babe
+    ${babe_SRCS}
+    )
+ 
+-install(TARGETS babe ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS Babe ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ target_link_libraries (
+-   babe
++   Babe
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Widgets