Merge branch 'master' of ssh://git.chakraos.org:22/desktop

chocolate-doom/PKGBUILD

 pkgname=chocolate-doom
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Doom port reproducing the behavior of the original DOS version."
 arch=('x86_64')
 url="http://www.chocolate-doom.org/"
@@ -10,7 +10,14 @@ makedepends=('python3')
 categories=('games')
 install=$pkgname.install
 source=(http://www.chocolate-doom.org/downloads/${pkgver}/chocolate-doom-${pkgver}.tar.gz)
-md5sums=('20ef24c517f701023aa187c07b587ce6')
+sha1sums=('be0f2b5d642beca8c9ef21ad0472ee9329bc2a78')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  
+  # Change binary dir from /usr/games to /usr/bin
+  sed 's|/games|/bin|g' -i src{,/setup}/Makefile.in
+}
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -23,4 +30,24 @@ package() {
   cd $srcdir/$pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
+  
+  mv $pkgdir/usr/share/applications/chocolate-doom.desktop $pkgdir/usr/share/applications/chocolate-doom-setup.desktop
+  mv $pkgdir/usr/share/applications/chocolate-heretic.desktop $pkgdir/usr/share/applications/chocolate-heretic-setup.desktop
+  mv $pkgdir/usr/share/applications/chocolate-hexen.desktop $pkgdir/usr/share/applications/chocolate-hexen-setup.desktop
+  mv $pkgdir/usr/share/applications/chocolate-strife.desktop $pkgdir/usr/share/applications/chocolate-strife-setup.desktop
+  
+  sed -i s!Exec=chocolate-doom!Exec=chocolate-doom-setup!  $pkgdir/usr/share/applications/chocolate-doom-setup.desktop
+  sed -i s!'Name=Chocolate Doom'!'Name=Chocolate Doom Setup'!  $pkgdir/usr/share/applications/chocolate-doom-setup.desktop
+  
+  sed -i s!Exec=chocolate-heretic!Exec=chocolate-heretic-setup!  $pkgdir/usr/share/applications/chocolate-heretic-setup.desktop
+  sed -i s!'Name=Chocolate Heretic'!'Name=Chocolate Heretic Setup'!  $pkgdir/usr/share/applications/chocolate-heretic-setup.desktop
+  
+  sed -i s!Exec=chocolate-hexen!Exec=chocolate-hexen-setup!  $pkgdir/usr/share/applications/chocolate-hexen-setup.desktop
+  sed -i s!'Name=Chocolate Hexen'!'Name=Chocolate Hexen Setup'!  $pkgdir/usr/share/applications/chocolate-hexen-setup.desktop
+  
+  sed -i s!Exec=chocolate-strife!Exec=chocolate-strife-setup!  $pkgdir/usr/share/applications/chocolate-strife-setup.desktop
+  sed -i s!'Name=Chocolate Strife'!'Name=Chocolate Strife Setup'!  $pkgdir/usr/share/applications/chocolate-strife-setup.desktop
+  
+  rm $pkgdir/usr/share/applications/chocolate-setup.desktop
+  rm -dr $pkgdir/usr/share/applications/screensavers
 }

ksuperkey/PKGBUILD

 pkgname=ksuperkey
 pkgver=0.4
-pkgrel=2
+pkgrel=4
 pkgdesc="Allows you to open the application launcher in KDE Plasma Desktop using the Super key"
 url="https://github.com/hanschen/ksuperkey"
 license=('GPL3')

ksuperkey/ksuperkey.install

@@ -43,4 +43,4 @@ fi
 
 post_upgrade() {
   post_install
-}
\ No newline at end of file
+}

lcov/PKGBUILD

+# Contributor: Jordi De Groof <jordi dot degroof at gmail dot com>
+# Contributor: Andre Klitzing <aklitzing () gmail () com>
+
+pkgname=lcov
+pkgver=1.12
+pkgrel=1
+pkgdesc="front-end for GCC's coverage testing tool gcov"
+arch=('any')
+url="http://ltp.sourceforge.net/coverage/lcov.php"
+license=('GPL')
+depends=('perl')
+source=("http://downloads.sourceforge.net/ltp/$pkgname-$pkgver.tar.gz"
+        "handle-equals-signs.patch"
+        "fix-undef-behaviour.patch"
+        "reproducible-manpage.patch"
+        )
+sha256sums=('b474e49c6c962754063b3be97a757a2ba9e7a455f0aea612863bf67e9b8b8ea7'
+            '54728aa4e244d3662c65ba91fb486dc1d5c64d9d55745ee334c4131109dc233c'
+            'ceaf41f7cc9cea5a6fc4b0385ffef10d1ab8812acd2a5b16dcd8d7bca7120488'
+            'd854c999a70ec8ac3e32419ece6acd62ad5517a7521a00dc1e5c79e9495c9af2')
+
+prepare()
+{
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i $srcdir/handle-equals-signs.patch
+  patch -p1 -i $srcdir/fix-undef-behaviour.patch
+  patch -p1 -i $srcdir/reproducible-manpage.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+}
+
+package()
+{
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make PREFIX="$pkgdir" install
+}

lcov/fix-undef-behaviour.patch

