Date: Sunday, August 3, 2014 @ 03:15:04
Author: lcarlier
Revision: 116762
archrelease: copy trunk to community-i686, community-x86_64
Added:
apitrace/repos/community-i686/PKGBUILD
(from rev 116761, apitrace/trunk/PKGBUILD)
apitrace/repos/community-i686/fix-python-executable.patch
(from rev 116761, apitrace/trunk/fix-python-executable.patch)
apitrace/repos/community-x86_64/PKGBUILD
(from rev 116761, apitrace/trunk/PKGBUILD)
apitrace/repos/community-x86_64/fix-python-executable.patch
(from rev 116761, apitrace/trunk/fix-python-executable.patch)
Deleted:
apitrace/repos/community-i686/PKGBUILD
apitrace/repos/community-i686/gcc-4.7-fix.patch
apitrace/repos/community-x86_64/PKGBUILD
apitrace/repos/community-x86_64/gcc-4.7-fix.patch
----------------------------------------------+
/PKGBUILD | 84 +++++++++++++++++++++++++
community-i686/PKGBUILD | 33 ---------
community-i686/fix-python-executable.patch | 65 +++++++++++++++++++
community-i686/gcc-4.7-fix.patch | 39 -----------
community-x86_64/PKGBUILD | 33 ---------
community-x86_64/fix-python-executable.patch | 65 +++++++++++++++++++
community-x86_64/gcc-4.7-fix.patch | 39 -----------
7 files changed, 214 insertions(+), 144 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-03 01:14:52 UTC (rev 116761)
+++ community-i686/PKGBUILD 2014-08-03 01:15:04 UTC (rev 116762)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordhea...@gmail.com>
-# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
-# Contributor: Glaucous <glakke1 at gmail dot com>
-
-pkgname=apitrace
-pkgver=5.0
-pkgrel=1
-pkgdesc="Graphics API Tracing"
-arch=('i686' 'x86_64')
-url="https://github.com/apitrace/apitrace";
-license=('custom')
-makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
-optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
-source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip";)
-md5sums=('2a60e8a4c90f841dc95fe659ba26607e')
-
-build() {
- cd ${srcdir}/apitrace-*
-
- cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr
-DPYTHON_EXECUTABLE='/usr/bin/python2'
- make -C build
-}
-
-package() {
- depends=('python2' 'libgl')
- cd ${srcdir}/apitrace-*
-
- make -C build DESTDIR="${pkgdir}/" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/apitrace"
- install -m644 LICENSE "${pkgdir}/usr/share/licenses/apitrace/"
-}
Copied: apitrace/repos/community-i686/PKGBUILD (from rev 116761,
apitrace/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-03 01:15:04 UTC (rev 116762)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordhea...@gmail.com>
+# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
+# Contributor: Glaucous <glakke1 at gmail dot com>
+
+pkgname=apitrace
+pkgver=5.0
+pkgrel=2
+pkgdesc="Graphics API Tracing"
+arch=('i686' 'x86_64')
+url="https://github.com/apitrace/apitrace";
+license=('custom')
+makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
+optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
+source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip";
+ fix-python-executable.patch)
+md5sums=('2a60e8a4c90f841dc95fe659ba26607e')
+
+prepare() {
+ cd ${srcdir}/apitrace-*
+
+ patch -Np1 -i ../fix-python-executable.patch
+}
+
+build() {
+ cd ${srcdir}/apitrace-*
+
+ cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr
-DPYTHON_EXECUTABLE='/usr/bin/python2'
+ make -C build
+}
+
+package() {
+ depends=('python2' 'libgl')
+ cd ${srcdir}/apitrace-*
+
+ make -C build DESTDIR="${pkgdir}/" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/apitrace"
+ install -m644 LICENSE "${pkgdir}/usr/share/licenses/apitrace/"
+}
+md5sums=('2a60e8a4c90f841dc95fe659ba26607e'
+ '3e96a8057550e86207fa075ca78392b7')
Copied: apitrace/repos/community-i686/fix-python-executable.patch (from rev
116761, apitrace/trunk/fix-python-executable.patch)
===================================================================
--- community-i686/fix-python-executable.patch (rev 0)
+++ community-i686/fix-python-executable.patch 2014-08-03 01:15:04 UTC (rev
116762)
@@ -0,0 +1,65 @@
+diff -ru apitrace-5.0/cli/cli_diff.cpp apitrace-5.0a/cli/cli_diff.cpp
+--- apitrace-5.0/cli/cli_diff.cpp 2014-05-03 00:22:02.000000000 +0200
++++ apitrace-5.0a/cli/cli_diff.cpp 2014-08-03 02:50:33.635426106 +0200
+@@ -50,7 +50,7 @@
+ }
+
+ char *args[4];
+- args[0] = (char *) "python";
++ args[0] = (char *) APITRACE_PYTHON_EXECUTABLE;
+ args[1] = (char *) command.str();
+ args[2] = (char *) "--help";
+ args[3] = NULL;
+@@ -71,7 +71,7 @@
+ os::String apitracePath = os::getProcessName();
+
+ std::vector<const char *> args;
+- args.push_back("python");
++ args.push_back(APITRACE_PYTHON_EXECUTABLE);
+ args.push_back(command.str());
+ args.push_back("--apitrace");
+ args.push_back(apitracePath.str());
+diff -ru apitrace-5.0/cli/cli_diff_images.cpp
apitrace-5.0a/cli/cli_diff_images.cpp
+--- apitrace-5.0/cli/cli_diff_images.cpp 2014-05-03 00:22:02.000000000
+0200
++++ apitrace-5.0a/cli/cli_diff_images.cpp 2014-08-03 02:50:02.439320408
+0200
+@@ -50,7 +50,7 @@
+ }
+
+ char *args[4];
+- args[0] = (char *) "python";
++ args[0] = (char *) APITRACE_PYTHON_EXECUTABLE;
+ args[1] = (char *) command.str();
+ args[2] = (char *) "--help";
+ args[3] = NULL;
+@@ -69,7 +69,7 @@
+ }
+
+ std::vector<const char *> args;
+- args.push_back("python");
++ args.push_back(APITRACE_PYTHON_EXECUTABLE);
+ args.push_back(command.str());
+ for (i = 1; i < argc; i++) {
+ args.push_back(argv[i]);
+diff -ru apitrace-5.0/cli/cli_diff_state.cpp
apitrace-5.0a/cli/cli_diff_state.cpp
+--- apitrace-5.0/cli/cli_diff_state.cpp 2014-05-03 00:22:02.000000000
+0200
++++ apitrace-5.0a/cli/cli_diff_state.cpp 2014-08-03 02:49:04.987020260
+0200
+@@ -87,7 +87,7 @@
+
+ char *args[5];
+
+- args[0] = const_cast<char *>("python");
++ args[0] = const_cast<char *>(APITRACE_PYTHON_EXECUTABLE);
+ args[1] = const_cast<char *>(command.str());
+ args[2] = file1;
+ args[3] = file2;
+diff -ru apitrace-5.0/cli/CMakeLists.txt apitrace-5.0a/cli/CMakeLists.txt
+--- apitrace-5.0/cli/CMakeLists.txt 2014-05-03 00:22:02.000000000 +0200
++++ apitrace-5.0a/cli/CMakeLists.txt 2014-08-03 02:46:05.803576581 +0200
+@@ -7,6 +7,7 @@
+ -DAPITRACE_PROGRAMS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/bin"
+
-DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
+
-DAPITRACE_WRAPPERS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
++ -DAPITRACE_PYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}"
+ )
+
+ add_executable (apitrace
Deleted: community-i686/gcc-4.7-fix.patch
===================================================================
--- community-i686/gcc-4.7-fix.patch 2014-08-03 01:14:52 UTC (rev 116761)
+++ community-i686/gcc-4.7-fix.patch 2014-08-03 01:15:04 UTC (rev 116762)
@@ -1,39 +0,0 @@
-From 8159d6c1295da8c1b342bc77686e7ecfed1e5c01 Mon Sep 17 00:00:00 2001
-From: Martin Olsson <mar...@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
-
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-03 01:14:52 UTC (rev 116761)
+++ community-x86_64/PKGBUILD 2014-08-03 01:15:04 UTC (rev 116762)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordhea...@gmail.com>
-# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
-# Contributor: Glaucous <glakke1 at gmail dot com>
-
-pkgname=apitrace
-pkgver=5.0
-pkgrel=1
-pkgdesc="Graphics API Tracing"
-arch=('i686' 'x86_64')
-url="https://github.com/apitrace/apitrace";
-license=('custom')
-makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
-optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
-source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip";)
-md5sums=('2a60e8a4c90f841dc95fe659ba26607e')
-
-build() {
- cd ${srcdir}/apitrace-*
-
- cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr
-DPYTHON_EXECUTABLE='/usr/bin/python2'
- make -C build
-}
-
-package() {
- depends=('python2' 'libgl')
- cd ${srcdir}/apitrace-*
-
- make -C build DESTDIR="${pkgdir}/" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/apitrace"
- install -m644 LICENSE "${pkgdir}/usr/share/licenses/apitrace/"
-}
Copied: apitrace/repos/community-x86_64/PKGBUILD (from rev 116761,
apitrace/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-03 01:15:04 UTC (rev 116762)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordhea...@gmail.com>
+# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
+# Contributor: Glaucous <glakke1 at gmail dot com>
+
+pkgname=apitrace
+pkgver=5.0
+pkgrel=2
+pkgdesc="Graphics API Tracing"
+arch=('i686' 'x86_64')
+url="https://github.com/apitrace/apitrace";
+license=('custom')
+makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
+optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
+source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip";
+ fix-python-executable.patch)
+md5sums=('2a60e8a4c90f841dc95fe659ba26607e')
+
+prepare() {
+ cd ${srcdir}/apitrace-*
+
+ patch -Np1 -i ../fix-python-executable.patch
+}
+
+build() {
+ cd ${srcdir}/apitrace-*
+
+ cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr
-DPYTHON_EXECUTABLE='/usr/bin/python2'
+ make -C build
+}
+
+package() {
+ depends=('python2' 'libgl')
+ cd ${srcdir}/apitrace-*
+
+ make -C build DESTDIR="${pkgdir}/" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/apitrace"
+ install -m644 LICENSE "${pkgdir}/usr/share/licenses/apitrace/"
+}
+md5sums=('2a60e8a4c90f841dc95fe659ba26607e'
+ '3e96a8057550e86207fa075ca78392b7')
Copied: apitrace/repos/community-x86_64/fix-python-executable.patch (from rev
116761, apitrace/trunk/fix-python-executable.patch)
===================================================================
--- community-x86_64/fix-python-executable.patch
(rev 0)
+++ community-x86_64/fix-python-executable.patch 2014-08-03 01:15:04 UTC
(rev 116762)
@@ -0,0 +1,65 @@
+diff -ru apitrace-5.0/cli/cli_diff.cpp apitrace-5.0a/cli/cli_diff.cpp
+--- apitrace-5.0/cli/cli_diff.cpp 2014-05-03 00:22:02.000000000 +0200
++++ apitrace-5.0a/cli/cli_diff.cpp 2014-08-03 02:50:33.635426106 +0200
+@@ -50,7 +50,7 @@
+ }
+
+ char *args[4];
+- args[0] = (char *) "python";
++ args[0] = (char *) APITRACE_PYTHON_EXECUTABLE;
+ args[1] = (char *) command.str();
+ args[2] = (char *) "--help";
+ args[3] = NULL;
+@@ -71,7 +71,7 @@
+ os::String apitracePath = os::getProcessName();
+
+ std::vector<const char *> args;
+- args.push_back("python");
++ args.push_back(APITRACE_PYTHON_EXECUTABLE);
+ args.push_back(command.str());
+ args.push_back("--apitrace");
+ args.push_back(apitracePath.str());
+diff -ru apitrace-5.0/cli/cli_diff_images.cpp
apitrace-5.0a/cli/cli_diff_images.cpp
+--- apitrace-5.0/cli/cli_diff_images.cpp 2014-05-03 00:22:02.000000000
+0200
++++ apitrace-5.0a/cli/cli_diff_images.cpp 2014-08-03 02:50:02.439320408
+0200
+@@ -50,7 +50,7 @@
+ }
+
+ char *args[4];
+- args[0] = (char *) "python";
++ args[0] = (char *) APITRACE_PYTHON_EXECUTABLE;
+ args[1] = (char *) command.str();
+ args[2] = (char *) "--help";
+ args[3] = NULL;
+@@ -69,7 +69,7 @@
+ }
+
+ std::vector<const char *> args;
+- args.push_back("python");
++ args.push_back(APITRACE_PYTHON_EXECUTABLE);
+ args.push_back(command.str());
+ for (i = 1; i < argc; i++) {
+ args.push_back(argv[i]);
+diff -ru apitrace-5.0/cli/cli_diff_state.cpp
apitrace-5.0a/cli/cli_diff_state.cpp
+--- apitrace-5.0/cli/cli_diff_state.cpp 2014-05-03 00:22:02.000000000
+0200
++++ apitrace-5.0a/cli/cli_diff_state.cpp 2014-08-03 02:49:04.987020260
+0200
+@@ -87,7 +87,7 @@
+
+ char *args[5];
+
+- args[0] = const_cast<char *>("python");
++ args[0] = const_cast<char *>(APITRACE_PYTHON_EXECUTABLE);
+ args[1] = const_cast<char *>(command.str());
+ args[2] = file1;
+ args[3] = file2;
+diff -ru apitrace-5.0/cli/CMakeLists.txt apitrace-5.0a/cli/CMakeLists.txt
+--- apitrace-5.0/cli/CMakeLists.txt 2014-05-03 00:22:02.000000000 +0200
++++ apitrace-5.0a/cli/CMakeLists.txt 2014-08-03 02:46:05.803576581 +0200
+@@ -7,6 +7,7 @@
+ -DAPITRACE_PROGRAMS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/bin"
+
-DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
+
-DAPITRACE_WRAPPERS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
++ -DAPITRACE_PYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}"
+ )
+
+ add_executable (apitrace
Deleted: community-x86_64/gcc-4.7-fix.patch
===================================================================
--- community-x86_64/gcc-4.7-fix.patch 2014-08-03 01:14:52 UTC (rev 116761)
+++ community-x86_64/gcc-4.7-fix.patch 2014-08-03 01:15:04 UTC (rev 116762)
@@ -1,39 +0,0 @@
-From 8159d6c1295da8c1b342bc77686e7ecfed1e5c01 Mon Sep 17 00:00:00 2001
-From: Martin Olsson <mar...@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
-
