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

[Antonio Rojas]

    Date: Sunday, August 7, 2016 @ 09:51:14
  Author: arojas
Revision: 185763

Hooks

Added:
  vdrift/trunk/vdrift-gcc6.patch
Modified:
  vdrift/trunk/PKGBUILD
Deleted:
  vdrift/trunk/vdrift.install

-------------------+
 PKGBUILD          |   17 +++++++++++------
 vdrift-gcc6.patch |   12 ++++++++++++
 vdrift.install    |   11 -----------
 3 files changed, 23 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-07 09:44:17 UTC (rev 185762)
+++ PKGBUILD	2016-08-07 09:51:14 UTC (rev 185763)
@@ -5,18 +5,23 @@
 
 pkgname=vdrift
 pkgver=2014.10.20
-pkgrel=4
+pkgrel=5
 pkgdesc="Open source driving simulation made with drift racing in mind"
 arch=('i686' 'x86_64')
 url="http://vdrift.net/"
 license=('GPL')
-depends=('bullet' 'curl' 'sdl2_gfx' 'sdl2_image' 'glew' 'libvorbis' 'vdrift-data'
-         'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive')
+depends=('bullet' 'curl' 'sdl2_gfx' 'sdl2_image' 'glew' 'libvorbis' 'vdrift-data' 'hicolor-icon-theme' 'libarchive')
 makedepends=('scons' 'boost' 'asio' 'mesa')
-install=vdrift.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
-md5sums=('524751fab341b36f59d0747ea52f0c41')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2 vdrift-gcc6.patch)
+md5sums=('524751fab341b36f59d0747ea52f0c41'
+         '2436c2b1c08d9266158e67ab0fd67691')
 
+prepare() {
+  cd vdrift
+# Fix build with GCC 6 (Fedora)
+  patch -p1 -i ../vdrift-gcc6.patch
+}
+
 build() {
   cd vdrift
 

Added: vdrift-gcc6.patch
===================================================================
--- vdrift-gcc6.patch	                        (rev 0)
+++ vdrift-gcc6.patch	2016-08-07 09:51:14 UTC (rev 185763)
@@ -0,0 +1,12 @@
+diff -up ./src/graphics/model_obj.cpp.gcc6 ./src/graphics/model_obj.cpp
+--- ./src/graphics/model_obj.cpp.gcc6	2016-02-09 19:02:50.282554264 -0500
++++ ./src/graphics/model_obj.cpp	2016-02-09 19:03:10.566308088 -0500
+@@ -221,7 +221,7 @@ bool ModelObj::Save(const std::string &
+ 	std::ofstream f(strFileName.c_str());
+ 	if (!f)
+ 	{
+-		error_output << "Error opening file for writing: " << error_output << endl;
++		error_output << "Error opening file for writing: " << strFileName << endl;
+ 		return false;
+ 	}
+ 

Deleted: vdrift.install
===================================================================
--- vdrift.install	2016-08-07 09:44:17 UTC (rev 185762)
+++ vdrift.install	2016-08-07 09:51:14 UTC (rev 185763)
@@ -1,11 +0,0 @@
-post_upgrade() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}