kde-apps: update to 16.12.2

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-02-22 14:13:48 +01:00
parent fba20fcb1e
commit 18dda42177
36 changed files with 69 additions and 232 deletions

View File

@@ -1,6 +1,6 @@
inherit kde-base
KDE_APP_VERSION = "16.12.1"
KDE_APP_VERSION = "16.12.2"
SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"

View File

@@ -24,8 +24,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "08b9058d317b9e5667bb0eaf2a4136c9"
SRC_URI[sha256sum] = "b54c137098bbf77d99a54e526a58a83aca73db1cf1fabbbc4bccdf09a1bee8d0"
SRC_URI[md5sum] = "79781fd04e82ed0661c99b1a608c99d4"
SRC_URI[sha256sum] = "23d346f331de8d3bce14ce073244f79f99321bf59c037e3a229d398b6511571e"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -18,5 +18,5 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5d3f8f89d833033794b170e6b9db4cbd"
SRC_URI[sha256sum] = "4bff2f4abd9d65f39e2b44189312bac139908362e8888c114bbf3d107902217c"
SRC_URI[md5sum] = "a5e3830bbd7535cc3f40b0bdf80188b8"
SRC_URI[sha256sum] = "9d8c7c8d842700f633156e0662554bb0b6f241d4a62087fb6a1a1b39862e1b00"

View File

@@ -17,8 +17,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ec6c38f965585beaba124eb78cce40fd"
SRC_URI[sha256sum] = "7dba4db8e72fdbe6fb552b4d8428676cf5cc490456518b918a650b616f8660b6"
SRC_URI[md5sum] = "9726506e5599eaa286e4fe3488dac7ae"
SRC_URI[sha256sum] = "f8279e1196430e41b0bc89bfde387241b3391e178683b065e9e204ac635f5f37"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -13,8 +13,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "c33684a8b47e439e68775a164455fb54"
SRC_URI[sha256sum] = "ff46afcdefb334bef5b8aca4bdcea1f2f133472e1e0922fb63361280ab6b3abd"
SRC_URI[md5sum] = "0ce7bbf17f46fc00450820c43b11d2a4"
SRC_URI[sha256sum] = "43b63456d53346f7ec377f476ecb5f62be36aae93683f75728ab01b14ae2241e"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -33,8 +33,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "149165d7954bfef08747e5bb7252a277"
SRC_URI[sha256sum] = "b02bbfbe6d3f8eef6a6fd9b6ff6f5e90b47ad27c9f2e7ebcd25346287490fa6e"
SRC_URI[md5sum] = "874df6323edb889cf955e51866bffb97"
SRC_URI[sha256sum] = "c657a80e241a341e85b28c30d064153df319319cee345dc7cc997576e1cc13f7"
SRC_URI += " \
file://0001-align-paths-to-phonon.patch \
file://0002-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -27,8 +27,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "0e5ca33aab8fdd0462494119e715195d"
SRC_URI[sha256sum] = "3302f189878ab5d337035bc73b3e0e753e2bfb1a995f5e5810cbc0304dc26092"
SRC_URI[md5sum] = "44b82a04f0bda100cc60de6d7f95d66e"
SRC_URI[sha256sum] = "7392a7cb24265364703032eef1ade06e1df9df9c9e291e9d479edf99ceb8311e"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"

View File

@@ -18,8 +18,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2bac6bc332a44b9120ec1b7b8dbcc583"
SRC_URI[sha256sum] = "f8a44821c01f84a8554f0d58e32bf6f351dd2d6ecb7e22b0544a40ebeb1e5d7d"
SRC_URI[md5sum] = "75ef111ab7c08ba37f56217c34a0381c"
SRC_URI[sha256sum] = "9c9d26e711c5397e42a26c4076bf507d750f8040836610f77fc1d8ec9fb2d87a"
SRC_URI += " \
file://0001-do-not-build-docs.patch \
file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \

