root
7 years ago
parent
aa42980458
commit
66f7d954ae
@ -1,26 +0,0 @@
|
||||
From ee2dfacb275e8145c7ae1ba8da86779054adf902 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Erculiani <lxnay@sabayon.org>
|
||||
Date: Fri, 6 Dec 2013 07:40:15 +0100
|
||||
Subject: [PATCH] entropy: PackageKitEntropyClient.output API update
|
||||
|
||||
---
|
||||
backends/entropy/entropyBackend.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py
|
||||
index 57b6c59..bec8ef6 100755
|
||||
--- a/backends/entropy/entropyBackend.py
|
||||
+++ b/backends/entropy/entropyBackend.py
|
||||
@@ -776,7 +776,8 @@ class PackageKitEntropyClient(Client):
|
||||
def init_singleton(self):
|
||||
Client.init_singleton(self, url_fetcher = PkUrlFetcher)
|
||||
|
||||
- def output(self, text, header = "", footer = "", back = False,
|
||||
+ @classmethod
|
||||
+ def output(cls, text, header = "", footer = "", back = False,
|
||||
importance = 0, level = "info", count = None, percent = False):
|
||||
"""
|
||||
Reimplemented from entropy.output.TextInterface.
|
||||
--
|
||||
1.8.4.4
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
Index: PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml
|
||||
===================================================================
|
||||
--- PackageKit-0.8.12.orig/src/org.freedesktop.PackageKit.xml
|
||||
+++ PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml
|
||||
@@ -317,6 +317,7 @@
|
||||
|
||||
<!--*****************************************************************************************-->
|
||||
<method name="GetPackageHistory">
|
||||
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariant"/>
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3e8d301..7ba7f4b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -361,7 +361,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br
|
||||
enable_browser_plugin=$enableval,enable_browser_plugin=yes)
|
||||
if test x$enable_browser_plugin = xyes; then
|
||||
PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \
|
||||
- mozilla-plugin >= 8.0 \
|
||||
+ npapi-sdk \
|
||||
gio-unix-2.0 \
|
||||
nspr >= 4.8 \
|
||||
cairo \
|
||||
@ -1,21 +0,0 @@
|
||||
--- a/src/drivers/mysql/drv_mysql.c.orig 2017-10-06 06:24:37.930414458 +0000
|
||||
+++ b/src/drivers/mysql/drv_mysql.c 2017-10-06 06:25:19.647414458 +0000
|
||||
@@ -35,7 +35,6 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include <mysql.h>
|
||||
-#include <mysql_version.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <errmsg.h>
|
||||
|
||||
@@ -50,8 +49,8 @@
|
||||
|
||||
#define SAFESTR(s) ((s != NULL) ? (s) : "(null)")
|
||||
|
||||
-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 && \
|
||||
- MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
|
||||
+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \
|
||||
+ MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
|
||||
typedef bool my_bool;
|
||||
#endif
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
DESCRIPTION="System performance benchmark"
|
||||
HOMEPAGE="https://github.com/akopytov/sysbench"
|
||||
SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="aio mysql postgres test"
|
||||
|
||||
RDEPEND="aio? ( dev-libs/libaio )
|
||||
mysql? ( virtual/libmysqlclient )
|
||||
postgres? ( dev-db/postgresql:= )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-editors/vim-core
|
||||
dev-lang/luajit:=
|
||||
dev-libs/concurrencykit
|
||||
dev-libs/libxslt
|
||||
sys-devel/libtool:=
|
||||
virtual/pkgconfig
|
||||
test? ( dev-util/cram )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i -e "/^htmldir =/s:=.*:=/usr/share/doc/${PF}/html:" doc/Makefile.am || die
|
||||
|
||||
# remove bundled libs
|
||||
rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
|
||||
|
||||
./autogen.sh || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable aio aio)
|
||||
$(use_with mysql mysql)
|
||||
$(use_with postgres pgsql)
|
||||
--without-attachsql
|
||||
--without-drizzle
|
||||
--without-oracle
|
||||
--with-system-luajit
|
||||
--with-system-ck
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check test
|
||||
}
|
||||
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit pax-utils
|
||||
|
||||
DESCRIPTION="System performance benchmark"
|
||||
HOMEPAGE="https://github.com/akopytov/sysbench"
|
||||
SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="aio mysql postgres test"
|
||||
|
||||
RDEPEND="aio? ( dev-libs/libaio )
|
||||
mysql? ( virtual/libmysqlclient )
|
||||
postgres? ( dev-db/postgresql:= )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-editors/vim-core
|
||||
dev-lang/luajit:=
|
||||
dev-libs/concurrencykit
|
||||
dev-libs/libxslt
|
||||
sys-devel/libtool:=
|
||||
virtual/pkgconfig
|
||||
test? ( dev-util/cram )"
|
||||
|
||||
# https://github.com/akopytov/sysbench/commit/f5fa7800cbbdd3920290e04e597d90a26cde7608
|
||||
PATCHES=( "${FILESDIR}/${PN}-fix-mariadb-include.patch" )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i -e "/^htmldir =/s:=.*:=/usr/share/doc/${PF}/html:" doc/Makefile.am || die
|
||||
|
||||
# remove bundled libs
|
||||
rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
|
||||
|
||||
./autogen.sh || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable aio aio)
|
||||
$(use_with mysql mysql)
|
||||
$(use_with postgres pgsql)
|
||||
--without-attachsql
|
||||
--without-drizzle
|
||||
--without-oracle
|
||||
--with-system-luajit
|
||||
--with-system-ck
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
pax-mark m "${S}/src/${PN}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check test
|
||||
}
|
||||
@ -1 +1 @@
|
||||
DIST eselect-electron-2.0.tar.gz 9673 SHA256 3e9414266f00cff3277967d20b8b6db1eeb5468a48b5ec59b37120a58887dd01 SHA512 1191acdbaf0d7f115dc8bcef259be111bf6631018a74eb0025e66ef3e26929eb6b630afc1a478956aa0c564ba13b318d97f704e093b68e0dbcbd1661f2cb202f WHIRLPOOL c24eb3761dd11103047b38e4fc88536187579148d3a4fdfa4567a5b4592eac22429ac55df9844c4b1492176e24736a1692629cd68c64597b476e8cc45843b2fd
|
||||
DIST eselect-electron-2.1.tar.gz 9658 SHA256 40f946907b91ede7b39bb1bf082db6d2a3ba04ea5d768c567d3d72c1881c7695 SHA512 6ba30b1e4d55e01cd9df3ab30038a45dba80c6191e676169e28b3f9881b4154db5edfe8569cafe77022b467e9383a291b1e6c49e296a8ed90582b2c6d1489c47 WHIRLPOOL 2dd5be13f777036bb694a69d4d1cb789c5092851677304df27bd7668a56380221fc5ec217fda4f0405aa5f4f696a5a75e2c8bbe0c908479c8a23200ed9abe60d
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
--- util/rarian-sk-preinstall.cpp.old 2008-09-01 20:40:21.000000000 +0200
|
||||
+++ util/rarian-sk-preinstall.cpp 2010-01-30 11:29:39.000000000 +0100
|
||||
@@ -96,8 +96,8 @@
|
||||
}
|
||||
if (i == 1) {
|
||||
/* Normal path. Add file:/ to the start */
|
||||
- new_url = (char *) malloc (sizeof(char) * (strlen (input) + 7));
|
||||
- sprintf (new_url, "file:/%s", input);
|
||||
+ new_url = (char *) malloc (sizeof(char) * (strlen (input) + 8));
|
||||
+ sprintf (new_url, "file://%s", input);
|
||||
} else {
|
||||
/* Don't know what to do. Just copy and append file: to it */
|
||||
new_url = (char *) malloc (sizeof(char) * (strlen(input) + 6));
|
||||
@ -0,0 +1 @@
|
||||
DIST jedi-0.8_p20171015.zip 43567 SHA256 a120fc6c611f4ee37771d6deb4b871a2d40ca7125231e6f262aa28772eb06880 SHA512 d69fa77ada22b0c75b7ec4ad1765035454312707ffb0f8a0bb0de4928e5fd21b08e39ab28b3f0ff9b37c8eb5389bc44c507fa2a08c0322510a57a91d7de028e6 WHIRLPOOL 150efcb21de8cd8fe523116f67999a99ae28438779eba40a1d8889896000ceebbd1fc9c8a22d0bfacd1619ad36d3ef60df2d97d254075c3a82b2f091e5d93d55
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_4} )
|
||||
|
||||
inherit vim-plugin python-r1 python-utils-r1
|
||||
|
||||
# Commit Date: Sun Oct 15 20:51:54 2017 +0200
|
||||
COMMIT="77924398bd594e238766153cec97ace62650f082"
|
||||
|
||||
DESCRIPTION="vim plugin: binding to the autocompletion library jedi"
|
||||
HOMEPAGE="https://github.com/davidhalter/jedi-vim"
|
||||
SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${COMMIT}.zip -> ${P}.zip"
|
||||
|
||||
LICENSE="MIT"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="dev-python/jedi[${PYTHON_USEDEP}]"
|
||||
DEPEND="app-editors/vim[python]"
|
||||
|
||||
S="${WORKDIR}/jedi-vim-${COMMIT}"
|
||||
|
||||
# Tests are broken.
|
||||
RESTRICT="test"
|
||||
|
||||
# Makefile tries hard to call tests so let's silence this phase.
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
vim-plugin_src_install
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>horea.christ@gmail.com</email>
|
||||
<name>Horea Christian</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>vim@gentoo.org</email>
|
||||
<name>Gentoo Vim Project</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
Jedi-vim is a VIM binding to the autocompletion library Jedi.
|
||||
Apart from that, jedi-vim provides a number of keybindings.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">davidhalter/jedi-vim</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,209 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
MY_EXTRAS_VER="20170926-1321Z"
|
||||
SUBSLOT="18"
|
||||
MYSQL_PV_MAJOR="5.6"
|
||||
|
||||
JAVA_PKG_OPT_USE="jdbc"
|
||||
|
||||
inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
|
||||
|
||||
HOMEPAGE="http://mariadb.org/"
|
||||
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
|
||||
|
||||
IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
|
||||
RESTRICT="!bindist? ( bindist )"
|
||||
|
||||
REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
|
||||
|
||||
# REMEMBER: also update eclass/mysql*.eclass before committing!
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
|
||||
|
||||
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
|
||||
PATCHES=(
|
||||
"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
|
||||
"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch"
|
||||
"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
|
||||
"${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
|
||||
)
|
||||
COMMON_DEPEND="
|
||||
!bindist? ( >=sys-libs/readline-4.1:0= )
|
||||
server? (
|
||||
extraengine? (
|
||||
odbc? ( dev-db/unixODBC:0= )
|
||||
xml? ( dev-libs/libxml2:2= )
|
||||
sys-libs/zlib[minizip]
|
||||
)
|
||||
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
|
||||
pam? ( virtual/pam:0= )
|
||||
tokudb? ( app-arch/snappy )
|
||||
)
|
||||
>=dev-libs/libpcre-8.41-r1:3=[${MULTILIB_USEDEP}]
|
||||
"
|
||||
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
|
||||
server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
|
||||
${COMMON_DEPEND}"
|
||||
RDEPEND="${RDEPEND} ${COMMON_DEPEND}
|
||||
perl? ( !dev-db/mytop
|
||||
virtual/perl-Getopt-Long
|
||||
dev-perl/TermReadKey
|
||||
virtual/perl-Term-ANSIColor
|
||||
virtual/perl-Time-HiRes )
|
||||
server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
|
||||
"
|
||||
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
|
||||
/usr/include/mysql/private/probes_mysql_nodtrace.h
|
||||
/usr/include/mysql/private/probes_mysql_dtrace.h )
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
mysql-multilib-r1_pkg_setup
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
java-pkg-opt-2_pkg_preinst
|
||||
mysql-multilib-r1_pkg_preinst
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
java-pkg-opt-2_src_prepare
|
||||
mysql-multilib-r1_src_prepare
|
||||
}
|
||||
|
||||
src_configure(){
|
||||
# bug 508724 mariadb cannot use ld.gold
|
||||
tc-ld-disable-gold
|
||||
local MYSQL_CMAKE_NATIVE_DEFINES=(
|
||||
-DWITH_JEMALLOC=$(usex jemalloc system)
|
||||
-DWITH_PCRE=system
|
||||
)
|
||||
if use server ; then
|
||||
# Federated{,X} must be treated special otherwise they will not be built as plugins
|
||||
if ! use extraengine ; then
|
||||
MYSQL_CMAKE_NATIVE_DEFINES+=(
|
||||
-DWITHOUT_FEDERATED=1
|
||||
-DWITHOUT_FEDERATEDX=1 )
|
||||
fi
|
||||
|
||||
# Connect with Zip is currently broken and does not compile
|
||||
# Reported upstream https://jira.mariadb.org/browse/MDEV-11809
|
||||
|
||||
MYSQL_CMAKE_NATIVE_DEFINES+=(
|
||||
$(mysql-cmake_use_plugin oqgraph OQGRAPH)
|
||||
$(mysql-cmake_use_plugin sphinx SPHINX)
|
||||
$(mysql-cmake_use_plugin tokudb TOKUDB)
|
||||
$(mysql-cmake_use_plugin pam AUTH_PAM)
|
||||
$(mysql-cmake_use_plugin extraengine SEQUENCE)
|
||||
$(mysql-cmake_use_plugin extraengine SPIDER)
|
||||
$(mysql-cmake_use_plugin extraengine CONNECT)
|
||||
-DCONNECT_WITH_LIBXML2=$(usex xml)
|
||||
-DCONNECT_WITH_ODBC=$(usex odbc)
|
||||
-DCONNECT_WITH_JDBC=$(usex jdbc)
|
||||
-DWITHOUT_MROONGA=1
|
||||
)
|
||||
fi
|
||||
mysql-multilib-r1_src_configure
|
||||
}
|
||||
|
||||
# Official test instructions:
|
||||
# USE='extraengine perl server openssl static-libs' \
|
||||
# FEATURES='test userpriv -usersandbox' \
|
||||
# ebuild mariadb-X.X.XX.ebuild \
|
||||
# digest clean package
|
||||
multilib_src_test() {
|
||||
|
||||
if ! multilib_is_native_abi ; then
|
||||
einfo "Server tests not available on non-native abi".
|
||||
return 0;
|
||||
fi
|
||||
|
||||
local TESTDIR="${BUILD_DIR}/mysql-test"
|
||||
local retstatus_unit
|
||||
local retstatus_tests
|
||||
|
||||
if use server ; then
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [[ $UID -eq 0 ]]; then
|
||||
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
|
||||
|
||||
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
addpredict /this-dir-does-not-exist/t9.MYI
|
||||
|
||||
# Run CTest (test-units)
|
||||
cmake-utils_src_test
|
||||
retstatus_unit=$?
|
||||
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
|
||||
|
||||
# Ensure that parallel runs don't die
|
||||
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
|
||||
# Enable parallel testing, auto will try to detect number of cores
|
||||
# You may set this by hand.
|
||||
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
|
||||
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
|
||||
|
||||
# create directories because mysqladmin might run out of order
|
||||
mkdir -p "${T}"/var-tests{,/log}
|
||||
|
||||
# These are failing in MariaDB 10.0 for now and are believed to be
|
||||
# false positives:
|
||||
#
|
||||
# main.information_schema, binlog.binlog_statement_insert_delayed,
|
||||
# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
|
||||
# funcs_1.is_columns_mysql main.bootstrap
|
||||
# fails due to USE=-latin1 / utf8 default
|
||||
#
|
||||
# main.mysql_client_test, main.mysql_client_test_nonblock
|
||||
# main.mysql_client_test_comp:
|
||||
# segfaults at random under Portage only, suspect resource limits.
|
||||
#
|
||||
# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
|
||||
# fails due to bad cleanup of previous tests when run in parallel
|
||||
# The tool is deprecated anyway
|
||||
# Bug 532288
|
||||
|
||||
#main.bootstrap \
|
||||
for t in connect.drop-open-error ; do
|
||||
# main.mysql_client_test_comp \
|
||||
# binlog.binlog_statement_insert_delayed main.information_schema \
|
||||
# main.mysqld--help \
|
||||
# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
|
||||
# funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
|
||||
mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
|
||||
done
|
||||
|
||||
# Run mysql tests
|
||||
pushd "${TESTDIR}" || die
|
||||
|
||||
# run mysql-test tests
|
||||
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
|
||||
|
||||
retstatus_tests=$?
|
||||
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
|
||||
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
|
||||
|
||||
popd || die
|
||||
|
||||
# Cleanup is important for these testcases.
|
||||
pkill -9 -f "${S}/ndb" 2>/dev/null
|
||||
pkill -9 -f "${S}/sql" 2>/dev/null
|
||||
|
||||
failures=""
|
||||
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
|
||||
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
|
||||
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
|
||||
|
||||
[[ -z "$failures" ]] || die "Test failures: $failures"
|
||||
einfo "Tests successfully completed"
|
||||
|
||||
else
|
||||
einfo "Skipping server tests due to minimal build."
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
https://bugs.exim.org/show_bug.cgi?id=2173#c4
|
||||
|
||||
diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c
|
||||
--- a/pcre/pcre_exec.c
|
||||
+++ b/pcre/pcre_exec.c
|
||||
@@ -509,6 +509,12 @@
|
||||
(e.g. stopped by repeated call or recursion limit)
|
||||
*/
|
||||
|
||||
+#ifdef __GNUC__
|
||||
+static int
|
||||
+match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
|
||||
+ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
|
||||
+ unsigned int rdepth) __attribute__((noinline,noclone));
|
||||
+#endif
|
||||
static int
|
||||
match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
|
||||
PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
|
||||
@ -0,0 +1,104 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
|
||||
|
||||
DESCRIPTION="Perl-compatible regular expression library"
|
||||
HOMEPAGE="http://www.pcre.org/"
|
||||
MY_P="pcre-${PV/_rc/-RC}"
|
||||
if [[ ${PV} != *_rc* ]] ; then
|
||||
# Only the final releases are available here.
|
||||
SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
|
||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
|
||||
else
|
||||
SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
|
||||
fi
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="3"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
|
||||
REQUIRED_USE="readline? ( !libedit )
|
||||
libedit? ( !readline )"
|
||||
|
||||
RDEPEND="
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
zlib? ( sys-libs/zlib )
|
||||
libedit? ( dev-libs/libedit )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="
|
||||
${RDEPEND}
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/pcre-config
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch
|
||||
"${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT)
|
||||
$(multilib_native_use_enable bzip2 pcregrep-libbz2)
|
||||
$(use_enable cxx cpp)
|
||||
$(use_enable jit) $(use_enable jit pcregrep-jit)
|
||||
$(use_enable pcre16)
|
||||
$(use_enable pcre32)
|
||||
$(multilib_native_use_enable libedit pcretest-libedit)
|
||||
$(multilib_native_use_enable readline pcretest-libreadline)
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable unicode utf) $(use_enable unicode unicode-properties)
|
||||
$(multilib_native_use_enable zlib pcregrep-libz)
|
||||
--enable-pcre8
|
||||
--enable-shared
|
||||
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
|
||||
--docdir="${EPREFIX}"/usr/share/doc/${PF}
|
||||
)
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
|
||||
install
|
||||
gen_usr_ldscript -a pcre
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserve_old_lib /$(get_libdir)/libpcre.so.0
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST link-grammar-5.3.10.tar.gz 3612522 SHA256 7ead9a5190cfac2f8a0f8b2608fd48b6d71a50aa55cb4fedd3f52e85a4df0a95 SHA512 b91c79c6c668c7d1ccb0f29e3762e4426f082421fc3a15e77bfacbc3681d4f969db7015010504dc8418e4d8c90847ed156bcc0ea01fd6589ef31c4d35af6e989 WHIRLPOOL 3c1d05f3523e6b411b653803c4f2490078d3a227eec3fc4497c0d801127c00fe3eca7bb9d1b868b2c776b59829ea96da42ceee70d24d6617f9040b0164dfe1bc
|
||||
DIST link-grammar-5.3.11.tar.gz 3632617 SHA256 73ca3ae82ec7ddbfce827eb7017a2953afea2cea854b4d7517139881e1170cd7 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2 WHIRLPOOL c4f1cfa11d7d1b07dfdd15d9798789fd5c7b2d8f79d12e717c9b92527757b7b9e67c9813deb8aac93e60a145c0783c23f3ee9654e570858ec428af094ba95831
|
||||
|
||||
@ -1,155 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
GNOME2_LA_PUNT="yes"
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
|
||||
|
||||
inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
|
||||
|
||||
DESCRIPTION="A Syntactic English parser"
|
||||
HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
|
||||
SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
|
||||
IUSE="aspell +hunspell java python static-libs threads"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="
|
||||
aspell? ( app-text/aspell )
|
||||
hunspell? ( app-text/hunspell )
|
||||
java? (
|
||||
>=virtual/jdk-1.6:*
|
||||
dev-java/ant-core )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/swig:0
|
||||
sys-devel/autoconf-archive
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
NORMAL_BUILD_DIR="${WORKDIR}/${P}-normal"
|
||||
|
||||
pkg_setup() {
|
||||
if use aspell && use hunspell; then
|
||||
ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
|
||||
ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
|
||||
ewarn "you want aspell support."
|
||||
fi
|
||||
use java && java-pkg-opt-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
use java && java-pkg-opt-2_src_prepare
|
||||
|
||||
# http://bugzilla.abisource.com/show_bug.cgi?id=13806
|
||||
eapply "${FILESDIR}"/${PN}-5.3.9-out-of-source-build.patch
|
||||
eautoreconf
|
||||
|
||||
if use python ; then
|
||||
prepare_python() {
|
||||
mkdir -p "${BUILD_DIR}" || die
|
||||
}
|
||||
python_foreach_impl prepare_python
|
||||
fi
|
||||
|
||||
mkdir -p "${NORMAL_BUILD_DIR}" || die
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--disable-editline
|
||||
--disable-perl-bindings
|
||||
--enable-shared
|
||||
$(use_enable aspell)
|
||||
$(use_enable hunspell)
|
||||
$(usex hunspell --with-hunspell-dictdir=/usr/share/myspell)
|
||||
$(use_enable java java-bindings)
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable threads pthreads)
|
||||
)
|
||||
|
||||
cd "${NORMAL_BUILD_DIR}" || die
|
||||
ECONF_SOURCE="${S}" gnome2_src_configure \
|
||||
--disable-python-bindings \
|
||||
--disable-python3-bindings \
|
||||
${myconf[@]}
|
||||
|
||||
if use python ; then
|
||||
prepare_python() {
|
||||
if python_is_python3; then
|
||||
ECONF_SOURCE="${S}" gnome2_src_configure \
|
||||
--disable-python-bindings \
|
||||
--enable-python3-bindings \
|
||||
${myconf[@]}
|
||||
else
|
||||
ECONF_SOURCE="${S}" gnome2_src_configure \
|
||||
--enable-python-bindings \
|
||||
--disable-python3-bindings \
|
||||
${myconf[@]}
|
||||
fi
|
||||
}
|
||||
python_foreach_impl run_in_build_dir prepare_python
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd "${NORMAL_BUILD_DIR}" || die
|
||||
gnome2_src_compile
|
||||
|
||||
if use python ; then
|
||||
compile_binding() {
|
||||
local pysuffix
|
||||
if python_is_python3; then
|
||||
pysuffix=3
|
||||
else
|
||||
pysuffix=
|
||||
fi
|
||||
|
||||
emake -C bindings/python$pysuffix \
|
||||
VPATH="${S}:${NORMAL_BUILD_DIR}" \
|
||||
_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
|
||||
_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la
|
||||
}
|
||||
python_foreach_impl run_in_build_dir compile_binding
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${NORMAL_BUILD_DIR}" || die
|
||||
ln -s "${S}"/data tests/data || die
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd "${NORMAL_BUILD_DIR}" || die
|
||||
gnome2_src_install
|
||||
|
||||
if use python ; then
|
||||
install_binding() {
|
||||
local pysuffix
|
||||
if python_is_python3; then
|
||||
pysuffix=3
|
||||
else
|
||||
pysuffix=
|
||||
fi
|
||||
|
||||
emake -C bindings/python$pysuffix \
|
||||
VPATH="${S}:${NORMAL_BUILD_DIR}" \
|
||||
_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
|
||||
_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
}
|
||||
python_foreach_impl run_in_build_dir install_binding
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
use java && java-pkg-opt-2_pkg_preinst
|
||||
gnome2_pkg_preinst
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
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.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
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 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
|
||||
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'
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
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}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qthelp-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtprintsupport-${PV}
|
||||
~dev-qt/qtsql-${PV}[sqlite]
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
webkit? ( ~dev-qt/qtwebkit-${PV} )
|
||||
"
|
||||
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
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
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.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils qt4-build-multilib
|
||||
|
||||
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESIGNER_PLUGINS="declarative phonon qt3support webkit"
|
||||
IUSE="${DESIGNER_PLUGINS}"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )"
|
||||
|
||||
QT4_TARGET_DIRECTORIES="tools/designer"
|
||||
|
||||
src_prepare() {
|
||||
qt4-build-multilib_src_prepare
|
||||
|
||||
local plugin
|
||||
for plugin in ${DESIGNER_PLUGINS}; do
|
||||
if ! use ${plugin} || [[ ${plugin} == phonon ]]; then
|
||||
sed -i -e "/\<${plugin}\>/d" \
|
||||
tools/designer/src/plugins/plugins.pro || die
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-system-libpng -system-libjpeg -system-zlib
|
||||
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
|
||||
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
|
||||
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
qt4_multilib_src_install_all
|
||||
|
||||
doicon tools/designer/src/designer/images/designer.png
|
||||
make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE="declarative webkit"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtprintsupport-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
|
||||
webkit? ( ~dev-qt/qtwebkit-${PV} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/designer
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
qt_use_disable_mod declarative quickwidgets \
|
||||
src/designer/src/plugins/plugins.pro
|
||||
|
||||
qt_use_disable_mod webkit webkitwidgets \
|
||||
src/designer/src/plugins/plugins.pro
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Tools for working with Qt translation data files"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE="qml"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/linguist
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e '/SUBDIRS += linguist/d' \
|
||||
src/linguist/linguist.pro || die
|
||||
|
||||
qt_use_disable_mod qml qmldevtools-private \
|
||||
src/linguist/lupdate/lupdate.pro
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
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.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils qt4-build-multilib
|
||||
|
||||
DESCRIPTION="Graphical tool for translating Qt applications"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-system-libpng -system-libjpeg -system-zlib
|
||||
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
|
||||
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
|
||||
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
qt4_multilib_src_install_all
|
||||
|
||||
newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
|
||||
make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Graphical tool for translating Qt applications"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm hppa ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/designer-${PV}
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtprintsupport-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/linguist/linguist
|
||||
)
|
||||
@ -1,5 +1,3 @@
|
||||
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.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-build-multilib
|
||||
|
||||
DESCRIPTION="Qt screen magnifier"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
!<dev-qt/qthelp-4.8.5:4
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT4_TARGET_DIRECTORIES="tools/pixeltool"
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-system-libpng -system-libjpeg -system-zlib
|
||||
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
|
||||
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
|
||||
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Qt screen magnifier"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm hppa ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/pixeltool
|
||||
)
|
||||
@ -1,3 +1,2 @@
|
||||
DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Interface to Qt applications communicating over D-Bus"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdbus-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/qdbus/qdbus
|
||||
)
|
||||
@ -1,5 +1,3 @@
|
||||
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.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils qt4-build-multilib
|
||||
|
||||
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-system-libpng -system-libjpeg -system-zlib
|
||||
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
|
||||
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
|
||||
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
qt4_multilib_src_install_all
|
||||
|
||||
newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
|
||||
make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm hppa ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdbus-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/qdbus/qdbusviewer
|
||||
)
|
||||
@ -1,3 +1,2 @@
|
||||
DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Qt documentation generator"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/qdoc
|
||||
)
|
||||
@ -1,3 +1,2 @@
|
||||
DIST 5.6.2-0qt-everywhere-documentation-5.6.2.7z 125390155 SHA256 3421b5a2fba1f6e134137e4c9f747303bc2218c46b314dae858499aab850931c SHA512 40026c69e6b2de8f84fc974bc307519016982cafe4006ef3663839c9bcf74f7c28679cf8f4ca5a82bfafc3cb455433fe3360c11a60192d8c6b75a8b1b56e7141 WHIRLPOOL edd591be964208467700c91a02eb345f73f4104820b3f605b8e2d4c2704faccc681320bcfef5bfa70cc084b10cf2ada09d5771b0ac578193fd7eaafe0ee86477
|
||||
DIST 5.7.1-0qt-everywhere-documentation-5.7.1.7z 173336041 SHA256 44eb231b5f961a9f11d05648431121bbdaa32ac65e6b563543d147c3b88eec41 SHA512 4fcbfcd29aa48937229d01d47569a5fcd81459b9444058c725bdbac14dd2b9c67c9e04944c74d351f4bca7d972e23c3832ba2dd8e979cc4e9fe677e2d51561e0 WHIRLPOOL 8a6e1857866e43f7f40ed4382e0d5b4f27520404a77f3a014834045117f207bb40a0a81aaa00afa39a4684584499f6957bf739a1f25d06c04019ef21dac1adfd
|
||||
DIST 5.9.2-0-201710050733qt-everywhere-documentation.7z 200249125 SHA256 eb6c5ad1cc12c6a921acb458725ae06f0b078857ec72b10c498833ea59f2fac0 SHA512 3cc73bec1a1310923206cbecfe95fe80d28195ae38251d04f07881dbd42ff1223f1353ac34787065ac3e09c4aceca76d2be407558204b8920fba65c04ee0594e WHIRLPOOL 4e1f4c7d0cee30e339aca5795e15af33762850b06bfa7a4da0259bac0425bf631bf622fba6557a77741db160b268f89a18c998020b4c9b4a720e879f5cc9ab7b
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit versionator
|
||||
|
||||
MY_PV=$(get_version_component_range 1)$(get_version_component_range 2)
|
||||
MY_P=${PV/_p/-}qt-everywhere-documentation-${PV%%_p*}
|
||||
|
||||
DESCRIPTION="Documentation for Qt5, for use with Qt Creator and other tools"
|
||||
HOMEPAGE="https://www.qt.io/"
|
||||
SRC_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${MY_PV}_src_doc_examples/qt.${MY_PV}.doc/${MY_P}.7z"
|
||||
|
||||
LICENSE="FDL-1.3"
|
||||
SLOT="5"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="app-arch/p7zip"
|
||||
|
||||
S=${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2)
|
||||
|
||||
src_install() {
|
||||
# ${PV} instead of ${PF} is intentional
|
||||
local dest=/usr/share/doc/qt-${PV%%_p*}
|
||||
insinto "${dest}"
|
||||
doins -r *
|
||||
docompress -x "${dest}"
|
||||
|
||||
# these files are not shipped in any other version of qt-docs and collide with qtcore
|
||||
# bug 597026
|
||||
rm -rf "${ED}${dest}"/global || die
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
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
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-build-multilib
|
||||
|
||||
DESCRIPTION="The Qt3Support module for the Qt toolkit"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
fi
|
||||
|
||||
IUSE="+accessibility"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/qt3support
|
||||
src/tools/uic3
|
||||
tools/porting"
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-qt3support
|
||||
$(qt_use accessibility)
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
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
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-build-multilib
|
||||
|
||||
DESCRIPTION="The network bearer plugins for the Qt toolkit"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
fi
|
||||
|
||||
IUSE="connman networkmanager"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
connman? ( net-misc/connman )
|
||||
networkmanager? ( net-misc/networkmanager )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/plugins/bearer/generic
|
||||
$(use connman && echo src/plugins/bearer/connman)
|
||||
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
$(use connman || use networkmanager || echo -no-dbus)
|
||||
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
|
||||
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
|
||||
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
|
||||
-no-cups -no-gtkstyle -no-nas-sound -no-opengl
|
||||
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
|
||||
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST qtconnectivity-opensource-src-5.6.2.tar.xz 2639772 SHA256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 SHA512 4cef0afa38679ca11550693ae9bb9ca70835ed129ba7aa3db868a06743d406cdf473173cc55bda7b1171499b58bdc860bc64838ae8d1f2a171c85a2b64756ff1 WHIRLPOOL 62b97e947af738ff80aa62ae1eb954968b520073e126dc8b33d84a105bf3d51397fc8e7f1d4ca3a4c1efa7f090d1105d1fe6abbd4e8a85c0382ef8bda0c4c310
|
||||
DIST qtconnectivity-opensource-src-5.7.1.tar.xz 2690688 SHA256 b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 SHA512 3550be2ce365c7eea2adb41b6db63d0867ff1eaae15d6f4d22345bfdd8e4ac9c2f3983e5d3e897d5c4d7d32e466929c2cfdfac0921c0927c3955f021d37d9e61 WHIRLPOOL 18776531aa22a060c73f6b3534060e38a6d5b7acb14834d7a531a22a246389753ce44e8de3dc3be476a21e2ddd6ca38746eee8a7e1e96c6a817f339fe9966051
|
||||
DIST qtconnectivity-opensource-src-5.9.2.tar.xz 2723028 SHA256 2c759597ec959d54f29a3f628896d9208cf1f4e2269d8e01a9d3036f6995f3cc SHA512 c7a32ca45464670bb461139e48721c80859d2ef2eb5e30b61062578c07dfe1cf9cceb0bfe01304f4661a6b80cc7c2769399e0745a165596440a896bd1e1d0893 WHIRLPOOL 85d1f7313f2721796c2afbc96d185fcbd051ac71edc686bde34feed1c24da8c785958c56bb651f01bd168cf5da6ee7b0a781c637b26bf449043f4369e3e28e87
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qtconnectivity"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Bluetooth support library for the Qt5 framework"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm x86"
|
||||
fi
|
||||
|
||||
IUSE="qml"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtconcurrent-${PV}
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdbus-${PV}
|
||||
>=net-wireless/bluez-5
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/nfc//' src/src.pro || die
|
||||
|
||||
qt_use_disable_mod qml quick src/src.pro
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
|
||||
DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
|
||||
DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qtbase"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/concurrent
|
||||
)
|
||||
@ -1,5 +1,3 @@
|
||||
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 qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
|
||||
DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
|
||||
DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
|
||||
|
||||
@ -1,431 +0,0 @@
|
||||
From fa81aa6d027049e855b76f5408586a288f160575 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Goetz <markus@woboq.com>
|
||||
Date: Tue, 28 Apr 2015 11:57:36 +0200
|
||||
Subject: QNAM: Fix upload corruptions when server closes connection
|
||||
|
||||
This patch fixes several upload corruptions if the server closes the connection
|
||||
while/before we send data into it. They happen inside multiple places in the HTTP
|
||||
layer and are explained in the comments.
|
||||
Corruptions are:
|
||||
* The upload byte device has an in-flight signal with pending upload data, if
|
||||
it gets reset (because server closes the connection) then the re-send of the
|
||||
request was sometimes taking this stale in-flight pending upload data.
|
||||
* Because some signals were DirectConnection and some were QueuedConnection, there
|
||||
was a chance that a direct signal overtakes a queued signal. The state machine
|
||||
then sent data down the socket which was buffered there (and sent later) although
|
||||
it did not match the current state of the state machine when it was actually sent.
|
||||
* A socket was seen as being able to have requests sent even though it was not
|
||||
encrypted yet. This relates to the previous corruption where data is stored inside
|
||||
the socket's buffer and then sent later.
|
||||
|
||||
The included auto test produces all fixed corruptions, I detected no regressions
|
||||
via the other tests.
|
||||
This code also adds a bit of sanity checking to protect from possible further
|
||||
problems.
|
||||
|
||||
[ChangeLog][QtNetwork] Fix HTTP(s) upload corruption when server closes connection
|
||||
|
||||
(cherry picked from commit qtbase/cff39fba10ffc10ee4dcfdc66ff6528eb26462d3)
|
||||
Change-Id: I9793297be6cf3edfb75b65ba03b65f7a133ef194
|
||||
Reviewed-by: Richard J. Moore <rich@kde.org>
|
||||
---
|
||||
src/corelib/io/qnoncontiguousbytedevice.cpp | 19 +++
|
||||
src/corelib/io/qnoncontiguousbytedevice_p.h | 4 +
|
||||
.../access/qhttpnetworkconnectionchannel.cpp | 47 +++++-
|
||||
src/network/access/qhttpthreaddelegate_p.h | 36 ++++-
|
||||
src/network/access/qnetworkaccesshttpbackend.cpp | 24 ++-
|
||||
src/network/access/qnetworkaccesshttpbackend_p.h | 5 +-
|
||||
tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 174 ++++++++++++++++++++-
|
||||
7 files changed, 280 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
|
||||
index bf58eee..1a0591e 100644
|
||||
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
|
||||
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
|
||||
@@ -245,6 +245,12 @@ qint64 QNonContiguousByteDeviceByteArrayImpl::size()
|
||||
return byteArray->size();
|
||||
}
|
||||
|
||||
+qint64 QNonContiguousByteDeviceByteArrayImpl::pos()
|
||||
+{
|
||||
+ return currentPosition;
|
||||
+}
|
||||
+
|
||||
+
|
||||
QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb)
|
||||
: QNonContiguousByteDevice(), currentPosition(0)
|
||||
{
|
||||
@@ -296,6 +302,11 @@ qint64 QNonContiguousByteDeviceRingBufferImpl::size()
|
||||
return ringBuffer->size();
|
||||
}
|
||||
|
||||
+qint64 QNonContiguousByteDeviceRingBufferImpl::pos()
|
||||
+{
|
||||
+ return currentPosition;
|
||||
+}
|
||||
+
|
||||
QNonContiguousByteDeviceIoDeviceImpl::QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d)
|
||||
: QNonContiguousByteDevice(),
|
||||
currentReadBuffer(0), currentReadBufferSize(16*1024),
|
||||
@@ -415,6 +426,14 @@ qint64 QNonContiguousByteDeviceIoDeviceImpl::size()
|
||||
return device->size() - initialPosition;
|
||||
}
|
||||
|
||||
+qint64 QNonContiguousByteDeviceIoDeviceImpl::pos()
|
||||
+{
|
||||
+ if (device->isSequential())
|
||||
+ return -1;
|
||||
+
|
||||
+ return device->pos();
|
||||
+}
|
||||
+
|
||||
QByteDeviceWrappingIoDevice::QByteDeviceWrappingIoDevice(QNonContiguousByteDevice *bd) : QIODevice((QObject*)0)
|
||||
{
|
||||
byteDevice = bd;
|
||||
diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h
|
||||
index b6966eb..d1a99a1 100644
|
||||
--- a/src/corelib/io/qnoncontiguousbytedevice_p.h
|
||||
+++ b/src/corelib/io/qnoncontiguousbytedevice_p.h
|
||||
@@ -69,6 +69,7 @@ public:
|
||||
virtual const char* readPointer(qint64 maximumLength, qint64 &len) = 0;
|
||||
virtual bool advanceReadPointer(qint64 amount) = 0;
|
||||
virtual bool atEnd() = 0;
|
||||
+ virtual qint64 pos() { return -1; }
|
||||
virtual bool reset() = 0;
|
||||
void disableReset();
|
||||
bool isResetDisabled() { return resetDisabled; }
|
||||
@@ -108,6 +109,7 @@ public:
|
||||
bool atEnd();
|
||||
bool reset();
|
||||
qint64 size();
|
||||
+ qint64 pos();
|
||||
protected:
|
||||
QByteArray* byteArray;
|
||||
qint64 currentPosition;
|
||||
@@ -123,6 +125,7 @@ public:
|
||||
bool atEnd();
|
||||
bool reset();
|
||||
qint64 size();
|
||||
+ qint64 pos();
|
||||
protected:
|
||||
QSharedPointer<QRingBuffer> ringBuffer;
|
||||
qint64 currentPosition;
|
||||
@@ -140,6 +143,7 @@ public:
|
||||
bool atEnd();
|
||||
bool reset();
|
||||
qint64 size();
|
||||
+ qint64 pos();
|
||||
protected:
|
||||
QIODevice* device;
|
||||
QByteArray* currentReadBuffer;
|
||||
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
|
||||
index 550e090..db2f712 100644
|
||||
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
|
||||
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
|
||||
@@ -107,15 +107,19 @@ void QHttpNetworkConnectionChannel::init()
|
||||
socket->setProxy(QNetworkProxy::NoProxy);
|
||||
#endif
|
||||
|
||||
+ // We want all signals (except the interactive ones) be connected as QueuedConnection
|
||||
+ // because else we're falling into cases where we recurse back into the socket code
|
||||
+ // and mess up the state. Always going to the event loop (and expecting that when reading/writing)
|
||||
+ // is safer.
|
||||
QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
|
||||
this, SLOT(_q_bytesWritten(qint64)),
|
||||
- Qt::DirectConnection);
|
||||
+ Qt::QueuedConnection);
|
||||
QObject::connect(socket, SIGNAL(connected()),
|
||||
this, SLOT(_q_connected()),
|
||||
- Qt::DirectConnection);
|
||||
+ Qt::QueuedConnection);
|
||||
QObject::connect(socket, SIGNAL(readyRead()),
|
||||
this, SLOT(_q_readyRead()),
|
||||
- Qt::DirectConnection);
|
||||
+ Qt::QueuedConnection);
|
||||
|
||||
// The disconnected() and error() signals may already come
|
||||
// while calling connectToHost().
|
||||
@@ -144,13 +148,13 @@ void QHttpNetworkConnectionChannel::init()
|
||||
// won't be a sslSocket if encrypt is false
|
||||
QObject::connect(sslSocket, SIGNAL(encrypted()),
|
||||
this, SLOT(_q_encrypted()),
|
||||
- Qt::DirectConnection);
|
||||
+ Qt::QueuedConnection);
|
||||
QObject::connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
|
||||
this, SLOT(_q_sslErrors(QList<QSslError>)),
|
||||
Qt::DirectConnection);
|
||||
QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
|
||||
this, SLOT(_q_encryptedBytesWritten(qint64)),
|
||||
- Qt::DirectConnection);
|
||||
+ Qt::QueuedConnection);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -163,7 +167,8 @@ void QHttpNetworkConnectionChannel::close()
|
||||
else
|
||||
state = QHttpNetworkConnectionChannel::ClosingState;
|
||||
|
||||
- socket->close();
|
||||
+ if (socket)
|
||||
+ socket->close();
|
||||
}
|
||||
|
||||
|
||||
@@ -280,6 +285,14 @@ bool QHttpNetworkConnectionChannel::sendRequest()
|
||||
// nothing to read currently, break the loop
|
||||
break;
|
||||
} else {
|
||||
+ if (written != uploadByteDevice->pos()) {
|
||||
+ // Sanity check. This was useful in tracking down an upload corruption.
|
||||
+ qWarning() << "QHttpProtocolHandler: Internal error in sendRequest. Expected to write at position" << written << "but read device is at" << uploadByteDevice->pos();
|
||||
+ Q_ASSERT(written == uploadByteDevice->pos());
|
||||
+ connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolFailure);
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
qint64 currentWriteSize = socket->write(readPointer, currentReadSize);
|
||||
if (currentWriteSize == -1 || currentWriteSize != currentReadSize) {
|
||||
// socket broke down
|
||||
@@ -639,6 +652,14 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
|
||||
}
|
||||
return false;
|
||||
}
|
||||
+
|
||||
+ // This code path for ConnectedState
|
||||
+ if (pendingEncrypt) {
|
||||
+ // Let's only be really connected when we have received the encrypted() signal. Else the state machine seems to mess up
|
||||
+ // and corrupt the things sent to the server.
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -980,6 +1001,13 @@ void QHttpNetworkConnectionChannel::_q_readyRead()
|
||||
void QHttpNetworkConnectionChannel::_q_bytesWritten(qint64 bytes)
|
||||
{
|
||||
Q_UNUSED(bytes);
|
||||
+
|
||||
+ if (ssl) {
|
||||
+ // In the SSL case we want to send data from encryptedBytesWritten signal since that one
|
||||
+ // is the one going down to the actual network, not only into some SSL buffer.
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
// bytes have been written to the socket. write even more of them :)
|
||||
if (isSocketWriting())
|
||||
sendRequest();
|
||||
@@ -1029,7 +1057,7 @@ void QHttpNetworkConnectionChannel::_q_connected()
|
||||
|
||||
// ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again!
|
||||
//channels[i].reconnectAttempts = 2;
|
||||
- if (!pendingEncrypt) {
|
||||
+ if (!pendingEncrypt && !ssl) { // FIXME: Didn't work properly with pendingEncrypt only, we should refactor this into an EncrypingState
|
||||
state = QHttpNetworkConnectionChannel::IdleState;
|
||||
if (!reply)
|
||||
connection->d_func()->dequeueRequest(socket);
|
||||
@@ -1157,7 +1185,10 @@ void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetwor
|
||||
|
||||
void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead()
|
||||
{
|
||||
- sendRequest();
|
||||
+ if (reply && state == QHttpNetworkConnectionChannel::WritingState) {
|
||||
+ // There might be timing issues, make sure to only send upload data if really in that state
|
||||
+ sendRequest();
|
||||
+ }
|
||||
}
|
||||
|
||||
#ifndef QT_NO_OPENSSL
|
||||
diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
|
||||
index 7648325..9dd0deb 100644
|
||||
--- a/src/network/access/qhttpthreaddelegate_p.h
|
||||
+++ b/src/network/access/qhttpthreaddelegate_p.h
|
||||
@@ -190,6 +190,7 @@ protected:
|
||||
QByteArray m_dataArray;
|
||||
bool m_atEnd;
|
||||
qint64 m_size;
|
||||
+ qint64 m_pos; // to match calls of haveDataSlot with the expected position
|
||||
public:
|
||||
QNonContiguousByteDeviceThreadForwardImpl(bool aE, qint64 s)
|
||||
: QNonContiguousByteDevice(),
|
||||
@@ -197,7 +198,8 @@ public:
|
||||
m_amount(0),
|
||||
m_data(0),
|
||||
m_atEnd(aE),
|
||||
- m_size(s)
|
||||
+ m_size(s),
|
||||
+ m_pos(0)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -205,6 +207,11 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
+ qint64 pos()
|
||||
+ {
|
||||
+ return m_pos;
|
||||
+ }
|
||||
+
|
||||
const char* readPointer(qint64 maximumLength, qint64 &len)
|
||||
{
|
||||
if (m_amount > 0) {
|
||||
@@ -232,11 +239,10 @@ public:
|
||||
|
||||
m_amount -= a;
|
||||
m_data += a;
|
||||
+ m_pos += a;
|
||||
|
||||
- // To main thread to inform about our state
|
||||
- emit processedData(a);
|
||||
-
|
||||
- // FIXME possible optimization, already ask user thread for some data
|
||||
+ // To main thread to inform about our state. The m_pos will be sent as a sanity check.
|
||||
+ emit processedData(m_pos, a);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -253,10 +259,21 @@ public:
|
||||
{
|
||||
m_amount = 0;
|
||||
m_data = 0;
|
||||
+ m_dataArray.clear();
|
||||
+
|
||||
+ if (wantDataPending) {
|
||||
+ // had requested the user thread to send some data (only 1 in-flight at any moment)
|
||||
+ wantDataPending = false;
|
||||
+ }
|
||||
|
||||
// Communicate as BlockingQueuedConnection
|
||||
bool b = false;
|
||||
emit resetData(&b);
|
||||
+ if (b) {
|
||||
+ // the reset succeeded, we're at pos 0 again
|
||||
+ m_pos = 0;
|
||||
+ // the HTTP code will anyway abort the request if !b.
|
||||
+ }
|
||||
return b;
|
||||
}
|
||||
|
||||
@@ -267,8 +284,13 @@ public:
|
||||
|
||||
public slots:
|
||||
// From user thread:
|
||||
- void haveDataSlot(QByteArray dataArray, bool dataAtEnd, qint64 dataSize)
|
||||
+ void haveDataSlot(qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize)
|
||||
{
|
||||
+ if (pos != m_pos) {
|
||||
+ // Sometimes when re-sending a request in the qhttpnetwork* layer there is a pending haveData from the
|
||||
+ // user thread on the way to us. We need to ignore it since it is the data for the wrong(later) chunk.
|
||||
+ return;
|
||||
+ }
|
||||
wantDataPending = false;
|
||||
|
||||
m_dataArray = dataArray;
|
||||
@@ -288,7 +310,7 @@ signals:
|
||||
|
||||
// to main thread:
|
||||
void wantData(qint64);
|
||||
- void processedData(qint64);
|
||||
+ void processedData(qint64 pos, qint64 amount);
|
||||
void resetData(bool *b);
|
||||
};
|
||||
|
||||
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
|
||||
index cc67258..fe2f627 100644
|
||||
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
|
||||
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
|
||||
@@ -193,6 +193,7 @@ QNetworkAccessHttpBackendFactory::create(QNetworkAccessManager::Operation op,
|
||||
QNetworkAccessHttpBackend::QNetworkAccessHttpBackend()
|
||||
: QNetworkAccessBackend()
|
||||
, statusCode(0)
|
||||
+ , uploadByteDevicePosition(false)
|
||||
, pendingDownloadDataEmissions(new QAtomicInt())
|
||||
, pendingDownloadProgressEmissions(new QAtomicInt())
|
||||
, loadingFromCache(false)
|
||||
@@ -610,9 +611,9 @@ void QNetworkAccessHttpBackend::postRequest()
|
||||
forwardUploadDevice->setParent(delegate); // needed to make sure it is moved on moveToThread()
|
||||
delegate->httpRequest.setUploadByteDevice(forwardUploadDevice);
|
||||
|
||||
- // From main thread to user thread:
|
||||
- QObject::connect(this, SIGNAL(haveUploadData(QByteArray, bool, qint64)),
|
||||
- forwardUploadDevice, SLOT(haveDataSlot(QByteArray, bool, qint64)), Qt::QueuedConnection);
|
||||
+ // From user thread to http thread:
|
||||
+ QObject::connect(this, SIGNAL(haveUploadData(qint64,QByteArray,bool,qint64)),
|
||||
+ forwardUploadDevice, SLOT(haveDataSlot(qint64,QByteArray,bool,qint64)), Qt::QueuedConnection);
|
||||
QObject::connect(uploadByteDevice.data(), SIGNAL(readyRead()),
|
||||
forwardUploadDevice, SIGNAL(readyRead()),
|
||||
Qt::QueuedConnection);
|
||||
@@ -620,8 +621,8 @@ void QNetworkAccessHttpBackend::postRequest()
|
||||
// From http thread to user thread:
|
||||
QObject::connect(forwardUploadDevice, SIGNAL(wantData(qint64)),
|
||||
this, SLOT(wantUploadDataSlot(qint64)));
|
||||
- QObject::connect(forwardUploadDevice, SIGNAL(processedData(qint64)),
|
||||
- this, SLOT(sentUploadDataSlot(qint64)));
|
||||
+ QObject::connect(forwardUploadDevice,SIGNAL(processedData(qint64, qint64)),
|
||||
+ this, SLOT(sentUploadDataSlot(qint64,qint64)));
|
||||
connect(forwardUploadDevice, SIGNAL(resetData(bool*)),
|
||||
this, SLOT(resetUploadDataSlot(bool*)),
|
||||
Qt::BlockingQueuedConnection); // this is the only one with BlockingQueued!
|
||||
@@ -915,12 +916,21 @@ void QNetworkAccessHttpBackend::replySslConfigurationChanged(const QSslConfigura
|
||||
void QNetworkAccessHttpBackend::resetUploadDataSlot(bool *r)
|
||||
{
|
||||
*r = uploadByteDevice->reset();
|
||||
+ if (*r) {
|
||||
+ // reset our own position which is used for the inter-thread communication
|
||||
+ uploadByteDevicePosition = 0;
|
||||
+ }
|
||||
}
|
||||
|
||||
// Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
|
||||
-void QNetworkAccessHttpBackend::sentUploadDataSlot(qint64 amount)
|
||||
+void QNetworkAccessHttpBackend::sentUploadDataSlot(qint64 pos, qint64 amount)
|
||||
{
|
||||
+ if (uploadByteDevicePosition + amount != pos) {
|
||||
+ // Sanity check, should not happen.
|
||||
+ error(QNetworkReply::UnknownNetworkError, "");
|
||||
+ }
|
||||
uploadByteDevice->advanceReadPointer(amount);
|
||||
+ uploadByteDevicePosition += amount;
|
||||
}
|
||||
|
||||
// Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
|
||||
@@ -933,7 +943,7 @@ void QNetworkAccessHttpBackend::wantUploadDataSlot(qint64 maxSize)
|
||||
QByteArray dataArray(data, currentUploadDataLength);
|
||||
|
||||
// Communicate back to HTTP thread
|
||||
- emit haveUploadData(dataArray, uploadByteDevice->atEnd(), uploadByteDevice->size());
|
||||
+ emit haveUploadData(uploadByteDevicePosition, dataArray, uploadByteDevice->atEnd(), uploadByteDevice->size());
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
|
||||
index 13519c6..b4ed67c 100644
|
||||
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
|
||||
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
|
||||
@@ -112,7 +112,7 @@ signals:
|
||||
|
||||
void startHttpRequestSynchronously();
|
||||
|
||||
- void haveUploadData(QByteArray dataArray, bool dataAtEnd, qint64 dataSize);
|
||||
+ void haveUploadData(const qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize);
|
||||
private slots:
|
||||
// From HTTP thread:
|
||||
void replyDownloadData(QByteArray);
|
||||
@@ -129,13 +129,14 @@ private slots:
|
||||
// From QNonContiguousByteDeviceThreadForwardImpl in HTTP thread:
|
||||
void resetUploadDataSlot(bool *r);
|
||||
void wantUploadDataSlot(qint64);
|
||||
- void sentUploadDataSlot(qint64);
|
||||
+ void sentUploadDataSlot(qint64, qint64);
|
||||
|
||||
bool sendCacheContents(const QNetworkCacheMetaData &metaData);
|
||||
|
||||
private:
|
||||
QHttpNetworkRequest httpRequest; // There is also a copy in the HTTP thread
|
||||
int statusCode;
|
||||
+ qint64 uploadByteDevicePosition;
|
||||
QString reasonPhrase;
|
||||
// Will be increased by HTTP thread:
|
||||
QSharedPointer<QAtomicInt> pendingDownloadDataEmissions;
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-build-multilib
|
||||
|
||||
DESCRIPTION="Cross-platform application development framework"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
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}] )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
PDEPEND="
|
||||
~dev-qt/qttranslations-${PV}
|
||||
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-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
|
||||
"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
|
||||
"${FILESDIR}/${PN}-4.8.6-QNAM-corruptions-fix.patch" # bug 548622
|
||||
"${FILESDIR}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104
|
||||
)
|
||||
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/tools/uic
|
||||
src/corelib
|
||||
src/network
|
||||
src/xml
|
||||
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"
|
||||
|
||||
QCONFIG_DEFINE="QT_ZLIB"
|
||||
|
||||
src_prepare() {
|
||||
qt4-build-multilib_src_prepare
|
||||
|
||||
# bug 172219
|
||||
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
|
||||
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
|
||||
qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
|
||||
|
||||
# bug 427782
|
||||
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"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
|
||||
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
|
||||
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
|
||||
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
|
||||
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
|
||||
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
|
||||
$(qt_use glib)
|
||||
$(qt_use iconv)
|
||||
$(qt_use icu)
|
||||
$(use ssl && echo -openssl-linked || echo -no-openssl)
|
||||
$(qt_use qt3support)
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qtbase"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Cross-platform application development framework"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE="icu systemd"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/glib:2
|
||||
>=dev-libs/libpcre-8.38[pcre16,unicode]
|
||||
>=sys-libs/zlib-1.2.5
|
||||
virtual/libiconv
|
||||
icu? ( dev-libs/icu:= )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-plugins.patch" )
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/corelib
|
||||
src/tools/qlalr
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
$(qt_use icu)
|
||||
$(qt_use systemd journald)
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
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 qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
|
||||
DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
|
||||
DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-build-multilib
|
||||
|
||||
DESCRIPTION="The DBus module for the Qt toolkit"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
sys-apps/dbus[${MULTILIB_USEDEP}]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
|
||||
"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
|
||||
)
|
||||
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/dbus
|
||||
tools/qdbus/qdbus
|
||||
tools/qdbus/qdbusxml2cpp
|
||||
tools/qdbus/qdbuscpp2xml"
|
||||
|
||||
QCONFIG_ADD="dbus dbus-linked"
|
||||
QCONFIG_DEFINE="QT_DBUS"
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-dbus-linked
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qtbase"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
>=sys-apps/dbus-1.4.20
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/dbus
|
||||
src/tools/qdbusxml2cpp
|
||||
src/tools/qdbuscpp2xml
|
||||
)
|
||||
|
||||
QT5_GENTOO_CONFIG=(
|
||||
:dbus
|
||||
:dbus-linked:
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
-dbus-linked
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
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 qtdeclarative-opensource-src-5.6.2.tar.xz 18813016 SHA256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da SHA512 30870f6c40b8c8ecd3b960ece8175f98a42aebc3f4fcada06b4dcc0f844c4acfd955d550d7014fb441f65d7010ced8a6ef394ec3887dc543306b5ef15570c88d WHIRLPOOL ef4ae3f6cebd44528917bd571b1eaa55d07b96f3b005e25eb201ef52477a6dff742fe85b30f491793ea8256489349780adb79a93ccb7d64e1787a7d5d388041e
|
||||
DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 SHA256 fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab WHIRLPOOL 36fdf7de44aaef1b5f6a6b7719705422cc4593da1a79e156a797bc86389f96b0bd5658b00ebc7177ecb2e5e17c3beead4205ccb7fb0d0eb2ec8679c5a58ae6fa
|
||||
DIST qtdeclarative-opensource-src-5.9.2.tar.xz 21435732 SHA256 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08 SHA512 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90 WHIRLPOOL 64b9f7d8c1c7930c3695d7cf24c2f6d61556fd9fb69347e04b5c47c8542fbefce385a436e7c68b0a3ee355c301ea8f5c9316256fbc0ac540a4c2e46acdd9012c
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-build-multilib
|
||||
|
||||
DESCRIPTION="The Declarative module for the Qt toolkit"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
|
||||
else
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
fi
|
||||
|
||||
IUSE="+accessibility qt3support webkit"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/declarative
|
||||
src/imports
|
||||
src/plugins/qmltooling
|
||||
tools/qml
|
||||
tools/qmlplugindump"
|
||||
|
||||
QCONFIG_ADD="declarative"
|
||||
QCONFIG_DEFINE="QT_DECLARATIVE"
|
||||
|
||||
pkg_setup() {
|
||||
use webkit && QT4_TARGET_DIRECTORIES+="
|
||||
src/3rdparty/webkit/Source/WebKit/qt/declarative"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
-declarative -no-gtkstyle
|
||||
$(qt_use accessibility)
|
||||
$(qt_use qt3support)
|
||||
$(qt_use webkit)
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5} )
|
||||
inherit python-any-r1 qt5-build
|
||||
|
||||
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE="gles2 +jit localstorage +widgets xml"
|
||||
|
||||
# qtgui[gles2=] is needed because of bug 504322
|
||||
RDEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}[gles2=]
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qttest-${PV}
|
||||
localstorage? ( ~dev-qt/qtsql-${PV} )
|
||||
widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
|
||||
xml? (
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtxmlpatterns-${PV}
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
|
||||
|
||||
use localstorage || sed -i -e '/localstorage/d' \
|
||||
src/imports/imports.pro || die
|
||||
|
||||
qt_use_disable_mod widgets widgets \
|
||||
src/src.pro \
|
||||
src/qmltest/qmltest.pro \
|
||||
tests/auto/auto.pro \
|
||||
tools/tools.pro \
|
||||
tools/qmlscene/qmlscene.pro \
|
||||
tools/qml/qml.pro
|
||||
|
||||
qt_use_disable_mod xml xmlpatterns \
|
||||
src/imports/imports.pro \
|
||||
tests/auto/quick/quick.pro \
|
||||
tests/auto/quick/examples/examples.pro
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
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
|
||||
|
||||
@ -1,91 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-build-multilib
|
||||
|
||||
DESCRIPTION="Demonstration module and examples for the Qt toolkit"
|
||||
|
||||
if [[ ${QT4_BUILD_TYPE} == live ]]; then
|
||||
KEYWORDS="arm ppc ppc64"
|
||||
else
|
||||
KEYWORDS="amd64 arm ppc ppc64 x86"
|
||||
fi
|
||||
|
||||
IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~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/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
|
||||
dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
|
||||
multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
phonon? ( media-libs/phonon[qt4] )
|
||||
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
|
||||
)
|
||||
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
demos
|
||||
examples"
|
||||
|
||||
src_prepare() {
|
||||
qt4-build-multilib_src_prepare
|
||||
|
||||
# Array mapping USE flags to subdirs
|
||||
local flags_subdirs_map=(
|
||||
'dbus'
|
||||
'declarative:declarative'
|
||||
'multimedia:spectrum'
|
||||
'opengl:boxes|glhypnotizer'
|
||||
'phonon:mediaplayer'
|
||||
'webkit:browser'
|
||||
'xmlpatterns'
|
||||
)
|
||||
|
||||
# Disable unwanted examples/demos
|
||||
for flag in "${flags_subdirs_map[@]}"; do
|
||||
if ! use ${flag%:*}; then
|
||||
einfo "Disabling ${flag%:*} examples"
|
||||
sed -i -e "/SUBDIRS += ${flag%:*}/d" \
|
||||
examples/examples.pro || die
|
||||
|
||||
if [[ ${flag} == *:* ]]; then
|
||||
einfo "Disabling ${flag%:*} demos"
|
||||
sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
|
||||
demos/demos.pro || die
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Remove bogus dependency on qt3support (bug 510042)
|
||||
sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
|
||||
examples/graphicsview/graphicsview.pro || die
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
$(qt_use dbus)
|
||||
$(qt_use declarative)
|
||||
$(qt_use multimedia) -no-audio-backend
|
||||
$(qt_use opengl)
|
||||
-no-openvg
|
||||
$(qt_native_use phonon) -no-phonon-backend
|
||||
$(qt_use webkit)
|
||||
$(qt_use xmlpatterns)
|
||||
)
|
||||
qt4_multilib_src_configure
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
|
||||
DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
|
||||
DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qttools"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
|
||||
fi
|
||||
|
||||
IUSE="+ssl"
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtnetwork-${PV}[ssl=]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/qtdiag
|
||||
)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue