[arch-commits] Commit in clipgrab/repos/community-x86_64 (5 files)

[Antonio Rojas]

    Date: Saturday, November 14, 2020 @ 11:08:30
  Author: arojas
Revision: 754054

archrelease: copy trunk to community-x86_64

Added:
  clipgrab/repos/community-x86_64/PKGBUILD
    (from rev 754053, clipgrab/trunk/PKGBUILD)
  clipgrab/repos/community-x86_64/clipgrab.desktop
    (from rev 754053, clipgrab/trunk/clipgrab.desktop)
  clipgrab/repos/community-x86_64/system-youtube-dl.patch
    (from rev 754053, clipgrab/trunk/system-youtube-dl.patch)
Deleted:
  clipgrab/repos/community-x86_64/PKGBUILD
  clipgrab/repos/community-x86_64/clipgrab.desktop

-------------------------+
 PKGBUILD                |   72 ++++++++++++++++++++++++----------------------
 clipgrab.desktop        |   26 ++++++++--------
 system-youtube-dl.patch |   11 +++++++
 3 files changed, 63 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-14 11:08:17 UTC (rev 754053)
+++ PKGBUILD	2020-11-14 11:08:30 UTC (rev 754054)
@@ -1,33 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Alois Nespor <alium at centrum.cz>
-# Contributor: kikadf <kikadf.01 at gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: thacrazze <thacrazze|googlemail|com>
-
-pkgname=clipgrab
-pkgver=3.9.0
-pkgrel=1
-pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...'
-arch=(x86_64)
-url='https://clipgrab.org'
-license=(GPL3)
-depends=(qt5-webengine)
-optdepends=('ffmpeg: for the conversion functionality')
-source=(https://download.clipgrab.org/$pkgname-$pkgver.tar.gz
-        $pkgname.desktop)
-sha256sums=('f815cc71df63bdea32da9f799de185dfdd5a8ff4c8c539aae50a563d2bda844b'
-            '840910097d8c129ea12c395c4a33f562591e878e521c98fde8a7b3f9403aa23f')
-
-build() {
-  cd $pkgname-$pkgver
-
-  qmake clipgrab.pro
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  install -Dm755 $pkgname -t "$pkgdir"/usr/bin/
-  install -Dm644 icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "$srcdir"/$pkgname.desktop -t "$pkgdir"/usr/share/applications/
-}

Copied: clipgrab/repos/community-x86_64/PKGBUILD (from rev 754053, clipgrab/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-14 11:08:30 UTC (rev 754054)
@@ -0,0 +1,39 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Alois Nespor <alium at centrum.cz>
+# Contributor: kikadf <kikadf.01 at gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: thacrazze <thacrazze|googlemail|com>
+
+pkgname=clipgrab
+pkgver=3.9.0
+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 youtube-dl)
+optdepends=('ffmpeg: for the conversion functionality')
+source=(https://download.clipgrab.org/$pkgname-$pkgver.tar.gz
+        $pkgname.desktop
+        system-youtube-dl.patch)
+sha256sums=('f815cc71df63bdea32da9f799de185dfdd5a8ff4c8c539aae50a563d2bda844b'
+            '840910097d8c129ea12c395c4a33f562591e878e521c98fde8a7b3f9403aa23f'
+            '8ce7a5309470c51bd79cbf6b5b769b302ac7b10f0bd9c7f80871b72822d3567b')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../system-youtube-dl.patch # Fix system youtube-dl detection
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  qmake clipgrab.pro
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  install -Dm755 $pkgname -t "$pkgdir"/usr/bin/
+  install -Dm644 icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$srcdir"/$pkgname.desktop -t "$pkgdir"/usr/share/applications/
+}

Deleted: clipgrab.desktop
===================================================================
--- clipgrab.desktop	2020-11-14 11:08:17 UTC (rev 754053)
+++ clipgrab.desktop	2020-11-14 11:08:30 UTC (rev 754054)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=ClipGrab
-GenericName=Video Downloader
-GenericName[de]=Video-Downloader
-Comment=Download videos and convert it
-Comment[de]=Videos herunterladen und konvertieren
-Icon=/usr/share/pixmaps/clipgrab.png
-Exec=clipgrab
-TryExec=clipgrab
-Terminal=false
-Categories=Qt;AudioVideo;Audio;Video;

Copied: clipgrab/repos/community-x86_64/clipgrab.desktop (from rev 754053, clipgrab/trunk/clipgrab.desktop)
===================================================================
--- clipgrab.desktop	                        (rev 0)
+++ clipgrab.desktop	2020-11-14 11:08:30 UTC (rev 754054)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=ClipGrab
+GenericName=Video Downloader
+GenericName[de]=Video-Downloader
+Comment=Download videos and convert it
+Comment[de]=Videos herunterladen und konvertieren
+Icon=/usr/share/pixmaps/clipgrab.png
+Exec=clipgrab
+TryExec=clipgrab
+Terminal=false
+Categories=Qt;AudioVideo;Audio;Video;

Copied: clipgrab/repos/community-x86_64/system-youtube-dl.patch (from rev 754053, clipgrab/trunk/system-youtube-dl.patch)
===================================================================
--- system-youtube-dl.patch	                        (rev 0)
+++ system-youtube-dl.patch	2020-11-14 11:08:30 UTC (rev 754054)
@@ -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();