# # Patch managed by http://www.holgerschurig.de/patcher.html # --- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip @@ -235,7 +235,7 @@ sipClass = sipClass_QCanvasLine; break; -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 case 8: sipClass = sipClass_QCanvasSpline; break; --- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip @@ -114,7 +114,7 @@ %ConvertToSubClassCode Py_BEGIN_ALLOW_THREADS -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 int rtti = sipCpp -> rtti(); if (rtti == QCheckTableItem::RTTI) --- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip @@ -102,7 +102,7 @@ #endif {sipName_QComboBox, &sipClass_QComboBox}, {sipName_QCommonStyle, &sipClass_QCommonStyle}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QDateEdit, &sipClass_QDateEdit}, {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit}, {sipName_QDesktopWidget, &sipClass_QDesktopWidget}, @@ -111,13 +111,13 @@ {sipName_QDial, &sipClass_QDial}, #endif {sipName_QDialog, &sipClass_QDialog}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QDockArea, &sipClass_QDockArea}, {sipName_QDockWindow, &sipClass_QDockWindow}, #endif {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, {sipName_QDragObject, &sipClass_QDragObject}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QErrorMessage, &sipClass_QErrorMessage}, #endif #if QT_VERSION >= 0x030100 @@ -133,7 +133,7 @@ {sipName_QFrame, &sipClass_QFrame}, {sipName_QGrid, &sipClass_QGrid}, {sipName_QGridLayout, &sipClass_QGridLayout}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QGridView, &sipClass_QGridView}, #endif {sipName_QGroupBox, &sipClass_QGroupBox}, @@ -175,7 +175,7 @@ {sipName_QNetworkOperation, &sipClass_QNetworkOperation}, {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol}, #endif -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler}, #endif #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM) @@ -185,7 +185,7 @@ #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG) {sipName_QPrintDialog, &sipClass_QPrintDialog}, #endif -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QProcess, &sipClass_QProcess}, #endif {sipName_QProgressBar, &sipClass_QProgressBar}, @@ -194,7 +194,7 @@ #endif {sipName_QPushButton, &sipClass_QPushButton}, {sipName_QRadioButton, &sipClass_QRadioButton}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QRegExpValidator, &sipClass_QRegExpValidator}, #endif #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI) @@ -229,11 +229,11 @@ {sipName_QTabWidget, &sipClass_QTabWidget}, {sipName_QTextBrowser, &sipClass_QTextBrowser}, {sipName_QTextDrag, &sipClass_QTextDrag}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QTextEdit, &sipClass_QTextEdit}, #endif {sipName_QTextView, &sipClass_QTextView}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QTimeEdit, &sipClass_QTimeEdit}, #endif {sipName_QTimer, &sipClass_QTimer}, --- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip @@ -528,7 +528,7 @@ sipClass = sipClass_QChildEvent; break; -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 case QEvent::ContextMenu: sipClass = sipClass_QContextMenuEvent; break; @@ -539,7 +539,7 @@ break; #endif -#if QT_VERSION >= 300 && QT_VERSION < 0x030100 +#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 case QEvent::IMCompose: sipClass = sipClass_QIMEvent; break; 2015-09-09 14:24:58 +0100'>2015-09-09package_manager.py: search provides when not found by pkgnameRobert Yang1 2015-09-07rootfs: Do not uninstall update-rc.dKhem Raj1 2015-09-07busybox: Enable getopt appletKhem Raj2 2015-09-07qemurunner: Drop error to a warning to improve user feedbackRichard Purdie1 2015-09-07qemu: Add fixes for smc91c11 qemu segfaults on armRichard Purdie2 2015-09-07devtool: add mechanism for updating extensible SDKQi.Chen@windriver.com1 2015-09-07Extensible SDK: allow for installation without preparing build systemQi.Chen@windriver.com2 2015-09-07populate_sdk_ext: don't remove the native qemu dependenciesQi.Chen@windriver.com1 2015-09-07populate_sdk_ext: consider custom configuration in local.confQi.Chen@windriver.com1 2015-09-07copy_buildsystem: make sure bitbake directory is copiedQi.Chen@windriver.com1 2015-09-07populate_sdk_ext: install the latest buildtools-tarballQi.Chen@windriver.com1 2015-09-07classes/populate_sdk_ext: avoid poky-specific buildtools namingPaul Eggleton1 2015-09-07toolchain-shar-extract.sh: explain why we cannot use sudo in extensible SDKBrendan Le Foll1 2015-09-07toolchain-shar-extract.sh: better default install path for extensible SDKBrendan Le Foll2 2015-09-07toolchain-shar-extract.sh: ensure extensible SDK install path obeys restrictionsBrendan Le Foll1 2015-09-07testimage: handle SIGTERM to conclude runqemuMariano Lopez2 2015-09-07rootfs.py: Allow to override postinst-intercepts locationMartin Jansa1 2015-09-06pseudo_1.7.3.bb: New version of pseudoPeter Seebach2 2015-09-06sstate: implement basic signing/validationRoss Burton1 2015-09-06libinput: avoid --enable-event-gui=autoJoe Slater1 2015-09-06cross-canadian.bbclass: typo fix in comments (s/repsonsible/responsible/)Mario Domenech Goulart1 2015-09-06boot-directdisk.bbclass: use rootfs UUID by defaultPatrick Ohly1 2015-09-06boot loader: support root=UUIDPatrick Ohly4 2015-09-06image-vm.bbclass: support specifying an initramfsPatrick Ohly1 2015-09-06image-vm.bbclass: avoid duplicating syslinux default valuesPatrick Ohly1 2015-09-06initramfs-framework: handle kernel parameters with . insidePatrick Ohly1 2015-09-06initramfs-live-boot: create /dev/consolePatrick Ohly1 2015-09-06initramfs-framework: create /dev/consolePatrick Ohly1 2015-09-06oprofileui: Use inherit gettextSaul Wold1 2015-09-06oeqa/decorators: Fixed a problem with tests having the same names.Lucian Musat1 2015-09-06libunique: remove the recipeAlexander Kanavin4 2015-09-06report-error: send only last 5242000 characters in error logsMartin Jansa1 2015-09-06procps: fix for base_sbindir == sbindirJoshua Lock1 2015-09-06nfs-utils: don't force use of /sbin as sbindirJoshua Lock1 2015-09-06pcmciautils: handle udev dir being 2 levels below /Joshua Lock1 2015-09-06bluez: handle udev dir being 2 levels below /Joshua Lock1 2015-09-06pulseaudio: handle udev dir being 2 levels below /Joshua Lock1 2015-09-06alsa-utils: handle udev dir being 2 levels below /Joshua Lock1 2015-09-06systemd: remove hard-coded paths in FILES entriesJoshua Lock1 2015-09-06busybox: fixes for when base_bindir != /binJoshua Lock1 2015-09-05oeqa: Test failure/cleanup improvementsRichard Purdie4