Date: Monday, April 4, 2016 @ 14:04:57 Author: svenstaro Revision: 263858
archrelease: copy trunk to extra-i686, extra-x86_64 Added: qtcreator/repos/extra-i686/PKGBUILD (from rev 263857, qtcreator/trunk/PKGBUILD) qtcreator/repos/extra-i686/qtcreator.desktop (from rev 263857, qtcreator/trunk/qtcreator.desktop) qtcreator/repos/extra-i686/qtcreator.install (from rev 263857, qtcreator/trunk/qtcreator.install) qtcreator/repos/extra-x86_64/PKGBUILD (from rev 263857, qtcreator/trunk/PKGBUILD) qtcreator/repos/extra-x86_64/qtcreator.desktop (from rev 263857, qtcreator/trunk/qtcreator.desktop) qtcreator/repos/extra-x86_64/qtcreator.install (from rev 263857, qtcreator/trunk/qtcreator.install) Deleted: qtcreator/repos/extra-i686/PKGBUILD qtcreator/repos/extra-i686/qtcreator.desktop qtcreator/repos/extra-i686/qtcreator.install qtcreator/repos/extra-x86_64/PKGBUILD qtcreator/repos/extra-x86_64/qtcreator.desktop qtcreator/repos/extra-x86_64/qtcreator.install --------------------------------+ /PKGBUILD | 148 +++++++++++++++++++++++++++++++++++++++ /qtcreator.desktop | 20 +++++ /qtcreator.install | 24 ++++++ extra-i686/PKGBUILD | 74 ------------------- extra-i686/qtcreator.desktop | 10 -- extra-i686/qtcreator.install | 12 --- extra-x86_64/PKGBUILD | 73 ------------------- extra-x86_64/qtcreator.desktop | 10 -- extra-x86_64/qtcreator.install | 12 --- 9 files changed, 192 insertions(+), 191 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-04-04 11:39:27 UTC (rev 263857) +++ extra-i686/PKGBUILD 2016-04-04 12:04:57 UTC (rev 263858) @@ -1,74 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org> -# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> -# Contributor: Dan Vratil <prog...@progdansoft.com> -# Contributor: thotypous <matiasΘarchlinux-br·org> -# Contributor: delor <bartekpiech gmail com> - -pkgname=qtcreator -pkgver=3.6.1 -_pkgver=v3.6.1 -pkgrel=2 -pkgdesc='Lightweight, cross-platform integrated development environment' -arch=('i686' 'x86_64') -url='http://qt-project.org' -license=('LGPL') -depends=('qt5-tools' 'qt5-declarative' 'qt5-script' 'qt5-quickcontrols' 'qt5-webkit') -makedepends=('git' 'mesa' 'clang') -options=('docs') -optdepends=('qt5-doc: integrated Qt documentation' - 'qt5-examples: welcome page examples' - 'gdb: debugger' - 'cmake: cmake project support' - 'openssh-askpass: ssh support' - 'git: git support' - 'mercurial: mercurial support' - 'bzr: bazaar support' - 'clang: Clang code model' - 'valgrind: analyze support') -install=qtcreator.install -source=("git://code.qt.io/qt-creator/qt-creator.git#tag=${_pkgver}" - "git://code.qt.io/qt-labs/qbs.git" - 'qtcreator.desktop') -md5sums=('SKIP' - 'SKIP' - '800c94165c547b64012a207d9830250a') - -prepare() { - cd qt-creator - git submodule init - git config submodule.qbs.url $srcdir/qbs - git submodule update - - # Debugger: Allow LLDB-MI to be used as debugger - # https://bugreports.qt.io/browse/QTCREATORBUG-15131 - # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=97e9f113879c - # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=e57b0db0f959 - git cherry-pick -n 97e9f113879c e57b0db0f959 -} - -build() { - [[ -d build ]] && rm -r build - mkdir build && cd build - - LLVM_INSTALL_DIR=/usr qmake CONFIG+=journald -r ../qt-creator/qtcreator.pro - make - make docs -j1 -} - -package() { - cd build - - make INSTALL_ROOT="${pkgdir}/usr/" install - make INSTALL_ROOT="${pkgdir}/usr/" install_docs - - # Workaround for FS#40583 - mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin - echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator - echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator - chmod +x "${pkgdir}"/usr/bin/qtcreator - - install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT -} Copied: qtcreator/repos/extra-i686/PKGBUILD (from rev 263857, qtcreator/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-04-04 12:04:57 UTC (rev 263858) @@ -0,0 +1,74 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> +# Contributor: Dan Vratil <prog...@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname=qtcreator +pkgver=3.6.1 +_pkgver=v3.6.1 +pkgrel=2 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt-project.org' +license=('LGPL') +depends=('qt5-tools' 'qt5-declarative' 'qt5-script' 'qt5-quickcontrols' 'qt5-webkit') +makedepends=('git' 'mesa' 'clang') +options=('docs') +optdepends=('qt5-doc: integrated Qt documentation' + 'qt5-examples: welcome page examples' + 'gdb: debugger' + 'cmake: cmake project support' + 'openssh-askpass: ssh support' + 'git: git support' + 'mercurial: mercurial support' + 'bzr: bazaar support' + 'clang: Clang code model' + 'valgrind: analyze support') +install=qtcreator.install +source=("git://code.qt.io/qt-creator/qt-creator.git#tag=${_pkgver}" + "git://code.qt.io/qt-labs/qbs.git" + 'qtcreator.desktop') +md5sums=('SKIP' + 'SKIP' + '800c94165c547b64012a207d9830250a') + +prepare() { + cd qt-creator + git submodule init + git config submodule.qbs.url $srcdir/qbs + git submodule update + + # Debugger: Allow LLDB-MI to be used as debugger + # https://bugreports.qt.io/browse/QTCREATORBUG-15131 + # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=97e9f113879c + # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=e57b0db0f959 + git cherry-pick -n 97e9f113879c e57b0db0f959 +} + +build() { + [[ -d build ]] && rm -r build + mkdir build && cd build + + LLVM_INSTALL_DIR=/usr qmake CONFIG+=journald -r ../qt-creator/qtcreator.pro + make + make docs -j1 +} + +package() { + cd build + + make INSTALL_ROOT="${pkgdir}/usr/" install + make INSTALL_ROOT="${pkgdir}/usr/" install_docs + + # Workaround for FS#40583 + mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin + echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator + echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator + chmod +x "${pkgdir}"/usr/bin/qtcreator + + install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} Deleted: extra-i686/qtcreator.desktop =================================================================== --- extra-i686/qtcreator.desktop 2016-04-04 11:39:27 UTC (rev 263857) +++ extra-i686/qtcreator.desktop 2016-04-04 12:04:57 UTC (rev 263858) @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=qtcreator %F -Name=Qt Creator -GenericName=C++ IDE for developing Qt applications -X-KDE-StartupNotify=true -Icon=QtProject-qtcreator -Terminal=false -Categories=Development;IDE;Qt; -MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource; Copied: qtcreator/repos/extra-i686/qtcreator.desktop (from rev 263857, qtcreator/trunk/qtcreator.desktop) =================================================================== --- extra-i686/qtcreator.desktop (rev 0) +++ extra-i686/qtcreator.desktop 2016-04-04 12:04:57 UTC (rev 263858) @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Exec=qtcreator %F +Name=Qt Creator +GenericName=C++ IDE for developing Qt applications +X-KDE-StartupNotify=true +Icon=QtProject-qtcreator +Terminal=false +Categories=Development;IDE;Qt; +MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource; Deleted: extra-i686/qtcreator.install =================================================================== --- extra-i686/qtcreator.install 2016-04-04 11:39:27 UTC (rev 263857) +++ extra-i686/qtcreator.install 2016-04-04 12:04:57 UTC (rev 263858) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: qtcreator/repos/extra-i686/qtcreator.install (from rev 263857, qtcreator/trunk/qtcreator.install) =================================================================== --- extra-i686/qtcreator.install (rev 0) +++ extra-i686/qtcreator.install 2016-04-04 12:04:57 UTC (rev 263858) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-04-04 11:39:27 UTC (rev 263857) +++ extra-x86_64/PKGBUILD 2016-04-04 12:04:57 UTC (rev 263858) @@ -1,73 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org> -# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> -# Contributor: Dan Vratil <prog...@progdansoft.com> -# Contributor: thotypous <matiasΘarchlinux-br·org> -# Contributor: delor <bartekpiech gmail com> - -pkgname=qtcreator -pkgver=3.6.1 -_pkgver=v3.6.1 -pkgrel=1 -pkgdesc='Lightweight, cross-platform integrated development environment' -arch=('i686' 'x86_64') -url='http://qt-project.org' -license=('LGPL') -depends=('qt5-tools' 'qt5-declarative' 'qt5-script' 'qt5-quickcontrols') -makedepends=('git' 'mesa' 'clang') -options=('docs') -optdepends=('qt5-doc: for the integrated Qt documentation' - 'gdb: for the debugger' - 'cmake: for cmake project support' - 'openssh-askpass: for ssh support' - 'git: for git support' - 'mercurial: for mercurial support' - 'bzr: for bazaar support' - 'clang: Clang code model' - 'valgrind: for analyze support') -install=qtcreator.install -source=("git://code.qt.io/qt-creator/qt-creator.git#tag=${_pkgver}" - "git://code.qt.io/qt-labs/qbs.git" - 'qtcreator.desktop') -md5sums=('SKIP' - 'SKIP' - '800c94165c547b64012a207d9830250a') - -prepare() { - cd qt-creator - git submodule init - git config submodule.qbs.url $srcdir/qbs - git submodule update - - # Debugger: Allow LLDB-MI to be used as debugger - # https://bugreports.qt.io/browse/QTCREATORBUG-15131 - # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=97e9f113879c - # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=e57b0db0f959 - git cherry-pick -n 97e9f113879c e57b0db0f959 -} - -build() { - [[ -d build ]] && rm -r build - mkdir build && cd build - - LLVM_INSTALL_DIR=/usr qmake CONFIG+=journald -r ../qt-creator/qtcreator.pro - make - make docs -j1 -} - -package() { - cd build - - make INSTALL_ROOT="${pkgdir}/usr/" install - make INSTALL_ROOT="${pkgdir}/usr/" install_docs - - # Workaround for FS#40583 - mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin - echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator - echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator - chmod +x "${pkgdir}"/usr/bin/qtcreator - - install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT -} Copied: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 263857, qtcreator/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-04-04 12:04:57 UTC (rev 263858) @@ -0,0 +1,74 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> +# Contributor: Dan Vratil <prog...@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname=qtcreator +pkgver=3.6.1 +_pkgver=v3.6.1 +pkgrel=2 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt-project.org' +license=('LGPL') +depends=('qt5-tools' 'qt5-declarative' 'qt5-script' 'qt5-quickcontrols' 'qt5-webkit') +makedepends=('git' 'mesa' 'clang') +options=('docs') +optdepends=('qt5-doc: integrated Qt documentation' + 'qt5-examples: welcome page examples' + 'gdb: debugger' + 'cmake: cmake project support' + 'openssh-askpass: ssh support' + 'git: git support' + 'mercurial: mercurial support' + 'bzr: bazaar support' + 'clang: Clang code model' + 'valgrind: analyze support') +install=qtcreator.install +source=("git://code.qt.io/qt-creator/qt-creator.git#tag=${_pkgver}" + "git://code.qt.io/qt-labs/qbs.git" + 'qtcreator.desktop') +md5sums=('SKIP' + 'SKIP' + '800c94165c547b64012a207d9830250a') + +prepare() { + cd qt-creator + git submodule init + git config submodule.qbs.url $srcdir/qbs + git submodule update + + # Debugger: Allow LLDB-MI to be used as debugger + # https://bugreports.qt.io/browse/QTCREATORBUG-15131 + # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=97e9f113879c + # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=e57b0db0f959 + git cherry-pick -n 97e9f113879c e57b0db0f959 +} + +build() { + [[ -d build ]] && rm -r build + mkdir build && cd build + + LLVM_INSTALL_DIR=/usr qmake CONFIG+=journald -r ../qt-creator/qtcreator.pro + make + make docs -j1 +} + +package() { + cd build + + make INSTALL_ROOT="${pkgdir}/usr/" install + make INSTALL_ROOT="${pkgdir}/usr/" install_docs + + # Workaround for FS#40583 + mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin + echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator + echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator + chmod +x "${pkgdir}"/usr/bin/qtcreator + + install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} Deleted: extra-x86_64/qtcreator.desktop =================================================================== --- extra-x86_64/qtcreator.desktop 2016-04-04 11:39:27 UTC (rev 263857) +++ extra-x86_64/qtcreator.desktop 2016-04-04 12:04:57 UTC (rev 263858) @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=qtcreator %F -Name=Qt Creator -GenericName=C++ IDE for developing Qt applications -X-KDE-StartupNotify=true -Icon=QtProject-qtcreator -Terminal=false -Categories=Development;IDE;Qt; -MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource; Copied: qtcreator/repos/extra-x86_64/qtcreator.desktop (from rev 263857, qtcreator/trunk/qtcreator.desktop) =================================================================== --- extra-x86_64/qtcreator.desktop (rev 0) +++ extra-x86_64/qtcreator.desktop 2016-04-04 12:04:57 UTC (rev 263858) @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Exec=qtcreator %F +Name=Qt Creator +GenericName=C++ IDE for developing Qt applications +X-KDE-StartupNotify=true +Icon=QtProject-qtcreator +Terminal=false +Categories=Development;IDE;Qt; +MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource; Deleted: extra-x86_64/qtcreator.install =================================================================== --- extra-x86_64/qtcreator.install 2016-04-04 11:39:27 UTC (rev 263857) +++ extra-x86_64/qtcreator.install 2016-04-04 12:04:57 UTC (rev 263858) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: qtcreator/repos/extra-x86_64/qtcreator.install (from rev 263857, qtcreator/trunk/qtcreator.install) =================================================================== --- extra-x86_64/qtcreator.install (rev 0) +++ extra-x86_64/qtcreator.install 2016-04-04 12:04:57 UTC (rev 263858) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}