View File

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "1d1ac5a3f9f9639b898db4008b9b52e6"
SRC_URI[sha256sum] = "255df6966b34278a3375880ff6ff31000cc52ea69285e5da5e95a3c4ff782c64"
SRC_URI[md5sum] = "93677b5c62e8657911489a49040ef4c2"
SRC_URI[sha256sum] = "b985e71bc1018dc7fa491a4a0fa91fba37c9a438d023857c4f998c0502a4aed1"
SRC_URI += " \
file://0001-Set-Kipi-package-properties.patch \

View File

@@ -24,8 +24,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "acc85096197530e2e02cb877cef3ce1f"
SRC_URI[sha256sum] = "06addd40448ba9d7f58231b5bfcfa2d9ff94d19e726a5ef320d8dd1cd599bdf3"
SRC_URI[md5sum] = "269703e1cd13bfe53076c34523c8a2ac"
SRC_URI[sha256sum] = "78217113f9f1f9b3e73a2bdc7faf4527710eca3a2008ae074ea469f45fe33a3d"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -30,8 +30,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ac0dbaa0f0b06e3cc96e9f87ea321f42"
SRC_URI[sha256sum] = "984a82005897b553eab0525715b626f7467bc1d664b29ac7944860cd1d7012dc"
SRC_URI[md5sum] = "3c3c582cb26b355192165ed1ec1b3d7b"
SRC_URI[sha256sum] = "57745e90d625b52178b7cb3362393602b6c075f587e07b1e1fd731d15afc78c2"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \

View File

@@ -25,8 +25,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "64f10e943903513cadae909b280f6fd6"
SRC_URI[sha256sum] = "57f4fc75c3383dacdfb7c7ad56c3da12878d4edff1079562af610c79695e54bd"
SRC_URI[md5sum] = "3a303d32654a2b54f153f326d20c5cc2"
SRC_URI[sha256sum] = "c8483a72a485ac6ca2e82d850856ff63dc37509408133636c7e70efcaf45f1e9"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
FILES_${PN} += " \

View File

@@ -26,8 +26,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "e492a200a396cb0b76c675f1707d3e6d"
SRC_URI[sha256sum] = "8ecdc1d391a8ede5db1eda50c7d212d6b5b4169bb74cb1c8bc6e630ace8c3481"
SRC_URI[md5sum] = "104a496bb39b2d8f2c949f98ff1140ed"
SRC_URI[sha256sum] = "95075d35d1d5c07f62a323ec3bac7d142a2a241468f42a625fb49429995359bf"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -20,8 +20,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "107022341aed3aef7c8d72b7de6c08a1"
SRC_URI[sha256sum] = "fb390f2e980f12beab6179240f665cb431626ffa9dea8c24d67ad02813309859"
SRC_URI[md5sum] = "07b596a401713f006883e3bad5177510"
SRC_URI[sha256sum] = "002baf1330bdbd23771a607de11114bb9fe288dba14a3578a89e0c3cabd69e1e"
FILES_SOLIBSDEV = ""

View File

@@ -13,8 +13,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "874e95369735955d827eff0aa69e65d3"
SRC_URI[sha256sum] = "7fe83e765be9de06bde1535e55ef7eb974c78ae8b2b232cc92f5ee71ea1307ef"
SRC_URI[md5sum] = "f1c55b5a19d1880fba88672e19c244aa"
SRC_URI[sha256sum] = "75b30f2f3d40e949597e1bd39375eb4a48869c49188ade8d065c2e005a94fa1e"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -32,8 +32,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "3c906a40f0c5649f4b1b68f4693352dc"
SRC_URI[sha256sum] = "bca5e9293326aecd6ae295f9f579ba5d7880baf54183cb0a8d8c708f4f04768d"
SRC_URI[md5sum] = "b6089df48369611d5dfa75dc8cef6445"
SRC_URI[sha256sum] = "e7231552328421e61919c6411a17784d19b6b579a4d4aee294a8531c8899d484"
SRC_URI += " \
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \

