[SCM] PyKDE4 packaging branch, master, updated. debian/4.13.3-1-3-gc300d5a

Sun Aug 24 21:36:57 UTC 2014

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

The following commit has been merged in the master branch:
commit 092f8f8b4339e9fc8852af27ea5d5ba13d59e390
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Aug 24 05:24:59 2014 +0200

    Refresh patches.
---
 debian/changelog                                         |  1 +
 debian/patches/add_qt_kde_definitions.diff               |  8 +++++---
 debian/patches/make_pykde4_respect_sip_flags.diff        | 16 +++++++++-------
 debian/patches/new_pyincludes.diff                       |  8 ++++----
 debian/patches/optional_install_sip_files.diff           | 10 +++++-----
 .../python_modules_dont_link_against_libpython.diff      | 10 +++++-----
 debian/patches/pythonpluginfactory_python3.diff          | 10 +++++-----
 7 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 929ee98..46c5828 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pykde4 (4:4.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Aug 2014 18:30:30 +0200
 
diff --git a/debian/patches/add_qt_kde_definitions.diff b/debian/patches/add_qt_kde_definitions.diff
index 197f94d..7014af7 100644
--- a/debian/patches/add_qt_kde_definitions.diff
+++ b/debian/patches/add_qt_kde_definitions.diff
@@ -5,9 +5,11 @@ Forwarded: no
 Last-Update: 2011-06-30
 Origin: vendor
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,6 +35,8 @@ set_package_properties(PythonInterp PROP
+Index: pykde4/CMakeLists.txt
+===================================================================
+--- pykde4.orig/CMakeLists.txt	2014-08-24 05:20:35.129395520 +0200
++++ pykde4/CMakeLists.txt	2014-08-24 05:20:35.125395684 +0200
+@@ -33,6 +33,8 @@
  
  include_directories(${KDE4_INCLUDES})
  
diff --git a/debian/patches/make_pykde4_respect_sip_flags.diff b/debian/patches/make_pykde4_respect_sip_flags.diff
index 30f66e9..4e24d34 100644
--- a/debian/patches/make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/make_pykde4_respect_sip_flags.diff
@@ -7,24 +7,26 @@ Last-Update: 2009-04-15
 Corrects FTBFS on armel by making sure pykde4 properly parses the python-qt4
 flags passed from PythonQt4's cmake file.
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -103,6 +103,9 @@ include_directories(
+Index: pykde4/CMakeLists.txt
+===================================================================
+--- pykde4.orig/CMakeLists.txt	2014-08-24 05:20:42.953073667 +0200
++++ pykde4/CMakeLists.txt	2014-08-24 05:21:35.606907685 +0200
+@@ -101,6 +101,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_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
  set(SIP_CONCAT_PARTS 8)
  if (WIN32)
-@@ -110,7 +113,7 @@ if (WIN32)
+@@ -108,7 +111,7 @@
  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_VERSION_MAJOR GREATER 2)
+ set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
+ 
diff --git a/debian/patches/new_pyincludes.diff b/debian/patches/new_pyincludes.diff
index 93e3c37..8065b49 100644
--- a/debian/patches/new_pyincludes.diff
+++ b/debian/patches/new_pyincludes.diff
@@ -1,8 +1,8 @@
 Index: pykde4/CMakeLists.txt
 ===================================================================
---- 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 @@
+--- pykde4.orig/CMakeLists.txt	2014-08-24 05:23:50.441361898 +0200
++++ pykde4/CMakeLists.txt	2014-08-24 05:23:50.437362061 +0200
+@@ -19,6 +19,7 @@
  set(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
  
  find_package(PythonLibrary)
@@ -10,7 +10,7 @@ Index: pykde4/CMakeLists.txt
  
  set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries"
                         URL "http://www.kde.org" TYPE REQUIRED
-@@ -79,7 +80,8 @@
+@@ -77,7 +78,8 @@
                         "Required to build Python Polkit bindings")
  
  include_directories(
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index bb54c50..0982c30 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -6,14 +6,14 @@ Last-Update: 2013-02-12
 
 Make it possible to only install the sip files under some conditions
 
-Index: b/CMakeLists.txt
+Index: pykde4/CMakeLists.txt
 ===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -280,15 +280,20 @@
- 
+--- pykde4.orig/CMakeLists.txt	2014-08-24 05:22:34.384489997 +0200
++++ pykde4/CMakeLists.txt	2014-08-24 05:23:38.197865431 +0200
+@@ -260,15 +260,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/.)
+ install(FILES ${CMAKE_BINARY_DIR}/pykde_config.sip DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4/)
 -install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4
 -    PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
 -    PATTERN ".svn" EXCLUDE
diff --git a/debian/patches/python_modules_dont_link_against_libpython.diff b/debian/patches/python_modules_dont_link_against_libpython.diff
index bb45fb7..c516287 100644
--- a/debian/patches/python_modules_dont_link_against_libpython.diff
+++ b/debian/patches/python_modules_dont_link_against_libpython.diff
@@ -10,11 +10,11 @@ CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
 
 Index: pykde4/CMakeLists.txt
 ===================================================================
---- pykde4.orig/CMakeLists.txt	2013-10-09 18:04:16.971427532 +0200
-+++ pykde4/CMakeLists.txt	2013-10-09 18:04:16.959428011 +0200
-@@ -129,6 +129,9 @@
- 
- add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API -DSIP_PROTECTED_IS_PUBLIC -Dprotected=public)
+--- pykde4.orig/CMakeLists.txt	2014-08-24 05:20:28.393672620 +0200
++++ pykde4/CMakeLists.txt	2014-08-24 05:20:28.389672785 +0200
+@@ -152,6 +152,9 @@
+     python_install(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
+ endif ()
  
 +# Do not use --no-undefined for python modules.
 +STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
diff --git a/debian/patches/pythonpluginfactory_python3.diff b/debian/patches/pythonpluginfactory_python3.diff
index 9c180d6..ef6baa0 100644
--- a/debian/patches/pythonpluginfactory_python3.diff
+++ b/debian/patches/pythonpluginfactory_python3.diff
@@ -6,8 +6,8 @@ that Python 3 interpreters will search for those first.
 Copyright (C) 2012 Barry A. Warsaw <barry at python.org>
 Index: pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
 ===================================================================
---- 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
+--- pykde4.orig/kpythonpluginfactory/kpythonpluginfactory.cpp	2014-08-24 05:23:56.005133082 +0200
++++ pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp	2014-08-24 05:23:56.001133247 +0200
 @@ -29,6 +29,10 @@
  #include <kcomponentdata.h>
  #include <kdebug.h>
@@ -83,9 +83,9 @@ Index: pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
      RunFunction(factoryFunction, pArgs);
 Index: pykde4/CMakeLists.txt
 ===================================================================
---- 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 @@
+--- pykde4.orig/CMakeLists.txt	2014-08-24 05:23:56.005133082 +0200
++++ pykde4/CMakeLists.txt	2014-08-24 05:23:56.001133247 +0200
+@@ -275,7 +275,10 @@
  add_subdirectory(tools)
  #add_subdirectory(docs)
  add_subdirectory(examples)

-- 
PyKDE4 packaging

