[SCM] PyKDE4 packaging branch, kde4.10, updated. debian/4.8.4-2-21-g3f279fc

Thu Jun 13 15:07:39 UTC 2013

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=3f279fc

The following commit has been merged in the kde4.10 branch:
commit 3f279fc95a0abaa731695a6832ad5245defc41c8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jun 13 15:57:53 2013 +0200

    Refresh patches.
---
 debian/changelog                                |    1 +
 debian/patches/new_pyincludes.diff              |   24 +++++-----
 debian/patches/python3_sip_options.diff         |   53 -----------------------
 debian/patches/pythonpluginfactory_python3.diff |   32 +++++++-------
 debian/patches/series                           |    1 -
 5 files changed, 29 insertions(+), 82 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35f3c48..1bb0d1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ pykde4 (4:4.10.4-1) UNRELEASED; urgency=low
   * Add myself to uploaders.
   * Revert most version dependencies changes reshuffling build-deps.
   * Bump kdepimlibs-dev build-dep to 4:4.10.4.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 13 Jun 2013 12:11:58 +0200
 
diff --git a/debian/patches/new_pyincludes.diff b/debian/patches/new_pyincludes.diff
index 27dffb6..93e3c37 100644
--- a/debian/patches/new_pyincludes.diff
+++ b/debian/patches/new_pyincludes.diff
@@ -1,19 +1,19 @@
-Index: pykde4-4.8.4/CMakeLists.txt
+Index: pykde4/CMakeLists.txt
 ===================================================================
---- pykde4-4.8.4.orig/CMakeLists.txt	2013-05-17 18:34:50.000000000 -0400
-+++ pykde4-4.8.4/CMakeLists.txt	2013-05-20 00:55:07.657362953 -0400
-@@ -26,6 +26,7 @@
+--- pykde4.orig/CMakeLists.txt	2013-06-13 15:49:54.410237959 +0200
++++ pykde4/CMakeLists.txt	2013-06-13 15:51:23.354669212 +0200
+@@ -21,6 +21,7 @@
+ set(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
  
- FIND_PACKAGE(PythonLibrary REQUIRED)
- INCLUDE(PythonMacros)
-+FIND_PACKAGE(PythonLibs)
+ find_package(PythonLibrary)
++find_package(PythonLibs)
  
- FIND_PACKAGE(SIP REQUIRED)
- IF(SIP_VERSION STRLESS "040c00")    # These version numbers also appear in ../CMakeLists.txt
-@@ -60,7 +61,8 @@
- ENDIF (${PYTHON_SHORT_VERSION} MATCHES "^3")
+ set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries"
+                        URL "http://www.kde.org" TYPE REQUIRED
+@@ -79,7 +80,8 @@
+                        "Required to build Python Polkit bindings")
  
- INCLUDE_DIRECTORIES(
+ include_directories(
 -    ${PYTHON_INCLUDE_PATH}
 +    ${PYTHON_INCLUDE_DIR}
 +    ${PYTHON_INCLUDE_DIR2}
diff --git a/debian/patches/python3_sip_options.diff b/debian/patches/python3_sip_options.diff
deleted file mode 100644
index 7e42e98..0000000
--- a/debian/patches/python3_sip_options.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Already upstream, can be dropped with 4.10.
-
-Index: pykde4-4.8.4/CMakeLists.txt
-===================================================================
---- pykde4-4.8.4.orig/CMakeLists.txt	2013-05-20 08:29:21.213422712 -0400
-+++ pykde4-4.8.4/CMakeLists.txt	2013-05-20 08:29:21.205422712 -0400
-@@ -101,11 +101,21 @@
- SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
- 
- # Use an extra option when compiling on Python 3.
--IF (PYTHON_3)
--    SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
--ELSE (PYTHON_3)
--    SET(SIP_EXTRA_OPTIONS -g)
--ENDIF (PYTHON_3)
-+if (PYTHON_3)
-+    if(PYQT4_VERSION STRGREATER "040904")
-+            # Disable for newer PyQt
-+            set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector)
-+    else ()
-+            set(SIP_EXTRA_OPTIONS -g)
-+    endif()
-+else (PYTHON_3)
-+    if(PYQT4_VERSION STRGREATER "040904")
-+        # Disable for newer PyQt
-+        set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3)
-+    else ()
-+            set(SIP_EXTRA_OPTIONS -g -x Py_v3)
-+    endif()
-+endif ()
- 
- ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
- 
-Index: pykde4-4.8.4/sip/kdecore/typedefs.sip
-===================================================================
---- pykde4-4.8.4.orig/sip/kdecore/typedefs.sip	2013-05-20 08:30:20.041420973 -0400
-+++ pykde4-4.8.4/sip/kdecore/typedefs.sip	2013-05-20 08:31:09.489419512 -0400
-@@ -951,6 +951,10 @@
- %End
- };
- 
-+%Feature PyKDE_QVector
-+
-+%If(PyKDE_QVector)
-+
- %MappedType QVector<int>
- {
- %TypeHeaderCode
-@@ -1025,3 +1029,4 @@
-     return sipGetState(sipTransferObj);
- %End
- };
-+%End
diff --git a/debian/patches/pythonpluginfactory_python3.diff b/debian/patches/pythonpluginfactory_python3.diff
index 29691f8..9c180d6 100644
--- a/debian/patches/pythonpluginfactory_python3.diff
+++ b/debian/patches/pythonpluginfactory_python3.diff
@@ -4,10 +4,10 @@ Note: It is OK for the Python and Python3 versions to have the same name
 because of the version specific ABI tags in Python 3 so files and the fact
 that Python 3 interpreters will search for those first.
 Copyright (C) 2012 Barry A. Warsaw <barry at python.org>
-Index: pykde4-4.8.4/kpythonpluginfactory/kpythonpluginfactory.cpp
+Index: pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
 ===================================================================
---- pykde4-4.8.4.orig/kpythonpluginfactory/kpythonpluginfactory.cpp	2013-05-20 02:27:28.047014262 -0400
-+++ pykde4-4.8.4/kpythonpluginfactory/kpythonpluginfactory.cpp	2013-05-20 02:27:28.039014262 -0400
+--- pykde4.orig/kpythonpluginfactory/kpythonpluginfactory.cpp	2013-06-13 15:54:27.847262446 +0200
++++ pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp	2013-06-13 15:54:27.843262607 +0200
 @@ -29,6 +29,10 @@
  #include <kcomponentdata.h>
  #include <kdebug.h>
@@ -81,19 +81,19 @@ Index: pykde4-4.8.4/kpythonpluginfactory/kpythonpluginfactory.cpp
      PyTuple_SetItem(pArgs, 0, pArg1);
      PyTuple_SetItem(pArgs, 1, pArg2);
      RunFunction(factoryFunction, pArgs);
-Index: pykde4-4.8.4/CMakeLists.txt
+Index: pykde4/CMakeLists.txt
 ===================================================================
---- pykde4-4.8.4.orig/CMakeLists.txt	2013-05-20 02:27:28.047014262 -0400
-+++ pykde4-4.8.4/CMakeLists.txt	2013-05-20 02:30:31.627008838 -0400
-@@ -277,7 +277,9 @@
- ADD_SUBDIRECTORY(tools)
- #ADD_SUBDIRECTORY(docs)
- ADD_SUBDIRECTORY(examples)
--IF (NOT PYTHON_3 AND DEFAULT_PYTHON_VERSION)
-+IF ((NOT PYTHON_3 AND DEFAULT_PYTHON_VERSION) OR PYTHON_3)
+--- pykde4.orig/CMakeLists.txt	2013-06-13 15:54:27.847262446 +0200
++++ pykde4/CMakeLists.txt	2013-06-13 15:56:20.434739659 +0200
+@@ -295,7 +295,10 @@
+ add_subdirectory(tools)
+ #add_subdirectory(docs)
+ add_subdirectory(examples)
+-if (PYTHON_VERSION_MAJOR LESS 3 AND DEFAULT_PYTHON_VERSION)
++if ((PYTHON_VERSION_MAJOR LESS 3 AND DEFAULT_PYTHON_VERSION) OR
++    PYTHON_VERSION_MAJOR GREATER 2)
 +# Due to version specific ABI tagging in Python 3 so files, we can build for
 +# all Python 3 versions without a problem.
-     ADD_SUBDIRECTORY(kpythonpluginfactory)
--ENDIF (NOT PYTHON_3 AND DEFAULT_PYTHON_VERSION)
-+ENDIF ((NOT PYTHON_3 AND DEFAULT_PYTHON_VERSION) OR PYTHON_3)
- #ADD_SUBDIRECTORY(pykdedocs)
+     add_subdirectory(kpythonpluginfactory)
+ endif ()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8ff5244..9975f63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,5 @@ pythonpluginfactory_use_versioned_python_lib.diff
 optional_install_sip_files.diff
 new_pyincludes.diff
 cmake_no_bytecode.diff
-python3_sip_options.diff
 pythonpluginfactory_python3.diff
 kpythonpluginfactory_3.2support.diff

-- 
PyKDE4 packaging