View File

@@ -20,8 +20,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "9bcb48e1de6483bf8a20315bb6d0ada9"
SRC_URI[sha256sum] = "db89a2a7cf899fbbbda503ed53b881db495dfdf4799595b71013e3ea50380bda"
SRC_URI[md5sum] = "7509dfa7e1230da0864775d151a584f6"
SRC_URI[sha256sum] = "d398e30c13d31248d97170e23fb2b949962d628314a5f3884c4e28cb32c67c7e"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -25,8 +25,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ab07c48b7b3155a5f049a35bf1a6fcc3"
SRC_URI[sha256sum] = "6bf47c486d4b7d8138522579ea7013a9c5967c59bedcf6095251d3f951d77a9b"
SRC_URI[md5sum] = "9dd6a4cf473caf83811a19bb99fa9cbc"
SRC_URI[sha256sum] = "bad71ecbacc526d7f4a24ac9ef08577eb19c465e1d4cf631ab1c2ab8a858d4ad"
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -26,8 +26,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2690a92fc8edf166c5643ccdeb9e5deb"
SRC_URI[sha256sum] = "648842ec7dd417d76f0b1bf8649e993f10bbc0fc37e5eaf31dcea83d6ed052df"
SRC_URI[md5sum] = "15cd0cdb9138ef2bf312a1567e602b53"
SRC_URI[sha256sum] = "69cb5037abb324b39e5c3aef494a610d825149b08fd15bb7f524e87fca3e32b2"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -44,8 +44,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "7afd2a4e1f645ef45450c1087e42206e"
SRC_URI[sha256sum] = "2cb558a7658894ee67f9318bbd98949b8eda425e5a30ca2af761e5d54d807093"
SRC_URI[md5sum] = "95be73884ffebcaa7c6a7d10317c9d3c"
SRC_URI[sha256sum] = "17d6ec049835bd228441bbb0b2d774fe802218ab17048c67b5a71feadfabd22d"
FILES_${PN} += " \
${datadir}/kio_bookmarks \

View File

@@ -26,8 +26,8 @@ PACKAGECONFIG = "pulseaudio"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "0d887662c99c262b90831942bc0cc2be"
SRC_URI[sha256sum] = "0f450623f1fc532cacf7b3fa5d1f00adb77e1be41bf08f472a276795f6398ca9"
SRC_URI[md5sum] = "c597377c51aa57cc8fb9cd0a5d695557"
SRC_URI[sha256sum] = "1f163ea62341199ccf0f0c13faaca849c51ea5a29dd7eabaab4ab1b7e4880de9"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

View File

@@ -24,8 +24,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "998e1a62f922cdf96ac848afaa8f148e"
SRC_URI[sha256sum] = "6162b62146d84377f3b24b70288b41798e8177e931f67836e9a15adcc620cf19"
SRC_URI[md5sum] = "0a4585f623a8f38a64bc24d318ba6f5e"
SRC_URI[sha256sum] = "d26e7ecc37d24bac174fd3ca1011c498a9b4f13855e112be7a171917968e35c2"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -36,8 +36,8 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ebe57e74bbcf6311eb449af12032583a"
SRC_URI[sha256sum] = "d5a242c8e23c4002736402ef5ecbb840b60e0e149fc92b480223dfeb7647335a"
SRC_URI[md5sum] = "965f95b007bb706a723717b3b6f532fc"
SRC_URI[sha256sum] = "e618127e7dded8e0ecc32d19b67cb012f9b465403f608868c5a155fba1d88ed7"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -20,7 +20,7 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ff692ae5a71862ffc40eba8296470083"
SRC_URI[sha256sum] = "06c1ef9378ac0477247627a2d0f1dfd659cbb5f76da790e17199d9ba3fc35c56"
SRC_URI[md5sum] = "7ab1242e587f1839f48b116a2bfe9720"
SRC_URI[sha256sum] = "a484000c082719a290b07b3f557e5dda47cb7be96d9b1f23445e5e0afd80028f"
FILES_${PN} += "${datadir}/kxmlgui5"

