[arch-commits] Commit in gource/trunk (PKGBUILD gource-gcc6.patch)

[Antonio Rojas]

    Date: Thursday, August 4, 2016 @ 18:10:42
  Author: arojas
Revision: 185082

GLEW 2.0 rebuild

Added:
  gource/trunk/gource-gcc6.patch
Modified:
  gource/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   13 ++++++++++---
 gource-gcc6.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-04 18:06:38 UTC (rev 185081)
+++ PKGBUILD	2016-08-04 18:10:42 UTC (rev 185082)
@@ -4,7 +4,7 @@
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
 pkgname=gource
 pkgver=0.43
-pkgrel=8
+pkgrel=9
 pkgdesc="software version control visualization"
 license=(GPL3)
 arch=(i686 x86_64)
@@ -11,9 +11,16 @@
 url=http://code.google.com/p/gource/
 depends=('ftgl' 'sdl2' 'sdl2_image' 'pcre' 'glew' 'boost-libs')
 makedepends=('boost' 'glm' 'mesa')
-source=(https://github.com/acaudwell/Gource/releases/download/gource-${pkgver}/gource-${pkgver}.tar.gz)
-md5sums=('d2b601782692301f6d8ecc97dc85d3f7')
+source=(https://github.com/acaudwell/Gource/releases/download/gource-${pkgver}/gource-${pkgver}.tar.gz gource-gcc6.patch)
+md5sums=('d2b601782692301f6d8ecc97dc85d3f7'
+         '4cfabcea55fe8bc71ebcf0ac06d89f29')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build with GCC 6 (Fedora)
+  patch -p0 -i ../gource-gcc6.patch
+}
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 

Added: gource-gcc6.patch
===================================================================
--- gource-gcc6.patch	                        (rev 0)
+++ gource-gcc6.patch	2016-08-04 18:10:42 UTC (rev 185082)
@@ -0,0 +1,11 @@
+--- src/dirnode.cpp~	2014-10-15 22:23:22.000000000 -0400
++++ src/dirnode.cpp	2016-02-25 10:11:26.838675629 -0500
+@@ -582,7 +582,7 @@
+     //this->dir_radius_sqrt = sqrt(dir_radius); //dir_radius_sqrt is not used
+ 
+ //    this->parent_radius = std::max(1.0, parent_circ / PI);
+-    this->parent_radius = std::max(1.0, sqrt(total_file_area) * gGourceDirPadding);
++    this->parent_radius = (1.0) > (sqrt(total_file_area) * gGourceDirPadding) ? (1.0) : (sqrt(total_file_area) * gGourceDirPadding);
+ }
+ 
+ float RDirNode::distanceToParent() const{