+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: Fix for undefined behavior in perl5.20
+Origin: http://bugs.debian.org/761308
+Forwarded: no
+Last-Updated: 2014-09-13
+
+Index: lcov-1.12/bin/lcov
+===================================================================
+--- lcov-1.12.orig/bin/lcov
++++ lcov-1.12/bin/lcov
+@@ -224,7 +224,9 @@ Getopt::Long::Configure("default");
+ 	# Remove spaces around rc options
+ 	my %new_opt_rc;
+ 
+-	while (my ($key, $value) = each(%opt_rc)) {
++	my @keys = keys %opt_rc;
++	for my $key (@keys) {
++	        my $value = $opt_rc{$key};
+ 		$key =~ s/^\s+|\s+$//g;
+ 		$value =~ s/^\s+|\s+$//g;
+ 
+Index: lcov-1.12/bin/geninfo
+===================================================================
+--- lcov-1.12.orig/bin/geninfo
++++ lcov-1.12/bin/geninfo
+@@ -284,8 +284,9 @@ Getopt::Long::Configure("default");
+ {
+ 	# Remove spaces around rc options
+ 	my %new_opt_rc;
+-
+-	while (my ($key, $value) = each(%opt_rc)) {
++	my @keys = keys %opt_rc;
++	for my $key (@keys) {
++		my $value = $opt_rc{$key};
+ 		$key =~ s/^\s+|\s+$//g;
+ 		$value =~ s/^\s+|\s+$//g;
+ 

lcov/handle-equals-signs.patch

+Description: Handle "=====" as another form of zero.
+ gcov prints "=====" instead of "######" when an unexecuted line is
+ "reachable only by exceptional paths such as C++ exception handlers."
+ This should be handled the same as "######" for our purposes.
+Author: Zack Weinberg <zackw@panix.com>
+Last-Update: 2013-02-01
+
+Index: lcov-1.12/bin/geninfo
+===================================================================
+--- lcov-1.12.orig/bin/geninfo
++++ lcov-1.12/bin/geninfo
+@@ -1771,8 +1771,9 @@ sub read_gcov_file($)
+ 				$number = (split(" ",substr($_, 0, 16)))[0];
+ 
+ 				# Check for zero count which is indicated
+-				# by ######
+-				if ($number eq "######") { $number = 0;	}
++				# by ###### or =====
++				if ($number eq "######" or
++				    $number eq "=====") { $number = 0; }
+ 
+ 				if ($exclude_line) {
+ 					# Register uninstrumented line instead

lcov/reproducible-manpage.patch

+Author: Reiner Herrmann <reiner@reiner-h.de>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803412
+Description: Use UTC to get date independent of timezone
+Last-Updated: 2015-10-29
+Forwarded: no
+
+Index: lcov-1.12/bin/updateversion.pl
+===================================================================
+--- lcov-1.12.orig/bin/updateversion.pl
++++ lcov-1.12/bin/updateversion.pl
+@@ -83,7 +83,7 @@ sub get_file_info($)
+ 
+ 	return (0, 0, 0) if (!-e $filename);
+ 	@stat = stat($filename);
+-	($sec, $min, $hour, $day, $month, $year) = localtime($stat[9]);
++	($sec, $min, $hour, $day, $month, $year) = gmtime($stat[9]);
+ 	$year += 1900;
+ 	$month += 1;
+ 

quiterss/PKGBUILD

 pkgname=quiterss
 _pkgname=QuiteRSS
-pkgver=0.18.3
+pkgver=0.18.4
 pkgrel=1
 pkgdesc="QuiteRSS is fast and light rss ,feed reader written in C++/Qt4"
 arch=('x86_64')
@@ -10,7 +10,7 @@ depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'phonon-qt5' 'icu' 'sqlite3')
 makedepends=('cmake' 'gettext' 'qt5-tools')
 install=${pkgname}.install
 source=("http://quiterss.org/files/${pkgver}/${_pkgname}-${pkgver}-src.tar.gz")
-sha256sums=('8c1a61452524b8f97f005df56f19d3ed71eb1f9c03c7d167ddc99b13e9c9a96b')
+sha256sums=('e53ddcab32ed4894ee59afd0db5d7ab86248986fdf6e1c1aeec9c8a841867a9c')
 
 build() {
   cd ${srcdir}

syncthing/PKGBUILD

 # Contributions from Arch Linux: https://www.archlinux.org/packages/community/x86_64/syncthing/
 
 pkgname=syncthing
-pkgver=0.12.19
+pkgver=0.12.20
 pkgrel=1
 pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing"
 url="http://syncthing.net/"
@@ -14,7 +14,7 @@ source=("$pkgname-$pkgver::https://github.com/syncthing/syncthing/releases/downl
         "syncthing.1"
         "syncthing.desktop"
         "syncthing.png")
-sha256sums=('d6d7aacc52724f80d589929667555156aa5a7705e3851ab5579d3b5d4eab0896'
+sha256sums=('402b7bae88e6f9a049b6df0dff7c81e95999b1be30948717b8b9c26f21a53d3b'
             '47913f9d2df6d1e240cbc7ecf04be7fb597ec6382052960a237d1230436b5932'
             'd240ae741cf30f4e6559d16a50c62da928557a0c8567600875a770d15e53daf4'
             '3457341a4089cc4ebe1835c352eaa35486f2c8be793c6a9e5e1d0891dc06e320')