Patch should be upstream soon™

3 files changed, 7 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c665a91d122..bbf42a6d2676 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = clementine-git
 	pkgdesc = A modern music player and library organizer
-	pkgver = 1.4.0rc1.r296.g68d375c43.0.g68d375c43
+	pkgver = 1.4.0rc1.r329.gf7bece3b8.0.gf7bece3b8
 	pkgrel = 1
 	url = http://www.clementine-player.org/
 	arch = x86_64
@@ -22,9 +22,7 @@ pkgbase = clementine-git
 	provides = clementine
 	conflicts = clementine
 	source = git+https://github.com/clementine-player/Clementine.git
-	source = close-fix.diff
 	sha256sums = SKIP
-	sha256sums = f8db366cf61b956a96b21d587aff42f565d9ac84636d5188249b34268d3537c5
 
 pkgname = clementine-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6ecd7b0af5a2..4aa6fd4223ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Based on community/clementine PKGBUILD
 
 pkgname=clementine-git
-pkgver=1.4.0rc1.r296.g68d375c43.0.g68d375c43
+pkgver=1.4.0rc1.r329.gf7bece3b8.0.gf7bece3b8
 pkgrel=1
 pkgdesc='A modern music player and library organizer'
 url='http://www.clementine-player.org/'
@@ -25,23 +25,18 @@ optdepends=('libcdio: for CD support'
 conflicts=(clementine)
 provides=(clementine)
 _name=Clementine
-source=("git+https://github.com/clementine-player/$_name.git"
-        "close-fix.diff")
-sha256sums=('SKIP'
-            'f8db366cf61b956a96b21d587aff42f565d9ac84636d5188249b34268d3537c5')
+source=("git+https://github.com/clementine-player/$_name.git")
+sha256sums=('SKIP')
 
 pkgver() {
     cd $_name
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-    cd $_name
-    patch -p1 -i $srcdir/close-fix.diff
-}
-
 build() {
-  cmake -B build -S $_name -DENABLE_SPOTIFY_BLOB=off
+  cmake -B build -S $_name \
+    -DENABLE_SPOTIFY_BLOB=off \
+    -DCMAKE_INSTALL_PREFIX=/usr
   cmake --build build
 }
 
diff --git a/close-fix.diff b/close-fix.diff
deleted file mode 100644
index 4625d3e455cd..000000000000
--- a/close-fix.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
-index 14921028c..4216e6237 100644
---- a/src/ui/mainwindow.cpp
-+++ b/src/ui/mainwindow.cpp
-@@ -1444,17 +1444,9 @@ void MainWindow::StopAfterCurrent() {
- }
- 
- void MainWindow::closeEvent(QCloseEvent* event) {
--  bool keep_running(false);
--  if (tray_icon_)
--    keep_running =
--        settings_.value("keeprunning", tray_icon_->IsVisible()).toBool();
--
--  if (keep_running && event->spontaneous()) {
--    event->ignore();
--    SetHiddenInTray(true);
--  } else {
--    Exit();
--  }
-+  if (!tray_icon_ || !tray_icon_->IsVisible())
-+        Exit();
-+  QMainWindow::closeEvent(event);
- }
- 
- void MainWindow::SetHiddenInTray(bool hidden) {