diff --git a/.gitignore b/.gitignore index edcb279..e2a963c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pykde4-4.13.2.tar.xz /pykde4-4.13.3.tar.xz +/pykde4-4.13.97.tar.xz 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 deleted file mode 100644 index 4727c41..0000000 --- a/0001-Ensure-SIP-files-are-installed-to-the-right-path-bas.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bfde1bec8426411f562011b30edcf05bc9561b0d Mon Sep 17 00:00:00 2001 -From: Luca Beltrame -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@gmail.com -CCMAIL: v.for.vandal@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/make_pykde4_respect_sip_flags.diff b/make_pykde4_respect_sip_flags.diff index 5a111b8..6ca93d6 100644 --- a/make_pykde4_respect_sip_flags.diff +++ b/make_pykde4_respect_sip_flags.diff @@ -1,32 +1,22 @@ -From: Michael Casadevall -Subject: Respect Qt SIP flags -Forwarded: no -Origin: -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. - -Index: pykde4-4.11.1+git20130916/CMakeLists.txt -=================================================================== ---- pykde4-4.11.1+git20130916.orig/CMakeLists.txt 2013-09-17 00:00:30.678363723 -0400 -+++ pykde4-4.11.1+git20130916/CMakeLists.txt 2013-09-17 00:00:30.670363723 -0400 -@@ -103,6 +103,9 @@ +diff -up pykde4-4.13.97/CMakeLists.txt.203 pykde4-4.13.97/CMakeLists.txt +--- pykde4-4.13.97/CMakeLists.txt.203 2014-08-05 00:00:48.662013293 -0500 ++++ pykde4-4.13.97/CMakeLists.txt 2014-08-05 00:01:51.729355782 -0500 +@@ -101,6 +101,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_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip) set(SIP_CONCAT_PARTS 8) if (WIN32) -@@ -110,7 +113,7 @@ +@@ -108,7 +111,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_VERSION_MAJOR GREATER 2) + set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) + diff --git a/pykde4-4.13.1-sip416.patch b/pykde4-4.13.1-sip416.patch deleted file mode 100644 index fb8f9bb..0000000 --- a/pykde4-4.13.1-sip416.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up pykde4-4.13.1/sip/plasma/glapplet.sip.sip416 pykde4-4.13.1/sip/plasma/glapplet.sip ---- pykde4-4.13.1/sip/plasma/glapplet.sip.sip416 2014-03-10 01:36:53.000000000 -0500 -+++ pykde4-4.13.1/sip/plasma/glapplet.sip 2014-06-02 06:54:31.898124821 -0500 -@@ -18,8 +18,8 @@ - // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - //force --typedef unsigned int GLuint; --typedef unsigned int GLenum; -+//typedef unsigned int GLuint; -+//typedef unsigned int GLenum; - - namespace Plasma - { diff --git a/pykde4.spec b/pykde4.spec index 73ce82d..918c21a 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -14,7 +14,7 @@ %{!?python2_version:%global python2_version %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3])")} Name: pykde4 -Version: 4.13.3 +Version: 4.13.97 Release: 1%{?dist} Summary: Python bindings for KDE4 @@ -29,10 +29,6 @@ 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 # see also https://bugzilla.redhat.com/show_bug.cgi?id=1050944 Patch50: pykde4-4.12.3-python_library_realpath.patch @@ -152,7 +148,6 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %prep %setup -q -n pykde4-%{version} -%patch1 -p1 -R -b .use_system_sip_dir %patch50 -p1 -b .python_library_realpath %if "%{?sip_version_min}" == "4.15.5" %patch51 -p1 -b .sip_4_15_5 @@ -296,6 +291,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %changelog +* Tue Aug 05 2014 Rex Dieter - 4.13.97-1 +- 4.13.97 + * Mon Jul 14 2014 Rex Dieter - 4.13.3-1 - 4.13.3 diff --git a/sources b/sources index a6c52ef..61cb5f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b62b574e4e5168989c5603353e5fea4 pykde4-4.13.3.tar.xz +ae58211634c68c64c59da7c560917810 pykde4-4.13.97.tar.xz