Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre

5 files changed, 48 insertions, 32 deletions

diff --git a/libre/khotkeys/PKGBUILD b/libre/khotkeys/PKGBUILD
index cce1bace4..fb009cfb8 100644
--- a/libre/khotkeys/PKGBUILD
+++ b/libre/khotkeys/PKGBUILD
@@ -3,9 +3,10 @@
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Antonio Rojas
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=khotkeys
-pkgver=5.10.0
+pkgver=5.10.1
 pkgrel=1.parabola1
 pkgdesc='KHotKeys, with DuckDuckGo HTML support'
 arch=('i686' 'x86_64' 'armv7h')
@@ -16,7 +17,7 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin')
 conflicts=('kdebase-workspace')
 groups=(plasma)
 source=("https://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('d77dda6844d83695b97d40dfe3124d6ddc7c0a129711629b49bfc8f6e217b570'
+sha512sums=('bd260215e3a9167d1871e7202268d5214f9f11ddd96bff1ecf37bb6970e6bac26c51c247be06182c3d3de624dc3668d071d0e75027847e9e74c4cd009e4a0ccb'
             'SKIP')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
diff --git a/libre/kinfocenter/PKGBUILD b/libre/kinfocenter/PKGBUILD
index b8c4ea407..1ffd501cf 100644
--- a/libre/kinfocenter/PKGBUILD
+++ b/libre/kinfocenter/PKGBUILD
@@ -3,9 +3,10 @@
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Antonio Rojas
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=kinfocenter
-pkgver=5.10.0
+pkgver=5.10.1
 pkgrel=1.parabola1
 pkgdesc='A utility that provides information about a computer system (Parabola rebranded)'
 arch=('i686' 'x86_64' 'armv7h')
@@ -16,11 +17,12 @@ makedepends=('extra-cmake-modules' 'python' 'plasma-framework' 'kdoctools')
 conflicts=('kdebase-workspace')
 groups=('plasma')
 source=("https://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"{,.sig}
-'parabola-logo.svg::https://wiki.parabola.nu/images/a/af/Parabolagnu%2Blinuxlibre-dark-scalable.svg' 'kcm-about-distrorc')
-sha256sums=('73d9ed2009982c95cf06c6f9154d3d7ad581e7102f25f50110da2207ac18518a'
+        'parabola-logo.svg::https://wiki.parabola.nu/images/a/af/Parabolagnu%2Blinuxlibre-dark-scalable.svg'
+        'kcm-about-distrorc')
+sha512sums=('be74aaaa7c881f4604b60dce126e8489ad3f782afddb412be7800d33e304a918822bab2ca17af9fc8e83ac97a2f2490734c8b1d6899a7b2f5901502110f5b99d'
             'SKIP'
-            '75136b90185242891cbeb993285f400bcc9c6c70fdccb0f5e50790acaf875b92'
-            '9c874f9ee68dc1c46fab1255f28bdca892e664b35208220db77ab59e04617a96')
+            'af9f9a8074cb84e3a2ab35200189627d8fb529741aa9c2a316c6c6f049ffd88b6b16d98f1fcdef731a9f75a03883b6806fb48c87c533b94ab3e719bdc02f7b9f'
+            '2a184861ce8aae52c98a143d3c905f74c03ccf10294234293f7eb647b663e9b0f95f2a45c3681e7948ddbdae082d51f9cd830e355302fdcd876a6d5be4ce557b')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
               'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson
diff --git a/libre/okular/PKGBUILD b/libre/okular/PKGBUILD
index b9239bf4f..9e27e8fe4 100644
--- a/libre/okular/PKGBUILD
+++ b/libre/okular/PKGBUILD
@@ -2,6 +2,7 @@
 # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=okular
 pkgver=17.04.2
diff --git a/pcr/freefilesync/PKGBUILD b/pcr/freefilesync/PKGBUILD
index efaa242d3..96c4b2f6e 100755
--- a/pcr/freefilesync/PKGBUILD
+++ b/pcr/freefilesync/PKGBUILD
@@ -4,8 +4,8 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=freefilesync
-pkgver=8.9
-pkgrel=0.1
+pkgver=9.1
+pkgrel=0
 pkgdesc="Backup software to synchronize files and folders"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.freefilesync.org/"
