summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-qt/assistant
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-qt/assistant')
-rw-r--r--dev-qt/assistant/Manifest4
-rw-r--r--dev-qt/assistant/assistant-4.8.5.ebuild65
-rw-r--r--dev-qt/assistant/assistant-4.8.6-r1.ebuild57
-rw-r--r--dev-qt/assistant/assistant-4.8.7.ebuild54
-rw-r--r--dev-qt/assistant/assistant-5.4.2.ebuild38
-rw-r--r--dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch12
-rw-r--r--dev-qt/assistant/files/disable-webkit.patch26
-rw-r--r--dev-qt/assistant/metadata.xml13
8 files changed, 269 insertions, 0 deletions
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
new file mode 100644
index 000000000000..20dcfa73ac8a
--- /dev/null
+++ b/dev-qt/assistant/Manifest
@@ -0,0 +1,4 @@
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
diff --git a/dev-qt/assistant/assistant-4.8.5.ebuild b/dev-qt/assistant/assistant-4.8.5.ebuild
new file mode 100644
index 000000000000..d08564ee00cd
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
+
+ qt4-build_pkg_setup
+}
+
+src_prepare() {
+ # bug 401173
+ use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
+
+ qt4-build_src_prepare
+}
+
+src_configure() {
+ myconf+="
+ -system-libpng -system-libjpeg -system-zlib
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
+ $(qt_use webkit)"
+
+ qt4-build_src_configure
+}
+
+src_install() {
+ qt4-build_src_install
+
+ doicon tools/assistant/tools/assistant/images/assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
diff --git a/dev-qt/assistant/assistant-4.8.6-r1.ebuild b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..fc4c237c260a
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS="alpha arm ia64 ppc ppc64"
+else
+ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+
+src_prepare() {
+ # bug 401173
+ use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
+
+ qt4-build-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ -system-libpng -system-libjpeg -system-zlib
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
+ doicon tools/assistant/tools/assistant/images/assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild
new file mode 100644
index 000000000000..f50bdf939146
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+
+src_prepare() {
+ # bug 401173
+ use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
+
+ qt4-build-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ -system-libpng -system-libjpeg -system-zlib
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
+ doicon tools/assistant/tools/assistant/images/assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
diff --git a/dev-qt/assistant/assistant-5.4.2.ebuild b/dev-qt/assistant/assistant-5.4.2.ebuild
new file mode 100644
index 000000000000..da3f3e978fbd
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+ >=dev-qt/qtcore-${PV}:5
+ >=dev-qt/qtgui-${PV}:5
+ >=dev-qt/qthelp-${PV}:5
+ >=dev-qt/qtnetwork-${PV}:5
+ >=dev-qt/qtprintsupport-${PV}:5
+ >=dev-qt/qtsql-${PV}:5[sqlite]
+ >=dev-qt/qtwidgets-${PV}:5
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/assistant/assistant
+)
+
+src_prepare() {
+ qt_use_disable_mod webkit webkitwidgets \
+ src/assistant/assistant/assistant.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
new file mode 100644
index 000000000000..1cf70275f634
--- /dev/null
+++ b/dev-qt/assistant/files/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/dev-qt/assistant/files/disable-webkit.patch b/dev-qt/assistant/files/disable-webkit.patch
new file mode 100644
index 000000000000..61bca05148e5
--- /dev/null
+++ b/dev-qt/assistant/files/disable-webkit.patch
@@ -0,0 +1,26 @@
+Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro
++++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
+@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa
+ TEMPLATE = app
+ LANGUAGE = C++
+ TARGET = assistant
+-contains(QT_CONFIG, webkit):QT += webkit
+ CONFIG += qt \
+ warn_on \
+ help
+@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \
+ openpageswidget.cpp \
+ openpagesmanager.cpp \
+ openpagesswitcher.cpp
+-contains(QT_CONFIG, webkit) {
+- SOURCES += helpviewer_qwv.cpp
+-} else {
+- SOURCES += helpviewer_qtb.cpp
+-}
++
++SOURCES += helpviewer_qtb.cpp
+
+ FORMS += bookmarkdialog.ui \
+ bookmarkmanagerwidget.ui \ \ No newline at end of file
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
new file mode 100644
index 000000000000..258aee1d6e0d
--- /dev/null
+++ b/dev-qt/assistant/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <use>
+ <flag name="exceptions">Add support for exceptions - like catching them
+ inside the event loop (recommended by upstream)</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugreports.qt.io/</bugs-to>
+ <doc>http://doc.qt.io/</doc>
+ </upstream>
+</pkgmetadata>