View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "26f200d763f3f2545631938edff10089"
SRC_URI[sha256sum] = "c126171e517a070be54a24c6f0a38c190fb630f75c174567a231f1b4337e729a"
SRC_URI[md5sum] = "2c443cc506fa3576fff50b1d0b4731cb"
SRC_URI[sha256sum] = "44fe6929ef039c3baf308c6e8f6ababc5de243397ebfa179d692bc02101b3889"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -31,8 +31,8 @@ DEPENDS += "\
PV = "${KDE_APP_VERSION}"
SRC_URI += "file://0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch"
SRC_URI[md5sum] = "b6277f92208fd86c53af5b68532e3e86"
SRC_URI[sha256sum] = "e28aa2b91219b2a3df0b70da265bf8db48a4abb9980aba01096ed493e54b21eb"
SRC_URI[md5sum] = "e3d22bb1669e5b915d76d1e649f9ce4b"
SRC_URI[sha256sum] = "328278fd0a0cd5290b0bbfb1b8f42b0d4fa1f16dea4a8c44d3e6fa3baa03763c"
# Aagh: To select a soundcard we need to select another type - so keep oss in as dummy
#EXTRA_OECMAKE += "-DWITH_OSS=OFF"

View File

@@ -40,8 +40,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "820885a12f1b78f1087261556eb09b59"
SRC_URI[sha256sum] = "51277bc284d27beec64103eff5b11cb9d672efd5c265f5f1a6bb9951290ba128"
SRC_URI[md5sum] = "f6dd158c323163eb9a7d23c3031626d9"
SRC_URI[sha256sum] = "9e1245ab8132b66c477b4b55f77562b1af7237fd6bbe8a0a2cb8937c03da8653"
SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch"
PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative"

View File

@@ -13,5 +13,5 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "e28e3fb8d04047a6810f70fa46cd5534"
SRC_URI[sha256sum] = "0d0f583071e735afe4ce9fae8c8317bfa43e49a71468099758a11312264bdc56"
SRC_URI[md5sum] = "e9d1848f59af117172d3e520452f6079"
SRC_URI[sha256sum] = "d943a485fd354531493baa1767fad3a33ca05cc2f6f4967b6167d21b7915f3ae"

View File

@@ -25,8 +25,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "31d6be64f5133aa2db94a4f6c984fcea"
SRC_URI[sha256sum] = "fac8e0a7a31f07020bc4726eb7b0079537dfe8d44b04fb9a89d8991b90fec3b1"
SRC_URI[md5sum] = "7713018e7aa8904e4d5d867c8df61d83"
SRC_URI[sha256sum] = "d35bb6358fdef09206727abb1349be50d11bbf8ae8646720c17f71387542990d"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "f8c45f7e5cf2798709af7802a5d0dc1a"
SRC_URI[sha256sum] = "1ac83cf09a515b5a0739a524225aeb5933c90620d06de72bb1a74f3de3c562c3"
SRC_URI[md5sum] = "83bc30b139eca4f4e511e3ea2587dd0d"
SRC_URI[sha256sum] = "e0c55d8c944ee6b53279307edd0087d607df4eb94404e8eb852f3940a150f35c"
SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
EXTRA_OECMAKE += "-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules"

View File

