[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-4-19-gb46722d
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Wed Mar 23 21:14:06 UTC 2011
The following commit has been merged in the master branch:
commit eaa3aa68acac4822906b0ca2239568cee25b446f
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Thu Mar 17 22:23:04 2011 +0100
Refresh patches.
---
debian/changelog | 6 +
...python_modules_dont_link_against_libpython.diff | 4 +-
...clude_default_settings_in_python_cmakelist.diff | 4 +-
.../patches/11_make_pykde4_respect_sip_flags.diff | 6 +-
...thonpluginfactory_use_versioned_python_lib.diff | 2 +-
debian/patches/backport_r1150375.diff | 21 ----
debian/patches/backport_r1170602.diff | 76 --------------
debian/patches/backport_r1184022.diff | 49 ---------
debian/patches/backport_r1209688.diff | 2 -
debian/patches/backport_r1211266.diff | 103 --------------------
debian/patches/optional_install_sip_files.diff | 2 +-
debian/patches/series | 4 -
12 files changed, 12 insertions(+), 267 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a44327f..aa337b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,12 @@ kdebindings (4:4.6.1-0r0) UNRELEASED; urgency=low
* Update installed files.
* Add libqtwebkit-dev build dependency.
* Remove libsmokeqtmultimedia4-3 for now.
+ * Refresh patches:
+ - Unfuzzy some of them.
+ - Delete backport_r1150375.diff.
+ - Delete backport_r1170602.diff.
+ - Delete backport_r1184022.diff.
+ - Delete backport_r1211266.diff.
[ Pino Toscano ]
* Few touches to the packages descriptions.
diff --git a/debian/patches/01_python_modules_dont_link_against_libpython.diff b/debian/patches/01_python_modules_dont_link_against_libpython.diff
index 601040b..4c7f33f 100644
--- a/debian/patches/01_python_modules_dont_link_against_libpython.diff
+++ b/debian/patches/01_python_modules_dont_link_against_libpython.diff
@@ -2,11 +2,9 @@ Do not link python modules against -lpython2.X. Since KDE4's cmake file
uses --no-undefined by default, we have to remove that from the default
CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
-Index: b/python/pykde4/CMakeLists.txt
-===================================================================
--- a/python/pykde4/CMakeLists.txt
+++ b/python/pykde4/CMakeLists.txt
-@@ -93,6 +93,9 @@
+@@ -101,6 +101,9 @@
ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
diff --git a/debian/patches/02_include_default_settings_in_python_cmakelist.diff b/debian/patches/02_include_default_settings_in_python_cmakelist.diff
index f0a1772..23874be 100644
--- a/debian/patches/02_include_default_settings_in_python_cmakelist.diff
+++ b/debian/patches/02_include_default_settings_in_python_cmakelist.diff
@@ -1,8 +1,6 @@
-Index: b/python/pykde4/CMakeLists.txt
-===================================================================
--- a/python/pykde4/CMakeLists.txt
+++ b/python/pykde4/CMakeLists.txt
-@@ -15,6 +15,18 @@
+@@ -22,6 +22,18 @@
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
diff --git a/debian/patches/11_make_pykde4_respect_sip_flags.diff b/debian/patches/11_make_pykde4_respect_sip_flags.diff
index 384fa74..e336c41 100644
--- a/debian/patches/11_make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/11_make_pykde4_respect_sip_flags.diff
@@ -1,8 +1,6 @@
-Index: b/python/pykde4/CMakeLists.txt
-===================================================================
--- a/python/pykde4/CMakeLists.txt
+++ b/python/pykde4/CMakeLists.txt
-@@ -87,6 +87,9 @@
+@@ -95,6 +95,9 @@
${KDEPIMLIBS_INCLUDE_DIRS}
)
@@ -12,7 +10,7 @@ Index: b/python/pykde4/CMakeLists.txt
SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
SET(SIP_CONCAT_PARTS 8)
IF (WIN32)
-@@ -94,7 +97,7 @@
+@@ -102,7 +105,7 @@
ELSE (WIN32)
SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
ENDIF (WIN32)
diff --git a/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff b/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff
index 61b4b46..36f56ec 100644
--- a/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff
+++ b/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff
@@ -1,6 +1,6 @@
--- a/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+++ b/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
-@@ -297,7 +297,7 @@ QLibrary *LoadPythonLibrary()
+@@ -307,7 +307,7 @@
{
QLibrary *pythonLib = new QLibrary();
pythonLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
diff --git a/debian/patches/backport_r1150375.diff b/debian/patches/backport_r1150375.diff
deleted file mode 100644
index 1b12b52..0000000
--- a/debian/patches/backport_r1150375.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-r1150375 | sedwards | 2010-07-15 22:17:52 +0200 (Thu, 15 Jul 2010) | 2 lines
-Changed paths:
- M /trunk/KDE/kdebindings/python/pykde4/sip/akonadi/addressattribute.sip
-
-Small compatibility fix for the latest (minor) version of SIP which came out a couple days ago.
-
-Applied-Upstream: 4.6.0
-
---- a/python/pykde4/sip/akonadi/addressattribute.sip
-+++ b/python/pykde4/sip/akonadi/addressattribute.sip
-@@ -57,6 +57,10 @@ public:
- else if (dynamic_cast<Akonadi::MessageThreadingAttribute*>(sipCpp))
- sipType = sipType_Akonadi_MessageThreadingAttribute;
- %End
-+private:
-+//force
-+Akonadi::AddressAttribute& operator = (const Akonadi::AddressAttribute&);
-+//end
- };
- };
- %ModuleHeaderCode
diff --git a/debian/patches/backport_r1170602.diff b/debian/patches/backport_r1170602.diff
deleted file mode 100644
index 2ef5825..0000000
--- a/debian/patches/backport_r1170602.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-r1170602 | mueller | 2010-09-01 17:31:50 +0200 (Wed, 01 Sep 2010) | 4 lines
-Changed paths:
- M /trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip
-
-I get the error "This MappedType is already defined" here,
-and indeed it compes from PyQt. removing here. Blame me
-if this is wrong.
-
-Applied-Upstream: 4.6.0
-
-Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
-===================================================================
---- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601)
-+++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 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*>
- {
diff --git a/debian/patches/backport_r1184022.diff b/debian/patches/backport_r1184022.diff
deleted file mode 100644
index 632f0a2..0000000
--- a/debian/patches/backport_r1184022.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-r1184022 | rdale | 2010-10-09 08:51:34 +0200 (Sat, 09 Oct 2010) | 5 lines
-Changed paths:
- M /trunk/KDE/kdebindings/generator/parser/rpp/pp-macro-expander.cpp
- M /trunk/KDE/kdebindings/generator/type_compiler.cpp
-
-* Apply patch from Rex Dieter for fixing issues with parsing the
-QtOpenGL module. Thanks for the patch.
-
-Applied-Upstream: 4.6.0
-
-Index: kdebindings/generator/type_compiler.cpp
-===================================================================
---- kdebindings/generator/type_compiler.cpp (revision 1184021)
-+++ kdebindings/generator/type_compiler.cpp (revision 1184022)
-@@ -182,7 +182,7 @@
- TypeCompiler tc(m_session, m_visitor);
- tc.run(node->type_specifier, node->declarator);
- NameCompiler name_cc(m_session, m_visitor);
-- if (tc.type().isFunctionPointer())
-+ if (tc.type().isFunctionPointer() && node->declarator && node->declarator->sub_declarator)
- name_cc.run(node->declarator->sub_declarator->id);
- else if (node->declarator)
- name_cc.run(node->declarator->id);
-Index: kdebindings/generator/parser/rpp/pp-macro-expander.cpp
-===================================================================
---- kdebindings/generator/parser/rpp/pp-macro-expander.cpp (revision 1184021)
-+++ kdebindings/generator/parser/rpp/pp-macro-expander.cpp (revision 1184022)
-@@ -268,10 +268,10 @@
- output << '\"';
-
- while (!is.atEnd()) {
-- if (input == '"') {
-+ if (is == '"') {
- output << '\\' << is;
-
-- } else if (input == '\n') {
-+ } else if (is == '\n') {
- output << '"' << is << '"';
-
- } else {
-@@ -338,7 +338,7 @@
-
- skip_blanks(input, devnull());
- //Omit paste tokens behind empty used actuals, else we will merge with the previous text
-- if(input == '#' && (++input) == '#') {
-+ if(!input.atEnd() && input == '#' && !(++input).atEnd() && input == '#') {
- ++input;
- //We have skipped a paste token
- }else{
diff --git a/debian/patches/backport_r1209688.diff b/debian/patches/backport_r1209688.diff
index c273aea..b7b9a5c 100644
--- a/debian/patches/backport_r1209688.diff
+++ b/debian/patches/backport_r1209688.diff
@@ -8,8 +8,6 @@ Make pykdeuic4 work again with PyQt 4.8:
- change the call to compileUi to account the new from_imports parameter
-Applied-Upstream: 4.6.0
-
Index: kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py
===================================================================
--- kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py (revision 1209687)
diff --git a/debian/patches/backport_r1211266.diff b/debian/patches/backport_r1211266.diff
deleted file mode 100644
index f853eb5..0000000
--- a/debian/patches/backport_r1211266.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-r1211266 | lbeltrame | 2011-01-03 14:41:10 +0100 (Mon, 03 Jan 2011) | 2 lines
-Changed paths:
- M /trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip
-
-Fix building against PyQt 4.8.2 (forwardport of r1208598 by sedwards)
-
-Applied-Upstream: 4.6.0
-
-Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
-===================================================================
---- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1211265)
-+++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1211266)
-@@ -582,90 +582,6 @@
- %End
- };
-
--template <TYPE>
--%MappedType QSet<TYPE>
--{
--%TypeHeaderCode
--#include <qset.h>
--%End
--
--%ConvertFromTypeCode
-- // Create the list.
-- PyObject *l;
--
-- if ((l = PyList_New(sipCpp->size())) == NULL)
-- return NULL;
--
-- // Set the list elements.
-- QSet<TYPE> set = *sipCpp;
-- int i = 0;
-- foreach (TYPE value, set)
-- {
-- PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
-- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
-- {
-- Py_DECREF(l);
--
-- if (obj)
-- Py_DECREF(obj);
--
-- return NULL;
-- }
--
-- Py_DECREF(obj);
-- i++;
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- {
-- if (!PyList_Check(sipPy))
-- return 0;
-- }
--
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- {
-- if (!PyList_Check(sipPy))
-- return 0;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-- if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
-- return 0;
-- }
--
-- QSet<TYPE> *qs = new QSet<TYPE>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-- {
-- int state;
--
-- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
--
-- if (*sipIsErr)
-- {
-- sipReleaseType(t, sipType_TYPE, state);
--
-- delete qs;
-- return 0;
-- }
--
-- *qs << *t;
--
-- sipReleaseType(t, sipType_TYPE, state);
-- }
--
-- *sipCppPtr = qs;
--
-- return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE1,TYPE2>
- %MappedType QPair<TYPE1,TYPE2>
- {
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index 2207073..ec1848a 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -1,6 +1,6 @@
--- a/python/pykde4/CMakeLists.txt
+++ b/python/pykde4/CMakeLists.txt
-@@ -249,15 +249,20 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DI
+@@ -257,15 +257,20 @@
# Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
# (Don't forget the / at the end of sip/.)
diff --git a/debian/patches/series b/debian/patches/series
index 0d3b299..d45b9a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,8 +12,4 @@ fix_segfault_in_generator_on_armel.diff
12_pythonpluginfactory_use_versioned_python_lib.diff
version_cppparser_library.diff
optional_install_sip_files.diff
-backport_r1150375.diff
-backport_r1170602.diff
-backport_r1184022.diff
backport_r1209688.diff
-backport_r1211266.diff
--
KDE Bindings module packaging
More information about the pkg-kde-commits
mailing list