From 8d2f526792146a724dc90817de8c47ef098f64e1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 29 Dec 2017 20:48:33 +0100
Subject: [PATCH] Update subtitlecomposer packages

* Import changes from AUR
* Rebuild against ICU 60
* Sync Git version with regular package
---
 subtitlecomposer/default/PKGBUILD | 8 ++++----
 subtitlecomposer/git/PKGBUILD     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/subtitlecomposer/default/PKGBUILD b/subtitlecomposer/default/PKGBUILD
index 6838e2e1..72b8efdc 100644
--- a/subtitlecomposer/default/PKGBUILD
+++ b/subtitlecomposer/default/PKGBUILD
@@ -12,8 +12,8 @@
 # you also find the URL of (another) binary repository (i686 and x86_64).
 
 pkgname=subtitlecomposer
-pkgver=0.6.4
-pkgrel=4
+pkgver=0.6.5
+pkgrel=2
 pkgdesc="A KDE subtitle editor"
 arch=('i686' 'x86_64')
 url="https://github.com/maxrd2/${pkgname}"
@@ -37,14 +37,14 @@ optdepends=('mplayer: MPlayer backend'
             'python: scripting')
 
 source=("https://github.com/maxrd2/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('030f3a33dccdc95b890c06de6f2566c4e6ec85264c8bc47430c72c137ce74f91')
+sha256sums=('26503c5f7ede37f482bd2da6b4acc8df83c0e5c18f38df011ce0f567a1422563')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_LIBDIR=lib \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
     -DBUILD_TESTING=OFF
   make
diff --git a/subtitlecomposer/git/PKGBUILD b/subtitlecomposer/git/PKGBUILD
index a148b5c7..1503c34f 100644
--- a/subtitlecomposer/git/PKGBUILD
+++ b/subtitlecomposer/git/PKGBUILD
@@ -13,7 +13,7 @@
 
 _name=subtitlecomposer
 pkgname=${_name}-git
-pkgver=0.6.4
+pkgver=0.6.5
 pkgrel=1
 pkgdesc="A KDE subtitle editor"
 arch=('i686' 'x86_64')
@@ -33,6 +33,7 @@ optdepends=('mplayer: MPlayer backend'
             'mpv: MPV backend'
             'xine-lib: Xine backend'
             'pocketsphinx: speech recognition'
+            'kross-interpreters: for ruby and python scripting support'
             'ruby: scripting'
             'python: scripting')
 
@@ -40,7 +41,6 @@ conflicts=($_name)
 provides=($_name)
 
 source=("git+https://github.com/maxrd2/${_name}.git")
-#source=("git+https://github.com/Martchus/${_name}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -53,7 +53,7 @@ build() {
   cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_LIBDIR=lib \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
     -DBUILD_TESTING=OFF
   make