@@ -19,8 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "6176e552d8f9539468acd55fd1500501"
SRC_URI[sha256sum] = "4be531d78eb1c2896110ecdc94e6fcfe0d3e6d54df48c9fbb78b93c18105541e"
SRC_URI[md5sum] = "a6796db1b5207f282e632bebe92afb64"
SRC_URI[sha256sum] = "3ae49595d64df56207472d70cb171fe85b60a6eab6d60530a7db3781695869eb"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "e122c901b5b3348d4b9aed7f9386231c"
SRC_URI[sha256sum] = "6c77d0602a923dcaf32054b699851f24fbfa93bdb89928d66e219e9f217efe23"
SRC_URI[md5sum] = "67b2cdfc0aa5c0151e01df7eb0c62d78"
SRC_URI[sha256sum] = "facc52051ad1579a7d312b2112e4beacade22600feb9765ab218bde3af5c01f7"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -34,8 +34,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2bb667d3e89399780b444134f1dc2c9d"
SRC_URI[sha256sum] = "83a3f81efc42b7b979318bb8cdba5294ef711d68e8fead049630b5e199728a8c"
SRC_URI[md5sum] = "64df40864ed7a447b19966c1c376d78c"
SRC_URI[sha256sum] = "6c8aa4eb80ff27dee18a49b71f7a336bc4ab19b69fa234e431e046e629371f08"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "da0bf367466a4dd4a7cdf5d420ddd12d"
SRC_URI[sha256sum] = "57e03741f52803896beaa2f0e914941fa9d4cef1dfbf2baf8aa825c8beabb7de"
SRC_URI[md5sum] = "2061df6f3eb9346fdb599514b2bcee05"
SRC_URI[sha256sum] = "07145215ae6824ddc10c5aceb76a7533ab0ada585c256f945b4c546edf44dfea"
FILES_${PN} += " \
${datadir}/dbus-1 \

View File

