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

[Laurent Carlier]

    Date: Wednesday, December 23, 2015 @ 00:07:13
  Author: lcarlier
Revision: 154307

upgpkg: apitrace 7.1-1

upstream update 7.1

Modified:
  apitrace/trunk/PKGBUILD
Deleted:
  apitrace/trunk/fix-python-executable.patch

-----------------------------+
 PKGBUILD                    |    6 +--
 fix-python-executable.patch |   65 ------------------------------------------
 2 files changed, 3 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-22 22:29:21 UTC (rev 154306)
+++ PKGBUILD	2015-12-22 23:07:13 UTC (rev 154307)
@@ -4,8 +4,8 @@
 # Contributor: Glaucous <glakke1 at gmail dot com>
 
 pkgname=apitrace
-pkgver=7.0
-pkgrel=3
+pkgver=7.1
+pkgrel=1
 pkgdesc="Graphics API Tracing"
 arch=('i686' 'x86_64')
 url="https://github.com/apitrace/apitrace"
@@ -12,7 +12,7 @@
 license=('custom')
 makedepends=('cmake' 'mesa' 'libgl' 'python2' 'procps-ng' 'qt5-webkit')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/apitrace/apitrace/archive/${pkgver}.tar.gz")
-md5sums=('3c0b3ebae4fda123c0bffcd6eb61d161')
+md5sums=('c5d44dece1e1ca7c63f8b8efbd06ac5a')
 
 build() {
   cd ${srcdir}/apitrace-*

Deleted: fix-python-executable.patch
===================================================================
--- fix-python-executable.patch	2015-12-22 22:29:21 UTC (rev 154306)
+++ fix-python-executable.patch	2015-12-22 23:07:13 UTC (rev 154307)
@@ -1,65 +0,0 @@
-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