From c2ee40f59a302b0af4e84ee12e445caecaa0cb10 Mon Sep 17 00:00:00 2001
From: demmm <anke62@gmail.com>
Date: Mon, 25 Sep 2017 22:20:05 +0000
Subject: [PATCH] lftp 4.8.2 brackets 1.11, gcrypt.so file no longer needed,
 /usr included in source, remove seperate /usr packaging section fails to run,
 no errors, possible curl3 issue scala 2.12.3.1 plasma-integration added new
 dep, prep next build

---
 brackets/PKGBUILD           | 23 ++++-------------------
 krita/PKGBUILD              |  8 ++++----
 lftp/PKGBUILD               |  8 ++++----
 plasma-integration/PKGBUILD |  2 +-
 scala/PKGBUILD              |  9 +++++----
 5 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/brackets/PKGBUILD b/brackets/PKGBUILD
index 7bc905561..b48c93530 100644
--- a/brackets/PKGBUILD
+++ b/brackets/PKGBUILD
@@ -1,51 +1,36 @@
 
 pkgname=brackets
-pkgver=1.10
+pkgver=1.11
 pkgrel=1
 pkgdesc="Open source code editor for web designers and front-end developers."
 arch=("x86_64")
 url="http://brackets.io"
 license=("MIT")
 depends=('gconf' 'nss' 'systemd' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2')
-makedepends=('prelink')
 optdepends=("google-chrome: to enable Live Preview"
             "gnuplot: to enable node benchmarking"
             "ruby: to enable LiveDevelopment Inspector")
 install=${pkgname}.install
 source=("https://github.com/adobe/brackets/releases/download/release-${pkgver}/Brackets.Release.${pkgver}.64-bit.deb"
         'libgcrypt.so.11.8.2')
-md5sums=('bc99bbfd99bb847b069ad89736954ac3'
+md5sums=('c102feb1e4ab03b36262d4c0e2c7e95d'
          'a17acc9851185dd5f219458140e6ccda')
 
 prepare() {
   cd $srcdir/
 
   tar -xf data.tar.xz
-  execstack -c opt/${pkgname}/Brackets
 }
 
 package() {
   install -d ${pkgdir}/opt
   cp -r opt/${pkgname} ${pkgdir}/opt/${pkgname}
+  cp -r usr/ ${pkgdir}/usr
 
   chmod -R a+rw ${pkgdir}/opt/${pkgname}/samples
 
-  install -d ${pkgdir}/usr/bin
-  ln -s /opt/brackets/brackets ${pkgdir}/usr/bin/${pkgname}
-
-  local _icon_dir="usr/share/icons/hicolor"
-  install -d ${pkgdir}/$_icon_dir/scalable/apps
-  install -Dm644 $_icon_dir/scalable/apps/${pkgname}.svg ${pkgdir}/$_icon_dir/scalable/apps/${pkgname}.svg
-  for _icon in "opt/brackets/appshell"*.png; do
-    local _icon_size=${_icon##*/appshell}
-    install -d ${pkgdir}/$_icon_dir/${_icon_size%.png}x${_icon_size%.png}/apps
-    install -Dm644 $_icon ${pkgdir}/$_icon_dir/${_icon_size%.png}x${_icon_size%.png}/apps/${pkgname}.png
-  done
-
   install -d ${pkgdir}/usr/share/applications
-  sed 's/Development/Development;/' opt/${pkgname}/${pkgname}.desktop > ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -m755 opt/${pkgname}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 
   install -Dm755 usr/share/doc/${pkgname}/copyright ${pkgdir}/usr/share/licenses/${pkgname}/copyright
-  #libgcrypt 1.6.0 fix 
-  install -m755 ${srcdir}/libgcrypt.so.11.8.2 ${pkgdir}/opt/brackets/libgcrypt.so.11
 }
diff --git a/krita/PKGBUILD b/krita/PKGBUILD
index 18af17520..9143cce13 100644
--- a/krita/PKGBUILD
+++ b/krita/PKGBUILD
@@ -1,8 +1,8 @@
 
 pkgname=krita
-pkgver=3.2.1
-_pkgver=3.2.1
-pkgrel=2
+pkgver=3.3.0
+_pkgver=3.3.0
+pkgrel=1
 pkgdesc="Program for sketching and painting, offering an end–to–end solution for creating digital painting files from scratch"
 arch=('x86_64')
 url='https://krita.org/'
@@ -18,7 +18,7 @@ replaces=('krita-l10n')
 source=("https://download.kde.org/stable/krita/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
         "https://github.com/KDE/krita/commit/2f59d0d1d91e3f79342c20d0df68aa9a51817e8d.diff"
         'launch_krita.sh')
-md5sums=('00896775772991182e927248eb3ef198'
+md5sums=('f68de1e0aa6483fe7f33d09c7748e4a6'
          '5fb8c7f3694ed02b329d0faff234c420'
          '673003bb648af0d4f801043ee0a17c2a')
 
diff --git a/lftp/PKGBUILD b/lftp/PKGBUILD
index 4ef178634..e66b67287 100644
--- a/lftp/PKGBUILD
+++ b/lftp/PKGBUILD
@@ -1,8 +1,8 @@
 
 pkgname=lftp
-pkgver=4.8.1
-_pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+_pkgver=4.8.2
+pkgrel=1
 pkgdesc="Sophisticated command line based FTP client with openssl"
 arch=('x86_64')
 url="https://lftp.yar.ru/"
@@ -11,7 +11,7 @@ depends=('gcc-libs' 'readline' 'gnutls' 'expat' 'perl' 'sh')
 makedepends=('autoconf')
 categories=('network')
 source=("https://lftp.yar.ru/ftp/${pkgname}-${_pkgver}.tar.xz")
-md5sums=('4ce82e5bbd331055247fc7263cdfdbf7')
+md5sums=('36f3ca2c070391282e0260dd6234af3b')
 
 build() {
   cd ${pkgname}-${_pkgver}
diff --git a/plasma-integration/PKGBUILD b/plasma-integration/PKGBUILD
index 717246e54..f5a834530 100644
--- a/plasma-integration/PKGBUILD
+++ b/plasma-integration/PKGBUILD
@@ -10,7 +10,7 @@ arch=('x86_64')
 url='https://github.com/KDE/plasma-integration'
 license=('LGPL')
 depends=('kconfig' 'kconfigwidgets' 'ki18n' 'kiconthemes' 'kio' 'knotifications' 'kwidgetsaddons'
-         'kwayland' 'noto-fonts' 'breeze' 'ttf-hack')
+         'kwayland' 'noto-fonts' 'breeze' 'ttf-hack' 'qt5-quickcontrols2')
 makedepends=('extra-cmake-modules')
 groups=('plasma5')
 #source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz"
diff --git a/scala/PKGBUILD b/scala/PKGBUILD
index 809f40b5c..6d43f3a0a 100644
--- a/scala/PKGBUILD
+++ b/scala/PKGBUILD
@@ -1,17 +1,18 @@
 
 pkgname=scala
-pkgver=2.12.3
+pkgver=2.12.3.1
+_pkgver=2.12.3-1
 pkgrel=1
 pkgdesc="Acronym for Scalable Language, running on the JVM. Java and Scala classes"
 arch=('x86_64')
 url="https://www.scala-lang.org"
 license=('custom')
 depends=('sh' 'java-environment')
-source=("https://www.scala-lang.org/files/archive/scala-$pkgver.tgz")
-md5sums=('68ba79e2172fc1ab8120fe6c615a2713')
+source=("https://www.scala-lang.org/files/archive/scala-${_pkgver}.tgz")
+md5sums=('0b88fccb499672ea00b11875a4d5f0dd')
 
 package() {
-  cd ${srcdir}/scala-${pkgver}
+  cd scala-${_pkgver}
 
   install -d ${pkgdir}/usr/{bin,share} ${pkgdir}/usr/share/man/man1 ${pkgdir}/usr/share/scala/{bin,lib}
   cp -r lib ${pkgdir}/usr/share/scala/