@@ -13,16 +13,14 @@ license=('GPLv3')
 depends=(wxgtk webkitgtk2 boost-libs)
 makedepends=(boost)
 source=(
-	"http://downloads.sourceforge.net/project/zenxml/zenXml_2.4.zip"	#zen
-	"FreeFileSync_${pkgver}_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.9_Source.zip"		#ffs
+	"FreeFileSync_${pkgver}_Source.zip::https://www.freefilesync.org/download_redirect.php?file=FreeFileSync_${pkgver}_Source.zip"		#ffs
 	FreeFileSync.desktop
 	ffsicon.png
 	RealTimeSync.desktop
 	rtsicon.png
 	)
 md5sums=(
-	 '55907f1af4eb94a4196d95815b675d78'	#zen source
-	 '92a29624a517367e348afce669502c73'	#ffs source
+	 '362eb9c7bfb8638119a8ba7a75c99fa4'	#ffs source
 	 'eab0ccfc6a88e229a0f07507b93cfcff'	#FreeFileSync.desktop
 	 '1f452dff6f970d95839411008d86250b'	#ffsicon.png
 	 'ab266177f69d16ad9f4099ae4edd77a2'	#RealTimeSync.desktop
@@ -33,27 +31,32 @@ prepare() {
 # wxgtk < 3.1.0
     sed -i 's/m_listBoxHistory->GetTopItem()/0/g'		FreeFileSync/Source/ui/main_dlg.cpp
 # gcc 6.3.1
-    sed -i 's!static_assert!//static_assert!'			zen/scope_guard.h
-# 8.9 warn_static(string) -DZEN_LINUX
-    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -DZEN_LINUX -O3 -DN!'		FreeFileSync/Source/Makefile
-    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -DZEN_LINUX -O3 -DN!'		FreeFileSync/Source/RealTimeSync/Makefile
-# 8.9 linker error
+    sed -i 's!static_assert!//static_assert!' zen/scope_guard.h
+
+# warn_static(string)
+    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -O3 -DN!' FreeFileSync/Source/Makefile
+    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -O3 -DN!' FreeFileSync/Source/RealTimeSync/Makefile
+
+# linker error
     sed -i 's#inline##g' FreeFileSync/Source/ui/version_check_impl.h
-# 8.9 install error
+
+# install error
     cp ${srcdir}/Changelog.txt ${srcdir}/FreeFileSync/Build
 }
 
 build() {
-# just in case of compile errors
-  VER=`g++ -dumpversion`
-  MAC=`g++ -dumpmachine`
-  echo "compiler g++ $VER $MAC"
-# FFS
-  cd ${srcdir}/FreeFileSync/Source
-  make launchpad
-# RTS
-  cd RealTimeSync
-  make launchpad
+### just in case of compile errors
+    VER=`g++ -dumpversion`
+    MAC=`g++ -dumpmachine`
+    echo "compiler g++ $VER $MAC"
+
+### FFS
+    cd ${srcdir}/FreeFileSync/Source
+    make launchpad
+
+### RTS
+    cd RealTimeSync
+    make launchpad
 }
 
 package() {
diff --git a/pcr/pacman2pacman/PKGBUILD b/pcr/pacman2pacman/PKGBUILD
index d545fbc62..235b9d16a 100644
--- a/pcr/pacman2pacman/PKGBUILD
+++ b/pcr/pacman2pacman/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Joseph Graham <joseph@xylon.me.uk>
 
 pkgname=pacman2pacman
-pkgver=20170610.1
+pkgver=20170611.2
 pkgdesc="A plugin for pacman to download packages by bittorrent and seed them back up"
 url="https://wiki.parabolagnulinux.org/Pacman2pacman"
 license=('GPL')
@@ -13,9 +13,9 @@ pkgrel=1
 arch=(any)
 depends=(transmission-cli)
 source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('ce4f31f201a7975a2746c6dd67167ae9')
+md5sums=('d0f180039d4d5d6e78a9a3a55d332749')
 
-_gitver='commit=5ff043cb7e53981c47a660ef9d392523fada3fb4'
+_gitver='commit=bb3865227066d7bd3e10f8977324e9768ac5a317'
 mksource=("$pkgname-$pkgver::git://git.parabola.nu/pacman2pacman.git/#$_gitver")
 mkmd5sums=('SKIP')
 
@@ -33,4 +33,13 @@ package() {
   cp pacman2pacman-get "${pkgdir}/usr/bin"
 
   chmod +x "${pkgdir}/usr/bin/pacman2pacman-get"
+
+  for dir in translations/*
+  do
+      if [[ -d "${dir}" ]]
+      then
+          mkdir -p "${pkgdir}/usr/share/locale/${dir#*/}/LC_MESSAGES/"
+          msgfmt -o "${pkgdir}/usr/share/locale/${dir#*/}/LC_MESSAGES/pacman2pacman-get.mo" "${dir}/pacman2pacman-get.po"
+      fi
+  done
 }