[SCM] PyKDE4 packaging branch, master, updated. debian/4.10.5-1

Sat Jul 13 12:46:57 UTC 2013

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

The following commit has been merged in the master branch:
commit 67be36ce87622d7ff110acfe628a6951cccd690a
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Feb 12 23:26:32 2013 +0100

    Update patches.
---
 debian/changelog                                   |    7 +++++-
 debian/patches/add_qt_kde_definitions.diff         |   12 +++++-----
 debian/patches/make_pykde4_respect_sip_flags.diff  |   22 +++++++++----------
 debian/patches/optional_install_sip_files.diff     |   23 ++++++++++----------
 ...python_modules_dont_link_against_libpython.diff |   10 ++++-----
 5 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 781e67e..50cf091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,12 @@ pykde4 (4:4.10.0-0r0) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.10.0.
   * Bump build dependencies on other KDE SC components to 4:4.10.
-  * Refresh some patches to make them apply without any offset.
+  * Update patches:
+    - update python_modules_dont_link_against_libpython.diff.
+    - update add_qt_kde_definitions.diff.
+    - update make_pykde4_respect_sip_flags.diff.
+    - update optional_install_sip_files.diff.
+    - refresh other patches to make them apply without any offset.
   * Add watch file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2013 13:53:10 +0100
diff --git a/debian/patches/add_qt_kde_definitions.diff b/debian/patches/add_qt_kde_definitions.diff
index 3777c9c..197f94d 100644
--- a/debian/patches/add_qt_kde_definitions.diff
+++ b/debian/patches/add_qt_kde_definitions.diff
@@ -7,12 +7,12 @@ Origin: vendor
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -10,6 +10,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
+@@ -35,6 +35,8 @@ set_package_properties(PythonInterp PROP
  
-     include_directories (${KDE4_INCLUDES})
+ include_directories(${KDE4_INCLUDES})
  
-+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
++add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
 +
- endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
- 
- # This module can be built independant from the rest of kdebindings.
+ find_package(SIP)
+ set_package_properties(SIP PROPERTIES DESCRIPTION "The SIP binding generator"
+                        URL "http://riverbankcomputing.com" TYPE REQUIRED
diff --git a/debian/patches/make_pykde4_respect_sip_flags.diff b/debian/patches/make_pykde4_respect_sip_flags.diff
index 9468cfa..30f66e9 100644
--- a/debian/patches/make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/make_pykde4_respect_sip_flags.diff
@@ -9,22 +9,22 @@ flags passed from PythonQt4's cmake file.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -87,6 +87,9 @@ INCLUDE_DIRECTORIES(
+@@ -103,6 +103,9 @@ include_directories(
      ${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)
-@@ -94,7 +97,7 @@ IF (WIN32)
- 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})
+ set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
+ set(SIP_CONCAT_PARTS 8)
+ if (WIN32)
+@@ -110,7 +113,7 @@ if (WIN32)
+ else ()
+     set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ endif ()
+-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)
+ if (PYTHON_VERSION_MAJOR GREATER 2)
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index 601aafd..8ee8ed6 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -2,17 +2,17 @@ From: Sune Vuorela <sune at debian.org>
 Subject: Install sip files only when building for default python version
 Forwarded: not-needed
 Origin: vendor
-Last-Update: 2011-07-01
+Last-Update: 2013-02-12
 
 Make it possible to only install the sip files under some conditions
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -263,15 +263,20 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DI
+@@ -278,15 +278,20 @@ python_install(${CMAKE_CURRENT_BINARY_DI
  
  # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
  # (Don't forget the / at the end of sip/.)
--INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
+-install(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
 -    PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
 -    PATTERN ".svn" EXCLUDE
 -    PATTERN "*.in" EXCLUDE)
@@ -26,12 +26,11 @@ Make it possible to only install the sip files under some conditions
 +   MESSAGE("Not installing sip files in this build pass")
 +ENDIF(DEFAULT_PYTHON_VERSION)
  
- ADD_SUBDIRECTORY(tools)
- #ADD_SUBDIRECTORY(docs)
- ADD_SUBDIRECTORY(examples)
--IF (NOT PYTHON_3)
-+IF (NOT PYTHON_3 AND DEFAULT_PYTHON_VERSION)
-     ADD_SUBDIRECTORY(kpythonpluginfactory)
--ENDIF (NOT PYTHON_3)
-+ENDIF (NOT PYTHON_3 AND DEFAULT_PYTHON_VERSION)
- #ADD_SUBDIRECTORY(pykdedocs)
+ add_subdirectory(tools)
+ #add_subdirectory(docs)
+ add_subdirectory(examples)
+-if (PYTHON_VERSION_MAJOR LESS 3)
++if (PYTHON_VERSION_MAJOR LESS 3 AND DEFAULT_PYTHON_VERSION)
+     add_subdirectory(kpythonpluginfactory)
+ endif ()
+ 
diff --git a/debian/patches/python_modules_dont_link_against_libpython.diff b/debian/patches/python_modules_dont_link_against_libpython.diff
index e3f6494..8953b16 100644
--- a/debian/patches/python_modules_dont_link_against_libpython.diff
+++ b/debian/patches/python_modules_dont_link_against_libpython.diff
@@ -2,7 +2,7 @@ From: Adeodato Simó <adeodato at debian.org>
 Subject: Do not let python modules link against libpython.
 Forwarded: no
 Origin: vendor
-Last-Update: 2008-01-25
+Last-Update: 2013-02-12
 
 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
@@ -10,13 +10,13 @@ CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -113,6 +113,9 @@ ENDIF (PYTHON_3)
+@@ -129,6 +129,9 @@ endif ()
  
- ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
+ add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
  
 +# Do not use --no-undefined for python modules.
 +STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 +
- FILE(GLOB kdecore_files_sip sip/kdecore/*.sip)
+ file(GLOB kdecore_files_sip sip/kdecore/*.sip)
  set(SIP_EXTRA_FILES_DEPEND ${kdecore_files_sip})
- ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY})
+ add_sip_python_module(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY})

-- 
PyKDE4 packaging

