libre/smplayer: updated to 18.2.0

3 files changed, 22 insertions, 33 deletions

diff --git a/libre/smplayer/PKGBUILD b/libre/smplayer/PKGBUILD
index 1d5c6a6a7..2a5a7a0d4 100644
--- a/libre/smplayer/PKGBUILD
+++ b/libre/smplayer/PKGBUILD
@@ -3,16 +3,19 @@
 # Contributor (Arch): Allan McRae <allan@archlinux.org>
 # Contributor (Arch): Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor (Arch): shamrok <szamrok@gmail.com>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Andreas Grapentin <andreas@grapentin.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+
+# parabola changes and rationale:
+#  - removed smtube support
 
 pkgname=smplayer
-pkgver=17.10.0
+pkgver=18.2.0
 pkgrel=1.parabola1
 pkgdesc='Media player with built-in codecs that can play virtually all video and audio formats, without nonfree smtube support'
-url='http://www.smplayer.info/'
-arch=('i686' 'x86_64' 'armv7h')
+url='https://www.smplayer.info/'
+arch=('x86_64' 'i686' 'armv7h')
 license=('GPL')
 depends=('qt5-script' 'mpv' 'hicolor-icon-theme' 'libx11' 'zlib' 'gcc-libs')
 makedepends=('qt5-tools')
@@ -20,37 +23,35 @@ optdepends=('smplayer-themes: icon themes collection'
             'smplayer-skins: skin themes collection'
             'youtube-dl: youtube videos and streaming'
             'mplayer: alternative multimedia engine')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        disable-smtube-support.patch
-        add-missing-QClipboard-include.patch)
-sha256sums=('3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375'
-            'e86a0881d6696dfe2b5a2742947f317090194beab4986df7e9ac8845727e78de'
-            'abb66acd70e61bc2bf7abfa2887b24b76004e00b9649a9b38aa44b4409fea08e')
+source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        libre.patch)
+sha256sums=('0e6e19dc90dd7a2bd0f920bff8c53f8a5450abd5907847726d47d172a51e76d0'
+            'e86a0881d6696dfe2b5a2742947f317090194beab4986df7e9ac8845727e78de')
+sha512sums=('43be64b82f77b223ef885b63b1bb3302b96cb93897cbf66df6272075bcfb76dbf11091526ae2b1bcde6845e25053a31456361fbd841a4dad8d229bacfab8bdb5'
+            '813efc30a754015d8bca9391ed3b586481c2cd931a0b234a8cb94cdad7ae92b8976aabd05569099900ce65b8f2fd39d39da0dddff46bfe10891dd5edc4f12283')
 
 prepare() {
-  cd $pkgname-$pkgver
-
+  cd ${pkgname}-${pkgver}
   # disable SMTube support
-  patch -p1 -i $srcdir/disable-smtube-support.patch
-
-  # add missing QClipboard include
-  patch -p1 -i $srcdir/add-missing-QClipboard-include.patch
-
+  patch -p1 -i $srcdir/libre.patch
   # fix GNU/Linux name
   sed -i 's|Linux|GNU/Linux|' src/smplayer.cpp
+  # make build reproducible, we compress ourselves
+  sed '/gzip -9/d' -i Makefile
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd ${pkgname}-${pkgver}
   make PREFIX=/usr \
     DOC_PATH="\\\"/usr/share/doc/smplayer\\\"" \
-    QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE
+    QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE \
+    CFLAGS_EXTRA="${CFLAGS} ${LDFLAGS}"
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd ${pkgname}-${pkgver}
   make DOC_PATH=/usr/share/doc/smplayer \
-    DESTDIR="$pkgdir" PREFIX=/usr install
+    DESTDIR="${pkgdir}" PREFIX=/usr install
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/libre/smplayer/add-missing-QClipboard-include.patch b/libre/smplayer/add-missing-QClipboard-include.patch
deleted file mode 100644
index 4f98cebe8..000000000
--- a/libre/smplayer/add-missing-QClipboard-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/playlist.cpp b/src/playlist.cpp
-index 575a7a19f..a143cdf16 100644
---- a/src/playlist.cpp
-+++ b/src/playlist.cpp
-@@ -46,6 +46,7 @@
- #include <QDomDocument>
- #include <QDesktopServices>
- #include <QDebug>
-+#include <QClipboard>
- 
- #if QT_VERSION >= 0x050000
- #include "myscroller.h"
diff --git a/libre/smplayer/disable-smtube-support.patch b/libre/smplayer/libre.patch
index bf41c8d95..bf41c8d95 100644
--- a/libre/smplayer/disable-smtube-support.patch
+++ b/libre/smplayer/libre.patch