[arch-commits] Commit in clipgrab/trunk (PKGBUILD system-youtube-dl.patch)

[Antonio Rojas]

    Date: Saturday, November 14, 2020 @ 11:08:17
  Author: arojas
Revision: 754053

Fix system youtube-dl detection

Added:
  clipgrab/trunk/system-youtube-dl.patch
Modified:
  clipgrab/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   14 ++++++++++----
 system-youtube-dl.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-14 10:10:33 UTC (rev 754052)
+++ PKGBUILD	2020-11-14 11:08:17 UTC (rev 754053)
@@ -6,18 +6,24 @@
 
 pkgname=clipgrab
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...'
 arch=(x86_64)
 url='https://clipgrab.org'
 license=(GPL3)
-depends=(qt5-webengine)
+depends=(qt5-webengine youtube-dl)
 optdepends=('ffmpeg: for the conversion functionality')
 source=(https://download.clipgrab.org/$pkgname-$pkgver.tar.gz
-        $pkgname.desktop)
+        $pkgname.desktop
+        system-youtube-dl.patch)
 sha256sums=('f815cc71df63bdea32da9f799de185dfdd5a8ff4c8c539aae50a563d2bda844b'
-            '840910097d8c129ea12c395c4a33f562591e878e521c98fde8a7b3f9403aa23f')
+            '840910097d8c129ea12c395c4a33f562591e878e521c98fde8a7b3f9403aa23f'
+            '8ce7a5309470c51bd79cbf6b5b769b302ac7b10f0bd9c7f80871b72822d3567b')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../system-youtube-dl.patch # Fix system youtube-dl detection
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: system-youtube-dl.patch
===================================================================
--- system-youtube-dl.patch	                        (rev 0)
+++ system-youtube-dl.patch	2020-11-14 11:08:17 UTC (rev 754053)
@@ -0,0 +1,11 @@
+--- clipgrab-3.9.0/youtube_dl.cpp.orig	2020-11-14 11:28:07.576057009 +0100
++++ clipgrab-3.9.0/youtube_dl.cpp	2020-11-14 12:04:53.362705720 +0100
+@@ -24,7 +24,7 @@
+ 
+     // Try system-wide youtube-dl installation
+     QString globalPath = QStandardPaths::findExecutable("youtube-dl");
+-    process = instance(localPath, QStringList() << "--version");
++    process = instance(globalPath, QStringList() << "--version");
+     process->start();
+     process->waitForFinished();
+     process->deleteLater();