[arch-commits] Commit in qtcreator/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue May 10 19:54:49 UTC 2016
Date: Tuesday, May 10, 2016 @ 21:54:49
Author: foutrelis
Revision: 267647
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
qtcreator/repos/staging-i686/
qtcreator/repos/staging-i686/PKGBUILD
(from rev 267646, qtcreator/trunk/PKGBUILD)
qtcreator/repos/staging-i686/qt-creator_llvmincdir.patch
(from rev 267646, qtcreator/trunk/qt-creator_llvmincdir.patch)
qtcreator/repos/staging-i686/qtcreator.desktop
(from rev 267646, qtcreator/trunk/qtcreator.desktop)
qtcreator/repos/staging-i686/qtcreator.install
(from rev 267646, qtcreator/trunk/qtcreator.install)
qtcreator/repos/staging-x86_64/
qtcreator/repos/staging-x86_64/PKGBUILD
(from rev 267646, qtcreator/trunk/PKGBUILD)
qtcreator/repos/staging-x86_64/qt-creator_llvmincdir.patch
(from rev 267646, qtcreator/trunk/qt-creator_llvmincdir.patch)
qtcreator/repos/staging-x86_64/qtcreator.desktop
(from rev 267646, qtcreator/trunk/qtcreator.desktop)
qtcreator/repos/staging-x86_64/qtcreator.install
(from rev 267646, qtcreator/trunk/qtcreator.install)
--------------------------------------------+
staging-i686/PKGBUILD | 80 +++++++++++++++++++++++++++
staging-i686/qt-creator_llvmincdir.patch | 12 ++++
staging-i686/qtcreator.desktop | 10 +++
staging-i686/qtcreator.install | 12 ++++
staging-x86_64/PKGBUILD | 80 +++++++++++++++++++++++++++
staging-x86_64/qt-creator_llvmincdir.patch | 12 ++++
staging-x86_64/qtcreator.desktop | 10 +++
staging-x86_64/qtcreator.install | 12 ++++
8 files changed, 228 insertions(+)
Copied: qtcreator/repos/staging-i686/PKGBUILD (from rev 267646, qtcreator/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-05-10 19:54:49 UTC (rev 267647)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: Dan Vratil <progdan at progdansoft.com>
+# Contributor: thotypous <matiasΘarchlinux-br·org>
+# Contributor: delor <bartekpiech gmail com>
+
+pkgname=qtcreator
+pkgver=3.6.1
+_pkgver=v3.6.1
+pkgrel=3
+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"
+ 'qt-creator_llvmincdir.patch'
+ 'qtcreator.desktop')
+md5sums=('SKIP'
+ 'SKIP'
+ 'ab50147c509e8043c69625afa7cca7fe'
+ '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
+
+ # Fix build with GCC 6 (patch from Fedora)
+ # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Q5SWCUUMWQ4EMS7CU2CBOZHV3WZYOOTT/
+ patch -Np1 -i ../qt-creator_llvmincdir.patch
+}
+
+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/staging-i686/qt-creator_llvmincdir.patch (from rev 267646, qtcreator/trunk/qt-creator_llvmincdir.patch)
===================================================================
--- staging-i686/qt-creator_llvmincdir.patch (rev 0)
+++ staging-i686/qt-creator_llvmincdir.patch 2016-05-10 19:54:49 UTC (rev 267647)
@@ -0,0 +1,12 @@
+diff -rupN qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro
+--- qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro 2015-12-11 13:45:01.000000000 +0100
++++ qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro 2016-02-08 23:04:03.654903983 +0100
+@@ -10,7 +10,7 @@ QT += core network
+ QT -= gui
+
+ LIBS += $$LLVM_LIBS
+-INCLUDEPATH += $$LLVM_INCLUDEPATH
++#INCLUDEPATH += $$LLVM_INCLUDEPATH
+
+ SOURCES += clangbackendmain.cpp
+
Copied: qtcreator/repos/staging-i686/qtcreator.desktop (from rev 267646, qtcreator/trunk/qtcreator.desktop)
===================================================================
--- staging-i686/qtcreator.desktop (rev 0)
+++ staging-i686/qtcreator.desktop 2016-05-10 19:54:49 UTC (rev 267647)
@@ -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;
Copied: qtcreator/repos/staging-i686/qtcreator.install (from rev 267646, qtcreator/trunk/qtcreator.install)
===================================================================
--- staging-i686/qtcreator.install (rev 0)
+++ staging-i686/qtcreator.install 2016-05-10 19:54:49 UTC (rev 267647)
@@ -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
+}
Copied: qtcreator/repos/staging-x86_64/PKGBUILD (from rev 267646, qtcreator/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-05-10 19:54:49 UTC (rev 267647)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: Dan Vratil <progdan at progdansoft.com>
+# Contributor: thotypous <matiasΘarchlinux-br·org>
+# Contributor: delor <bartekpiech gmail com>
+
+pkgname=qtcreator
+pkgver=3.6.1
+_pkgver=v3.6.1
+pkgrel=3
+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"
+ 'qt-creator_llvmincdir.patch'
+ 'qtcreator.desktop')
+md5sums=('SKIP'
+ 'SKIP'
+ 'ab50147c509e8043c69625afa7cca7fe'
+ '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
+
+ # Fix build with GCC 6 (patch from Fedora)
+ # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Q5SWCUUMWQ4EMS7CU2CBOZHV3WZYOOTT/
+ patch -Np1 -i ../qt-creator_llvmincdir.patch
+}
+
+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/staging-x86_64/qt-creator_llvmincdir.patch (from rev 267646, qtcreator/trunk/qt-creator_llvmincdir.patch)
===================================================================
--- staging-x86_64/qt-creator_llvmincdir.patch (rev 0)
+++ staging-x86_64/qt-creator_llvmincdir.patch 2016-05-10 19:54:49 UTC (rev 267647)
@@ -0,0 +1,12 @@
+diff -rupN qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro
+--- qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro 2015-12-11 13:45:01.000000000 +0100
++++ qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro 2016-02-08 23:04:03.654903983 +0100
+@@ -10,7 +10,7 @@ QT += core network
+ QT -= gui
+
+ LIBS += $$LLVM_LIBS
+-INCLUDEPATH += $$LLVM_INCLUDEPATH
++#INCLUDEPATH += $$LLVM_INCLUDEPATH
+
+ SOURCES += clangbackendmain.cpp
+
Copied: qtcreator/repos/staging-x86_64/qtcreator.desktop (from rev 267646, qtcreator/trunk/qtcreator.desktop)
===================================================================
--- staging-x86_64/qtcreator.desktop (rev 0)
+++ staging-x86_64/qtcreator.desktop 2016-05-10 19:54:49 UTC (rev 267647)
@@ -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;
Copied: qtcreator/repos/staging-x86_64/qtcreator.install (from rev 267646, qtcreator/trunk/qtcreator.install)
===================================================================
--- staging-x86_64/qtcreator.install (rev 0)
+++ staging-x86_64/qtcreator.install 2016-05-10 19:54:49 UTC (rev 267647)
@@ -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
+}
More information about the arch-commits
mailing list