* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2013-04-22 1:07 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2013-04-22 1:07 UTC (permalink / raw
To: gentoo-commits
commit: 4bb44fcbedd219dcec1994394b7b6050ce5b21f3
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 01:06:55 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 01:06:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4bb44fcb
[dev-qt/qtcore:5] Stop building qdoc.
It requires QtXml now, so we cannot build it in qtcore.
Package-Manager: portage-2.2.0_alpha173
---
dev-qt/qtcore/qtcore-5.1.9999.ebuild | 1 -
dev-qt/qtcore/qtcore-5.9999.ebuild | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.1.9999.ebuild b/dev-qt/qtcore/qtcore-5.1.9999.ebuild
index 12918b5..c6b55df 100644
--- a/dev-qt/qtcore/qtcore-5.1.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.1.9999.ebuild
@@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
src/tools/rcc
- src/tools/qdoc
src/corelib
)
QCONFIG_DEFINE="QT_ZLIB"
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 12918b5..c6b55df 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
src/tools/rcc
- src/tools/qdoc
src/corelib
)
QCONFIG_DEFINE="QT_ZLIB"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-05-23 18:18 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-05-23 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 242e23f1f5e8139c644fa60ef100f98a8d8f47d7
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 18:14:17 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 23 18:14:17 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=242e23f1
[dev-qt/qtcore:4] Use eclass's src_install rather than internal functions.
So that installation paths are respected.
Package-Manager: portage-2.2.10
---
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 36 ++++++++++++------------------------
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 4c4f5a3..85a3a37 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -105,29 +105,13 @@ src_configure() {
}
src_install() {
- dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs
+ emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
# install private headers
insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtCore/private
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins '{}' +
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" \
- "${S}"/bin/lrelease translations/*.ts \
- || die "generating translations failed"
- insinto "${QT4_TRANSLATIONDIR#${EPREFIX}}"
- doins translations/*.qm
-
- setqtenv
- fix_library_files
+ qt4-build-multilib_src_install
# List all the multilib libdirs
local libdirs=
@@ -157,13 +141,17 @@ src_install() {
|| die "sed for qconfig.h failed"
fi
- install_qconfigs
-
- # remove .la files
- prune_libtool_files
+ # use freshly built libraries
+ local DYLD_FPATH=
+ [[ -d "${S}"/lib/QtCore.framework ]] \
+ && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
+ DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${S}"/bin/lrelease translations/*.ts \
+ || die "generating translations failed"
- # framework magic
- fix_includes
+ insinto "${QT4_TRANSLATIONDIR#${EPREFIX}}"
+ doins translations/*.qm
keepdir "${QT4_SYSCONFDIR#${EPREFIX}}"
}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-05-27 10:48 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-05-27 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 52bcb4af3258474d1be5bd6c24c1126d2b915b86
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 26 18:16:17 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 26 18:16:17 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=52bcb4af
[dev-qt/qtcore:4] Remove redundant code.
We always run qmake with CONFIG+=nostrip, so these lines are unnecessary.
Package-Manager: portage-2.2.10
---
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 85a3a37..12b17dd 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -19,7 +19,7 @@ IUSE="+glib iconv icu qt3support ssl"
DEPEND="
sys-libs/zlib
glib? ( dev-libs/glib:2 )
- icu? ( >=dev-libs/icu-49:= )
+ icu? ( dev-libs/icu:= )
ssl? ( dev-libs/openssl:0 )
"
RDEPEND="${DEPEND}"
@@ -66,11 +66,6 @@ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
QCONFIG_DEFINE="QT_ZLIB"
src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
qt4-build-multilib_src_prepare
# bug 172219
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-06-01 2:41 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-06-01 2:41 UTC (permalink / raw
To: gentoo-commits
commit: f7f3815402c3114d0914f575b5b017ede5ece520
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 20:46:27 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 1 02:39:56 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f7f38154
[dev-qt/qtcore:4] Cleanups.
Package-Manager: portage-2.2.10
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 21 +++++++++++----------
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 21 +++++++++++----------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 577f23a..c40f089 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -38,8 +38,8 @@ QT4_TARGET_DIRECTORIES="
src/tools/rcc
src/tools/uic
src/corelib
- src/xml
src/network
+ src/xml
src/plugins/codecs
tools/linguist/lconvert
tools/linguist/lrelease
@@ -48,11 +48,11 @@ QT4_TARGET_DIRECTORIES="
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
include
src/3rdparty/des
+ src/3rdparty/easing
src/3rdparty/harfbuzz
src/3rdparty/md4
src/3rdparty/md5
src/3rdparty/sha1
- src/3rdparty/easing
src/3rdparty/zlib_dependency.pri
src/declarative
src/gui
@@ -68,14 +68,14 @@ src_prepare() {
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
+ qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
# bug 427782
- sed -i -e "/^CPPFLAGS/s/-g//" \
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix CPPFLAGS failed"
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
- "${S}"/configure || die "sed configure setBootstrapVariable failed"
+ sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+ qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
+ sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
+ -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
+ configure || die "sed configure setBootstrapVariable failed"
}
src_configure() {
@@ -119,8 +119,9 @@ src_install() {
# TODO: do this better
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+ || die "sed for qconfig.h failed"
+ dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
+ "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
"${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 577f23a..c40f089 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -38,8 +38,8 @@ QT4_TARGET_DIRECTORIES="
src/tools/rcc
src/tools/uic
src/corelib
- src/xml
src/network
+ src/xml
src/plugins/codecs
tools/linguist/lconvert
tools/linguist/lrelease
@@ -48,11 +48,11 @@ QT4_TARGET_DIRECTORIES="
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
include
src/3rdparty/des
+ src/3rdparty/easing
src/3rdparty/harfbuzz
src/3rdparty/md4
src/3rdparty/md5
src/3rdparty/sha1
- src/3rdparty/easing
src/3rdparty/zlib_dependency.pri
src/declarative
src/gui
@@ -68,14 +68,14 @@ src_prepare() {
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
+ qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
# bug 427782
- sed -i -e "/^CPPFLAGS/s/-g//" \
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix CPPFLAGS failed"
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
- "${S}"/configure || die "sed configure setBootstrapVariable failed"
+ sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+ qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
+ sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
+ -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
+ configure || die "sed configure setBootstrapVariable failed"
}
src_configure() {
@@ -119,8 +119,9 @@ src_install() {
# TODO: do this better
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+ || die "sed for qconfig.h failed"
+ dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
+ "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
"${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-06-01 2:41 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-06-01 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 21a8165cd4a195750ba0c85252ab5506cce5ed6a
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 22:30:22 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 1 02:39:56 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=21a8165c
[dev-qt/qtcore:4] Explicitly list all codecs in QT4_TARGET_DIRECTORIES.
As a side effect, qmake is run inside each of the codecs dirs,
fixing a "pre-stripped files" regression introduced in commit
52bcb4af3258474d1be5bd6c24c1126d2b915b86.
Package-Manager: portage-2.2.10
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 5 ++++-
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index c40f089..a1fb867 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -40,7 +40,10 @@ QT4_TARGET_DIRECTORIES="
src/corelib
src/network
src/xml
- src/plugins/codecs
+ src/plugins/codecs/cn
+ src/plugins/codecs/jp
+ src/plugins/codecs/kr
+ src/plugins/codecs/tw
tools/linguist/lconvert
tools/linguist/lrelease
tools/linguist/lupdate"
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index c40f089..a1fb867 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -40,7 +40,10 @@ QT4_TARGET_DIRECTORIES="
src/corelib
src/network
src/xml
- src/plugins/codecs
+ src/plugins/codecs/cn
+ src/plugins/codecs/jp
+ src/plugins/codecs/kr
+ src/plugins/codecs/tw
tools/linguist/lconvert
tools/linguist/lrelease
tools/linguist/lupdate"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-07-24 1:05 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-07-24 1:05 UTC (permalink / raw
To: gentoo-commits
commit: 6c66f6520c0c69d32f1e3fc833ac846f67b0d38c
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 22:59:29 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 22:59:29 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6c66f652
[dev-qt/qtcore:5] Convert to QT5_GENTOO_CONFIG.
And remove redundant -iconv, now specified by eclass.
Package-Manager: portage-2.2.10
---
dev-qt/qtcore/qtcore-5.3.1.ebuild | 13 +++--------
dev-qt/qtcore/qtcore-5.3.9999.ebuild | 13 +++--------
dev-qt/qtcore/qtcore-5.9999.ebuild | 44 +++---------------------------------
3 files changed, 9 insertions(+), 61 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.3.1.ebuild b/dev-qt/qtcore/qtcore-5.3.1.ebuild
index 8d12ffd..3ed8bb6 100644
--- a/dev-qt/qtcore/qtcore-5.3.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1.ebuild
@@ -33,21 +33,14 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
)
-QCONFIG_DEFINE=( QT_ZLIB )
-pkg_setup() {
- QCONFIG_REMOVE=(
- $(usev !glib)
- $(usev !icu)
- )
-
- qt5-build_pkg_setup
-}
+QT5_GENTOO_CONFIG=(
+ ::ZLIB
+)
src_configure() {
local myconf=(
$(qt_use glib)
- -iconv
$(qt_use icu)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.3.9999.ebuild b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
index 8d12ffd..3ed8bb6 100644
--- a/dev-qt/qtcore/qtcore-5.3.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
@@ -33,21 +33,14 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
)
-QCONFIG_DEFINE=( QT_ZLIB )
-pkg_setup() {
- QCONFIG_REMOVE=(
- $(usev !glib)
- $(usev !icu)
- )
-
- qt5-build_pkg_setup
-}
+QT5_GENTOO_CONFIG=(
+ ::ZLIB
+)
src_configure() {
local myconf=(
$(qt_use glib)
- -iconv
$(qt_use icu)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 0395893..3ed8bb6 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -33,53 +33,15 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
)
-QCONFIG_DEFINE=( QT_ZLIB )
-pkg_setup() {
- QCONFIG_REMOVE=(
- $(usev !glib)
- $(usev !icu)
- )
-
- qt5-build_pkg_setup
-}
+QT5_GENTOO_CONFIG=(
+ ::ZLIB
+)
src_configure() {
local myconf=(
$(qt_use glib)
- -iconv
$(qt_use icu)
)
qt5-build_src_configure
}
-
-# Test dependencies
-#
-# kernel/qobject/test/test.pro: network
-# kernel/qpointer/qpointer.pro: widgets (opt)
-# kernel/qmetaproperty/qmetaproperty.pro: gui
-# kernel/qeventloop/qeventloop.pro: network
-# kernel/qsocketnotifier/qsocketnotifier.pro: network
-# kernel/qsignalmapper/qsignalmapper.pro: gui?
-# kernel/qmetaobject/qmetaobject.pro: gui
-# kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro: gui
-# kernel/qmimedata/qmimedata.pro: gui?
-# codecs/qtextcodec/test/test.pro: gui?
-# xml/qxmlstream/qxmlstream.pro: xml network
-# itemmodels/qabstractitemmodel/qabstractitemmodel.pro: gui?
-# itemmodels/qitemselectionmodel/qitemselectionmodel.pro: widgets
-# itemmodels/qabstractproxymodel/qabstractproxymodel.pro: gui?
-# itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro: gui widgets
-# itemmodels/qidentityproxymodel/qidentityproxymodel.pro: gui?
-# itemmodels/qitemmodel/qitemmodel.pro: widgets sql
-# statemachine/qstatemachine/qstatemachine.pro: gui widgets (opt)
-# animation/qparallelanimationgroup/qparallelanimationgroup.pro: gui
-# animation/qpauseanimation/qpauseanimation.pro: gui
-# animation/qpropertyanimation/qpropertyanimation.pro: gui widgets
-# io/qiodevice/qiodevice.pro: network
-# io/qsettings/qsettings.pro: gui
-# io/qprocess/testGuiProcess/testGuiProcess.pro: widgets
-# io/qprocess/test/test.pro: network
-# io/qtextstream/test/test.pro: network
-# io/qdatastream/qdatastream.pro: gui?
-# io/qfile/test/test.pro: network
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-07-29 22:14 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-07-29 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 54ec3ccc928738d3545d0967606215dbd3c4b756
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 22:14:22 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 22:14:22 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=54ec3ccc
[dev-qt/qtcore:5] Don't define QT_ZLIB.
1) It's qtcore, so we can just use whatever the configure generates.
2) The actual macro for the feature is QT(_NO)_COMPRESS. I believe
QT_ZLIB is defined only when using the bundled zlib.
3) QT(_NO)_ZLIB isn't used anywhere anyway.
Package-Manager: portage-2.2.10
---
dev-qt/qtcore/qtcore-5.3.1.ebuild | 4 ----
dev-qt/qtcore/qtcore-5.3.9999.ebuild | 4 ----
dev-qt/qtcore/qtcore-5.9999.ebuild | 4 ----
3 files changed, 12 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.3.1.ebuild b/dev-qt/qtcore/qtcore-5.3.1.ebuild
index 3ed8bb6..f3675ba 100644
--- a/dev-qt/qtcore/qtcore-5.3.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1.ebuild
@@ -34,10 +34,6 @@ QT5_TARGET_SUBDIRS=(
src/corelib
)
-QT5_GENTOO_CONFIG=(
- ::ZLIB
-)
-
src_configure() {
local myconf=(
$(qt_use glib)
diff --git a/dev-qt/qtcore/qtcore-5.3.9999.ebuild b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
index 3ed8bb6..f3675ba 100644
--- a/dev-qt/qtcore/qtcore-5.3.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
@@ -34,10 +34,6 @@ QT5_TARGET_SUBDIRS=(
src/corelib
)
-QT5_GENTOO_CONFIG=(
- ::ZLIB
-)
-
src_configure() {
local myconf=(
$(qt_use glib)
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 3ed8bb6..f3675ba 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -34,10 +34,6 @@ QT5_TARGET_SUBDIRS=(
src/corelib
)
-QT5_GENTOO_CONFIG=(
- ::ZLIB
-)
-
src_configure() {
local myconf=(
$(qt_use glib)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-08-27 2:16 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-08-27 2:16 UTC (permalink / raw
To: gentoo-commits
commit: dfcc84015c0ef0eb4425d30adfe6323968ce622d
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 27 02:12:25 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Aug 27 02:12:25 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dfcc8401
[dev-qt/qtcore:5] Build qlalr.
Package-Manager: portage-2.2.12
---
dev-qt/qtcore/qtcore-5.3.1-r1.ebuild | 1 +
dev-qt/qtcore/qtcore-5.3.9999.ebuild | 1 +
dev-qt/qtcore/qtcore-5.4.9999.ebuild | 1 +
dev-qt/qtcore/qtcore-5.9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+ src/tools/qlalr
)
src_configure() {
diff --git a/dev-qt/qtcore/qtcore-5.3.9999.ebuild b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5.3.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+ src/tools/qlalr
)
src_configure() {
diff --git a/dev-qt/qtcore/qtcore-5.4.9999.ebuild b/dev-qt/qtcore/qtcore-5.4.9999.ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5.4.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.9999.ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+ src/tools/qlalr
)
src_configure() {
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+ src/tools/qlalr
)
src_configure() {
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-09-01 0:26 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-09-01 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 1688ef3d4d6e444948812a7877315f52c47b405d
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 1 00:26:15 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep 1 00:26:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1688ef3d
[dev-qt/qtcore:4] Raise minimum deps to ensure correct multilib USE deps.
Package-Manager: portage-2.2.12-r1
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 4 ++--
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 4ceb304..24a95a6 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -17,10 +17,10 @@ fi
IUSE="+glib iconv icu qt3support ssl"
DEPEND="
- sys-libs/zlib[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
- ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
PDEPEND="
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 4ceb304..24a95a6 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -17,10 +17,10 @@ fi
IUSE="+glib iconv icu qt3support ssl"
DEPEND="
- sys-libs/zlib[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
- ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
PDEPEND="
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-10-13 19:35 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-10-13 19:35 UTC (permalink / raw
To: gentoo-commits
commit: e6a119eb59b3b67e2587a285a57db4037f4ab907
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 14:41:38 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 14:41:38 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e6a119eb
[dev-qt/qtcore] Enable multilib header wrapping
Package-Manager: portage-2.2.14_rc1
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 5 +++++
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 24a95a6..7089648 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -28,6 +28,11 @@ PDEPEND="
qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
"
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/qt4/Qt/qconfig.h
+ /usr/include/qt4/QtCore/qconfig.h
+)
+
PATCHES=(
"${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 24a95a6..7089648 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -28,6 +28,11 @@ PDEPEND="
qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
"
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/qt4/Qt/qconfig.h
+ /usr/include/qt4/QtCore/qconfig.h
+)
+
PATCHES=(
"${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-10-27 0:53 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-10-27 0:53 UTC (permalink / raw
To: gentoo-commits
commit: f1c2941f8b40e41e3413f4465c2edec1bb1a78a8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 27 00:53:22 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct 27 00:53:22 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f1c2941f
[dev-qt/qtcore:4] Adjust sed expression to work with multilib-wrapped headers.
Package-Manager: portage-2.2.14
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 11 +++++------
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 7089648..841e740 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -107,18 +107,17 @@ multilib_src_install_all() {
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
- # Framework hacking
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+ # Framework hacking
# TODO: do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
+ sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed for qconfig.h failed"
dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
- "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \
+ sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
|| die "sed for qconfig.h failed"
fi
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 7089648..841e740 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -107,18 +107,17 @@ multilib_src_install_all() {
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
- # Framework hacking
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+ # Framework hacking
# TODO: do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
+ sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed for qconfig.h failed"
dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
- "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \
+ sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
|| die "sed for qconfig.h failed"
fi
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-11-10 3:02 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-11-10 3:02 UTC (permalink / raw
To: gentoo-commits
commit: a3f2285b56e55a011290b47af1d016b1a7574195
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 03:01:47 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 03:01:47 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a3f2285b
[dev-qt/qtcore:4] Drop keepdir.
Package-Manager: portage-2.2.14
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 2 --
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 2 --
2 files changed, 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index a3a0370..af8ef25 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -106,6 +106,4 @@ multilib_src_install_all() {
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-
- keepdir "${QT4_SYSCONFDIR#${EPREFIX}}"
}
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index a3a0370..af8ef25 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -106,6 +106,4 @@ multilib_src_install_all() {
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-
- keepdir "${QT4_SYSCONFDIR#${EPREFIX}}"
}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2014-12-09 3:22 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2014-12-09 3:22 UTC (permalink / raw
To: gentoo-commits
commit: f1596fa4dea35a5e05d6400b5163006608ff51a9
Author: Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Tue Nov 4 16:27:29 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 8 21:59:11 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f1596fa4
[dev-qt/qtcore] Add journald logging support (qtbase f81de394)
Package-Manager: portage-2.2.14
---
dev-qt/qtcore/metadata.xml | 1 +
dev-qt/qtcore/qtcore-5.4.0_rc.ebuild | 4 +++-
dev-qt/qtcore/qtcore-5.4.9999.ebuild | 4 +++-
dev-qt/qtcore/qtcore-5.9999.ebuild | 4 +++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index c0ae526..8cae287 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -8,6 +8,7 @@
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
+ <flag name="systemd">Enable native journald logging support</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild b/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild
index db7311e..4034e13 100644
--- a/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="icu"
+IUSE="icu systemd"
DEPEND="
dev-libs/glib:2
@@ -24,6 +24,7 @@ DEPEND="
sys-libs/zlib
virtual/libiconv
icu? ( dev-libs/icu:= )
+ systemd? ( sys-apps/systemd )
"
RDEPEND="${DEPEND}"
@@ -38,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
$(qt_use icu)
+ $(qt_use systemd journald)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-5.4.9999.ebuild b/dev-qt/qtcore/qtcore-5.4.9999.ebuild
index db7311e..4034e13 100644
--- a/dev-qt/qtcore/qtcore-5.4.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.9999.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="icu"
+IUSE="icu systemd"
DEPEND="
dev-libs/glib:2
@@ -24,6 +24,7 @@ DEPEND="
sys-libs/zlib
virtual/libiconv
icu? ( dev-libs/icu:= )
+ systemd? ( sys-apps/systemd )
"
RDEPEND="${DEPEND}"
@@ -38,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
$(qt_use icu)
+ $(qt_use systemd journald)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index db7311e..4034e13 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="icu"
+IUSE="icu systemd"
DEPEND="
dev-libs/glib:2
@@ -24,6 +24,7 @@ DEPEND="
sys-libs/zlib
virtual/libiconv
icu? ( dev-libs/icu:= )
+ systemd? ( sys-apps/systemd )
"
RDEPEND="${DEPEND}"
@@ -38,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
$(qt_use icu)
+ $(qt_use systemd journald)
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2015-03-26 1:49 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2015-03-26 1:49 UTC (permalink / raw
To: gentoo-commits
commit: c64c403ee8aa0ec24c7e9cb52ee04d98a145780c
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 01:28:28 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 01:28:28 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c64c403e
[dev-qt/qtcore:5] Raise some deps based on the version of bundled copies.
Package-Manager: portage-2.2.18
dev-qt/qtcore/qtcore-5.4.9999.ebuild | 4 ++--
dev-qt/qtcore/qtcore-5.5.9999.ebuild | 4 ++--
dev-qt/qtcore/qtcore-5.9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.4.9999.ebuild b/dev-qt/qtcore/qtcore-5.4.9999.ebuild
index 56e57dd..3207c29 100644
--- a/dev-qt/qtcore/qtcore-5.4.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.9999.ebuild
@@ -20,8 +20,8 @@ IUSE="icu systemd"
DEPEND="
dev-libs/glib:2
- >=dev-libs/libpcre-8.30[pcre16]
- sys-libs/zlib
+ >=dev-libs/libpcre-8.35[pcre16]
+ >=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
systemd? ( sys-apps/systemd )
diff --git a/dev-qt/qtcore/qtcore-5.5.9999.ebuild b/dev-qt/qtcore/qtcore-5.5.9999.ebuild
index 56e57dd..3207c29 100644
--- a/dev-qt/qtcore/qtcore-5.5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.5.9999.ebuild
@@ -20,8 +20,8 @@ IUSE="icu systemd"
DEPEND="
dev-libs/glib:2
- >=dev-libs/libpcre-8.30[pcre16]
- sys-libs/zlib
+ >=dev-libs/libpcre-8.35[pcre16]
+ >=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
systemd? ( sys-apps/systemd )
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 56e57dd..3207c29 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -20,8 +20,8 @@ IUSE="icu systemd"
DEPEND="
dev-libs/glib:2
- >=dev-libs/libpcre-8.30[pcre16]
- sys-libs/zlib
+ >=dev-libs/libpcre-8.35[pcre16]
+ >=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
systemd? ( sys-apps/systemd )
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2015-05-10 1:18 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2015-05-10 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 60509ba13624ef43e3d851a408bbd47824876c02
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 01:15:09 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 10 01:15:09 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=60509ba1
[dev-qt/qtcore:4] Sync.
Package-Manager: portage-2.2.18
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 430907b..2968134 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+glib iconv icu qt3support ssl"
@@ -19,6 +19,7 @@ IUSE="+glib iconv icu qt3support ssl"
DEPEND="
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+ iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2016-04-24 15:52 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2016-04-24 15:52 UTC (permalink / raw
To: gentoo-commits
commit: a3e8d5f4bfe6557ef38692a29c788a12b663900e
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 15:44:18 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 15:44:18 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a3e8d5f4
dev-qt/qtcore: use := on systemd dependency
We link against libsystemd.
Package-Manager: portage-2.2.28
dev-qt/qtcore/qtcore-5.6.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.7.0_beta.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.7.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.6.9999.ebuild b/dev-qt/qtcore/qtcore-5.6.9999.ebuild
index c19d231..9404055 100644
--- a/dev-qt/qtcore/qtcore-5.6.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.9999.ebuild
@@ -20,7 +20,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
index df7d48e..1119dc0 100644
--- a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtcore/qtcore-5.7.9999.ebuild b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
index df7d48e..1119dc0 100644
--- a/dev-qt/qtcore/qtcore-5.7.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index df7d48e..1119dc0 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2016-04-24 15:52 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2016-04-24 15:52 UTC (permalink / raw
To: gentoo-commits
commit: f1c66749c739db5e7b468af1abc238a29cba8bd0
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 15:52:34 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 15:52:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f1c66749
dev-qt/qtcore: raise libpcre dep and ensure it's built with unicode support
Package-Manager: portage-2.2.28
dev-qt/qtcore/qtcore-5.6.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.7.0_beta.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.7.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.6.9999.ebuild b/dev-qt/qtcore/qtcore-5.6.9999.ebuild
index 9404055..25061d7 100644
--- a/dev-qt/qtcore/qtcore-5.6.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.9999.ebuild
@@ -16,7 +16,7 @@ IUSE="icu systemd"
DEPEND="
dev-libs/glib:2
- >=dev-libs/libpcre-8.35[pcre16]
+ >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
diff --git a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
index 1119dc0..b1842b1 100644
--- a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
@@ -17,7 +17,7 @@ IUSE="icu systemd"
# TODO after bug 581054: dev-libs/double-conversion:=
DEPEND="
dev-libs/glib:2
- >=dev-libs/libpcre-8.35[pcre16]
+ >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
diff --git a/dev-qt/qtcore/qtcore-5.7.9999.ebuild b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
index 1119dc0..b1842b1 100644
--- a/dev-qt/qtcore/qtcore-5.7.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
@@ -17,7 +17,7 @@ IUSE="icu systemd"
# TODO after bug 581054: dev-libs/double-conversion:=
DEPEND="
dev-libs/glib:2
- >=dev-libs/libpcre-8.35[pcre16]
+ >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 1119dc0..b1842b1 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -17,7 +17,7 @@ IUSE="icu systemd"
# TODO after bug 581054: dev-libs/double-conversion:=
DEPEND="
dev-libs/glib:2
- >=dev-libs/libpcre-8.35[pcre16]
+ >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2016-11-30 17:23 Michael Palimaka
0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2016-11-30 17:23 UTC (permalink / raw
To: gentoo-commits
commit: eb2fcb6851f7442f90f8be85b2c3d7d00f8de646
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 17:59:53 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 17:22:50 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb2fcb68
dev-qt/qtcore: Add 'doc' submodule
Fixes install-phase that was broken due to the following upstream
change:
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=a7ddef139415f74f9ba8dc84a2f15105149ca5e8
Gentoo-Bug: https://bugs.gentoo.org/596054
Package-Manager: portage-2.3.1
dev-qt/qtcore/qtcore-5.6.9999.ebuild | 1 +
dev-qt/qtcore/qtcore-5.7.9999.ebuild | 1 +
dev-qt/qtcore/qtcore-5.8.9999.ebuild | 1 +
dev-qt/qtcore/qtcore-5.9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.6.9999.ebuild b/dev-qt/qtcore/qtcore-5.6.9999.ebuild
index 25061d7..e53c62d 100644
--- a/dev-qt/qtcore/qtcore-5.6.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.9999.ebuild
@@ -30,6 +30,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+ doc
)
src_configure() {
diff --git a/dev-qt/qtcore/qtcore-5.7.9999.ebuild b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
index b1842b1..ad9f43c 100644
--- a/dev-qt/qtcore/qtcore-5.7.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+ doc
)
src_configure() {
diff --git a/dev-qt/qtcore/qtcore-5.8.9999.ebuild b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
index b1842b1..ad9f43c 100644
--- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+ doc
)
src_configure() {
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index b1842b1..ad9f43c 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+ doc
)
src_configure() {
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2017-01-25 17:24 Michael Palimaka
0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2017-01-25 17:24 UTC (permalink / raw
To: gentoo-commits
commit: fd78df39dfe6fbc13d8e3358157dcf3201ef12bc
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 17:23:51 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 17:24:17 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fd78df39
dev-qt/qtcore: disable iconv if icu is enabled
See qtbase commit fd9e5d90333c385ad191a289b2e95e918c58b242.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-qt/qtcore/qtcore-5.8.0.ebuild | 4 ++--
dev-qt/qtcore/qtcore-5.8.9999.ebuild | 6 +++---
dev-qt/qtcore/qtcore-5.9999.ebuild | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 02eb34e..79ce95f 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -19,8 +19,8 @@ DEPEND="
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
- virtual/libiconv
icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use icu)
+ $(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.8.9999.ebuild b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
index ad9f43c..79ce95f 100644
--- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,8 +19,8 @@ DEPEND="
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
- virtual/libiconv
icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use icu)
+ $(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index ad9f43c..79ce95f 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,8 +19,8 @@ DEPEND="
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
- virtual/libiconv
icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use icu)
+ $(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
qt5-build_src_configure
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2017-01-25 18:30 Michael Palimaka
0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2017-01-25 18:30 UTC (permalink / raw
To: gentoo-commits
commit: a7eb647324892b8b155516e6aa9e6dd36d695837
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 18:29:54 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 18:30:10 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a7eb6473
dev-qt/qtcore: use system dev-libs/double-conversion
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-qt/qtcore/qtcore-5.8.0.ebuild | 3 ++-
dev-qt/qtcore/qtcore-5.8.9999.ebuild | 3 ++-
dev-qt/qtcore/qtcore-5.9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 79ce95f..1a9bc8c 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -14,8 +14,8 @@ fi
IUSE="icu systemd"
-# TODO after bug 581054: dev-libs/double-conversion:=
DEPEND="
+ dev-libs/double-conversion:=
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
@@ -36,6 +36,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
+ -system-doubleconversion
$(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
diff --git a/dev-qt/qtcore/qtcore-5.8.9999.ebuild b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
index 79ce95f..1a9bc8c 100644
--- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
@@ -14,8 +14,8 @@ fi
IUSE="icu systemd"
-# TODO after bug 581054: dev-libs/double-conversion:=
DEPEND="
+ dev-libs/double-conversion:=
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
@@ -36,6 +36,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
+ -system-doubleconversion
$(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 79ce95f..1a9bc8c 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -14,8 +14,8 @@ fi
IUSE="icu systemd"
-# TODO after bug 581054: dev-libs/double-conversion:=
DEPEND="
+ dev-libs/double-conversion:=
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
@@ -36,6 +36,7 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
+ -system-doubleconversion
$(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2017-04-18 16:15 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2017-04-18 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 346765882df9096eeca6856d6f45d8f24439e39c
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 13:22:00 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 16:11:53 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=34676588
dev-qt/qtcore: Switch to libpcre2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtcore/qtcore-5.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 6e111d62..cce06a22 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -16,8 +16,8 @@ IUSE="icu systemd"
DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
- >=dev-libs/libpcre-8.38[pcre16,unicode]
- >=sys-libs/zlib-1.2.5
+ dev-libs/libpcre2[pcre16,unicode]
+ sys-libs/zlib
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2017-04-18 16:15 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2017-04-18 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 685469744619d170ff18bf8974f9fd9ca1dfd3ce
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 13:25:37 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 16:13:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=68546974
dev-qt/qtcore: Add 'src/tools/qfloat16-tables' to target subdirs
This directory needs to have been processed before 'src/corelib', or
the compilation will fail.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtcore/qtcore-5.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index cce06a22..175000e7 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -28,6 +28,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
src/tools/rcc
+ src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
doc
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2017-09-08 15:52 Michael Palimaka
0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2017-09-08 15:52 UTC (permalink / raw
To: gentoo-commits
commit: c00c316dcf9e123f2d1eeeabd11774a8a491dafc
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 7 14:26:26 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep 8 15:51:58 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c00c316d
dev-qt/qtcore: replicate ifdefs removed in >=5.8
Gentoo-bug: 620348
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtcore/qtcore-5.10.9999.ebuild | 22 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.9.1.ebuild | 22 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.9.9999.ebuild | 22 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.9999.ebuild | 22 ++++++++++++++++++++++
4 files changed, 88 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.10.9999.ebuild b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
index 175000e7..b568c54d 100644
--- a/dev-qt/qtcore/qtcore-5.10.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ local flags=(
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+ XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ )
+
+ for flag in ${flags[@]}; do
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+ #if defined(QT_NO_${flag}) && defined(QT_${flag})
+ # undef QT_NO_${flag}
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+ # define QT_NO_${flag}
+ #endif
+ _EOF_
+ done
+}
diff --git a/dev-qt/qtcore/qtcore-5.9.1.ebuild b/dev-qt/qtcore/qtcore-5.9.1.ebuild
index 175000e7..779bc30c 100644
--- a/dev-qt/qtcore/qtcore-5.9.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.1.ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ local flags=(
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+ XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ )
+
+ for flag in ${flags[@]}; do
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+ #if defined(QT_NO_${flag}) && defined(QT_${flag})
+ # undef QT_NO_${flag}
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+ # define QT_NO_${flag}
+ #endif
+ _EOF_
+ done
+}
diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
index 175000e7..779bc30c 100644
--- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ local flags=(
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+ XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ )
+
+ for flag in ${flags[@]}; do
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+ #if defined(QT_NO_${flag}) && defined(QT_${flag})
+ # undef QT_NO_${flag}
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+ # define QT_NO_${flag}
+ #endif
+ _EOF_
+ done
+}
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 175000e7..779bc30c 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ local flags=(
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+ XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ )
+
+ for flag in ${flags[@]}; do
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+ #if defined(QT_NO_${flag}) && defined(QT_${flag})
+ # undef QT_NO_${flag}
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+ # define QT_NO_${flag}
+ #endif
+ _EOF_
+ done
+}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2017-12-09 23:02 Jimi Huotari
0 siblings, 0 replies; 48+ messages in thread
From: Jimi Huotari @ 2017-12-09 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 4a318f4fe92e2b8a987920e5579222dacf5968fc
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 12:12:10 2017 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 12:57:53 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4a318f4f
dev-qt/qtcore: add 'src/tools/qvkgen' to subdirs
Building 'dev-qt/qtgui' will fail without this new tool.
Package-Manager: Portage-2.3.17, Repoman-2.3.6
dev-qt/qtcore/qtcore-5.10.9999.ebuild | 1 +
dev-qt/qtcore/qtcore-5.9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.10.9999.ebuild b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
index b568c54d..bbe1ad96 100644
--- a/dev-qt/qtcore/qtcore-5.10.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
+ src/tools/qvkgen
doc
)
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 779bc30c..0dcfb236 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
+ src/tools/qvkgen
doc
)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2018-02-02 11:54 Michael Palimaka
0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2018-02-02 11:54 UTC (permalink / raw
To: gentoo-commits
commit: ca05e01917d000e2a1f6bfd2aba2c8fa5290675a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 06:44:36 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 11:53:56 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ca05e019
dev-qt/qtcore: add QT5_GENTOO_PRIVATE_CONFIG
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-qt/qtcore/qtcore-5.10.0.ebuild | 9 ++++++++-
dev-qt/qtcore/qtcore-5.10.9999.ebuild | 9 ++++++++-
dev-qt/qtcore/qtcore-5.11.9999.ebuild | 7 +++++++
dev-qt/qtcore/qtcore-5.9.4.ebuild | 7 +++++++
dev-qt/qtcore/qtcore-5.9.9999.ebuild | 9 ++++++++-
dev-qt/qtcore/qtcore-5.9999.ebuild | 9 ++++++++-
6 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.10.0.ebuild b/dev-qt/qtcore/qtcore-5.10.0.ebuild
index b568c54d..d2aa31ee 100644
--- a/dev-qt/qtcore/qtcore-5.10.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ !:network
+ !:sql
+ !:testlib
+ !:xml
+)
+
src_configure() {
local myconf=(
$(qt_use icu)
diff --git a/dev-qt/qtcore/qtcore-5.10.9999.ebuild b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
index b568c54d..d2aa31ee 100644
--- a/dev-qt/qtcore/qtcore-5.10.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ !:network
+ !:sql
+ !:testlib
+ !:xml
+)
+
src_configure() {
local myconf=(
$(qt_use icu)
diff --git a/dev-qt/qtcore/qtcore-5.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
index 970e630d..d2aa31ee 100644
--- a/dev-qt/qtcore/qtcore-5.11.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ !:network
+ !:sql
+ !:testlib
+ !:xml
+)
+
src_configure() {
local myconf=(
$(qt_use icu)
diff --git a/dev-qt/qtcore/qtcore-5.9.4.ebuild b/dev-qt/qtcore/qtcore-5.9.4.ebuild
index bce7aeab..54eb30f5 100644
--- a/dev-qt/qtcore/qtcore-5.9.4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.4.ebuild
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ !:network
+ !:sql
+ !:testlib
+ !:xml
+)
+
src_configure() {
local myconf=(
$(qt_use icu)
diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
index 779bc30c..54eb30f5 100644
--- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ !:network
+ !:sql
+ !:testlib
+ !:xml
+)
+
src_configure() {
local myconf=(
$(qt_use icu)
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 779bc30c..54eb30f5 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ !:network
+ !:sql
+ !:testlib
+ !:xml
+)
+
src_configure() {
local myconf=(
$(qt_use icu)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2018-02-06 12:32 Michael Palimaka
0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2018-02-06 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 6d5b33f7c7c9cd0aaaab791313a3946caedc7dd9
Author: Psi <public+gentoo <AT> psionix <DOT> net>
AuthorDate: Tue Feb 6 12:30:29 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 12:32:30 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6d5b33f7
dev-qt/qtcore: add support for mangling QT_NO_WIDGETS
Bug: https://bugs.gentoo.org/646504
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-qt/qtcore/qtcore-5.10.0.ebuild | 8 ++++----
dev-qt/qtcore/qtcore-5.10.9999.ebuild | 8 ++++----
dev-qt/qtcore/qtcore-5.11.9999.ebuild | 8 ++++----
dev-qt/qtcore/qtcore-5.9.9999.ebuild | 4 ++--
dev-qt/qtcore/qtcore-5.9999.ebuild | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.10.0.ebuild b/dev-qt/qtcore/qtcore-5.10.0.ebuild
index d2aa31ee..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.10.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.0.ebuild
@@ -54,10 +54,10 @@ src_install() {
qt5-build_src_install
local flags=(
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
- XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+ XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.10.9999.ebuild b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
index d2aa31ee..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.10.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.9999.ebuild
@@ -54,10 +54,10 @@ src_install() {
qt5-build_src_install
local flags=(
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
- XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+ XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
index d2aa31ee..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.11.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
@@ -54,10 +54,10 @@ src_install() {
qt5-build_src_install
local flags=(
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
- XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+ XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
index 54eb30f5..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
@@ -56,8 +56,8 @@ src_install() {
local flags=(
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
- XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+ XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 54eb30f5..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -56,8 +56,8 @@ src_install() {
local flags=(
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
- XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+ XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
for flag in ${flags[@]}; do
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2018-02-22 22:19 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2018-02-22 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 0187047ebc112e073b31c7753d4d07d23a31c57a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 19:49:40 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 22:14:14 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0187047e
dev-qt/qtcore: Enforce qtchooser qt5-default, block pre-switch qtcore:4
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtcore/{qtcore-5.10.1.ebuild => qtcore-5.10.1-r1.ebuild} | 4 +++-
dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild | 4 +++-
dev-qt/qtcore/qtcore-5.11.9999.ebuild | 4 +++-
dev-qt/qtcore/qtcore-5.9.9999.ebuild | 4 +++-
dev-qt/qtcore/qtcore-5.9999.ebuild | 4 +++-
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.10.1.ebuild b/dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
similarity index 96%
rename from dev-qt/qtcore/qtcore-5.10.1.ebuild
rename to dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.10.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
@@ -22,7 +22,9 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !<dev-qt/qtcore-4.8.7-r4:4
+"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
diff --git a/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild b/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
@@ -22,7 +22,9 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !<dev-qt/qtcore-4.8.7-r4:4
+"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
diff --git a/dev-qt/qtcore/qtcore-5.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.11.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
@@ -22,7 +22,9 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !<dev-qt/qtcore-4.8.7-r4:4
+"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
@@ -22,7 +22,9 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !<dev-qt/qtcore-4.8.7-r4:4
+"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -22,7 +22,9 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !<dev-qt/qtcore-4.8.7-r4:4
+"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2018-09-13 10:30 Jimi Huotari
0 siblings, 0 replies; 48+ messages in thread
From: Jimi Huotari @ 2018-09-13 10:30 UTC (permalink / raw
To: gentoo-commits
commit: d58aed70a809eef627f0ca954e8aa3517a7bba43
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 10:07:47 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 10:10:54 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d58aed70
dev-qt/qtcore: sync with main Gentoo repo tree
Drop the XRENDER flag, which would lead to QT_NO_XRENDER being set,
which would lead to unwanted behaviour such as shadows not being
rendered around Qt context-menus.
Upstream removed the option a while ago, in
commit: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=d37c353d
Bug: https://bugs.gentoo.org/648300
Package-Manager: Portage-2.3.49, Repoman-2.3.10
dev-qt/qtcore/qtcore-5.11.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.12.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.9.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5.11.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
- XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.12.9999.ebuild b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5.12.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
- XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
- XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
- XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+ XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
for flag in ${flags[@]}; do
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2019-01-07 1:04 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2019-01-07 1:04 UTC (permalink / raw
To: gentoo-commits
commit: c14b6caccfe183122857fb7cf7d664ac3db9c966
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 21:25:59 2019 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 21:25:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c14b6cac
dev-qt/qtcore: add := subslot dep on sys-libs/zlib
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.12.0.ebuild | 4 ++--
dev-qt/qtcore/qtcore-5.12.9999.ebuild | 4 ++--
dev-qt/qtcore/qtcore-5.9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild b/dev-qt/qtcore/qtcore-5.12.0.ebuild
index 571af4d5..290fc94e 100644
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib
+ sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
diff --git a/dev-qt/qtcore/qtcore-5.12.9999.ebuild b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
index 25c17255..290fc94e 100644
--- a/dev-qt/qtcore/qtcore-5.12.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib
+ sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 25c17255..290fc94e 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib
+ sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2019-01-07 20:33 Davide Pesavento
0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento @ 2019-01-07 20:33 UTC (permalink / raw
To: gentoo-commits
commit: ffd4863f2536e76a6c855c7b6d82346299d4bd17
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 20:15:15 2019 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 20:15:15 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ffd4863f
dev-qt/qtcore: sync with 5.11.3-r2 in gentoo.git
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.12.0.ebuild | 10 +++++++++-
dev-qt/qtcore/qtcore-5.12.9999.ebuild | 10 +++++++++-
dev-qt/qtcore/qtcore-5.9999.ebuild | 10 +++++++++-
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild b/dev-qt/qtcore/qtcore-5.12.0.ebuild
index f6a45867..a77edf08 100644
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
fi
IUSE="icu systemd"
@@ -43,8 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+src_prepare() {
+ # fix missing qt_version_tag symbol w/ LTO, bug 674382
+ sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
+ -no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
diff --git a/dev-qt/qtcore/qtcore-5.12.9999.ebuild b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
index f6a45867..a77edf08 100644
--- a/dev-qt/qtcore/qtcore-5.12.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
fi
IUSE="icu systemd"
@@ -43,8 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+src_prepare() {
+ # fix missing qt_version_tag symbol w/ LTO, bug 674382
+ sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
+ -no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index f6a45867..a77edf08 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
fi
IUSE="icu systemd"
@@ -43,8 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+src_prepare() {
+ # fix missing qt_version_tag symbol w/ LTO, bug 674382
+ sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
+ -no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2019-08-04 12:43 Michael Palimaka
0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2019-08-04 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 1b76480ac298bd1d4890e06ecafdd0277b37d0d8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 12:43:33 2019 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 12:43:43 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1b76480a
dev-qt/qtcore: $D has no trailing slash in EAPI 7
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.12.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.13.9999.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.12.9999.ebuild b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
index 661a57a2..d881786f 100644
--- a/dev-qt/qtcore/qtcore-5.12.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
@@ -72,7 +72,7 @@ src_install() {
)
for flag in ${flags[@]}; do
- cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+ cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}
diff --git a/dev-qt/qtcore/qtcore-5.13.9999.ebuild b/dev-qt/qtcore/qtcore-5.13.9999.ebuild
index 661a57a2..d881786f 100644
--- a/dev-qt/qtcore/qtcore-5.13.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.9999.ebuild
@@ -72,7 +72,7 @@ src_install() {
)
for flag in ${flags[@]}; do
- cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+ cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 661a57a2..d881786f 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -72,7 +72,7 @@ src_install() {
)
for flag in ${flags[@]}; do
- cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+ cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2019-08-24 9:14 Jimi Huotari
0 siblings, 0 replies; 48+ messages in thread
From: Jimi Huotari @ 2019-08-24 9:14 UTC (permalink / raw
To: gentoo-commits
commit: f4147c0b8d844b51940dd8badf511941289b84cc
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 09:14:20 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 09:14:20 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4147c0b
dev-qt/qtcore: drop 'qfloat16-tables' from 5.14.9999
This was moved and removed from the build.
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=5e40d3d9
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.14.9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
index d881786f..68c4c734 100644
--- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
@@ -30,7 +30,6 @@ QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
src/tools/rcc
- src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
doc
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2020-04-09 18:10 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 35678fe2decea3d9de1a317c9e8e6a031437b334
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 8 08:50:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 18:09:50 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=35678fe2
dev-qt/qtcore: enable renameat2 and getentropy conditionally
Add USE=old-kernel to switch off the new syscalls.
renameat2() and getentropy() are not available until linux-3.17.
Bug: https://bugs.gentoo.org/669994
Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
Closes: https://github.com/gentoo/qt/pull/214
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/metadata.xml | 1 +
dev-qt/qtcore/qtcore-5.14.9999.ebuild | 16 ++++++++++++++--
dev-qt/qtcore/qtcore-5.15.9999.ebuild | 16 ++++++++++++++--
dev-qt/qtcore/qtcore-5.9999.ebuild | 18 +++++++++++++++---
4 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index c612265c..34d2b272 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="old-kernel">disable new syscalls for Linux kernel >= 3.17</flag>
<flag name="systemd">Enable native journald logging support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
index 9b476abf..a6f5b7fc 100644
--- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
+pkg_pretend() {
+ if use kernel_linux; then
+ get_running_version
+ if kernel_is -lt 3 17 && ! use old-kernel; then
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
+ ewarn "to function on this kernel properly. See Bug #669994."
+ fi
+ fi
+}
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
@@ -59,6 +69,8 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
+ $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
+ $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
index 9b476abf..a6f5b7fc 100644
--- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
+pkg_pretend() {
+ if use kernel_linux; then
+ get_running_version
+ if kernel_is -lt 3 17 && ! use old-kernel; then
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
+ ewarn "to function on this kernel properly. See Bug #669994."
+ fi
+ fi
+}
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
@@ -59,6 +69,8 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
+ $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
+ $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 4ef01cf6..c39aa396 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
DEPEND="
dev-libs/double-conversion:=
@@ -43,6 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+pkg_pretend() {
+ if use kernel_linux; then
+ get_running_version
+ if kernel_is -lt 3 17 && ! use old-kernel; then
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
+ ewarn "to function on this kernel properly. See Bug #669994."
+ fi
+ fi
+}
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
@@ -58,6 +68,8 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
+ $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
+ $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
qt5-build_src_configure
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2020-04-09 18:10 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 309a55f158cac29e11823e3904632520b205edfb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 18:02:28 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 18:09:57 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=309a55f1
dev-qt/qtcore: Improve old-kernel metadata description
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 34d2b272..8342d1e9 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,7 +6,7 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="old-kernel">disable new syscalls for Linux kernel >= 3.17</flag>
+ <flag name="old-kernel">Disable syscalls not available on Linux kernels older than 3.17</flag>
<flag name="systemd">Enable native journald logging support</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2020-04-09 18:10 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 95afe01e2b4de041b40bd772858869815a3c9745
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 18:05:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 18:09:57 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=95afe01e
dev-qt/qtcore: Reduce indentation in pkg_pretend
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.14.9999.ebuild | 11 +++++------
dev-qt/qtcore/qtcore-5.15.9999.ebuild | 11 +++++------
dev-qt/qtcore/qtcore-5.9999.ebuild | 11 +++++------
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
index a6f5b7fc..7469ab23 100644
--- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
@@ -45,12 +45,11 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
pkg_pretend() {
- if use kernel_linux; then
- get_running_version
- if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
- ewarn "to function on this kernel properly. See Bug #669994."
- fi
+ use kernel_linux || return
+ get_running_version
+ if kernel_is -lt 3 17 && ! use old-kernel; then
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
+ ewarn "to function on this kernel properly. See Bug #669994."
fi
}
diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
index a6f5b7fc..7469ab23 100644
--- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
@@ -45,12 +45,11 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
pkg_pretend() {
- if use kernel_linux; then
- get_running_version
- if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
- ewarn "to function on this kernel properly. See Bug #669994."
- fi
+ use kernel_linux || return
+ get_running_version
+ if kernel_is -lt 3 17 && ! use old-kernel; then
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
+ ewarn "to function on this kernel properly. See Bug #669994."
fi
}
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index c39aa396..7622204e 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -44,12 +44,11 @@ QT5_GENTOO_PRIVATE_CONFIG=(
)
pkg_pretend() {
- if use kernel_linux; then
- get_running_version
- if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
- ewarn "to function on this kernel properly. See Bug #669994."
- fi
+ use kernel_linux || return
+ get_running_version
+ if kernel_is -lt 3 17 && ! use old-kernel; then
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
+ ewarn "to function on this kernel properly. See Bug #669994."
fi
}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2020-04-09 18:10 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 9a5c96c676c7fbe248a10d59f8803872f4a9e2be
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 18:06:08 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 18:09:58 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9a5c96c6
dev-qt/qtcore: Update 5.15.0_beta3
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 9b476abf..7469ab23 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,15 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
+pkg_pretend() {
+ use kernel_linux || return
+ get_running_version
+ if kernel_is -lt 3 17 && ! use old-kernel; then
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
+ ewarn "to function on this kernel properly. See Bug #669994."
+ fi
+}
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
@@ -59,6 +68,8 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
+ $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
+ $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
qt5-build_src_configure
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2020-04-09 18:18 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 3e6eeb7983e0b1fe6ea6dc47bc6cc3a44730f5f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 8 19:10:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 18:12:27 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e6eeb79
dev-qt/qtcore: More fine-grained subslot
Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.14.9999.ebuild | 2 ++
dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 2 ++
dev-qt/qtcore/qtcore-5.15.9999.ebuild | 2 ++
dev-qt/qtcore/qtcore-5.9999.ebuild | 2 ++
4 files changed, 8 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
index 7469ab23..14b4d293 100644
--- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
@@ -2,10 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 7469ab23..14b4d293 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -2,10 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
index 7469ab23..14b4d293 100644
--- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
@@ -2,10 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 7622204e..fc5723d2 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -2,10 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2020-04-10 21:33 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2020-04-10 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 9ff0752e1ee3c28818197eaaca45545708035152
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 17:10:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 21:08:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ff0752e
dev-qt/qtcore: renameat2 is glibc specific
We let Qt do the detection and only pass -no-foo when old-kernel is requested.
Bug: https://bugs.gentoo.org/669994
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.14.9999.ebuild | 10 ++++++----
dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 10 ++++++----
dev-qt/qtcore/qtcore-5.15.9999.ebuild | 10 ++++++----
dev-qt/qtcore/qtcore-5.9999.ebuild | 10 ++++++----
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
index 14b4d293..8fe97564 100644
--- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
@@ -50,8 +50,8 @@ pkg_pretend() {
use kernel_linux || return
get_running_version
if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
- ewarn "to function on this kernel properly. See Bug #669994."
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
+ ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
fi
}
@@ -70,10 +70,12 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
- $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
- $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
+ use old-kernel && myconf+=(
+ -no-feature-renameat2 # needs Linux 3.16, bug 669994
+ -no-feature-getentropy # needs Linux 3.17, bug 669994
+ )
qt5-build_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 14b4d293..8fe97564 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -50,8 +50,8 @@ pkg_pretend() {
use kernel_linux || return
get_running_version
if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
- ewarn "to function on this kernel properly. See Bug #669994."
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
+ ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
fi
}
@@ -70,10 +70,12 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
- $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
- $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
+ use old-kernel && myconf+=(
+ -no-feature-renameat2 # needs Linux 3.16, bug 669994
+ -no-feature-getentropy # needs Linux 3.17, bug 669994
+ )
qt5-build_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
index 14b4d293..8fe97564 100644
--- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
@@ -50,8 +50,8 @@ pkg_pretend() {
use kernel_linux || return
get_running_version
if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
- ewarn "to function on this kernel properly. See Bug #669994."
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
+ ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
fi
}
@@ -70,10 +70,12 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
- $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
- $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
+ use old-kernel && myconf+=(
+ -no-feature-renameat2 # needs Linux 3.16, bug 669994
+ -no-feature-getentropy # needs Linux 3.17, bug 669994
+ )
qt5-build_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index fc5723d2..ff1430d7 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -49,8 +49,8 @@ pkg_pretend() {
use kernel_linux || return
get_running_version
if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}"
- ewarn "to function on this kernel properly. See Bug #669994."
+ ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
+ ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
fi
}
@@ -69,10 +69,12 @@ src_configure() {
-no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
- $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994
- $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994
$(qt_use systemd journald)
)
+ use old-kernel && myconf+=(
+ -no-feature-renameat2 # needs Linux 3.16, bug 669994
+ -no-feature-getentropy # needs Linux 3.17, bug 669994
+ )
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2020-04-12 18:09 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2020-04-12 18:09 UTC (permalink / raw
To: gentoo-commits
commit: dc7faccb8dccf0e3b418bef7b23f49b004fb4208
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 17:46:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 18:04:04 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dc7faccb
dev-qt/qtcore: In >=5.15, disable statx only with IUSE="old-kernel"
Bug: https://bugs.gentoo.org/672856
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/metadata.xml | 3 ++-
dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.15.9999.ebuild | 8 ++++----
dev-qt/qtcore/qtcore-5.9999.ebuild | 8 ++++----
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 8342d1e9..9354e57a 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,7 +6,8 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="old-kernel">Disable syscalls not available on Linux kernels older than 3.17</flag>
+ <flag name="old-kernel" restrict="<dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 3.17</flag>
+ <flag name="old-kernel" restrict=">=dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 4.11</flag>
<flag name="systemd">Enable native journald logging support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 8fe97564..16b2ab23 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
src_configure() {
local myconf=(
- -no-feature-statx # bug 672856
+ -no-feature-statx # needs Linux 4.11, bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
index 8fe97564..449fddfc 100644
--- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
@@ -49,9 +49,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 7
pkg_pretend() {
use kernel_linux || return
get_running_version
- if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
- ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
+ if kernel_is -lt 4 11 && ! use old-kernel; then
+ ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
+ ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
fi
}
@@ -67,7 +67,6 @@ src_prepare() {
src_configure() {
local myconf=(
- -no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
@@ -75,6 +74,7 @@ src_configure() {
use old-kernel && myconf+=(
-no-feature-renameat2 # needs Linux 3.16, bug 669994
-no-feature-getentropy # needs Linux 3.17, bug 669994
+ -no-feature-statx # needs Linux 4.11, bug 672856
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index ff1430d7..77ca00e6 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -48,9 +48,9 @@ QT5_GENTOO_PRIVATE_CONFIG=(
pkg_pretend() {
use kernel_linux || return
get_running_version
- if kernel_is -lt 3 17 && ! use old-kernel; then
- ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
- ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
+ if kernel_is -lt 4 11 && ! use old-kernel; then
+ ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
+ ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
fi
}
@@ -66,7 +66,6 @@ src_prepare() {
src_configure() {
local myconf=(
- -no-feature-statx # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
@@ -74,6 +73,7 @@ src_configure() {
use old-kernel && myconf+=(
-no-feature-renameat2 # needs Linux 3.16, bug 669994
-no-feature-getentropy # needs Linux 3.17, bug 669994
+ -no-feature-statx # needs Linux 4.11, bug 672856
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2021-02-02 0:49 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2021-02-02 0:49 UTC (permalink / raw
To: gentoo-commits
commit: 9ff8d7a06d35186160ece9436416324342684465
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 00:45:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 00:48:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ff8d7a0
dev-qt/qtcore: Remove obsolete blocker on !<dev-qt/qtcore-4.8.7-r4:4
Last match removed 2.95 years ago.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.9999.ebuild | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
index 449fddfc..06672498 100644
--- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,9 +24,7 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
-RDEPEND="${DEPEND}
- !<dev-qt/qtcore-4.8.7-r4:4
-"
+RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2022-03-21 10:06 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2022-03-21 10:06 UTC (permalink / raw
To: gentoo-commits
commit: cd28c783082b970b1c52580c2485979d42ae6d5a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 20:55:59 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:04:45 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd28c783
dev-qt/qtcore: Symlink qmake to /usr/bin/qmake5
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.3.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild
index bf94a0df..3d3b8751 100644
--- a/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild
@@ -81,6 +81,7 @@ src_configure() {
src_install() {
qt5-build_src_install
+ qt5_symlink_binary_to_path qmake 5
local flags=(
DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2022-05-20 6:46 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2022-05-20 6:46 UTC (permalink / raw
To: gentoo-commits
commit: 3f34ed50026289f348aa3301c0f3a8deea31540c
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 05:03:48 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 20 06:35:57 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3f34ed50
dev-qt/qtcore: keyword 5.15.3 for ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.4.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild
index f8c7d657..e197e2ff 100644
--- a/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2022-06-18 14:27 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2022-06-18 14:27 UTC (permalink / raw
To: gentoo-commits
commit: bce861717d5120f95d17eec6ce9d672ae791e80c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 23:10:33 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:21:22 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bce86171
dev-qt/qtcore: add FORTIFY_SOURCE=3 workaround (force back to =2)
As discussed with asturm until we know what's happening with
the upstream bug. We can consider the opensuse patch once
that's resolved, if the upstream fix isn't made public, almost
certainly via KDE Qt5PatchCollection. But we'll see.
Bug: https://bugs.gentoo.org/847145
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.5.9999.ebuild | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild
index 84966e24..1f4a57ff 100644
--- a/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
QT5_MODULE="qtbase"
-inherit linux-info qt5-build
+inherit linux-info flag-o-matic qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
@@ -58,6 +58,25 @@ src_prepare() {
# fix missing qt_version_tag symbol w/ LTO, bug 674382
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+ # Broken with FORTIFY_SOURCE=3
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ # Refs:
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
+ # https://bugreports.qt.io/browse/QTBUG-103782
+ # bug #847145
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ # (Qt doesn't seem to respect CPPFLAGS?)
+ append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
qt5-build_src_prepare
}
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2023-06-22 15:53 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2023-06-22 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 4c9d2129b757f5e10e73a9d5e25994542c3e9d07
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 17:30:44 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 15:53:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4c9d2129
dev-qt/qtcore: Make use of qt5_syncqt_version()
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.10.9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.15.10.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.10.9999.ebuild
index e8431443..3478e067 100644
--- a/dev-qt/qtcore/qtcore-5.15.10.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10.9999.ebuild
@@ -79,6 +79,9 @@ src_prepare() {
fi
qt5-build_src_prepare
+
+ # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header
+ qt5_syncqt_version
}
src_configure() {
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2023-09-03 8:02 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2023-09-03 8:02 UTC (permalink / raw
To: gentoo-commits
commit: d105bdeb2221778d76fd1a8241b1a8ea356fbce6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 23:46:28 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 08:00:43 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d105bdeb
dev-qt/qtcore: Drop obsolete metadata
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/metadata.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 44b12b34..eac86fb8 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,8 +6,7 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="old-kernel" restrict="<dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 3.17</flag>
- <flag name="old-kernel" restrict=">=dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 4.11</flag>
+ <flag name="old-kernel">Disable syscalls not available on Linux kernels older than 4.11</flag>
<flag name="systemd">Enable native journald logging support</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2023-10-07 20:40 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2023-10-07 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 90cdaecb147ae4a583b777692817409ef5945265
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 23:00:25 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 7 16:07:48 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=90cdaecb
dev-qt/qtcore: remove IUSE=systemd
This is to control where log messages will be sent by default, and
I think enabling this is just going to be confusing. Off-by-default
(even if found), and cmake gives a warning that we should do special
handling for it. Plus no parity for openrc given we were not enabling
syslog as alternative.
Have not looked much, but not seem most distros enable this.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/metadata.xml | 1 -
dev-qt/qtcore/qtcore-5.15.11.9999.ebuild | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index eac86fb8..2bc45aff 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="old-kernel">Disable syscalls not available on Linux kernels older than 4.11</flag>
- <flag name="systemd">Enable native journald logging support</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild
index 3478e067..fdea7264 100644
--- a/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild
@@ -14,7 +14,7 @@ inherit linux-info flag-o-matic qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
-IUSE="icu old-kernel systemd"
+IUSE="icu old-kernel"
DEPEND="
dev-libs/double-conversion:=
@@ -23,7 +23,6 @@ DEPEND="
sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
- systemd? ( sys-apps/systemd:= )
"
RDEPEND="${DEPEND}"
@@ -88,7 +87,6 @@ src_configure() {
local myconf=(
$(qt_use icu)
$(qt_use !icu iconv)
- $(qt_use systemd journald)
)
use old-kernel && myconf+=(
-no-feature-renameat2 # needs Linux 3.16, bug 669994
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2023-10-08 15:21 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2023-10-08 15:21 UTC (permalink / raw
To: gentoo-commits
commit: ec1cae0ebc814755c9cf1dd5b5a70d1777d422b8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 11:41:48 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 15:20:41 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ec1cae0e
dev-qt/qtcore: use tc-enables-fortify-source
Better than fragile optimisation level checking.
Bug: https://bugs.gentoo.org/841770
Bug: https://bugs.gentoo.org/847145
Bug: https://bugs.gentoo.org/852974
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.11.9999.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild
index fdea7264..36a727a0 100644
--- a/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then
fi
QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
@@ -59,6 +59,7 @@ src_prepare() {
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
# Broken with FORTIFY_SOURCE=3
+ #
# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
# to unset F_S first, then explicitly set 2, to negate any default
# and anything set by the user if they're choosing 3 (or if they've
@@ -69,7 +70,7 @@ src_prepare() {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
# https://bugreports.qt.io/browse/QTBUG-103782
# bug #847145
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ if tc-enables-fortify-source ; then
# We can't unconditionally do this b/c we fortify needs
# some level of optimisation.
filter-flags -D_FORTIFY_SOURCE=3
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
@ 2024-01-03 23:09 Andreas Sturmlechner
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Sturmlechner @ 2024-01-03 23:09 UTC (permalink / raw
To: gentoo-commits
commit: a1d53ef41a21b8db0e76709500df8c0b7ae61038
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 1 13:56:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 21:09:19 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1d53ef4
dev-qt/qtcore: Add wall of blockers against <${QT5_PV}
Revdeps can drop dev-qt/* dependencies on version bumps at any time, which then
may lead to Portage disregarding these dev-qt/* packages for upgrade if nothing
is left depending on them. When these packages contain Qt5 plugins it breaks
runtime hard - broken screenlocker, blank login manager, ... -, with:
`Cannot mix incompatible Qt library (5.15.10) with this library (5.15.11)`
We've had this happen with dev-qt/qtvirtualkeyboard and dev-qt/qtcharts already
and gradual porting to Qt6 ensures it will happen more often in the future.
Package groups (https://bugs.gentoo.org/918873) are not effective here as it
concerns ::installed package set.
For lack of a better mechanism from the package manager, these blockers make
sure dep calculation will take care of the necessary cleanup of dangling Qt5
packages, even if it will not improve our backtracking situation.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.12.9999.ebuild | 45 +++++++++++++++++++++++++++++++-
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.12.9999.ebuild
index 36a727a0..d5a3c424 100644
--- a/dev-qt/qtcore/qtcore-5.15.12.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12.9999.ebuild
@@ -24,7 +24,50 @@ DEPEND="
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !<dev-qt/designer-${QT5_PV}:5
+ !<dev-qt/qt3d-${QT5_PV}:5
+ !<dev-qt/qtbluetooth-${QT5_PV}:5
+ !<dev-qt/qtcharts-${QT5_PV}:5
+ !<dev-qt/qtconcurrent-${QT5_PV}:5
+ !<dev-qt/qtdatavis3d-${QT5_PV}:5
+ !<dev-qt/qtdbus-${QT5_PV}:5
+ !<dev-qt/qtdeclarative-${QT5_PV}:5
+ !<dev-qt/qtgamepad-${QT5_PV}:5
+ !<dev-qt/qtgraphicaleffects-${QT5_PV}:5
+ !<dev-qt/qtgui-${QT5_PV}:5
+ !<dev-qt/qthelp-${QT5_PV}:5
+ !<dev-qt/qtimageformats-${QT5_PV}:5
+ !<dev-qt/qtlocation-${QT5_PV}:5
+ !<dev-qt/qtmultimedia-${QT5_PV}:5
+ !<dev-qt/qtnetwork-${QT5_PV}:5
+ !<dev-qt/qtnetworkauth-${QT5_PV}:5
+ !<dev-qt/qtopengl-${QT5_PV}:5
+ !<dev-qt/qtpositioning-${QT5_PV}:5
+ !<dev-qt/qtprintsupport-${QT5_PV}:5
+ !<dev-qt/qtquickcontrols-${QT5_PV}:5
+ !<dev-qt/qtquickcontrols2-${QT5_PV}:5
+ !<dev-qt/qtquicktimeline-${QT5_PV}:5
+ !<dev-qt/qtscript-${QT5_PV}:5
+ !<dev-qt/qtscxml-${QT5_PV}:5
+ !<dev-qt/qtsensors-${QT5_PV}:5
+ !<dev-qt/qtserialbus-${QT5_PV}:5
+ !<dev-qt/qtserialport-${QT5_PV}:5
+ !<dev-qt/qtspeech-${QT5_PV}:5
+ !<dev-qt/qtsql-${QT5_PV}:5
+ !<dev-qt/qtsvg-${QT5_PV}:5
+ !<dev-qt/qttest-${QT5_PV}:5
+ !<dev-qt/qtvirtualkeyboard-${QT5_PV}:5
+ !<dev-qt/qtwayland-${QT5_PV}:5
+ !<dev-qt/qtwebchannel-${QT5_PV}:5
+ !<dev-qt/qtwebengine-${QT5_PV}:5
+ !<dev-qt/qtwebsockets-${QT5_PV}:5
+ !<dev-qt/qtwebview-${QT5_PV}:5
+ !<dev-qt/qtwidgets-${QT5_PV}:5
+ !<dev-qt/qtx11extras-${QT5_PV}:5
+ !<dev-qt/qtxml-${QT5_PV}:5
+ !<dev-qt/qtxmlpatterns-${QT5_PV}:5
+"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 48+ messages in thread
end of thread, other threads:[~2024-01-03 23:09 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-08 15:21 [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-01-03 23:09 Andreas Sturmlechner
2023-10-07 20:40 Andreas Sturmlechner
2023-09-03 8:02 Andreas Sturmlechner
2023-06-22 15:53 Andreas Sturmlechner
2022-06-18 14:27 Andreas Sturmlechner
2022-05-20 6:46 Andreas Sturmlechner
2022-03-21 10:06 Andreas Sturmlechner
2021-02-02 0:49 Andreas Sturmlechner
2020-04-12 18:09 Andreas Sturmlechner
2020-04-10 21:33 Andreas Sturmlechner
2020-04-09 18:18 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2019-08-24 9:14 Jimi Huotari
2019-08-04 12:43 Michael Palimaka
2019-01-07 20:33 Davide Pesavento
2019-01-07 1:04 Davide Pesavento
2018-09-13 10:30 Jimi Huotari
2018-02-22 22:19 Andreas Sturmlechner
2018-02-06 12:32 Michael Palimaka
2018-02-02 11:54 Michael Palimaka
2017-12-09 23:02 Jimi Huotari
2017-09-08 15:52 Michael Palimaka
2017-04-18 16:15 Davide Pesavento
2017-04-18 16:15 Davide Pesavento
2017-01-25 18:30 Michael Palimaka
2017-01-25 17:24 Michael Palimaka
2016-11-30 17:23 Michael Palimaka
2016-04-24 15:52 Davide Pesavento
2016-04-24 15:52 Davide Pesavento
2015-05-10 1:18 Davide Pesavento
2015-03-26 1:49 Davide Pesavento
2014-12-09 3:22 Davide Pesavento
2014-11-10 3:02 Davide Pesavento
2014-10-27 0:53 Davide Pesavento
2014-10-13 19:35 Davide Pesavento
2014-09-01 0:26 Davide Pesavento
2014-08-27 2:16 Davide Pesavento
2014-07-29 22:14 Davide Pesavento
2014-07-24 1:05 Davide Pesavento
2014-06-01 2:41 Davide Pesavento
2014-06-01 2:41 Davide Pesavento
2014-05-27 10:48 Davide Pesavento
2014-05-23 18:18 Davide Pesavento
2013-04-22 1:07 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox