[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 2a5e5ed2a4ef65d9feb93d11793038c3e8d48273
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 27 03:46:55 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 7 12:15:21 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2a5e5ed2
qt5-build.eclass: create a forwarding header for qtbase
Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.
This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
Gentoo-bug: 599636
eclass/qt5-build.eclass | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8066d84f..c0c5bda8 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -615,12 +615,7 @@ qt5_base_configure() {
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
- # FIXME
- # since 5.8, disabling dbus generates a QT_NO_DBUS in
QtCore/qconfig.h,
- # thus specify runtime loading of libdbus to avoid the #define
- $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime ||
echo -no-dbus)
+ -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
# let portage handle stripping
-no-strip
@@ -684,6 +679,12 @@ qt5_base_configure() {
"${S}"/configure "${conf[@]}" || die "configure failed"
popd >/dev/null || die
+
+ if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+ # a forwarding header is no longer created since 5.8, causing
the system
+ # config to always be used. bug 599636
+ cp src/corelib/global/qconfig.h include/QtCore/ || die
+ fi
}
# @FUNCTION: qt5_qmake
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 2a263048bd80f87a97fb8fe6b2b57c7ff701a3a6
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Sep 3 00:22:52 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Sep 3 00:22:52 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2a263048
qt5-build.eclass: drop insecure git:// URL from EGIT_REPO_URI
eclass/qt5-build.eclass | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d0013f3e..8066d84f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -92,8 +92,7 @@ esac
readonly QT5_BUILD_TYPE
EGIT_REPO_URI=(
- "git://code.qt.io/qt/${QT5_MODULE}.git"
- "https://code.qt.io/git/qt/${QT5_MODULE}.git";
+ "https://code.qt.io/qt/${QT5_MODULE}.git";
"https://github.com/qt/${QT5_MODULE}.git";
)
[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 1679bdc3ac6778153ec044cb9f99479c2b38e8b7
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Sep 3 00:21:14 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Sep 3 00:21:14 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1679bdc3
qt5-build.eclass: update github mirror URL
eclass/qt5-build.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 60c16829..d0013f3e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -94,7 +94,7 @@ readonly QT5_BUILD_TYPE
EGIT_REPO_URI=(
"git://code.qt.io/qt/${QT5_MODULE}.git"
"https://code.qt.io/git/qt/${QT5_MODULE}.git";
- "https://github.com/qtproject/${QT5_MODULE}.git";
+ "https://github.com/qt/${QT5_MODULE}.git";
)
[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 54a9ac159f8aa39c8e6b70a06a6fbd62548a5945
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 27 03:46:55 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 27 05:51:53 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=54a9ac15
qt5-build.eclass: create a forwarding header for qtbase
Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.
This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
Gentoo-bug: 599636
eclass/qt5-build.eclass | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 60c16829..0a1eb77c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -616,12 +616,7 @@ qt5_base_configure() {
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
- # FIXME
- # since 5.8, disabling dbus generates a QT_NO_DBUS in
QtCore/qconfig.h,
- # thus specify runtime loading of libdbus to avoid the #define
- $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime ||
echo -no-dbus)
+ -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
# let portage handle stripping
-no-strip
@@ -685,6 +680,12 @@ qt5_base_configure() {
"${S}"/configure "${conf[@]}" || die "configure failed"
popd >/dev/null || die
+
+ if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+ # a forwarding header is no longer created since 5.8, causing
the system
+ # config to always be used. bug 599636
+ cp src/corelib/global/qconfig.h include/QtCore/ || die
+ fi
}
# @FUNCTION: qt5_qmake
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 1495d22c38a2b6fec517fee21cb2acf5416746c5
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 27 03:46:55 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 27 04:15:28 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1495d22c
qt5-build.eclass: create a forwarding header for qtbase
Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.
This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
Gentoo-bug: 599636
eclass/qt5-build.eclass | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ec6cac3..4c311493 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -616,12 +616,7 @@ qt5_base_configure() {
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
- # FIXME
- # since 5.8, disabling dbus generates a QT_NO_DBUS in
QtCore/qconfig.h,
- # thus specify runtime loading of libdbus to avoid the #define
- $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime ||
echo -no-dbus)
+ -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
# let portage handle stripping
-no-strip
@@ -685,6 +680,12 @@ qt5_base_configure() {
"${S}"/configure "${conf[@]}" || die "configure failed"
popd >/dev/null || die
+
+ if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+ # a forwarding header is no longer created since 5.8, causing
the system
+ # config to always be used. bug 599636
+ cp src/corelib/global/qconfig.h include/QtCore/ || die
+ fi
}
# @FUNCTION: qt5_qmake
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: b64a61991e951958415f5e0ba72043d1a385a894
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Aug 7 14:41:26 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 27 03:49:08 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b64a6199
Revert "qt5-build.eclass: workaround global disabling of dbus for qtbase >= 5.8"
This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
eclass/qt5-build.eclass | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ec6cac3..b6c211bc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -616,12 +616,7 @@ qt5_base_configure() {
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
- # FIXME
- # since 5.8, disabling dbus generates a QT_NO_DBUS in
QtCore/qconfig.h,
- # thus specify runtime loading of libdbus to avoid the #define
- $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime ||
echo -no-dbus)
+ -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
# let portage handle stripping
-no-strip
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: c2e9b8b08fc490af7bdfb48cace3ca335bcabdd1
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 27 03:46:55 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 27 03:52:23 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c2e9b8b0
qt5-build.eclass: create a forwarding header for qtbase
Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.
This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
Gentoo-bug: 599636
eclass/qt5-build.eclass | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ec6cac3..4c311493 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -616,12 +616,7 @@ qt5_base_configure() {
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
- # FIXME
- # since 5.8, disabling dbus generates a QT_NO_DBUS in
QtCore/qconfig.h,
- # thus specify runtime loading of libdbus to avoid the #define
- $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime ||
echo -no-dbus)
+ -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
# let portage handle stripping
-no-strip
@@ -685,6 +680,12 @@ qt5_base_configure() {
"${S}"/configure "${conf[@]}" || die "configure failed"
popd >/dev/null || die
+
+ if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+ # a forwarding header is no longer created since 5.8, causing
the system
+ # config to always be used. bug 599636
+ cp src/corelib/global/qconfig.h include/QtCore/ || die
+ fi
}
# @FUNCTION: qt5_qmake
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 17850705303f7a6f3a1498f71daa02f4a1cbccac
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 27 03:46:55 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 27 03:49:08 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=17850705
qt5-build.eclass: create a forwarding header for qtbase
Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.
Gentoo-bug: 599636
eclass/qt5-build.eclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b6c211bc..4c311493 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -680,6 +680,12 @@ qt5_base_configure() {
"${S}"/configure "${conf[@]}" || die "configure failed"
popd >/dev/null || die
+
+ if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+ # a forwarding header is no longer created since 5.8, causing
the system
+ # config to always be used. bug 599636
+ cp src/corelib/global/qconfig.h include/QtCore/ || die
+ fi
}
# @FUNCTION: qt5_qmake
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 63fc505ee72954ded8676c40b891190a5f2af284
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Aug 7 13:25:15 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Aug 7 13:26:59 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=63fc505e
qt5-build.eclass: revert dbus handling workaround
This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
eclass/qt5-build.eclass | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ec6cac3..b6c211bc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -616,12 +616,7 @@ qt5_base_configure() {
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
- # FIXME
- # since 5.8, disabling dbus generates a QT_NO_DBUS in
QtCore/qconfig.h,
- # thus specify runtime loading of libdbus to avoid the #define
- $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime ||
echo -no-dbus)
+ -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
# let portage handle stripping
-no-strip
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: f5155ee01d166f12d4b96ec9cb65d1601278f87c
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Aug 7 13:25:15 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Aug 7 13:25:15 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f5155ee0
qt5-build.eclass: revert dbus handling workaround
This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
eclass/qt5-build.eclass | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4136c8d3..ee5d4f7b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -616,12 +616,7 @@ qt5_base_configure() {
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
- # FIXME
- # since 5.8, disabling dbus generates a QT_NO_DBUS in
QtCore/qconfig.h,
- # thus specify runtime loading of libdbus to avoid the #define
- $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime ||
echo -no-dbus)
+ -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
# let portage handle stripping
-no-strip
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: acb3532769811a5fe20b67f9122fdcd56f1e22ae
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 6 11:26:58 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 6 11:26:58 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=acb35327
qt5-build.eclass: more whitespace
eclass/qt5-build.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2ddd4ec4..4136c8d3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -794,6 +794,7 @@ qt5_regenerate_global_qconfigs() {
for flag in ${flags[@]}; do
cat >> "${T}"/gentoo-qconfig.h <<- _EOF_ || die
+
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}
#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: 7abdf01cd6f44d768750c8d261acfb87adae7078
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 6 11:23:02 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 6 11:23:02 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7abdf01c
qt5-build.eclass: whitespace
eclass/qt5-build.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8c62c65e..2ddd4ec4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -799,7 +799,7 @@ qt5_regenerate_global_qconfigs() {
#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
# define QT_NO_${flag}
#endif
- _EOF_
+ _EOF_
done
mv -f "${T}"/gentoo-qconfig.h
"${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
[gentoo-commits] proj/qt:qtbase59 commit in: eclass/
commit: a07e8719136e55981f3e9574c6253e31ab329254
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 6 11:19:59 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 6 11:19:59 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a07e8719
qt5-build.eclass: remove stray quote
eclass/qt5-build.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index bc67db7e..8c62c65e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -793,7 +793,7 @@ qt5_regenerate_global_qconfigs() {
)
for flag in ${flags[@]}; do
- cat >> "${T}"/gentoo-qconfig.h" <<- _EOF_ || die
+ cat >> "${T}"/gentoo-qconfig.h <<- _EOF_ || die
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}
#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
