* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-assistant/files/, x11-libs/qt-assistant/
@ 2012-02-01 23:14 Markos Chandras
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras @ 2012-02-01 23:14 UTC (permalink / raw
To: gentoo-commits
commit: 02473e0882210a9e7df86f7cef3c6492f5530018
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 23:13:33 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 23:13:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=02473e08
x11-libs/qt-assistant: Remove obsolete patch. Does not apply to live ebuilds
---
x11-libs/qt-assistant/Manifest | 5 +-
.../files/qt-assistant-4.8.0-install-fix.patch | 59 --------------------
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 5 --
x11-libs/qt-assistant/qt-assistant-4.9999.ebuild | 5 --
4 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index eda7e3b..98ba021 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,9 +1,8 @@
AUX disable-webkit.patch 872 RMD160 cfcb8a1f44a1fe0cddc0d45977cc62351eb2b02a SHA1 cbe42f5611aa06292dd26e6770e553c6f852d5af SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc
AUX qt-assistant-4.7-fix-compat.patch 2987 RMD160 1086b830699b5357388fa0c1b3633c6c4c3f6bd4 SHA1 63dd8200f0a4fcbd29356fbbc11de19f13a75ed2 SHA256 eefa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc
AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f860a8b8dc SHA1 782a7ebf6486fa80c5253f6e37b6ac48cdede7a4 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580
-AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c504585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA256 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
EBUILD qt-assistant-4.7.9999.ebuild 2772 RMD160 3630fabc5bd1c439e6b2d9d123f2d6b747a28a84 SHA1 c81e03e87e62cefb0f1496106c3a680fc6cbe9b1 SHA256 005ddd402c7485d988d4987f8bc39ca3f0e4616456228831e2eb0bf1394530d3
-EBUILD qt-assistant-4.8.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6
-EBUILD qt-assistant-4.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6
+EBUILD qt-assistant-4.8.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729db605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84dfb38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb
+EBUILD qt-assistant-4.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729db605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84dfb38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb
MISC metadata.xml 816 RMD160 7f4cdb5e95a0e1f50fa64172fc238ced50797074 SHA1 8d04c81cb77a5dbe825a070958700cda6fbb64b3 SHA256 080d4e3bc86ad0b0907f13b2ac88cedf515d2508d3135ee4276babdd6098763f
diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch b/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch
deleted file mode 100644
index f18f45e..0000000
--- a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-fix qt-assistant-4.8.0 not installing
-
-gentoo bug #395067
-https://bugs.gentoo.org/show_bug.cgi?id=395067
-
---- doc/doc.pri.org
-+++ doc/doc.pri
-@@ -17,11 +17,6 @@
- COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt
- COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html
-
--EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml
--DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml
--EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples
--DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos
--
- $$unixstyle {
- QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
- } else {
-@@ -30,18 +25,12 @@
- COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
- COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\")
- COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\")
-- EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST, "/", "\\")
-- DEMOSMANIFEST = $$replace(DEMOSMANIFEST, "/", "\\")
-- EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET, "/", "\\")
-- DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\")
- }
- ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
- QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
- linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
- (cd $$QT_BUILD_TREE && \
- $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \
-- $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \
-- $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \
- $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
- $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
- $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \
-@@ -85,14 +74,6 @@
- htmldocs.path = $$[QT_INSTALL_DOCS]
- htmldocs.CONFIG += no_check_exist directory
-
--examplesmanifest.files = $$EXAMPLESMANIFEST
--examplesmanifest.path = $$[QT_INSTALL_EXAMPLES]
--examplesmanifest.CONFIG += no_check_exist directory
--
--demosmanifest.files = $$DEMOSMANIFEST
--demosmanifest.path = $$[QT_INSTALL_DEMOS]
--demosmanifest.CONFIG += no_check_exist directory
--
- qchdocs.files= $$QT_BUILD_TREE/doc/qch
- qchdocs.path = $$[QT_INSTALL_DOCS]
- qchdocs.CONFIG += no_check_exist directory
-@@ -104,4 +85,4 @@
- sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE))
-
- QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP
--INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest
-+INSTALLS += htmldocs qchdocs docimages
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index c16ab12..97ad1d2 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -23,11 +23,6 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?
webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )"
RDEPEND="${DEPEND}"
-PATCHES=(
- # bug 395067
- "${FILESDIR}/${P}-install-fix.patch"
-)
-
pkg_setup() {
# Pixeltool isn't really assistant related, but it relies on
# the assistant libraries. doc/qch/
diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
index c16ab12..97ad1d2 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
@@ -23,11 +23,6 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?
webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )"
RDEPEND="${DEPEND}"
-PATCHES=(
- # bug 395067
- "${FILESDIR}/${P}-install-fix.patch"
-)
-
pkg_setup() {
# Pixeltool isn't really assistant related, but it relies on
# the assistant libraries. doc/qch/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-assistant/files/, x11-libs/qt-assistant/
@ 2012-05-14 17:00 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2012-05-14 17:00 UTC (permalink / raw
To: gentoo-commits
commit: 13131c1852354862d887086d0f5369d6c2a4ac32
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May 14 16:59:47 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 14 16:59:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=13131c18
[x11-libs/qt-assistant] Sync with portage.
(Portage version: 2.2.0_alpha104/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-assistant/Manifest | 1 +
.../files/qt-assistant-4.7-include.tar.gz | Bin 448 -> 0 bytes
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 21 +++++++++++--------
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 9ac0ec7..9e50f44 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1 +1,2 @@
+DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz b/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz
deleted file mode 100644
index 34207d7..0000000
Binary files a/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz and /dev/null differ
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index c0643af..55f346b 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -7,13 +7,17 @@ EAPI=4
inherit qt4-build
DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
-SLOT="4"
+SRC_URI+="
+ compat? (
+ ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+ http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
+ )"
+SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos"
fi
IUSE="compat doc +glib qt3support trace webkit"
@@ -53,12 +57,11 @@ src_unpack() {
# compat version
# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
if use compat; then
- unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+ unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
+ ${PN}-compat-headers-4.7.tar.gz
mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
- "${S}"/tools/assistant/compat ||
- die "moving compat to the right place failed"
- tar xzf "${FILESDIR}"/${PN}-4.7-include.tar.gz -C "${S}"/include/ ||
- die "unpacking the include files failed"
+ "${S}"/tools/assistant/compat || die
+ mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
fi
}
@@ -100,8 +103,8 @@ src_compile() {
if use doc; then
emake docs
- # live ebuild cannot build qch_docs. It will build them through emake docs
elif [[ ${QT4_BUILD_TYPE} == release ]]; then
+ # live ebuild cannot build qch_docs, it will build them through emake docs
emake qch_docs
fi
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-assistant/files/, x11-libs/qt-assistant/
@ 2012-09-11 0:45 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2012-09-11 0:45 UTC (permalink / raw
To: gentoo-commits
commit: b7b275da5f123725b45eff79a1cc20b8f405245f
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Sep 11 00:23:50 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 00:23:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b7b275da
[x11-libs/qt-assistant] Add missing patch from portage.
(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-assistant/Manifest | 2 +-
.../files/qt-assistant-4.8.2+gcc-4.7.patch | 12 ++++++++++++
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 4 ++++
3 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 9e50f44..7abb861 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,2 +1,2 @@
DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
-DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
+DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.8.2+gcc-4.7.patch b/x11-libs/qt-assistant/files/qt-assistant-4.8.2+gcc-4.7.patch
new file mode 100644
index 0000000..1cf7027
--- /dev/null
+++ b/x11-libs/qt-assistant/files/qt-assistant-4.8.2+gcc-4.7.patch
@@ -0,0 +1,12 @@
+--- tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:02:37.539564947 +0200
++++ tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:03:18.843561620 +0200
+@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
+ if (helpEngine.usesAppFont())
+ font = helpEngine.appFont();
+
+- const QWidgetList &widgets = qApp->allWidgets();
+- foreach (QWidget* widget, widgets)
++ foreach (QWidget* widget, QApplication::allWidgets())
+ widget->setFont(font);
+ }
+
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index 5319d37..8d396a4 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -28,6 +28,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
pkg_setup() {
# Pixeltool isn't really assistant related, but it relies on
# the assistant libraries.
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-11 0:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-01 23:14 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-assistant/files/, x11-libs/qt-assistant/ Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2012-05-14 17:00 Davide Pesavento
2012-09-11 0:45 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox