Date: Saturday, May 30, 2015 @ 09:05:23 Author: lcarlier Revision: 134330
archrelease: copy trunk to community-i686, community-x86_64 Added: apitrace/repos/community-i686/PKGBUILD (from rev 134329, apitrace/trunk/PKGBUILD) apitrace/repos/community-i686/fix-python-executable.patch (from rev 134329, apitrace/trunk/fix-python-executable.patch) apitrace/repos/community-x86_64/PKGBUILD (from rev 134329, apitrace/trunk/PKGBUILD) apitrace/repos/community-x86_64/fix-python-executable.patch (from rev 134329, apitrace/trunk/fix-python-executable.patch) Deleted: apitrace/repos/community-i686/PKGBUILD apitrace/repos/community-i686/fix-python-executable.patch apitrace/repos/community-x86_64/PKGBUILD apitrace/repos/community-x86_64/fix-python-executable.patch ----------------------------------------------+ /PKGBUILD | 72 +++++++++++++ /fix-python-executable.patch | 130 +++++++++++++++++++++++++ community-i686/PKGBUILD | 36 ------ community-i686/fix-python-executable.patch | 65 ------------ community-x86_64/PKGBUILD | 36 ------ community-x86_64/fix-python-executable.patch | 65 ------------ 6 files changed, 202 insertions(+), 202 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-05-30 07:05:03 UTC (rev 134329) +++ community-i686/PKGBUILD 2015-05-30 07:05:23 UTC (rev 134330) @@ -1,36 +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=6.1 -pkgrel=1 -pkgdesc="Graphics API Tracing" -arch=('i686' 'x86_64') -url="https://github.com/apitrace/apitrace" -license=('custom') -makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit') -source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip") -md5sums=('9661028558461feaab6e66538b15a805') - -build() { - cd ${srcdir}/apitrace-* - - cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DENABLE_GUI=TRUE - make -C build -} - -package() { - depends=('python2' 'libgl') - optdepends=('qtwebkit: GUI support') - - 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 134329, apitrace/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-05-30 07:05:23 UTC (rev 134330) @@ -0,0 +1,36 @@ +# $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=6.1 +pkgrel=2 +pkgdesc="Graphics API Tracing" +arch=('i686' 'x86_64') +url="https://github.com/apitrace/apitrace" +license=('custom') +makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit') +source=("$pkgname-$pkgver.zip::https://github.com/apitrace/apitrace/archive/${pkgver}.tar.gz") +md5sums=('d8fa88e0e594420afb5d17fdafdab0e4') + +build() { + cd ${srcdir}/apitrace-* + + cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DENABLE_GUI=TRUE + make -C build +} + +package() { + depends=('python2' 'libgl') + optdepends=('qtwebkit: GUI support') + + 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/" +} Deleted: community-i686/fix-python-executable.patch =================================================================== --- community-i686/fix-python-executable.patch 2015-05-30 07:05:03 UTC (rev 134329) +++ community-i686/fix-python-executable.patch 2015-05-30 07:05:23 UTC (rev 134330) @@ -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 Copied: apitrace/repos/community-i686/fix-python-executable.patch (from rev 134329, apitrace/trunk/fix-python-executable.patch) =================================================================== --- community-i686/fix-python-executable.patch (rev 0) +++ community-i686/fix-python-executable.patch 2015-05-30 07:05:23 UTC (rev 134330) @@ -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/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-05-30 07:05:03 UTC (rev 134329) +++ community-x86_64/PKGBUILD 2015-05-30 07:05:23 UTC (rev 134330) @@ -1,36 +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=6.1 -pkgrel=1 -pkgdesc="Graphics API Tracing" -arch=('i686' 'x86_64') -url="https://github.com/apitrace/apitrace" -license=('custom') -makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit') -source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip") -md5sums=('9661028558461feaab6e66538b15a805') - -build() { - cd ${srcdir}/apitrace-* - - cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DENABLE_GUI=TRUE - make -C build -} - -package() { - depends=('python2' 'libgl') - optdepends=('qtwebkit: GUI support') - - 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 134329, apitrace/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-05-30 07:05:23 UTC (rev 134330) @@ -0,0 +1,36 @@ +# $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=6.1 +pkgrel=2 +pkgdesc="Graphics API Tracing" +arch=('i686' 'x86_64') +url="https://github.com/apitrace/apitrace" +license=('custom') +makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit') +source=("$pkgname-$pkgver.zip::https://github.com/apitrace/apitrace/archive/${pkgver}.tar.gz") +md5sums=('d8fa88e0e594420afb5d17fdafdab0e4') + +build() { + cd ${srcdir}/apitrace-* + + cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DENABLE_GUI=TRUE + make -C build +} + +package() { + depends=('python2' 'libgl') + optdepends=('qtwebkit: GUI support') + + 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/" +} Deleted: community-x86_64/fix-python-executable.patch =================================================================== --- community-x86_64/fix-python-executable.patch 2015-05-30 07:05:03 UTC (rev 134329) +++ community-x86_64/fix-python-executable.patch 2015-05-30 07:05:23 UTC (rev 134330) @@ -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 Copied: apitrace/repos/community-x86_64/fix-python-executable.patch (from rev 134329, apitrace/trunk/fix-python-executable.patch) =================================================================== --- community-x86_64/fix-python-executable.patch (rev 0) +++ community-x86_64/fix-python-executable.patch 2015-05-30 07:05:23 UTC (rev 134330) @@ -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