bump, remove cmake patch...

3 files changed, 9 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b44a3169bcf..a967a11644b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = babe-git
 	pkgdesc = Tiny Qt Babe Music Player
-	pkgver = r37.g9af8ab2
+	pkgver = r41.g60913c8
 	pkgrel = 1
 	url = https://babe.kde.org/
 	arch = i686
@@ -10,8 +10,8 @@ pkgbase = babe-git
 	makedepends = git
 	makedepends = python
 	depends = hicolor-icon-theme
-	depends = knotifications
 	depends = ki18n
+	depends = knotifications
 	depends = taglib
 	optdepends = youtube-dl: youtube support
 	provides = babe
@@ -19,9 +19,7 @@ pkgbase = babe-git
 	conflicts = babe-qt
 	replaces = babe-qt
 	source = git+git://anongit.kde.org/babe.git
-	source = cmake.patch
 	sha256sums = SKIP
-	sha256sums = 6cd25406e607d248ff00baf1b204a32ca0eca59d53465b1904795abf917b4cb9
 
 pkgname = babe-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 996a1a75a2d5..943141b17410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,26 @@
 # Maintainer: Josip Ponjavic <josipponjavic at gmail dot com>
  
 pkgname=babe-git
-pkgver=r37.g9af8ab2
+pkgver=r41.g60913c8
 pkgrel=1
 pkgdesc='Tiny Qt Babe Music Player'
 arch=('i686' 'x86_64')
 url="https://babe.kde.org/"
 license=('GPL3')
-depends=('hicolor-icon-theme' 'knotifications' 'ki18n' 'taglib')
+depends=('hicolor-icon-theme' 'ki18n' 'knotifications' 'taglib')
 makedepends=('extra-cmake-modules' 'git' 'python')
 optdepends=('youtube-dl: youtube support')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}" 'babe-qt')
 replaces=('babe-qt')
-source=('git+git://anongit.kde.org/babe.git' 'cmake.patch')
-sha256sums=('SKIP' '6cd25406e607d248ff00baf1b204a32ca0eca59d53465b1904795abf917b4cb9')
+source=('git+git://anongit.kde.org/babe.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd babe
   printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd babe
-  patch -p1 < $srcdir/cmake.patch
-}
-
 build() {
   cd babe
   cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
@@ -33,5 +28,7 @@ build() {
 }
  
 package() {
-  make -C babe DESTDIR="${pkgdir}/" install
+  cd babe
+  make DESTDIR="${pkgdir}/" install
+  install -Dm755 data/babe.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/Babe.svg"
 }
diff --git a/cmake.patch b/cmake.patch
deleted file mode 100644
index 5434094f1490..000000000000
--- a/cmake.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ruN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-04-27 17:14:32.108830838 +0200
-+++ b/CMakeLists.txt	2017-04-27 17:18:58.798979344 +0200
-@@ -78,12 +78,14 @@
-    notify.cpp
-    youtube.cpp
-    metadataForm.cpp
--   onlineview.cpp
-    web_jgm90.cpp
-+   rabbitview.cpp
-    )
- 
-    
- 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/*
- #
-@@ -114,7 +116,6 @@
-    about.ui
-    infoview.ui
-    metadataForm.ui
--   onlineview.ui
-    )
- 
- qt5_add_resources (
-@@ -123,14 +124,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