[arch-commits] Commit in apitrace/trunk (PKGBUILD gcc-4.7-fix.patch)

[Laurent Carlier]

    Date: Monday, February 25, 2013 @ 21:38:19
  Author: lcarlier
Revision: 84882

upgpkg: apitrace 3.0-1

Initial commit

Added:
  apitrace/trunk/gcc-4.7-fix.patch
Modified:
  apitrace/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   16 ++++++++--------
 gcc-4.7-fix.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-25 19:42:06 UTC (rev 84881)
+++ PKGBUILD	2013-02-25 20:38:19 UTC (rev 84882)
@@ -9,13 +9,13 @@
 pkgdesc="Graphics API Tracing"
 arch=('i686' 'x86_64')
 url="https://github.com/apitrace/apitrace"
-license=('BSD')
-depends=('python2' 'libgl')
-makedepends=('cmake>=2.8' 'mesa')
-optdepends=('qt: GUI support' 'qjson: GUI support')
+license=('custom')
+makedepends=('cmake' 'mesa' 'libgl>=9.1' 'python2' 'qtwebkit' 'qjson')
+optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
 source=("https://github.com/apitrace/$pkgname/zipball/$pkgver"
 	gcc-4.7-fix.patch)
-#	LICENSE)
+md5sums=('9ef70fa990f165e30a4408762fdb4a76'
+         '27a9a7aa14355b56fb48e2e17ff9911e')
 
 build() {
   cd ${srcdir}/apitrace-*
@@ -28,11 +28,11 @@
 }
 
 package() {
+depends=('python2' 'libgl')
   cd ${srcdir}/apitrace-*
 
   make -C build DESTDIR="${pkgdir}/" install
 
-#  mkdir -p "${pkgdir}"/usr/share/licenses/apitrace
-#  mv "${pkgdir}"/usr/share/{doc,licenses}/apitrace/LICENSE
+  install -m755 -d "${pkgdir}/usr/share/licenses/apitrace"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/apitrace/"
 }
-

Added: gcc-4.7-fix.patch
===================================================================
--- gcc-4.7-fix.patch	                        (rev 0)
+++ gcc-4.7-fix.patch	2013-02-25 20:38:19 UTC (rev 84882)
@@ -0,0 +1,39 @@
+From 8159d6c1295da8c1b342bc77686e7ecfed1e5c01 Mon Sep 17 00:00:00 2001
+From: Martin Olsson <martin at minimum.se>
+Date: Mon, 26 Mar 2012 10:40:45 +0200
+Subject: [PATCH] Fix compile error "isatty was not declared"; missing
+ unistd.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When I built apitrace on Fedora 16, using the usual:
+
+	cmake -H. -Bbuild
+	make -C build
+
+...then I got this compile error:
+
+	apitrace/cli/cli_dump.cpp: In function ‘int command(int, char**)’:
+	apitrace/cli/cli_dump.cpp:176:25: error: ‘isatty’ was not declared in this scope
+---
+ cli/cli_dump.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
+index 28c91af..f52b83c 100644
+--- a/cli/cli_dump.cpp
++++ b/cli/cli_dump.cpp
+@@ -28,6 +28,9 @@
+ #include <string.h>
+ #include <limits.h> // for CHAR_MAX
+ #include <getopt.h>
++#ifndef _WIN32
++#include <unistd.h> // for isatty()
++#endif
+ 
+ #include "cli.hpp"
+ #include "cli_pager.hpp"
+-- 
+1.7.10
+