Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2013-03-14 11:23:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2013-02-12 12:48:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2013-03-14 11:23:43.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Mar 13 09:54:26 UTC 2013 - [email protected] + +- Added use-a-numeric-comparision.patch from upstream, fixes + building with python-qt 4.10 + +------------------------------------------------------------------- +Sat Mar 2 15:34:10 UTC 2013 - [email protected] + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information +- Drop fix-plugin-loading.diff, applied upstream + +------------------------------------------------------------------- Old: ---- fix-plugin-loading.diff kate-4.10.0.tar.xz New: ---- kate-4.10.1.tar.xz use-a-numeric-comparision.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.0UoJCr/_old 2013-03-14 11:23:44.000000000 +0100 +++ /var/tmp/diff_new_pack.0UoJCr/_new 2013-03-14 11:23:44.000000000 +0100 @@ -17,15 +17,15 @@ Name: kate -Version: 4.10.0 +Version: 4.10.1 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: %{name}-%{version}.tar.xz -#PATCH-FIX-UPSTREAM fix-plugin-loading.diff kde#314530 -Patch0: fix-plugin-loading.diff +#PATCH-FIX-UPSTREAM use-a-numeric-comparision.patch -- Fixes build with python-qt 4.10 +Patch0: use-a-numeric-comparision.patch BuildRequires: fdupes BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %version ++++++ kate-4.10.0.tar.xz -> kate-4.10.1.tar.xz ++++++ ++++ 2879 lines of diff (skipped) ++++++ use-a-numeric-comparision.patch ++++++ From: Shaheed Haque <[email protected]> Date: Sat, 09 Mar 2013 15:41:34 +0000 Subject: Fix Pate build for Qt 4.10 X-Git-Url: http://quickgit.kde.org/?p=kate.git&a=commitdiff&h=106f4ee310796170a28786a32f2a235d5464f83c --- Fix Pate build for Qt 4.10 Use a numeric comparision, not a case-sensitive sring comparision! --- --- a/kate/plugins/pate/CMakeLists.txt +++ b/kate/plugins/pate/CMakeLists.txt @@ -42,7 +42,7 @@ return() endif (NOT PYTHON_LIBRARY) if (NOT SIP_FOUND OR 0x${SIP_VERSION} LESS 0x40701) - message(WARNING "Pate plugin needs SIP 4.7.1 or later.") + message(WARNING "Pate plugin needs SIP 4.7.1 or later. " ${SIP_VERSION}) return() endif (NOT SIP_FOUND OR 0x${SIP_VERSION} LESS 0x40701) if (NOT SIP_EXECUTABLE OR NOT EXISTS ${SIP_EXECUTABLE}) @@ -57,10 +57,10 @@ message(WARNING "Pate plugin needs the PyKDE4 development sip files kdecoremod.sip") return() endif() -if (NOT PYQT4_FOUND OR PYQT4_VERSION LESS "040301") - message(WARNING "Pate plugin needs PyQT 4.3.1 or later.") +if (NOT PYQT4_FOUND OR 0x${PYQT4_VERSION} LESS 0x040301) + message(WARNING "Pate plugin needs PyQT 4.3.1 or later. " ${PYQT4_VERSION}) return() -endif (NOT PYQT4_FOUND OR PYQT4_VERSION LESS "040301") +endif (NOT PYQT4_FOUND OR 0x${PYQT4_VERSION} LESS 0x040301) if (NOT PYKDE4_FOUND) message(WARNING "Pate plugin needs PyKDE4.") return() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
