diff --git a/srcpkgs/qtcreator-data b/srcpkgs/qtcreator-data new file mode 120000 index 00000000000..265a9b4f7d6 --- /dev/null +++ b/srcpkgs/qtcreator-data @@ -0,0 +1 @@ +qtcreator \ No newline at end of file diff --git a/srcpkgs/qtcreator/patches/musl-no_execinfo_h.patch b/srcpkgs/qtcreator/patches/musl-no_execinfo_h.patch deleted file mode 100644 index a39a9213504..00000000000 --- a/srcpkgs/qtcreator/patches/musl-no_execinfo_h.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- src/plugins/qmldesigner/designercore/exceptions/exception.cpp 2015-04-21 17:56:56.000000000 +0200 -+++ src/plugins/qmldesigner/designercore/exceptions/exception.cpp 2015-06-26 13:17:08.600350791 +0200 -@@ -31,7 +31,9 @@ - #include "exception.h" - - #ifdef Q_OS_LINUX -+#if defined(__GLIBC__) - #include -+#endif - #include - #endif - -@@ -107,6 +109,7 @@ - m_file(file) - { - #ifdef Q_OS_LINUX -+#ifdef __GLIBC__ - void * array[50]; - int nSize = backtrace(array, 50); - char ** symbols = backtrace_symbols(array, nSize); -@@ -118,6 +121,7 @@ - - free(symbols); - #endif -+#endif - - if (s_shouldAssert) - Q_ASSERT_X(false, function.toUtf8(), QString("%1:%2 - %3").arg(file).arg(line).arg(function).toUtf8()); ---- src/plugins/debugger/shared/backtrace.cpp 2015-04-21 17:56:56.000000000 +0200 -+++ src/plugins/debugger/shared/backtrace.cpp 2015-06-26 13:14:54.295358053 +0200 -@@ -35,8 +35,10 @@ - #if defined(Q_OS_LINUX) - #include - #include -+#if defined(__GLIBC__) - #include - #endif -+#endif - - namespace Debugger { - namespace Internal { -@@ -45,7 +47,7 @@ - { - if (maxdepth == -1) - maxdepth = 200; --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) && defined(__GLIBC__) - void *bt[200] = {0}; - qDebug() << "BACKTRACE:"; - int size = backtrace(bt, sizeof(bt) / sizeof(bt[0])); diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 85fa118bb64..4148741f307 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,28 +1,38 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=4.10.2 +version=4.11.1 revision=1 wrksrc="qt-creator-opensource-src-${version}" build_style=qmake make_install_args="INSTALL_ROOT=\${DESTDIR}/usr" -hostmakedepends="clang llvm perl pkg-config python" -makedepends="botan-devel qt5-declarative-devel qt5-script-devel qt5-tools-devel +hostmakedepends="clang llvm perl pkg-config python which" +makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel qt5-quickcontrols" -depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite" +depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite qtcreator-data-${version}_${revision}" short_desc="Cross-platform IDE for Qt developers" maintainer="Jürgen Buchmüller " -license="GPL-3.0-only,QtCompany-GPL-Exception-1.0" +license="GPL-3.0-only, QtCompany-GPL-Exception-1.0" homepage="https://wiki.qt.io/Category:Tools::QtCreator" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz" -checksum=9add6bdddfe5726bb02535409c2ed788b1afeee082121f54f887281d0e3c449a +checksum=c511f5beacadad4a37cbf7ec23c17cf28630c79998f1dc8bc7edefa9b9337924 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel" makedepends+=" clang llvm" fi +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" libexecinfo-devel" +fi + pre_configure() { - sed -i qtcreator.pri -e'/CONFIG += c++14/aCONFIG += use_system_botan' + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \ + src/plugins/clangformat/clangformat.pro \ + -e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo" + vsed -i src/plugins/debugger/debugger.pro \ + -e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo" + fi } post_install() { @@ -52,3 +62,11 @@ qtcreator-full_package() { echo "Just the dependencies" } } + +qtcreator-data_package() { + short_desc+=" - data files" + archs=noarch + pkg_install() { + vmove usr/share + } +}