add patched pykde4

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2391 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-09-02 18:19:27 +00:00
parent a7be10ccbe
commit ee3e6a6140
6 changed files with 189 additions and 0 deletions

5
kde-base/pykde4/Manifest Normal file
View File

@ -0,0 +1,5 @@
AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
AUX pykde4-4.4.92-build-fix-sip.patch 557 RMD160 d9d1c299f6acbc97c75ff8ddc23bd13d1ff0bce6 SHA1 6cb4154b980320fcff792434b8abf7b9fce1ce68 SHA256 0b2fd1753e7fe41698a8c1c0568c4cd52fd14ddc6c010f91f6052fe89044cf6e
AUX pykde4.patch 1406 RMD160 7af64a0841d604fc695441524561142a0ad1e3fe SHA1 8167ae067f6cb47b7685c2d052b9d57d3e88ba10 SHA256 94cbc246a62fe0256e3a57bdfd1aae6b1a313229031433f65a389442c7fa10e2
DIST kdebindings-4.5.1.tar.bz2 6325783 RMD160 8d5425cc973f3a73fa22f89badb437945f453d93 SHA1 0f75b9b787fd58ff5e36ce6ac87329ea31ad66b6 SHA256 5cb33f3cb2ea4d54f0bc851fe2f0eaf76df30333108a862a60129cc5e9710bc9
EBUILD pykde4-4.5.1-r1.ebuild 1920 RMD160 12715c35bf4a43a7665bc3f3dc00a69154f55898 SHA1 1097151453de8e1bce3677382157c276bbdd5d62 SHA256 416e0d6bf6b50023771e85040667cdd44fe9d1d827470d460d60cf2b04e3e531

View File

@ -0,0 +1,22 @@
diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
--- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt 2010-03-29 14:57:40.000000000 +0200
+++ pykde4-4.4.3/python/pykde4/CMakeLists.txt 2010-05-31 15:49:17.095615617 +0200
@@ -75,6 +75,9 @@
${KDEPIMLIBS_INCLUDE_DIRS}
)
+# Pull in ARM configuration options if needed
+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
+
SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
SET(SIP_CONCAT_PARTS 8)
IF (WIN32)
@@ -82,7 +85,7 @@
ELSE (WIN32)
SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
ENDIF (WIN32)
-SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
+SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
# Use an extra option when compiling on Python 3.
IF (PYTHON_3)

View File

@ -0,0 +1,12 @@
diff -ur pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip
--- pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip 2010-05-27 19:21:46.000000000 +0200
+++ pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip 2010-07-15 06:36:27.000000000 +0200
@@ -19,7 +19,7 @@
namespace Akonadi
{
-class AddressAttribute : Akonadi::Attribute
+class AddressAttribute : Akonadi::Attribute /NoDefaultCtors/
{
%TypeHeaderCode
#include <akonadi/kmime/addressattribute.h>

View File

@ -0,0 +1,64 @@
--- trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip 2010/01/16 10:06:39 1075490
+++ trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip 2010/09/01 15:31:50 1170602
@@ -733,61 +733,6 @@
};
-%MappedType QList<uint>
-{
-%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 PY_MAJOR_VERSION >= 3
- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
-#else
- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
-#endif
- 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 PyList_Check(sipPy);
-
- QList<uint> *ql = new QList<uint>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
-#if PY_MAJOR_VERSION >= 3
- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
-#else
- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
-#endif
- }
-
- *sipCppPtr = ql;
-
- return sipGetState(sipTransferObj);
-%End
-};
-
-
template <TYPE*>
%MappedType QStack<TYPE*>
{

View File

@ -0,0 +1,84 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
KMNAME="kdebindings"
KMMODULE="python/pykde4"
OPENGL_REQUIRED="always"
PYTHON_USE_WITH="threads"
RESTRICT_PYTHON_ABIS="2.4"
inherit python kde4-meta
DESCRIPTION="Python bindings for KDE4"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc examples semantic-desktop"
# blocker added due to compatibility issues and error during compile time
DEPEND="
!dev-python/pykde
$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,aqua] )
!aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] )
"
RDEPEND="${DEPEND}"
pkg_setup() {
python_pkg_setup
kde4-meta_pkg_setup
}
src_prepare() {
kde4-meta_src_prepare
if ! use examples; then
sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
|| die "Failed to disable examples"
fi
# See bug 322351
use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
epatch "${FILESDIR}/pykde4.patch"
}
src_configure() {
mycmakeargs=(
-DWITH_QScintilla=OFF
-DWITH_PolkitQt=OFF
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with semantic-desktop Nepomuk)
$(cmake-utils_use_with semantic-desktop KdepimLibs)
)
kde4-meta_src_configure
}
src_install() {
use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/")
kde4-meta_src_install
python_convert_shebangs -q -r $(python_get_version) "${ED}"
python_clean_installation_image -q
}
pkg_postinst() {
kde4-meta_pkg_postinst
python_mod_optimize PyKDE4 PyQt4
if use examples; then
echo
elog "PyKDE4 examples have been installed to"
elog "${EKDEDIR}/share/apps/${PN}/examples"
echo
fi
}
pkg_postrm() {
kde4-meta_pkg_postrm
python_mod_cleanup PyKDE4 PyQt4
}

