[arch-commits] Commit in openshot/repos/community-any (2837.patch PKGBUILD PKGBUILD)

[Florian Pritz]

    Date: Sunday, June 30, 2019 @ 11:31:51
  Author: bluewind
Revision: 486265

archrelease: copy trunk to community-any

Added:
  openshot/repos/community-any/2837.patch
    (from rev 486264, openshot/trunk/2837.patch)
  openshot/repos/community-any/PKGBUILD
    (from rev 486264, openshot/trunk/PKGBUILD)
Deleted:
  openshot/repos/community-any/PKGBUILD

------------+
 2837.patch |   31 ++++++++++++++++++++++++++++++
 PKGBUILD   |   60 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 65 insertions(+), 26 deletions(-)

Copied: openshot/repos/community-any/2837.patch (from rev 486264, openshot/trunk/2837.patch)
===================================================================
--- 2837.patch	                        (rev 0)
+++ 2837.patch	2019-06-30 11:31:51 UTC (rev 486265)
@@ -0,0 +1,31 @@
+From c254a0aef217ef0cc3fd256accdb32180e18b24d Mon Sep 17 00:00:00 2001
+From: Florian Pritz <bluewind at server-speed.net>
+Date: Sat, 15 Jun 2019 11:39:29 +0200
+Subject: [PATCH] Install icons to hicolor/NxN instead of hicolor/N
+
+Nearly all other Arch Linux packages also follow this pattern and the Freedesktop specification also only uses this pattern when providing examples.
+
+References:
+https://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+https://bugs.archlinux.org/task/62900
+---
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index dbae3900..43e08e0a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -71,9 +71,9 @@
+     ('share/pixmaps', ['xdg/openshot-qt.svg']),
+     # XDG Freedesktop icon paths
+     ('share/icons/hicolor/scalable/apps', ['xdg/openshot-qt.svg']),
+-    ('share/icons/hicolor/64/apps', ['xdg/icon/64/openshot-qt.png']),
+-    ('share/icons/hicolor/256/apps', ['xdg/icon/256/openshot-qt.png']),
+-    ('share/icons/hicolor/512/apps', ['xdg/icon/512/openshot-qt.png']),
++    ('share/icons/hicolor/64x64/apps', ['xdg/icon/64/openshot-qt.png']),
++    ('share/icons/hicolor/256x256/apps', ['xdg/icon/256/openshot-qt.png']),
++    ('share/icons/hicolor/512x512/apps', ['xdg/icon/512/openshot-qt.png']),
+     # XDG desktop mime types cache
+     ('share/mime/packages', ['xdg/openshot-qt.xml']),
+     # launcher (mime.types)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-30 11:31:48 UTC (rev 486264)
+++ PKGBUILD	2019-06-30 11:31:51 UTC (rev 486265)
@@ -1,26 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
-
-pkgname=openshot
-pkgver=2.4.4
-pkgrel=1
-pkgdesc="an open-source, non-linear video editor for Linux based on MLT framework"
-arch=('any')
-url="https://www.openshot.org/"
-license=('GPL')
-depends=('mlt-python-bindings' 'sdl' 'librsvg' 'mplayer'
-	 'pyxdg' 'python-pyqt5' 'python-httplib2' 'python-pillow' 'dvgrab'
-	 'ladspa' 'sox' 'vid.stab' 'qt5-svg' 'sdl_image'
-	 'libopenshot' 'python-pyzmq' 'qt5-webkit' 'python-setuptools'
-	 'python-requests')
-optdepends=('frei0r-plugins: effects'
-	    'libquicktime' 'libavc1394' 'faac' 'jack')
-makedepends=('python-setuptools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenShot/openshot-qt/archive/v$pkgver.tar.gz")
-sha256sums=('8197923b3fff2010ee69c75469818543674a12fcb8fcb08944471e4ead3426be')
-
-package() {
-  cd "$srcdir"/openshot-qt-$pkgver
-  python setup.py install --root="$pkgdir/" --optimize=1
-}

Copied: openshot/repos/community-any/PKGBUILD (from rev 486264, openshot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-30 11:31:51 UTC (rev 486265)
@@ -0,0 +1,34 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
+
+pkgname=openshot
+pkgver=2.4.4
+pkgrel=2
+pkgdesc="an open-source, non-linear video editor for Linux based on MLT framework"
+arch=('any')
+url="https://www.openshot.org/"
+license=('GPL')
+depends=('python-mlt' 'sdl' 'librsvg' 'mplayer'
+	 'pyxdg' 'python-pyqt5' 'python-httplib2' 'python-pillow' 'dvgrab'
+	 'ladspa' 'sox' 'vid.stab' 'qt5-svg' 'sdl_image'
+	 'libopenshot' 'python-pyzmq' 'qt5-webkit' 'python-setuptools'
+	 'python-requests')
+optdepends=('frei0r-plugins: effects'
+	    'libquicktime' 'libavc1394' 'faac' 'jack')
+makedepends=('python-setuptools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenShot/openshot-qt/archive/v$pkgver.tar.gz" 2837.patch)
+sha256sums=('8197923b3fff2010ee69c75469818543674a12fcb8fcb08944471e4ead3426be'
+            '3a4da79b668d263095559a9e5fa257bdb49fa8a6aa96d02e5c4e27def2b10634')
+
+prepare() {
+  cd "$srcdir"/openshot-qt-$pkgver
+
+  # Fix hicolor icon paths. Fix is part of develop branch (2.4.4+)
+  patch -p1 -i "$srcdir/2837.patch"
+}
+
+package() {
+  cd "$srcdir"/openshot-qt-$pkgver
+  python setup.py install --root="$pkgdir/" --optimize=1
+}