Adding metadata

6 files changed, 53 insertions, 4 deletions

diff --git a/dev-qt/qt3d/qt3d-5.15.3.ebuild b/dev-qt/qt3d/qt3d-5.15.3.ebuild
index 1637b7777d62..f52e61e191a6 100644
--- a/dev-qt/qt3d/qt3d-5.15.3.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 # TODO: tools
diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
new file mode 100644
index 000000000000..c83c59ac3113
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
@@ -0,0 +1,41 @@
+# Use link option -pthread instead of -lpthread
+
+# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4
+# https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling
+# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed -latomic --pop-state"
+
+diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+index 544cc227..add969be 100644
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
+@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL          = -lEGL
+ QMAKE_LIBS_OPENGL       = -lGL
+ QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
+ QMAKE_LIBS_OPENVG       = -lOpenVG
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ QMAKE_LIBS_VULKAN       =
+ 
+ QMAKE_INCDIR_WAYLAND    =
+diff --git a/src/corelib/configure.json b/src/corelib/configure.json
+index 9b5d19d4..da028fb2 100644
+--- a/src/corelib/configure.json
++++ b/src/corelib/configure.json
+@@ -355,7 +355,7 @@
+                     "std::future<int> f = std::async([]() { return 42; });",
+                     "(void)f.get();"
+                 ],
+-                "qmake": "unix:LIBS += -lpthread"
++                "qmake": "unix:LIBS += -pthread"
+             }
+         },
+         "cxx11_random": {
+@@ -466,7 +466,7 @@
+                     "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);",
+                     "shm_unlink(\"test\");"
+                 ],
+-                "qmake": "linux: LIBS += -lpthread -lrt"
++                "qmake": "linux: LIBS += -pthread -lrt"
+             }
+         },
+         "linkat": {
diff --git a/dev-qt/qtcore/qtcore-5.15.3.ebuild b/dev-qt/qtcore/qtcore-5.15.3.ebuild
index 156e4f73b725..8e924cdfabd0 100644
--- a/dev-qt/qtcore/qtcore-5.15.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3.ebuild
@@ -43,6 +43,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	!:xml
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
+)
+
 pkg_pretend() {
 	use kernel_linux || return
 	get_running_version
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 756b849a281e..44dcd675336b 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,3 +1,3 @@
 DIST qtdeclarative-5.15.2-29ee9a0e.tar.gz 24346706 BLAKE2B 5bd518a61aaa24672164fad41599ca6cc4ed7e8ab3eac56d8a38d9b0d892f92ddc3e4f7a6a66c16043d1eb29578602a91824413283fdcf971bbfaf95e0a59af0 SHA512 7964cf301f8cceb01cc4eaa7b3a5bc1e882633f61abcd250fee6dc27110baa4e32622d0b24e2cdc3874b0518c79f6f42fa1ac434535270af3b35081e663d8cd4
-DIST qtdeclarative-5.15.3-gentoo-kde-1.tar.xz 7612 BLAKE2B e4385c43a05a152e5d4071ee72142bec617b9707ffd4e60afd66b124bf0c272a236eaf9bb984e49769687ac680550c9aeb61a773a0b820fc00500f0faec85d09 SHA512 9e25e42c5616f4e3487f6c012e63c245e68a807407dd9c54d6b8d4efc23ba98a6f7fe67cf87017161676a0335cf4d12e494d1956dbf8efeedaa9504dff3ade4a
+DIST qtdeclarative-5.15.3-gentoo-kde-2.tar.xz 17340 BLAKE2B 5f5efae23cf6c1c3abf8d0d0594ac66ae3bf116e744626f7218d0a66e5f5598861a25e8b2d8aaec7c3dd444fa4e91de313b67b53ec624965f08472587fee460d SHA512 76d5bd8aa9f2b2e766ad4dd63a3c03b2e52da90b91cf11c777f3efd6fb3110100b358f05562639b60031bb49622fd1f4b135b6903a53493664bcbf1a0b6d69d7
 DIST qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz 21567896 BLAKE2B 897aa6959f34bc6e5a3be04d9f56d13315e6681daadb935f0e2422f551865c8c6d49b0c15c5358439155d3215c1c139fe60acf0b4a7e766e8e1ff4ce85a0449e SHA512 c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
index aedad7870c16..95c551bfbfdf 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-QT5_KDEPATCHSET_REV=1
+QT5_KDEPATCHSET_REV=2
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit python-any-r1 qt5-build
 
@@ -28,6 +28,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
+)
+
 src_prepare() {
 	qt_use_disable_mod localstorage sql \
 		src/imports/imports.pro
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
index 889dad2eec9c..23b8279f774e 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt module to support gamepad hardware"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 IUSE="evdev qml sdl"