diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-python/PyQt4 | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-python/PyQt4')
-rw-r--r-- | dev-python/PyQt4/Manifest | 5 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.12.1.ebuild | 193 | ||||
-rw-r--r-- | dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch | 25 | ||||
-rw-r--r-- | dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch | 239 | ||||
-rw-r--r-- | dev-python/PyQt4/metadata.xml | 36 |
5 files changed, 0 insertions, 498 deletions
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest deleted file mode 100644 index 75f48e5402cf..000000000000 --- a/dev-python/PyQt4/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX PyQt4-4.11.2-phonon.patch 897 BLAKE2B b4834b319d15f96b80e4cb3bc4fe6d3f690df3f1b97d79ee35cd0dcb3a4abb4542c56b84991137ee50a86f1a0abcb6ccddca213d8d50e54e43520f76d2f11eb8 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee -AUX PyQt4-4.7.3-qreal_float_support.patch 5954 BLAKE2B ae198e39b05d42aa9be83a4d2bb69ba3705f3bc8e72ebc3e7b6ba7ef650f68f7d2dcb13dfade1dbb6a441809d39f4b9ade7fa3eaa075bc13cc16a0ef20b98022 SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 -DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 BLAKE2B b1261318eed18faa4eb94b1b3db9d2ba9f4d000f295eab6985ce2e6e39f3c94ab5b524a1d437406b8154d6b9ada1da710d427af0a1c410579eb9194b36aeb4cf SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1 -EBUILD PyQt4-4.12.1.ebuild 4726 BLAKE2B e08eaefb436e0d72a647b1fab21f80caf902ca556bdafbffcc44da9c391334c5f52d0beb1338555edf6e0292fc2a7116f5185055455b91d492d58655b3205bbc SHA512 140230da20582fb01f50fee0caefb248b9086fd211f5977c381473e8cd54d9314ade5d45784c234ecbd11861f769d9f28e012ac9703db78056b2f2dc82924914 -MISC metadata.xml 1770 BLAKE2B dfb5d8b53c0a5666b0ffda7a9f055eb134f651781e579cd3171ddbcf0a50c3bd5d307a6ff87647c4632b66f5b64601021bb57bf6fb73cfbd504c0aea8a6dc1fe SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559 diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild deleted file mode 100644 index aa304f2326a8..000000000000 --- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit multibuild python-r1 qmake-utils toolchain-funcs - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro" - -MY_P=${PN}_gpl_x11-${PV/_pre/.dev} -if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz" -else - SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" -fi - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" - -IUSE="X compat dbus debug declarative designer doc examples help multimedia - opengl phonon script scripttools sql svg testlib webkit xmlpatterns" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - sql? ( X ) - testlib? ( X ) -" - -# Minimal supported version of Qt. -QT_PV="4.8.5:4" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-python/sip-4.19.1:=[${PYTHON_USEDEP}] - >=dev-qt/qtcore-${QT_PV} - X? ( >=dev-qt/qtgui-${QT_PV} ) - dbus? ( - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-qt/qtdbus-${QT_PV} - ) - declarative? ( >=dev-qt/qtdeclarative-${QT_PV} ) - designer? ( >=dev-qt/designer-${QT_PV} ) - help? ( >=dev-qt/qthelp-${QT_PV} ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) - opengl? ( >=dev-qt/qtopengl-${QT_PV} ) - phonon? ( >=media-libs/phonon-4.7[qt4] ) - script? ( >=dev-qt/qtscript-${QT_PV} ) - scripttools? ( >=dev-qt/qtgui-${QT_PV} ) - sql? ( >=dev-qt/qtsql-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - testlib? ( >=dev-qt/qttest-${QT_PV} ) - webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) - xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} ) -" -DEPEND="${RDEPEND} - dbus? ( virtual/pkgconfig ) -" - -S=${WORKDIR}/${MY_P} - -DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} ) -PATCHES=( - # Allow building against KDE's phonon (bug 525354) - "${FILESDIR}/${PN}-4.11.2-phonon.patch" -) - -src_prepare() { - # Support qreal on arm architecture (bug 322349) - use arm && PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch") - - default -} - -pyqt_run() { - echo "$@" - "${PYTHON}" "$@" -} - -pyqt_use_enable() { - use "$1" || return - - echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}} -} - -src_configure() { - configuration() { - local myconf=( - $(usex debug '--debug --trace' '') - --verbose - --confirm-license - --qmake="$(qt4_get_bindir)"/qmake - --bindir="${EPREFIX}/usr/bin" - --destdir="$(python_get_sitedir)" - --qsci-api - --enable=QtCore - --enable=QtNetwork - --enable=QtXml - $(pyqt_use_enable X QtGui) - $(pyqt_use_enable dbus QtDBus) - $(pyqt_use_enable declarative) - $(pyqt_use_enable designer) - $(usex designer '' --no-designer-plugin) - $(pyqt_use_enable help) - $(pyqt_use_enable multimedia) - $(pyqt_use_enable opengl QtOpenGL) - $(pyqt_use_enable phonon phonon) - $(pyqt_use_enable script) - $(pyqt_use_enable scripttools QtScriptTools) - $(pyqt_use_enable sql) - $(pyqt_use_enable svg) - $(pyqt_use_enable testlib QtTest) - $(pyqt_use_enable webkit QtWebKit) - $(pyqt_use_enable xmlpatterns QtXmlPatterns) - ) - - if use compat; then - local compat_build_dir=${BUILD_DIR%/}-compat - cp -Rp "${S}" "${compat_build_dir}" || die - pushd "${compat_build_dir}" >/dev/null || die - - local mycompatconf=( - "${myconf[@]}" - AR="$(tc-getAR) cqs" - CC="$(tc-getCC)" - CFLAGS="${CFLAGS}" - CFLAGS_RELEASE= - CXX="$(tc-getCXX)" - CXXFLAGS="${CXXFLAGS}" - CXXFLAGS_RELEASE= - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - LFLAGS="${LDFLAGS}" - LFLAGS_RELEASE= - RANLIB= - STRIP= - ) - pyqt_run configure.py "${mycompatconf[@]}" || die - - popd >/dev/null || die - fi - - myconf+=( - --sip-incdir="$(python_get_includedir)" - $(usex dbus '' --no-python-dbus) - ) - pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die - - eqmake4 -recursive ${PN}.pro - } - python_foreach_impl run_in_build_dir configuration -} - -src_compile() { - python_foreach_impl run_in_build_dir default -} - -src_install() { - installation() { - local tmp_root=${D%/}/tmp - emake INSTALL_ROOT="${tmp_root}" install - - local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic - if python_is_python3; then - rm -r "${uic_dir}"/port_v2 || die - else - rm -r "${uic_dir}"/port_v3 || die - fi - - python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 - rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die - - multibuild_merge_root "${tmp_root}" "${D}" - - if use compat; then - local compat_build_dir=${BUILD_DIR%/}-compat - python_moduleinto ${PN} - python_domodule "${compat_build_dir}"/pyqtconfig.py - fi - - python_optimize - } - python_foreach_impl run_in_build_dir installation - - einstalldocs - use doc && dodoc -r doc/html - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch deleted file mode 100644 index e3449b3b4bfc..000000000000 --- a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e8931ed7f49eb55d6259328a5a78f3fc18472d48 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <pesa@gentoo.org> -Date: Tue, 14 Oct 2014 04:30:29 +0200 -Subject: [PATCH] Support building against KDE's phonon variant. - ---- - configure-ng.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure-ng.py b/configure-ng.py -index a80cb57..fd2c56c 100644 ---- a/configure-ng.py -+++ b/configure-ng.py -@@ -2256,6 +2256,8 @@ def generate_sip_module_code(target_config, verbose, no_timestamp, parts, tracin - if mname == 'QtCore': - includepath = target_config.vend_inc_dir - libs = '-L%s -lvendorid' % target_config.vend_lib_dir -+ if mname == 'phonon': -+ includepath = os.path.join(sys.prefix, 'include', 'phonon') - - generate_module_makefile(target_config, verbose, mname, - includepath=includepath, libs=libs, qpy_sources=qpy_sources, --- -2.1.2 - diff --git a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch b/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch deleted file mode 100644 index 37e1e69eb3f4..000000000000 --- a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch +++ /dev/null @@ -1,239 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails@gmail.com> -## -## DP: Corrects a configure test, and adds explicate double handling -## to qlist.sip on architectures where qreal != double - -@DPATCH@ -Index: python-qt4-4.7.2/sip/QtCore/qlist.sip -=================================================================== ---- python-qt4-4.7.2.orig/sip/QtCore/qlist.sip 2010-03-17 19:29:26.000000000 +0100 -+++ python-qt4-4.7.2/sip/QtCore/qlist.sip 2010-03-25 23:53:55.468631945 +0100 -@@ -749,3 +749,227 @@ - return sipGetState(sipTransferObj); - %End - }; -+ -+// If we're on an architecture where qreal != double, then we need to also -+// explicately handle doubles. On architectures where qreal == double, they -+// will automaticially be cast upwards -+ -+%If (!PyQt_qreal_double) -+ -+%If (Qt_4_3_0 -) -+// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples. -+%MappedType QList<QPair<double, double> > -+{ -+%TypeHeaderCode -+#include <qlist.h> -+#include <qpair.h> -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ const QPair<double, double> &p = sipCpp->at(i); -+ PyObject *pobj; -+ -+ if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL) -+ { -+ Py_DECREF(l); -+ -+ return NULL; -+ } -+ -+ PyList_SET_ITEM(l, i, pobj); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ SIP_SSIZE_T len; -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) -+ return 0; -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *tup = PySequence_ITEM(sipPy, i); -+ -+ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2) -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ QList<QPair<double, double> > *ql = new QList<QPair<double, double> >; -+ len = PySequence_Size(sipPy); -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *tup = PySequence_ITEM(sipPy, i); -+ -+ double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0)); -+ double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1)); -+ -+ ql->append(QPair<double, double>(first, second)); -+ } -+ -+ *sipCppPtr = ql; -+ -+ return sipGetState(sipTransferObj); -+%End -+}; -+%End -+%If (Qt_4_3_0 -) -+// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples. -+template<double, TYPE> -+%MappedType QList<QPair<double, TYPE> > -+{ -+%TypeHeaderCode -+#include <qlist.h> -+#include <qpair.h> -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ const QPair<double, TYPE> &p = sipCpp->at(i); -+ TYPE *t = new TYPE(p.second); -+ PyObject *pobj; -+ -+ if ((pobj = sipBuildResult(NULL, "(dB)", p.first, t, sipClass_TYPE, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ delete t; -+ -+ return NULL; -+ } -+ -+ PyList_SET_ITEM(l, i, pobj); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ SIP_SSIZE_T len; -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) -+ return 0; -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *tup = PySequence_ITEM(sipPy, i); -+ -+ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2) -+ return 0; -+ -+ if (!sipCanConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, SIP_NOT_NONE)) -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >; -+ len = PySequence_Size(sipPy); -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *tup = PySequence_ITEM(sipPy, i); -+ double d; -+ int state; -+ -+ d = PyFloat_AsDouble(PySequence_ITEM(tup, 0)); -+ TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ -+ if (*sipIsErr) -+ { -+ sipReleaseInstance(t, sipClass_TYPE, state); -+ -+ delete ql; -+ return 0; -+ } -+ -+ ql->append(QPair<double, TYPE>(d, *t)); -+ -+ sipReleaseInstance(t, sipClass_TYPE, state); -+ } -+ -+ *sipCppPtr = ql; -+ -+ return sipGetState(sipTransferObj); -+%End -+}; -+%End -+ -+// QList<double> is implemented as a Python list of doubles. -+%MappedType QList<double> -+{ -+%TypeHeaderCode -+#include <qlist.h> -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ PyObject *pobj; -+ -+ if ((pobj = PyFloat_FromDouble(sipCpp->value(i))) == NULL) -+ { -+ Py_DECREF(l); -+ -+ return NULL; -+ } -+ -+ PyList_SET_ITEM(l, i, pobj); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ return (PySequence_Check(sipPy) && PySequence_Size(sipPy) >= 0); -+ -+ QList<double> *ql = new QList<double>; -+ SIP_SSIZE_T len = PySequence_Size(sipPy); -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i))); -+ -+ *sipCppPtr = ql; -+ -+ return sipGetState(sipTransferObj); -+%End -+}; -+ -+%End diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml deleted file mode 100644 index 7cc6900ee958..000000000000 --- a/dev-python/PyQt4/metadata.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="X">Build bindings for the QtGui module</flag> - <flag name="compat">Install the deprecated pyqtconfig module for backward compatibility</flag> - <flag name="dbus">Build bindings for the QtDBus module</flag> - <flag name="declarative">Build bindings for the QtDeclarative module</flag> - <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag> - <flag name="help">Build bindings for the QtHelp module</flag> - <flag name="multimedia">Build bindings for the QtMultimedia module</flag> - <flag name="opengl">Build bindings for the QtOpenGL module</flag> - <flag name="phonon">Build bindings for the phonon module</flag> - <flag name="script">Build bindings for the QtScript module</flag> - <flag name="scripttools">Build bindings for the QtScriptTools module</flag> - <flag name="sql">Build bindings for the QtSql module</flag> - <flag name="svg">Build bindings for the QtSvg module</flag> - <flag name="testlib">Build bindings for the QtTest module</flag> - <flag name="webkit">Build bindings for the QtWebKit module</flag> - <flag name="xmlpatterns">Build bindings for the QtXmlPatterns module</flag> - </use> - <upstream> - <maintainer status="active"> - <email>phil@riverbankcomputing.com</email> - <name>Phil Thompson</name> - </maintainer> - <bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to> - <doc>http://pyqt.sourceforge.net/Docs/PyQt4/</doc> - <remote-id type="pypi">PyQt4</remote-id> - <remote-id type="sourceforge">pyqt</remote-id> - </upstream> -</pkgmetadata> |