diff options
Diffstat (limited to 'dev-qt')
25 files changed, 394 insertions, 262 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 2825d109a74f..fdc6907ff22a 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 240d2b7a73a9..1b11631c8cf5 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,8 +1,10 @@ +AUX qt-creator-4.12.0-dylib-fix.patch 4022 BLAKE2B ea5d2b4a5daabc76515c1777a5df1738800d5cf79e9b52b60bb0d3d1c923b6d0daeb1f1a7e77f1e707aa7948f2a673f637e1e66bd3aa30f47c19ef89351114c5 SHA512 a81ed8b5616f816bc4ade87c159997f33a55c07417b93cbcbfc29f32fb36060370bf05f85cc94ac64297a7b33cf2852b3be2a8c7b99b58914085acd9dc533808 +AUX qt-creator-4.12.0-libclangformat-ide.patch 2463 BLAKE2B a99fc6e1354fde03ddbf60e5115fbec46fc5074353b5512973bb3802bb65d3401a4ac51e41a5d113ffea14faf85b48f334d97f21e210d173b534c6e2fdfec328 SHA512 f08a95d5e0e9201792f5c16e3b2a61e9a54f08a885e214ea237d3e49bad8d2d94a59cbdc35703641a1ed1ee4037f64bf7d6d6bbd4dab11fa153a3ac4ef67e050 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3 -DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215 +DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450 EBUILD qt-creator-4.10.1.ebuild 6229 BLAKE2B 9681c8465616bfa0d2ae0c1968285603e6840213c4da1fe34de0ef191c394306c8a935d3080919a590c71bbd04deb6e96828eb95ff691c378696c5f21059f953 SHA512 224693d7cfbddb31bc01ccec252c59e79f82f990b4178bde8aa8d2b647bea8b0b283421cc2e0c2e6076b5caaa430e4b4ac8028ff21f87d0d5d9b24031693f67a -EBUILD qt-creator-4.12.0.ebuild 6338 BLAKE2B be92f41a4598ed751dd2d328d360bc8c4913f15d3bb6de6d6130fba2764caff9e87a703885f89e96cc9f5af05edc410f06d5182d380a4d565ee67dcfc54982ee SHA512 40f9da93e455e3cd8d7d89d92a0b1b53310f828df154871a9360e1c4a8d10b315e2f7d01e12abb55b3eb8a8799adeb15dcbde65916292bbfe25337d955035510 +EBUILD qt-creator-4.12.3.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345 EBUILD qt-creator-4.8.2.ebuild 5826 BLAKE2B c3b87e94ae39f69abbefd189fe52dd946dbece17de5a301b3b4a651a683770c5ca58c5f2afcea0237ef18bb0d80e53d69f5078bb0d219f0c114331da5456320a SHA512 7f01324288b26da063d3d1d4d93232f74d0c7a7ad9e481d872a045935265aa1bed200ec24ce2d90469f17bb9da3c7de5aeecb8b8be1d2a04c510c51c533c99c4 -EBUILD qt-creator-9999.ebuild 6358 BLAKE2B 186f2c620c33176dbd83491e9291d55b637f12d07c9b39767ecf4bb2321ca4ad2134831d3c3f789aea36d94e66f6efed896dadd18bf25db055c33b7fbda9a6a6 SHA512 c67d24ea242ffd2a729d36894a6a8511e844ef4a41e1d150a004bac6b23d9b9ff9a6b54f8e96195745c77e3032568a20c4cc36dea966a80094afad57340243e2 +EBUILD qt-creator-9999.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345 MISC metadata.xml 3297 BLAKE2B 02d12b1d65d5791fe108f75d76f01804d363c933b5b50317a2976d5a3099bf36c2a78d40390a6e16e341b462c7b7a86c0da1f1be9ca4e9cb29ea9e24285227dd SHA512 0597fb87fe7f82c0a4502c0299a0b0d6ab981d8923c1db58f0c26102a93507a8ec75005430a2c538a2621c37936b662a6f0acfc2c7168bc2d608cb3ed44db2cf diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch new file mode 100644 index 000000000000..0d4deb2c7956 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch @@ -0,0 +1,84 @@ +From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001 +From: Peter Levine <plevine457@gmail.com> +Date: Tue, 5 May 2020 03:45:35 -0400 +Subject: [PATCH] Fix building against clang configured with + CLANG_LINK_CLANG_DYLIB + +LLVM/Clang upstream only officially supports building shared +components as a single dynamic library (via +LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..). +Linux distros like Fedora and Gentoo have followed suit. + +Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri +file assumes clang is built with separate component libraries +and the build fails. + +This change alters the build to check for the existence +of clang component libraries and, if found, link to them, or +otherwise to libclang-cpp. + +Task-number: QTCREATORBUG-23172 +Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86 +--- + src/shared/clang/clang_installation.pri | 35 +++++++++++++++---------- + 1 file changed, 21 insertions(+), 14 deletions(-) + +diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri +index 08838838bca..c191c57f1c7 100644 +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) { + } + } + +- isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { +- CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h +- exists($$CLANGFORMAT_MAIN_HEADER) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic +- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ +- -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangAST -lclangLex -lclangBasic +- win32:CLANGFORMAT_LIBS += -lversion +- } +- } +- win32:ALL_CLANG_LIBS += -lversion +- + LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h + !exists($$LIBCLANG_MAIN_HEADER) { + $$llvmWarningOrError(\ +@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) { + LIBCLANG_LIBS += $${CLANG_LIB} + + isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { ++ CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h ++ exists($$CLANGFORMAT_MAIN_HEADER) { ++ exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) { ++ CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ ++ -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ ++ -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ ++ -lclangASTMatchers -lclangAST -lclangLex -lclangBasic ++ win32:CLANGFORMAT_LIBS += -lversion ++ win32:ALL_CLANG_LIBS += -lversion ++ } else { ++ CLANGFORMAT_LIBS=-lclang-cpp ++ ALL_CLANG_LIBS=-lclang-cpp ++ } ++ } ++ + QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING) + isEmpty(QTC_DISABLE_CLANG_REFACTORING) { + !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR} +- LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS ++ exists($${LLVM_LIBDIR}/libclangTooling.so*)|exists($${LLVM_LIBDIR}/libclangTooling.dylib) { ++ LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS ++ } else { ++ LIBTOOLING_LIBS += -lclang-cpp $$LLVM_STATIC_LIBS ++ } + } + } + +-- +2.26.2 + diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch new file mode 100644 index 000000000000..12c46c89ed0e --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch @@ -0,0 +1,64 @@ +--- a/src/plugins/clangformat/clangformatbaseindenter.h ++++ b/src/plugins/clangformat/clangformatbaseindenter.h +@@ -27,7 +27,7 @@ + + #include <texteditor/indenter.h> + +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + namespace ClangFormat { + +--- a/src/plugins/clangformat/clangformatconfigwidget.cpp ++++ b/src/plugins/clangformat/clangformatconfigwidget.cpp +@@ -32,7 +32,7 @@ + #include "ui_clangformatchecks.h" + #include "ui_clangformatconfigwidget.h" + +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + #include <coreplugin/icore.h> + #include <cppeditor/cpphighlighter.h> +--- a/src/plugins/clangformat/clangformatplugin.cpp ++++ b/src/plugins/clangformat/clangformatplugin.cpp +@@ -56,7 +56,7 @@ + #include <texteditor/icodestylepreferences.h> + #include <texteditor/texteditorsettings.h> + +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + #include <utils/algorithm.h> + +--- a/src/plugins/clangformat/clangformatutils.h ++++ b/src/plugins/clangformat/clangformatutils.h +@@ -27,7 +27,7 @@ + + #include <coreplugin/id.h> + #include <utils/fileutils.h> +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + #include <QFile> + +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -227,7 +227,7 @@ + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { + exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclangFormatIDE -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic + ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ + -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +@@ -235,7 +235,7 @@ + win32:CLANGFORMAT_LIBS += -lversion + win32:ALL_CLANG_LIBS += -lversion + } else { +- CLANGFORMAT_LIBS=-lclang-cpp ++ CLANGFORMAT_LIBS=-lclangFormatIDE -lclang-cpp + ALL_CLANG_LIBS=-lclang-cpp + } + } diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild index a4ca520e9938..ff58c169e4e0 100644 --- a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=9 +LLVM_MAX_SLOT=10 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -20,32 +20,38 @@ else MY_P=${PN}-opensource-src-${MY_PV} [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_P} fi -# TODO: unbundle sqlite and KSyntaxHighlighting +# TODO: unbundle sqlite QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase - cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios +lsp:languageclient - mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager - +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion - valgrind winrt) + cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios + lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python + qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal + silversearcher subversion valgrind webassembly winrt) IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}" RESTRICT="!test? ( test )" REQUIRED_USE=" - clang? ( test? ( qbs ) ) - qnx? ( remotelinux ) boot2qt? ( remotelinux ) + clang? ( test? ( qbs ) ) + mcu? ( cmake ) python? ( lsp ) + qnx? ( remotelinux ) " # minimum Qt version required QT_PV="5.12.3:5" +BDEPEND=" + >=dev-qt/linguist-tools-${QT_PV} + virtual/pkgconfig + doc? ( >=dev-qt/qdoc-${QT_PV} ) +" CDEPEND=" - >=dev-cpp/yaml-cpp-0.6.2 + >=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-${QT_PV} >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtdeclarative-${QT_PV}[widgets] @@ -59,7 +65,16 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( >=sys-devel/clang-9.0.1:= ) + kde-frameworks/syntax-highlighting:5 + clang? ( + || ( + ( sys-devel/clang:10 + dev-libs/libclangformat-ide:10 ) + ( sys-devel/clang:9 + dev-libs/libclangformat-ide:9 ) + ) + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= + ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -71,9 +86,6 @@ CDEPEND=" systemd? ( sys-apps/systemd:= ) " DEPEND="${CDEPEND} - >=dev-qt/linguist-tools-${QT_PV} - virtual/pkgconfig - doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( >=dev-qt/qtdeclarative-${QT_PV}[localstorage] >=dev-qt/qtquickcontrols2-${QT_PV} @@ -88,6 +100,7 @@ RDEPEND="${CDEPEND} cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) @@ -99,6 +112,16 @@ for x in ${PLOCALES}; do done unset x +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch + "${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch +) + +llvm_check_deps() { + has_version -d "sys-devel/clang:${LLVM_SLOT}" && \ + has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}" +} + pkg_setup() { use clang && llvm_pkg_setup } @@ -131,8 +154,8 @@ src_prepare() { sed -i -e '/modelinglib/d' src/libs/libs.pro || die fi if ! use perfprofiler; then - rm -rf src/tools/perfparser || die - if ! use qmlprofiler && ! use ctfvisualizer; then + rm -r src/tools/perfparser || die + if ! use ctfvisualizer && ! use qmlprofiler; then sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die fi fi @@ -169,13 +192,21 @@ src_prepare() { done sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + # remove bundled syntax-highlighting + rm -r src/libs/3rdparty/syntax-highlighting || die + + # remove bundled yaml-cpp + rm -r src/libs/3rdparty/yaml-cpp || die + # remove bundled qbs - rm -rf src/shared/qbs || die + rm -r src/shared/qbs || die } src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ + KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index c6649849153f..ff58c169e4e0 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=8 +LLVM_MAX_SLOT=10 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -20,11 +20,11 @@ else MY_P=${PN}-opensource-src-${MY_PV} [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_P} fi -# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting +# TODO: unbundle sqlite QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase @@ -45,7 +45,13 @@ REQUIRED_USE=" # minimum Qt version required QT_PV="5.12.3:5" +BDEPEND=" + >=dev-qt/linguist-tools-${QT_PV} + virtual/pkgconfig + doc? ( >=dev-qt/qdoc-${QT_PV} ) +" CDEPEND=" + >=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-${QT_PV} >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtdeclarative-${QT_PV}[widgets] @@ -59,7 +65,16 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( sys-devel/clang:8= ) + kde-frameworks/syntax-highlighting:5 + clang? ( + || ( + ( sys-devel/clang:10 + dev-libs/libclangformat-ide:10 ) + ( sys-devel/clang:9 + dev-libs/libclangformat-ide:9 ) + ) + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= + ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -71,9 +86,6 @@ CDEPEND=" systemd? ( sys-apps/systemd:= ) " DEPEND="${CDEPEND} - >=dev-qt/linguist-tools-${QT_PV} - virtual/pkgconfig - doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( >=dev-qt/qtdeclarative-${QT_PV}[localstorage] >=dev-qt/qtquickcontrols2-${QT_PV} @@ -88,6 +100,7 @@ RDEPEND="${CDEPEND} cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) @@ -99,6 +112,16 @@ for x in ${PLOCALES}; do done unset x +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch + "${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch +) + +llvm_check_deps() { + has_version -d "sys-devel/clang:${LLVM_SLOT}" && \ + has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}" +} + pkg_setup() { use clang && llvm_pkg_setup } @@ -131,7 +154,7 @@ src_prepare() { sed -i -e '/modelinglib/d' src/libs/libs.pro || die fi if ! use perfprofiler; then - rm -rf src/tools/perfparser || die + rm -r src/tools/perfparser || die if ! use ctfvisualizer && ! use qmlprofiler; then sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die fi @@ -169,13 +192,21 @@ src_prepare() { done sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + # remove bundled syntax-highlighting + rm -r src/libs/3rdparty/syntax-highlighting || die + + # remove bundled yaml-cpp + rm -r src/libs/3rdparty/yaml-cpp || die + # remove bundled qbs - rm -rf src/shared/qbs || die + rm -r src/shared/qbs || die } src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ + KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest index d64095b40a9a..6e0bb1ff7061 100644 --- a/dev-qt/qt-docs/Manifest +++ b/dev-qt/qt-docs/Manifest @@ -31,6 +31,7 @@ DIST 5.14.2-0-202003291239qtquickcontrols-documentation.7z 9331828 BLAKE2B 08d52 DIST 5.14.2-0-202003291239qtquickcontrols1-documentation.7z 1961340 BLAKE2B 46b1795874e9e29019427259c502ddd644c5de6e985700416fff1494b199b6f518fca17e07168cb3de1a201a2754518c4055559442301254f2bd86e87b1c354f SHA512 bf715dffa72e0369faa159d67ba9bacf31154da382a87a031577729acf7caa51af55cbf2fb94ab529afbfaa5dd65f1a011ef8e52b8ce764dbfff037358d0f22c DIST 5.14.2-0-202003291239qtquickdialogs-documentation.7z 183373 BLAKE2B e1b1d4ddb85ce48e9c744ce7566f1ec2789b2fcf03f65c2616fa63b2a7ccdabc0a2ab60811bc723f3e9aa4bfa304b04bcd5097b0e617dd4f8c72b19d499e2ee0 SHA512 18a0914c7d398fdeb065829e9f93f51efddb58c35e43962fc891a46538807ce7dad27644acd976886fbb441e8b9e35790f4ed1271546a155da38b9dcd803a027 DIST 5.14.2-0-202003291239qtquickextras-documentation.7z 673822 BLAKE2B d06bead9f468325f1457fd41d047797f3618322131e5fbc095c1a78e0926b020a5f3012f86f251c96d52e8d52b0d79c05f4639c19338d67f0e6de65901bb5af7 SHA512 d6fa5acb6558fc840d731da25d9061fe3dfa4e3bbb47354bc8760afe0431bcdbd1cb21491416d7773bb171108492b35e14d2f5df0fdf67e307e3ccd6fa0cc598 +DIST 5.14.2-0-202003291239qtquicktimeline-documentation.7z 149836 BLAKE2B 28cc7173aea37167a7aaada170bb0fa7fa378ddf270c6237836c47bf2b741aefd7f0454e33be4c089742644bb72b91f9aec1e00d54d837790b21349d1d66092b SHA512 b92c321d486a49a586569dd248cf9a6f49a5acb7806bd3ba60e1f29b85919d2ef79749cef644d9f53be5cb242ef9475bf1358e38bfb4bdaedb4b02f2f90de86c DIST 5.14.2-0-202003291239qtscript-documentation.7z 601309 BLAKE2B 24b63ae7f20f60d5e2b2c1cbbc5dc47f3f19cc1bb0bc1dade609bcb0a253f483d49359a7b2f9f508936a8c3d22802907fdb64fcf388e4c6b42cb60c6b154f2d7 SHA512 8cbff7316c0b0f2dfd302b374bb78fb6b7f4f466e886299d9c2aa22097ff2b871e4a41bad2f4262c49b065e13892f1e155f1dd6aa179b9a9e898227bb0641d76 DIST 5.14.2-0-202003291239qtscripttools-documentation.7z 85919 BLAKE2B 9da6dfdc7bb18e4fbb6bad8326040e35e55ac8be556d8cc7e280b8fb481d56c9e26fa1f8bce4fa47acb0024bf622c2d46f99f5199cf0dd8412626c23f3b06767 SHA512 545e3b7cfe5fc2a76928e5c75866e350f2a80c7d47104171252e734e9d0c2966c4dae3100118730854f3de9bba7e1bc84167f60f44956730db0e0543a10819a8 DIST 5.14.2-0-202003291239qtscxml-documentation.7z 622979 BLAKE2B 6243b5dc2c17eb6c0727174f61327a7a687a0af6cdc99a27d6f3c796f29358873e2fdadc2384341bf4ebe57078ada9ba2e9633c64699a280c1dd148bff273f29 SHA512 19e836eda1e1f7d9dc278a2195309665a0962ba4ba339511a2060217751de5288e137139833dc6e5825a7a5914ec66f234ceb58497058ae183f57b663b7b9cd3 @@ -85,6 +86,7 @@ DIST 5.15.0-0-202005140838qtquickcontrols-documentation.7z 9346972 BLAKE2B d0085 DIST 5.15.0-0-202005140838qtquickcontrols1-documentation.7z 1956754 BLAKE2B 397c522177dd6f0617001ac19b4186063b6769e5f43f79d3e0106dc56b72081c2b7ce5ea8cb321cc21b56d1c1137da7c4616bb5fe670d0e2ee5d48633c58cd74 SHA512 18ae89bf4f06cd82ab1b2035cffa6836c2f44d5c279c24020e4120e6e61be468a1880d702adbcabcda42c944e0cba0206e87b927fdc3ddcfb271b86ef4adc924 DIST 5.15.0-0-202005140838qtquickdialogs-documentation.7z 182847 BLAKE2B d4f21132d5cf64495fcff0ef67b4d013cf2232c5e9def804e451fb23cf7637c79dcf4449fbf17ab29c424381b551c24878f0831f12222a31b8e5fb6aed03f0be SHA512 99238206e08daf62ce87361a8c80cdbabf0e08e84c7b517a8cabbdc569075f619e53e4fbdf57e02473ce69aa0aa30708fcfc354702153cb765c9c1b338d37710 DIST 5.15.0-0-202005140838qtquickextras-documentation.7z 672364 BLAKE2B 7ceda31a991583da626a37b99153c3fa96011d9c6cbedb7a5215ed630c35a981b05eea83b144c805bf8ce23205e24c9c283dd4e174942e1e238c7654dc17c2f0 SHA512 80cf53613b769baca47ef4dff59d02484da1299844473418909bc9050baac49ad502ee11071977defea636da4a550c9023484317c8f1f9ab4c309a986a49e57c +DIST 5.15.0-0-202005140838qtquicktimeline-documentation.7z 149475 BLAKE2B 3bb26c0600d3ec05394a9a42a7f3c78b0f149158469a42a18010bc1e9d8025d335045360c5e14996b2ed5a56b3fdddb5fe3924fe8f7b6ee5f62f55a3df87674a SHA512 24de8a2535398796f39a11a5cbc8551920a9f7befc255f54de58ef5c54d5ebc7c5bde203e503ccc56ffa9a39021ab4fc4f8c927d6d812d9a592bdd2467e1b842 DIST 5.15.0-0-202005140838qtscript-documentation.7z 598991 BLAKE2B c0884b13cac91c18de7b281f8bc8885bec318669c4f2ab33ce6e11b77ebd8638b2d93a62d816051a449b84491fea0097eeb6e0b704aeb949e4301e4cc1825205 SHA512 5dd47de26a0f6b865482a01c5a498611f8daecc727b1183b5370345c0cdc60c8858a3662ffa558c824dea42a2978ae56ac05357306ff1d65ab106c69bb16b943 DIST 5.15.0-0-202005140838qtscripttools-documentation.7z 85666 BLAKE2B 811ebe15745781c62bfecac034dba7abbdcb5156c1bc9e214810b65fd7df1cebb53b17b31277f65134664becbf218aee2eff3b4a04937bc60c50bcff7381ba6e SHA512 9bb9f3fe7d19ea9eaafe94ed13446fc55310f209aaa69cf56bd44f8cc77fa81277836bf32ad0d23311c2e4431773d6361ff0d19fdee4ba4fcfc6b306501a7a0c DIST 5.15.0-0-202005140838qtscxml-documentation.7z 618965 BLAKE2B 189b2986fe8264fe7c3b72519540fbdc4ff019e93a374aa623f4175bf6aeb7019ff783b22f0f675af076c6d81facd35530a6a119e0880d66c64bcdbd983ad5e9 SHA512 14de1ef2607a8d93fc8ed1a0392911113373ed1aa5bc2fdbc06312a74c46effe7c0f18d028f02a0e557dfe5be95fd8791302676be13bcc5a5c1cfeb8d9d47ad1 @@ -106,6 +108,7 @@ DIST 5.15.0-0-202005140838qtwidgets-documentation.7z 26787886 BLAKE2B 93cb5ff151 DIST 5.15.0-0-202005140838qtx11extras-documentation.7z 36651 BLAKE2B 1e07affdcdfe26a83f76ef63cb82a840ed3d782bd028ac0f0f54ce3a64512923e69e570864b3ace689f41f698eb238ac77453dabf86f787088c1d951a26a478b SHA512 916fb288457047ffc6f61f8271b1c5fda9b0c94e37279a6e4c08d13697fbbcdaf020a07e6b846e561792eb46c9c663d3c486daa10cc15be85495a719206a60e9 DIST 5.15.0-0-202005140838qtxml-documentation.7z 456330 BLAKE2B 362d5c395289d3fb250992bb7904f58270abe5ddcbdf47b2558e4078fb9060d6aafcfe14a3cb80dd90f36e68dce9e15f523afced066eae32b55c380661589e3c SHA512 790dc3b472a0a9c0acb9c20d12f645278bb6e70de9767f2aed59dc7079b853b0f4fb6466ff9bb62c507f4a0064c10e469401ddcd2057c9c23d2372b441cf3566 DIST 5.15.0-0-202005140838qtxmlpatterns-documentation.7z 1191223 BLAKE2B 8113e532de5d1cfe11a3f4765da685ef0ec6172584189f005d37eda5aae42d784143a4abc810d4e49ef097657af03afb20385d1921f1dd0e7e030caae142c1aa SHA512 b534fe6d81acaa60ae1c243e41d173b0d84c4ed01fc4b0e55d50ffbc6c10530064d779b9f67a6e357c9ab94e77e01f7565d60bc7884d2dd44e8aa569489070e9 +EBUILD qt-docs-5.14.2_p202003291239-r1.ebuild 3066 BLAKE2B eb79fd4283c765a71f5fd60c475bc0d9ce807a95ead1719ceaf2b37ed11e6e2bdcd2ff2db8e7960040ff9ae67e809319d26c132a1a2a7b06cc31a90f616bc1ab SHA512 664feddd58aa974de01a00b8153390b41ab5377cfc61599a45d227f73c6ed2d8ff2fd1d615e9d07ef05fcd69a1c55ed272f0c36ddd22d9fbf7c3d2ba22dce602 EBUILD qt-docs-5.14.2_p202003291239.ebuild 2968 BLAKE2B 05273c473995b9c11c5070c6dc38fef31a5b742a71151a77b7b68148704342a8c0ad8c52ff74c9d270300761272f1195a69a2a7c37106fdb0404fad7b797df67 SHA512 0195382e1ccf86f7fd4567922077c636fd7dcff58219302b550037508232dd7ec7e7e036ef2a69525c1d35c4b64581e6f3c2d52c44b774f59fc6c9f85b30e939 -EBUILD qt-docs-5.15.0_p202005140838.ebuild 2971 BLAKE2B 662b11ab88d36ed1335eb1320dacdd0242db8d3a028fd06eb18a339fc3af9ca873eb896b0b9a7aef82071d54929b1aa522d3b45c4e7af9411f19b39ba26a3e69 SHA512 6a868d567e6f140d95200b37510f442cf35c319100d9365ea9cc9a0db2927a8fda3880486d1a87951c16543ded3c8b715cef94318cfe60aa9d3a01dd66a48953 -MISC metadata.xml 3896 BLAKE2B 9ddb79d566a10dffbccfc8fca4f970c1a49b1d2c3f6885474d1919e1647a403877c565b186da92a5823ec49c0e4af92a4478643c608574f2e3b5675334bef2aa SHA512 6418b810cf78d5acee499340352b30589d483c8be74a9412cf9c7a43534b7c5d37fa9e2d5a49e2be079d40e0120e738fac21132ccc04f64aca12895bc3865c80 +EBUILD qt-docs-5.15.0_p202005140838.ebuild 3066 BLAKE2B eb79fd4283c765a71f5fd60c475bc0d9ce807a95ead1719ceaf2b37ed11e6e2bdcd2ff2db8e7960040ff9ae67e809319d26c132a1a2a7b06cc31a90f616bc1ab SHA512 664feddd58aa974de01a00b8153390b41ab5377cfc61599a45d227f73c6ed2d8ff2fd1d615e9d07ef05fcd69a1c55ed272f0c36ddd22d9fbf7c3d2ba22dce602 +MISC metadata.xml 3987 BLAKE2B 88a562c2f30685b8f20c14398020923ad320cfe14eedc8ca8bacb1ebce44857cc7795618376c4a66625ca30b50dfc0b348acfad8c323c83d10630af37d3e6b19 SHA512 0ef66e7526514436fcdece85ff01b17f6aff031a50ad2d7a1e86b04140d25de56645cc634290c41a1ae0dd077963afd7799341597158bf6d6d0b7a79c3884342 diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml index 37201cd0276d..af49c1ea8e0e 100644 --- a/dev-qt/qt-docs/metadata.xml +++ b/dev-qt/qt-docs/metadata.xml @@ -39,6 +39,7 @@ <flag name="serialport">Install documentation for <pkg>dev-qt/qtserialport</pkg></flag> <flag name="speech">Install documentation for <pkg>dev-qt/qtspeech</pkg></flag> <flag name="sql">Install documentation for <pkg>dev-qt/qtsql</pkg></flag> + <flag name="timeline">Install documentation for <pkg>dev-qt/qtquicktimeline</pkg></flag> <flag name="virtualkeyboard">Install documentation for <pkg>dev-qt/qtvirtualkeyboard</pkg></flag> <flag name="webchannel">Install documentation for <pkg>dev-qt/qtwebchannel</pkg></flag> <flag name="webengine">Install documentation for <pkg>dev-qt/qtwebengine</pkg></flag> diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild new file mode 100644 index 000000000000..9014281d55fc --- /dev/null +++ b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PV_FULL=${PV/_p/-0-} +PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*}) +BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc" + +declare -A QT5_DOCS=( + [3d]="qt3d" + [assistant]="qtassistant" + [bluetooth]="qtbluetooth" + [concurrent]="qtconcurrent" + [core]="qtcore qmake qtdoc" + [dbus]="qtdbus" + [declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras" + [designer]="qtdesigner qtuitools" + [gamepad]="qtgamepad" + [graphicaleffects]="qtgraphicaleffects" + [gui]="qtgui qtplatformheaders" + [help]="qthelp" + [imageformats]="qtimageformats" + [linguist]="qtlinguist" + [location]="qtlocation" + [multimedia]="qtmultimedia" + [network]="qtnetwork" + [opengl]="qtopengl" + [positioning]="qtpositioning" + [printsupport]="qtprintsupport" + [qdoc]="qdoc" + [quickcontrols2]="qtquickcontrols" + [quickcontrols]="qtquickcontrols1" + [scxml]="qtscxml" + [sensors]="qtsensors" + [serialbus]="qtserialbus" + [serialport]="qtserialport" + [speech]="qtspeech" + [sql]="qtsql" + [svg]="qtsvg" + [test]="qttestlib" + [wayland]="qtwaylandcompositor" + [webchannel]="qtwebchannel" + [websockets]="qtwebsockets" + [webview]="qtwebview" + [widgets]="qtwidgets" + [x11extras]="qtx11extras" + [xml]="qtxml" + [xmlpatterns]="qtxmlpatterns" +) + +DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools" +HOMEPAGE="https://doc.qt.io/" + +LICENSE="FDL-1.3" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine" +REQUIRED_USE="|| ( html qch )" + +SRC_URI=" + charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z ) + datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z ) + networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z ) + script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z + ${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z ) + timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z ) + virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z ) + webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z ) +" + +for DOCUSE in ${!QT5_DOCS[@]}; do + IUSE+=" +${DOCUSE}" + for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do + SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )" + done +done +unset DOCTAR DOCUSE + +BDEPEND=" + app-arch/p7zip + media-libs/libpng:0 +" + +S=${WORKDIR}/Docs/Qt-${PV%_p*} + +src_prepare() { + default + + # Fix broken png file, bug 679146 + local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png + pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes + [[ $? -gt 15 ]] && die "Failed to fix ${png}" + mv -f ${png/.png/fixed.png} ${png} || die +} + +src_install() { + # must be the same as QT5_DOCDIR + insinto /usr/share/qt5-doc + use html && doins -r */ + use qch && doins *.qch +} diff --git a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild b/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild index 466a8de3c9dc..9014281d55fc 100644 --- a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild +++ b/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild @@ -56,7 +56,7 @@ LICENSE="FDL-1.3" SLOT="5" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine" +IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine" REQUIRED_USE="|| ( html qch )" SRC_URI=" @@ -65,6 +65,7 @@ SRC_URI=" networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z ) script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z ${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z ) + timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z ) virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z ) webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z ) " diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 96664cc4a9f7..fe84bc10d748 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -4,7 +4,6 @@ AUX qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch 3141 BLAKE2B 98aa282 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004 DIST qtdeclarative-everywhere-src-5.15.0.tar.xz 21493268 BLAKE2B c6b8365caa3e0eef3023d727adf086c16bafc171bcfa839a4dc83132b5c9a76c9a849b387f3815c1a9b12db5824ccc628cad22efd0ce0cb70059971cadfbb00b SHA512 0ec3403286efea6d6ac975ea6bd4464ea656c031f5f27b852235fd69d316a627ac3ff2ea2c3cca0a5375ca278f592df3ecade4e98aa15ec92816a16927f56e5e -EBUILD qtdeclarative-5.14.2-r2.ebuild 1338 BLAKE2B 1cfe2dc4bb2dc7c9466c0cc2c69d272b3d4fd30be3035ab2999b9fd65f9453d855bab3a3bc79edb3d99038f30c380b1b26dbc7c8232c3f85f8c9142e73bee960 SHA512 f46b45e34b7ab08daa2466b6f5699055539a7901901082afb20d539fe8dedecc8978178f878f0e958612f27da759e448345ceb9e6174b71b6b23f437e6b103da -EBUILD qtdeclarative-5.14.2-r3.ebuild 1421 BLAKE2B 759cf174be108b8d039158bfb67a82380e18bb6803bdfeac106249c1b80e126e23e2d141b36bd1a2ed74825ba3ceee6a9baa63f370fb4b00f9398698fec85e0c SHA512 9fc7eba36fa39f1cbc799a43aca9f704ea74b27397c950e180e73d87cad81f7280c42e7e7bef5bcefb002d56a3ca4c04755560402369304c80f12f19bbad9400 +EBUILD qtdeclarative-5.14.2-r3.ebuild 1417 BLAKE2B a7f6734e157acb79488a3e3cf283ccd909de12c1ffafdbc293c78179f5c37ac4a605e8916f1e047f7d4847e0391e38639b713904fccf31f8f0de466cad2d7351 SHA512 2a191231c2d9af1cd75adb94e9c1bee95894e75844234308b5169ad8eb4079c395156110a135b84ffb562bf22d7529a9a103adcf3e8832c474945b7770c34dfe EBUILD qtdeclarative-5.15.0.ebuild 1360 BLAKE2B 5d66999c92120e357aed3ac2828c8163fbe2f854be4794a4cf793417014a60a16adc794fa9cea50340c8df185c94a7aea5f1b6efd46aa0890765a9684118a816 SHA512 ae0b1468d90fef120f0e22cbe09bc2d33838d30f188167d54addb32f4f286377145b447f6dd4d0e4e914f528182e2b648079c8649ec5f2e0491544e077354fdf MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild deleted file mode 100644 index 24d7551a2fd7..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2009-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="gles2-only +jit localstorage vulkan +widgets" - -BDEPEND="${PYTHON_DEPS}" -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2-only=,vulkan=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] ) -" -RDEPEND="${DEPEND} - !<dev-qt/qtquickcontrols-5.7:5 -" - -PATCHES=( - "${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 - "${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646 -) - -src_prepare() { - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/qmltest/qmltest.pro \ - tests/auto/auto.pro \ - tools/tools.pro \ - tools/qmlscene/qmlscene.pro \ - tools/qml/qml.pro - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - -- - -qml-debug - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild index e75b8c2887e3..e306c7574439 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild @@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets" diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index ba9f95a94ed1..0ccee4756946 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,7 +1,6 @@ AUX qtmultimedia-5.14.2-gstreamer-buffering.patch 1516 BLAKE2B 8e80c834a0bb5cc4bcd7b0995a62c7d23777ac4ff5ebe22dad4eb09c0428253b3a4ba28fc6440f5461bb5e1be1c32a3f7f63e63a20a19a6ab750884e26f8f643 SHA512 2ba151ea48aa5dee3e670cfe9b03adfe1ceef23e15d79fdbe2eedf7bb42bf406b8753d2a00fdf14953b6730503bd98687e760cec36b77aface52dc88a06810e0 DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559 DIST qtmultimedia-everywhere-src-5.15.0.tar.xz 3796364 BLAKE2B 3ab2137f811910c25c86aee10ee8266729ba186412bb0d61c02c655573cff66c2725f30c3d8782473820a1b9e0388d9fdb24c218c09afdcde26d899039bd7bb6 SHA512 120ff3be99c685fb5944da657d571d83c985e139a34b23f7527daf2a0fdde949a452d4c3691b41a86ed3f141decf1833f496b3b61fd87bc602b8164563cb79d6 -EBUILD qtmultimedia-5.14.2-r1.ebuild 1539 BLAKE2B d04ab86cfae242d4c54fa07a2964f0e1e2bf0d4c7a786f1af16bab48cbe41450a70ab9ffc57293ffa307a79019602e91e9b4998fe31ec167bc9cff176207fabe SHA512 660b1673b738f663e7a83a91420e0458d0582ca590fa6f9efb21d926afeca8d73a0ab1c29c097df68f74990699972b87bd3617490d53a42fa5146137a46aeeb7 -EBUILD qtmultimedia-5.14.2.ebuild 1462 BLAKE2B 9036ccdd8a1690afdf2a8fb07a38aed37365cc7a9059a192120c8a2136caff7ab592f9eb76308a85f285a50af4f074a4785c4340403bde2da72d49855a99982e SHA512 b4a2434eb36eddb127ee7f0d73c3af7c0c55950fe350dea2bdf7544bd9c91a3c30edb0ddb7548fc866f70c0068a60838aea8f5349fee7be8749ff14a35f4d00d +EBUILD qtmultimedia-5.14.2-r1.ebuild 1535 BLAKE2B 94348292c210c42a846f888384cee6d863cc0c0d6dc27f2c63cfbdb7119f4460b648f7b9ae92e9437f526d4c9d5fd1968369521b019c58ee0da166109d26ba92 SHA512 a46fb3b2e26d3dbd6235236899632b29d0226b4734a93b94c163436e86f3866b1279f6d7ba9ff9b4cd2d729bb3e17bf958d1391cb85e5eca52d52a355ad656bc EBUILD qtmultimedia-5.15.0.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a MISC metadata.xml 732 BLAKE2B f07c73041fca311cdae68d67a638926bcc124a879cb39d92a431c42c2eb5fdec65a483a24d4931534ecd0299a655c584fccd5d42d8694902a64e0da6d64c627e SHA512 bf4f77d5e918dccac25a31bba310f8a508efa0f0ccbe5c142b48443205f44e50477a46d7c363ba9313c623ff68d5a9bdf1dc699aa6ec3fbb3ab6b14afd1eff55 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild index 0382c0343d65..fdcd87079b9e 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild @@ -7,7 +7,7 @@ inherit qt5-build DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" fi IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets" diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild deleted file mode 100644 index 33eb59e9fbe4..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets" - -RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtnetwork-${PV} - alsa? ( media-libs/alsa-lib ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - ) - pulseaudio? ( media-sound/pulseaudio[glib] ) - qml? ( - ~dev-qt/qtdeclarative-${PV} - gles2-only? ( ~dev-qt/qtgui-${PV}[egl] ) - openal? ( media-libs/openal ) - ) - widgets? ( - ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV}[gles2-only=] - ) -" -DEPEND="${RDEPEND} - gstreamer? ( x11-base/xorg-proto ) -" - -src_prepare() { - sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ - src/multimedia/multimedia.pro || die - - qt_use_disable_config openal openal \ - src/imports/imports.pro - - qt_use_disable_mod qml quick \ - src/src.pro \ - src/plugins/plugins.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/gsttools/gsttools.pro \ - src/plugins/gstreamer/common.pri - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - -- - $(qt_use alsa) - $(qt_use gstreamer) - $(qt_use pulseaudio) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index e97109fcc853..1893b8e9ab59 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -2,7 +2,6 @@ AUX qtnetwork-5.14.2-CVE-2020-13962.patch 7797 BLAKE2B ad7f5fbbbafe784c7f88877f8 AUX qtnetwork-5.15.0-libressl.patch 15934 BLAKE2B c4e3a48a345245150994f4edbac1b5289373518245eebbda34767d54a22d07890e0e44338647b42cb240ea42901226b5077170cdd84243ad1a8bcb34e492424c SHA512 e4c7dffb665ee1b0a64631a64abf5aa06d188983e30102e8ebaafdfb66db77f4dd116ee62665fee588dbf0c6ae33abe7a940bab3cbcb6f14c5bc9c0decd3076f DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a -EBUILD qtnetwork-5.14.2-r1.ebuild 1477 BLAKE2B 7184815bce2ff20e95adf7d5ec2a1647e24c12296978b6f23072307512e361fa17fd53306a56473a6cfbf0d01ddb1fae0f62de555e6e07c2e6ee6573a824c069 SHA512 00716703455019ab67331b32468d71fe6114cf8f5770666af32dfcac28ce41ad4f123fcdcaeba2d9ca49a382428381ea840e7187ca23a909f5c20b27746dced9 -EBUILD qtnetwork-5.14.2.ebuild 1393 BLAKE2B aa17c38a93c91e1d11be0c6f5731a010a4984d1b01c2e33ba9cc670db0b57cb0286fa594801182f8febd52e653b6dc8b5848e94ed18446d9c9451faa6bf9dab9 SHA512 408505f59f2c0d49780f832eeb1c1264e70ebdc3ae84e0c9a3c7e730dfdd1235e5cf545133f2e376e3c8ea4add9d2601388a492ad658b1b1856900acbe787386 +EBUILD qtnetwork-5.14.2-r1.ebuild 1473 BLAKE2B 4d867f30a6e11d2ae59c2d85b470aae5e5f697c31f9fe046dacd1c5389e1ae931042accabcffa41db58227b2ad4c8550f6741e6262aaddb6a79b5a77be73fb45 SHA512 6e3bec5875b1ba8919cf1aa46e678a51294f58f8af26211ae3d531023cc0fc70b285e7bc8b19abf9712c97124c498b41850550e047915de00868d2ff41cf0062 EBUILD qtnetwork-5.15.0.ebuild 1549 BLAKE2B 7e3344b37988416d12b6cca4fac784589ae65adbc64165fd96d7e8c9d166b10acd2a5f95f59ed4bd877a9245b6ed5ff438aa6e648634b358ae043d668e352bb4 SHA512 e227aa30bbe97b8b303c858b42e83890cd0731faf9c518971d27687ae71246ac53035b3371d3ff9d4e6cff9496cdc5b6d33bfd98edac830f5b0096bfb4e2c705 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild index b627687281a2..e26d2f3855c0 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Network abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" fi IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl" diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild deleted file mode 100644 index 88dfeb7a1579..000000000000 --- a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-libs/zlib:= - connman? ( ~dev-qt/qtdbus-${PV} ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( ~dev-qt/qtdbus-${PV} ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( dev-libs/openssl:0=[bindist=] ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -QT5_TARGET_SUBDIRS=( - src/network - src/plugins/bearer/generic -) - -QT5_GENTOO_CONFIG=( - libproxy:libproxy: - ssl::SSL - ssl::OPENSSL - ssl:openssl-linked:LINKED_OPENSSL -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :network -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_configure() { - local myconf=( - $(usex connman -dbus-linked '') - $(usex gssapi -feature-gssapi -no-feature-gssapi) - $(qt_use libproxy) - $(usex networkmanager -dbus-linked '') - $(qt_use sctp) - $(usex ssl -openssl-linked '') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest index 4a7727b71345..e934de3908cf 100644 --- a/dev-qt/qtquickcontrols2/Manifest +++ b/dev-qt/qtquickcontrols2/Manifest @@ -1,7 +1,6 @@ AUX qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch 2268 BLAKE2B e321a635cc94d92245291539d862aa1cfc63bc6a558d6ddc792800be409dff11b1777349aed394d0e9df5dbfae29cd71681271eda1c68745af3ec1e1e76eabed SHA512 6d559d5c128e0046319fb8d6bdd3914a30eae41315efd267e6271c3f69759024abb79c7cb3a604c8bb58936a2daf25fd1217ee877516b65b8d5262fd76dac39f DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722 DIST qtquickcontrols2-everywhere-src-5.15.0.tar.xz 8164236 BLAKE2B 7e5e2b2640d6eda1864d04a397f91e69a79b5b0590097f2c8a9a06e26ec8f9a0c09028f2fec87acba91d0df568d6085eae50ccb7962c50be6a3de64088f122b6 SHA512 560014b882ef9d274cb1532025cae79987eec3569541e111e91f047261fcd7f26fcb40689d8dd6921ae26fbf9cdee60a87d3a1c7212e547529ff4adf9c5cf136 -EBUILD qtquickcontrols2-5.14.2-r1.ebuild 697 BLAKE2B 4b940ac4ef6991a3cea58e3563240ce0d3ae9ba4f070c86cf2de7a98325087e405934427fca5e4e0198928935a446f55ffbb9433c17c38796a0278092634d486 SHA512 fb36c3016333e77ed78de7286d7467dd832aebc500f1b367c91ae7cacfb4800b7907f8d78da0f01786bda3885bb2371ba9a1d58431f5dccb190d7f85b05fdb25 -EBUILD qtquickcontrols2-5.14.2.ebuild 606 BLAKE2B 0d3d0105694c0a2be2ea02a6a4605dc3174de9535b4997f35a7dce5bb73ec782767e871e95ab1ff16103bc214eb9753b01085d1919827ad64d31b8cb6381f8bc SHA512 37a4182eb357133277b9e40af464ddf2d8cb0fd2a4990de23e986f5e764249e61a09674493042b13da62be44097fb3d717495161d771a99500241cd1db00fe0e +EBUILD qtquickcontrols2-5.14.2-r1.ebuild 696 BLAKE2B eb186869701f065ef1b1f8bd3e51055bf796c388dd9f4511fbb5471911e193a0a9d451fcf3a1c1bde2699123420345c08c20ca6df221ea33cabc78b376fafada SHA512 c6103cf3fdabf9b9c105426032b0c41ee3397aa94363d098cc06e1abde3d1cd46591022c9d845b4c8a41eea3605eca126715b3e471c8623f55d2d4098c4932b4 EBUILD qtquickcontrols2-5.15.0.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild index 58fe1ee53d9d..05d48cade927 100644 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild +++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild @@ -7,7 +7,7 @@ inherit qt5-build DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" fi IUSE="widgets" diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2.ebuild deleted file mode 100644 index d9241d146306..000000000000 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -fi - -IUSE="widgets" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - widgets? ( ~dev-qt/qtwidgets-${PV} ) -" -RDEPEND="${DEPEND} - ~dev-qt/qtgraphicaleffects-${PV} -" - -src_prepare() { - qt_use_disable_mod widgets widgets \ - src/imports/platform/platform.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest new file mode 100644 index 000000000000..2245c0d3bd2d --- /dev/null +++ b/dev-qt/qtquicktimeline/Manifest @@ -0,0 +1,3 @@ +DIST qtquicktimeline-everywhere-src-5.15.0.tar.xz 102460 BLAKE2B f563ba5ab8ec1171e32a85422529a9e4e14833377091f3bd66d3f72b14671acc74db9dd11f3d56719921bb516ead885ce6cf994f8b00ea6a734a0f7b9371c451 SHA512 14e0f52800bf7b347f03264f306f2c13f4c0bf590c8881135b3bfeb1a08cd07248345de7ab7d3ae9af39f75a5247c0c9f98dde33466481995e45a93717a937b0 +EBUILD qtquicktimeline-5.15.0.ebuild 373 BLAKE2B e4a74904400302a2ea41bbe2e7c1bfdb3328680237bffc51ce7baf646466622db9d79ec63074cf8d5346a2d2ac40809fe38065cc4dda22b1581437acd4bb8640 SHA512 aa4cfecbe7c393c19018f224954bd0161de3977fe1b64f99a68c0a935dbf8a99383fc4817ea3e8cb7339b1da96ad643fa4fc30dd778c440508b351f1c2bbd675 +MISC metadata.xml 382 BLAKE2B 3b12c68b32cd705b033f8750db3115587b76d52369a33481330d100e3bbd22dbfbcc0ea065f7659e6771af923477f2fbd1d4fc86743d13fc64f194e7b014567b SHA512 4825235a64c6320484a0bfd188dc1f4a0686f6222ee4abd29d6904899eed14f6471358562e8f08cd9b90743a718383e980925a432917dbbe3abba1872c631951 diff --git a/dev-qt/qtquicktimeline/metadata.xml b/dev-qt/qtquicktimeline/metadata.xml new file mode 100644 index 000000000000..c3b4f7735310 --- /dev/null +++ b/dev-qt/qtquicktimeline/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/qt-5/qtquicktimeline-index.html</doc> + </upstream> +</pkgmetadata> diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild new file mode 100644 index 000000000000..109d4654f8ba --- /dev/null +++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit qt5-build + +DESCRIPTION="Qt module for keyframe-based timeline construction" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~x86" +fi + +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV} +" + +RDEPEND="${DEPEND}" |