View File

@ -8,6 +8,8 @@ AUX prozilla-no_memleak.patch 966 RMD160 fe6b961aa6fd420db3a759a24254e467bce10a1
AUX prozilla-opt.patch 1228 RMD160 7b1ba8559e4a7892710e4fd61b97c93d831e6452 SHA1 e2b406800183d13374e2e37c091c83614572d265 SHA256 66cde409c8a501c2ed0ba44d12a8fe38d5866860732711188444f4ff31babb9f AUX prozilla-opt.patch 1228 RMD160 7b1ba8559e4a7892710e4fd61b97c93d831e6452 SHA1 e2b406800183d13374e2e37c091c83614572d265 SHA256 66cde409c8a501c2ed0ba44d12a8fe38d5866860732711188444f4ff31babb9f
AUX prozrc.sample 2752 RMD160 a0dbd572ca617b6910eda182e2c4f28aec50edc8 SHA1 ba26061686958d99427230f7efd86253066bcc07 SHA256 2e2eb6ce637be0a1af854e9b327e6d5816855ece3a2ac02ba9d3e50cfcc88432 AUX prozrc.sample 2752 RMD160 a0dbd572ca617b6910eda182e2c4f28aec50edc8 SHA1 ba26061686958d99427230f7efd86253066bcc07 SHA256 2e2eb6ce637be0a1af854e9b327e6d5816855ece3a2ac02ba9d3e50cfcc88432
DIST prozilla-2.0.4.tar.bz2 745429 RMD160 223056a1d353bba957cb252b7cb3509816875900 SHA1 328861f1b1491226f46ce2ed7f872c6a267d384c SHA256 0fda675f6032543a73a4cd0dec02fd16b35708694f5dbae235354751e00616ac DIST prozilla-2.0.4.tar.bz2 745429 RMD160 223056a1d353bba957cb252b7cb3509816875900 SHA1 328861f1b1491226f46ce2ed7f872c6a267d384c SHA256 0fda675f6032543a73a4cd0dec02fd16b35708694f5dbae235354751e00616ac
DIST prozilla-2.0.5.tar.bz2 797705 RMD160 806c059a3a45ef700b34ab389bec2e8ea6a1d71e SHA1 0e33efeb1b6a29f6e4288d8793fe15c02ab5b2c8 SHA256 b599bcddd5195bcacf3739adcd56559325b54475b8b0fe661800a34ecfe44ac8
EBUILD prozilla-2.0.4.ebuild 1410 RMD160 ba38dfcd338dcdde289199ea9bb6b028ed59a370 SHA1 c78b5e0ed120fa9df5b23001935b33bc24691751 SHA256 9a2ca5c23b4b2ae4f74f959069b526af60593e8c90857733c746ebe4eec16425 EBUILD prozilla-2.0.4.ebuild 1410 RMD160 ba38dfcd338dcdde289199ea9bb6b028ed59a370 SHA1 c78b5e0ed120fa9df5b23001935b33bc24691751 SHA256 9a2ca5c23b4b2ae4f74f959069b526af60593e8c90857733c746ebe4eec16425
EBUILD prozilla-2.0.5.ebuild 954 RMD160 1ffab4fd16e60522b8300e8be983482e38331aca SHA1 c65be94c0cf7b8b875d224eb6f5085cc5e5df0d9 SHA256 fd297562519ed8ff3f789be5c62443839b2427b2366fddec5689682bb91959e6
MISC ChangeLog 1187 RMD160 f9fb2eb1b361314ba9cbee3e87f7b47afcd9fcb9 SHA1 cfbb7637e3c1319f3a3a2e237a112f6bbdfd1ba0 SHA256 6a94c484f0524424f3c3e0ad39ba6416c88dac0d3abb9af0b9d5c789c1ecc791 MISC ChangeLog 1187 RMD160 f9fb2eb1b361314ba9cbee3e87f7b47afcd9fcb9 SHA1 cfbb7637e3c1319f3a3a2e237a112f6bbdfd1ba0 SHA256 6a94c484f0524424f3c3e0ad39ba6416c88dac0d3abb9af0b9d5c789c1ecc791
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42