Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2015-04-07 09:27:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2014-11-19 20:27:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2015-04-07 09:27:11.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 5 00:42:05 UTC 2015 - [email protected] + +- add arm-qreal-float.patch, arm-avoid-return-type-confusion.patch + to fix build on ARM + +------------------------------------------------------------------- python3-kde4.changes: same change New: ---- arm-avoid-return-type-confusion.patch arm-qreal-float.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.nJrteb/_old 2015-04-07 09:27:12.000000000 +0200 +++ /var/tmp/diff_new_pack.nJrteb/_new 2015-04-07 09:27:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-kde4 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: Development/Libraries/KDE Url: https://projects.kde.org/projects/kde/kdebindings/pykde4 Source0: pykde4-%{version}.tar.xz +Patch0: arm-qreal-float.patch +Patch1: arm-avoid-return-type-confusion.patch BuildRequires: fdupes BuildRequires: libjasper-devel BuildRequires: libkde4-devel @@ -124,6 +126,10 @@ %prep %setup -q -n pykde4-%{version} +%patch0 +%ifarch %arm +%patch1 +%endif %build %cmake_kde4 -d build -- -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE ++++++ python3-kde4.spec ++++++ --- /var/tmp/diff_new_pack.nJrteb/_old 2015-04-07 09:27:12.000000000 +0200 +++ /var/tmp/diff_new_pack.nJrteb/_new 2015-04-07 09:27:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-kde4 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: Development/Libraries/KDE Url: https://projects.kde.org/projects/kde/kdebindings/pykde4 Source0: pykde4-%{version}.tar.xz +Patch0: arm-qreal-float.patch +Patch1: arm-avoid-return-type-confusion.patch BuildRequires: fdupes BuildRequires: libjasper-devel BuildRequires: libkde4-devel @@ -127,6 +129,10 @@ %prep %setup -q -n pykde4-%{version} +%patch0 +%ifarch %arm +%patch1 +%endif %build %cmake_kde4 -d build -- -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE ++++++ arm-avoid-return-type-confusion.patch ++++++ --- sip/kdeui/kplotaxis.sip +++ sip/kdeui/kplotaxis.sip @@ -41,8 +41,6 @@ char tickLabelFormat () const; int tickLabelPrecision () const; void setTickMarks (double x0, double length); - QList<double> majorTickMarks () const; - QList<double> minorTickMarks () const; private: //force --- sip/plasma/signalplotter.sip +++ sip/plasma/signalplotter.sip @@ -43,7 +43,6 @@ public: SignalPlotter (QGraphicsItem* parent = 0); void addPlot (const QColor& color); - void addSample (const QList<double>& samples); void reorderPlots (const QList<uint>& newOrder); void removePlot (uint pos); QList<Plasma::PlotColor>& plotColors (); ++++++ arm-qreal-float.patch ++++++ --- CMakeLists.txt +++ CMakeLists.txt @@ -106,7 +106,9 @@ else () set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) endif () -set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) + +STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_QREAL ${PYQT4_SIP_FLAGS} "") +set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_QREAL}) set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