@@ -1,162 +0,0 @@
From ce147ad93100a0d296f1c5958fcb7bf70c9d70af Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 14 Jan 2017 11:45:46 +0100
Subject: [PATCH] Use gcc buildin null pointer check to remove x86 limitation
of previous implementation.
Thanks to Kevin Kofler for pointing out.
MSVC dynamic_cast null pointer support has been checked and proved by Daniel Wendt.
BUG:374530
FIXED-IN:2.12.2 (KDE Applications 16.12.2)
Upstream-Status: Backport
---
CMakeLists.txt | 4 +++
lib/cppparser/driver.h | 2 --
umbrello/debug/debug_utils.h | 19 --------------
umbrello/umlmodel/umlobject.cpp | 57 ++++++++++++++++++++---------------------
4 files changed, 32 insertions(+), 50 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9e7443..2faf930 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,10 @@ include(Macros)
set(CMAKE_AUTORCC ON)
+if(CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks")
+endif()
+
if(NOT BUILD_KF5)
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h
index 86dd03d..73989ed 100644
--- a/lib/cppparser/driver.h
+++ b/lib/cppparser/driver.h
@@ -21,7 +21,6 @@
#include "ast.h"
-#include "debug_utils.h"
#include "macro.h"
#include <qpair.h>
#include <QStringList>
@@ -110,7 +109,6 @@ public:
TranslationUnitAST* operator -> () const
{
- uCheckPointerAndReturnIfZero(this);
return (TranslationUnitAST*)m_translationUnit.data();
}
diff --git a/umbrello/debug/debug_utils.h b/umbrello/debug/debug_utils.h
index 5c0b921..4480ba5 100644
--- a/umbrello/debug/debug_utils.h
+++ b/umbrello/debug/debug_utils.h
@@ -131,25 +131,6 @@ private:
#define uIgnoreZeroPointer(a) if (!a) { uDebug() << "zero pointer detected" << __FILE__ << __LINE__; continue; }
-/**
- Check a pointer and return 0 if it is zero.
-
- This macros is implemented as asm code to prevent
- removing by gcc optimizer for example in class methods
- where 'this' pointer is attributed as "nonnull".
-
- @param p pointer to check
- @return returns 0 is pointer is zero
-*/
-#define uCheckPointerAndReturnIfZero(p) \
- asm goto ("test %0,%0; jne %l[next]" \
- : /* No outputs. */ \
- : "r"(p) \
- : \
- : next); \
- return 0; \
- next:
-
/**
* In a Q_OBJECT class define any enum as Q_ENUMS.
diff --git a/umbrello/umlmodel/umlobject.cpp b/umbrello/umlmodel/umlobject.cpp
index 224361a..bfd17ae 100644
--- a/umbrello/umlmodel/umlobject.cpp
+++ b/umbrello/umlmodel/umlobject.cpp
@@ -669,7 +669,6 @@ void UMLObject::setUMLParent(UMLObject *parent)
*/
UMLObject *UMLObject::umlParent() const
{
- uCheckPointerAndReturnIfZero(this);
return dynamic_cast<UMLObject *>(parent());
}
@@ -1228,32 +1227,32 @@ QDebug operator<<(QDebug out, const UMLObject& obj)
#include "usecase.h"
-UMLActor* UMLObject::asUMLActor() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLActor*>(this); }
-UMLArtifact* UMLObject::asUMLArtifact() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLArtifact*>(this); }
-UMLAssociation* UMLObject::asUMLAssociation() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLAssociation*>(this); }
-UMLAttribute* UMLObject::asUMLAttribute() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLAttribute*>(this); }
-UMLCanvasObject* UMLObject::asUMLCanvasObject() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLCanvasObject*>(this); }
-UMLCategory* UMLObject::asUMLCategory() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLCategory*>(this); }
-UMLCheckConstraint* UMLObject::asUMLCheckConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLCheckConstraint*>(this); }
-UMLClassifier* UMLObject::asUMLClassifier() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLClassifier*>(this); }
-UMLClassifierListItem *UMLObject::asUMLClassifierListItem() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLClassifierListItem*>(this); }
-UMLComponent* UMLObject::asUMLComponent() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLComponent*>(this); }
-UMLDatatype *UMLObject::asUMLDatatype() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLDatatype*>(this); }
-UMLEntity* UMLObject::asUMLEntity() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEntity*>(this); }
-UMLEntityAttribute* UMLObject::asUMLEntityAttribute() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEntityAttribute*>(this); }
-UMLEntityConstraint* UMLObject::asUMLEntityConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEntityConstraint*>(this); }
-UMLEnum* UMLObject::asUMLEnum() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEnum*>(this); }
-UMLEnumLiteral* UMLObject::asUMLEnumLiteral() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEnumLiteral*>(this); }
-UMLFolder* UMLObject::asUMLFolder() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLFolder*>(this); }
-UMLForeignKeyConstraint* UMLObject::asUMLForeignKeyConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLForeignKeyConstraint*>(this); }
-UMLNode* UMLObject::asUMLNode() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLNode*>(this); }
-UMLObject* UMLObject::asUMLObject() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLObject*>(this); }
-UMLOperation* UMLObject::asUMLOperation() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLOperation*>(this); }
-UMLPackage* UMLObject::asUMLPackage() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLPackage*>(this); }
-UMLPort* UMLObject::asUMLPort() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLPort*>(this); }
-UMLRole* UMLObject::asUMLRole() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLRole*>(this); }
-UMLStereotype* UMLObject::asUMLStereotype() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLStereotype*>(this); }
-UMLTemplate* UMLObject::asUMLTemplate() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLTemplate*>(this); }
-UMLUniqueConstraint* UMLObject::asUMLUniqueConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLUniqueConstraint*>(this); }
-UMLUseCase* UMLObject::asUMLUseCase() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLUseCase*>(this); }
+UMLActor* UMLObject::asUMLActor() { return dynamic_cast<UMLActor*>(this); }
+UMLArtifact* UMLObject::asUMLArtifact() { return dynamic_cast<UMLArtifact*>(this); }
+UMLAssociation* UMLObject::asUMLAssociation() { return dynamic_cast<UMLAssociation*>(this); }
+UMLAttribute* UMLObject::asUMLAttribute() { return dynamic_cast<UMLAttribute*>(this); }
+UMLCanvasObject* UMLObject::asUMLCanvasObject() { return dynamic_cast<UMLCanvasObject*>(this); }
+UMLCategory* UMLObject::asUMLCategory() { return dynamic_cast<UMLCategory*>(this); }
+UMLCheckConstraint* UMLObject::asUMLCheckConstraint() { return dynamic_cast<UMLCheckConstraint*>(this); }
+UMLClassifier* UMLObject::asUMLClassifier() { return dynamic_cast<UMLClassifier*>(this); }
+UMLClassifierListItem *UMLObject::asUMLClassifierListItem() { return dynamic_cast<UMLClassifierListItem*>(this); }
+UMLComponent* UMLObject::asUMLComponent() { return dynamic_cast<UMLComponent*>(this); }
+UMLDatatype *UMLObject::asUMLDatatype() { return dynamic_cast<UMLDatatype*>(this); }
+UMLEntity* UMLObject::asUMLEntity() { return dynamic_cast<UMLEntity*>(this); }
+UMLEntityAttribute* UMLObject::asUMLEntityAttribute() { return dynamic_cast<UMLEntityAttribute*>(this); }
+UMLEntityConstraint* UMLObject::asUMLEntityConstraint() { return dynamic_cast<UMLEntityConstraint*>(this); }
+UMLEnum* UMLObject::asUMLEnum() { return dynamic_cast<UMLEnum*>(this); }
+UMLEnumLiteral* UMLObject::asUMLEnumLiteral() { return dynamic_cast<UMLEnumLiteral*>(this); }
+UMLFolder* UMLObject::asUMLFolder() { return dynamic_cast<UMLFolder*>(this); }
+UMLForeignKeyConstraint* UMLObject::asUMLForeignKeyConstraint() { return dynamic_cast<UMLForeignKeyConstraint*>(this); }
+UMLNode* UMLObject::asUMLNode() { return dynamic_cast<UMLNode*>(this); }
+UMLObject* UMLObject::asUMLObject() { return dynamic_cast<UMLObject*>(this); }
+UMLOperation* UMLObject::asUMLOperation() { return dynamic_cast<UMLOperation*>(this); }
+UMLPackage* UMLObject::asUMLPackage() { return dynamic_cast<UMLPackage*>(this); }
+UMLPort* UMLObject::asUMLPort() { return dynamic_cast<UMLPort*>(this); }
+UMLRole* UMLObject::asUMLRole() { return dynamic_cast<UMLRole*>(this); }
+UMLStereotype* UMLObject::asUMLStereotype() { return dynamic_cast<UMLStereotype*>(this); }
+UMLTemplate* UMLObject::asUMLTemplate() { return dynamic_cast<UMLTemplate*>(this); }
+UMLUniqueConstraint* UMLObject::asUMLUniqueConstraint() { return dynamic_cast<UMLUniqueConstraint*>(this); }
+UMLUseCase* UMLObject::asUMLUseCase() { return dynamic_cast<UMLUseCase*>(this); }
--
2.5.5

View File

@@ -26,9 +26,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI += "file://0001-Use-gcc-buildin-null-pointer-check-to-remove-x86-lim.patch"
SRC_URI[md5sum] = "d4cd9ef531b22ab14b3b6b1f6259ea8e"
SRC_URI[sha256sum] = "2ccd645ab52544885e3b373b0da543ae171d8b41a0bdeb93ae45170f8cd30bb9"
SRC_URI[md5sum] = "8220dee29d3b970579297c284b1c3916"
SRC_URI[sha256sum] = "dfd079eb57ea4429016276d721190f942aeb9d4e155b83e6a87f27b9ab2988bc"
EXTRA_OECMAKE += "-DBUILD_KF5=1"