public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qtcore/
@ 2014-11-10  3:02 Davide Pesavento
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2014-11-10  3:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e8043452c212e25eaf8ba485112eceee66c59091
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 02:56:51 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 02:58:54 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e8043452

[dev-qt/qtcore:4] Move qconfig.h sed to qt4-build-multilib.eclass

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild    | 14 --------------
 dev-qt/qtcore/qtcore-4.8.9999.ebuild | 14 --------------
 eclass/qt4-build-multilib.eclass     | 20 ++++++++++++++++++--
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 841e740..a3a0370 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -107,19 +107,5 @@ multilib_src_install_all() {
 	dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
 	mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
 
-	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
-		# Framework hacking
-		# TODO: do this better
-		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 '1i #include <Gentoo/gentoo-qconfig.h>\n' \
-			"${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
-			|| die "sed for qconfig.h failed"
-	fi
-
 	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 841e740..a3a0370 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -107,19 +107,5 @@ multilib_src_install_all() {
 	dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
 	mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
 
-	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
-		# Framework hacking
-		# TODO: do this better
-		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 '1i #include <Gentoo/gentoo-qconfig.h>\n' \
-			"${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
-			|| die "sed for qconfig.h failed"
-	fi
-
 	keepdir "${QT4_SYSCONFDIR#${EPREFIX}}"
 }

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index d677ae5..eae348f 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -409,8 +409,9 @@ qt4_multilib_src_install() {
 	qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
 	if [[ ${PN} == qtcore ]]; then
-		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}"
-		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
+		set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
+		einfo "Running $*"
+		"$@"
 
 		# install qtchooser configuration file
 		cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_
@@ -438,6 +439,21 @@ qt4_multilib_src_install() {
 }
 
 qt4_multilib_src_install_all() {
+	if [[ ${PN} == qtcore ]]; then
+		# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h
+		if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+			sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
+				|| die "sed failed (qconfig.h)"
+			dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
+				"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+		else
+			sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
+				|| die "sed failed (qconfig.h)"
+		fi
+	fi
+
 	# install private headers of a few modules
 	if has ${PN} qtcore qtdeclarative qtgui qtscript; then
 		local moduledir=${PN#qt}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qtcore/
@ 2014-11-12  2:15 Davide Pesavento
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2014-11-12  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     46bbe9ea1137984ed7909d8da818f7980dc1a056
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 12 02:14:10 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Nov 12 02:14:10 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=46bbe9ea

[dev-qt/qtcore:4] Move the rest of multilib_src_install_all to the eclass.

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild    | 7 -------
 dev-qt/qtcore/qtcore-4.8.9999.ebuild | 7 -------
 eclass/qt4-build-multilib.eclass     | 3 +++
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index e06581e..542bc0b 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -89,10 +89,3 @@ multilib_src_configure() {
 	)
 	qt4_multilib_src_configure
 }
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
-	mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-}

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index e06581e..542bc0b 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -89,10 +89,3 @@ multilib_src_configure() {
 	)
 	qt4_multilib_src_configure
 }
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
-	mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-}

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 441371b..f53fed2 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -458,6 +458,9 @@ qt4_multilib_src_install_all() {
 				"${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
 				|| die "sed failed (qconfig.h)"
 		fi
+
+		dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
+		mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
 	fi
 
 	# install private headers of a few modules


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qtcore/
@ 2016-04-24 15:52 Davide Pesavento
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2016-04-24 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d1cd6fe09289146151c5c69a5a2817f2d90612f6
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 15:34:25 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 15:35:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d1cd6fe0

dev-qt/qtcore: add TODO note on new dev-libs/double-conversion dep

Package-Manager: portage-2.2.28

 dev-qt/qtcore/qtcore-5.7.0_beta.ebuild | 1 +
 dev-qt/qtcore/qtcore-5.7.9999.ebuild   | 1 +
 dev-qt/qtcore/qtcore-5.9999.ebuild     | 1 +
 eclass/qt5-build.eclass                | 8 +++++---
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
index c19d231..df7d48e 100644
--- a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
@@ -14,6 +14,7 @@ fi
 
 IUSE="icu systemd"
 
+# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libpcre-8.35[pcre16]

diff --git a/dev-qt/qtcore/qtcore-5.7.9999.ebuild b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
index c19d231..df7d48e 100644
--- a/dev-qt/qtcore/qtcore-5.7.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
@@ -14,6 +14,7 @@ fi
 
 IUSE="icu systemd"
 
+# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libpcre-8.35[pcre16]

diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index c19d231..df7d48e 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -14,6 +14,7 @@ fi
 
 IUSE="icu systemd"
 
+# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libpcre-8.35[pcre16]

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ba3f5bf..30ef6db 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -84,7 +84,7 @@ case ${PV} in
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
 		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P%-alpha}
+		S=${WORKDIR}/${MY_P}
 		;;
 	*)
 		# official stable release
@@ -557,9 +557,11 @@ qt5_base_configure() {
 		# use pkg-config to detect include and library paths
 		-pkg-config
 
-		# prefer system libraries (only common deps here)
+		# prefer system libraries (only common hard deps here)
 		-system-zlib
 		-system-pcre
+		# TODO after bug 581054
+		#$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion)
 
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev
@@ -571,7 +573,7 @@ qt5_base_configure() {
 		-no-xkbcommon-x11 -no-xkbcommon-evdev
 		-no-xinput2 -no-xcb-xlib
 
-		# don't specify -no-gif because there is no way to override it later
+		# cannot use -no-gif because there is no way to override it later
 		#-no-gif
 
 		# always enable glib event loop support


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qtcore/
@ 2017-03-15  0:34 Davide Pesavento
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2017-03-15  0:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3351afb360c87bb9d0596bff371536b710886375
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 00:31:40 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 00:31:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3351afb3

dev-qt/qtcore: move system-doubleconversion handling to the eclass

And enable it for 5.7 as well

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-qt/qtcore/qtcore-5.7.9999.ebuild | 4 ++--
 dev-qt/qtcore/qtcore-5.8.0.ebuild    | 1 -
 dev-qt/qtcore/qtcore-5.8.9999.ebuild | 1 -
 dev-qt/qtcore/qtcore-5.9999.ebuild   | 1 -
 eclass/qt5-build.eclass              | 3 +--
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.7.9999.ebuild b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
index 4d79aa12..42e33d83 100644
--- a/dev-qt/qtcore/qtcore-5.7.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.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
 
 EAPI=6
@@ -13,8 +13,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

diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 1c5b1eb7..6e111d62 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -35,7 +35,6 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		-system-doubleconversion
 		$(qt_use icu)
 		$(qt_use !icu iconv)
 		$(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 1c5b1eb7..6e111d62 100644
--- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
@@ -35,7 +35,6 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		-system-doubleconversion
 		$(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 1c5b1eb7..6e111d62 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -35,7 +35,6 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		-system-doubleconversion
 		$(qt_use icu)
 		$(qt_use !icu iconv)
 		$(qt_use systemd journald)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 97659d23..eea388d8 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -593,8 +593,7 @@ qt5_base_configure() {
 		# prefer system libraries (only common hard deps here)
 		-system-zlib
 		-system-pcre
-		# TODO after bug 581054
-		#$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion)
+		$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion)
 
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-15  0:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-15  0:34 [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qtcore/ Davide Pesavento
  -- strict thread matches above, loose matches on Subject: below --
2016-04-24 15:52 Davide Pesavento
2014-11-12  2:15 Davide Pesavento
2014-11-10  3:02 Davide Pesavento

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox