[pykde4] revert upstream commit changing sip install paths
Rex Dieter
rdieter at fedoraproject.org
Sun Mar 31 22:03:29 UTC 2013
commit 0a78b1a562daa139a5d1ad9fb987e874271365fd
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Mar 31 17:02:39 2013 -0500
revert upstream commit changing sip install paths
See https://reviewboard.kde.org/r/101903
hard-codes sip path to /usr/share/sip, instead of respecting system
...files-are-installed-to-the-right-path-bas.patch | 54 ++++++++++++++++++++
pykde4.spec | 6 ++
2 files changed, 60 insertions(+), 0 deletions(-)
---
diff --git a/0001-Ensure-SIP-files-are-installed-to-the-right-path-bas.patch b/0001-Ensure-SIP-files-are-installed-to-the-right-path-bas.patch
new file mode 100644
index 0000000..4727c41
--- /dev/null
+++ b/0001-Ensure-SIP-files-are-installed-to-the-right-path-bas.patch
@@ -0,0 +1,54 @@
+From bfde1bec8426411f562011b30edcf05bc9561b0d Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame at kde.org>
+Date: Sat, 2 Mar 2013 16:25:23 +0100
+Subject: [PATCH] Ensure SIP files are installed to the right path basing on
+ the INSTALL_PREFIX, rather than hardcode install directories.
+
+This allows full installation of PyKDE4 outside of the system
+directories (the other bits were done in kdelibs prior to 4.10).
+
+Based on a patch by Artem Serebriyskiy.
+
+Reviewed by krop and tested by shumski.
+
+REVIEW: 101903
+CCMAIL: hrvoje.senjan at gmail.com
+CCMAIL: v.for.vandal at gmail.com
+---
+ CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c2837b6..09fcc34 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -241,6 +241,8 @@ endforeach (_X ${SIP_DISABLE_FEATURES})
+
+ get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME)
+
++set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
++
+ set(SIP_CONFIGURATION "
+ kde_version_parts = '${KDE_VERSION}'.split('.')
+ kde_version_hex = int(kde_version_parts[0])*65536 + int(kde_version_parts[1])*256 + int(kde_version_parts[2])
+@@ -258,7 +260,7 @@ _pkg_config = {
+ 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
+ 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
+ 'pykde_modules': '${PYKDE_MODULES}',
+- 'pykde_sip_dir': '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
++ 'pykde_sip_dir': '${SIP_FILES_INSTALL_DIR}/PyKDE4',
+ 'pykde_version': kde_version_hex,
+ 'pykde_version_str': '${KDE_VERSION}'
+ }
+@@ -270,7 +272,7 @@ python_install(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES
+
+ # 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_FILES_INSTALL_DIR}/PyKDE4
+ PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want?
+ PATTERN ".svn" EXCLUDE
+ PATTERN "*.in" EXCLUDE)
+--
+1.8.1.4
+
diff --git a/pykde4.spec b/pykde4.spec
index d0158f6..bff5a8a 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -25,6 +25,10 @@ URL: http://developer.kde.org/language-bindings/
%endif
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+# See https://reviewboard.kde.org/r/101903
+# hard-codes sip path to /usr/share/sip, instead of respecting system path
+Patch1: 0001-Ensure-SIP-files-are-installed-to-the-right-path-bas.patch
+
## upstreamable patches
## upstream patches
@@ -151,6 +155,8 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release}
%prep
%setup -q -n pykde4-%{version}
+%patch1 -p1 -R -b .use_system_sip_dir
+
%patch200 -p1 -b .respect_sip_flags
%patch201 -p1 -b .kpythonpluginfactory_slots
More information about the scm-commits
mailing list