From patchwork Sun Sep 18 11:23:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-opie, 02/17] libqpe-opie: fix LnkProperties desctructor visibility issues Date: Sun, 18 Sep 2011 11:23:04 -0000 From: lumag X-Patchwork-Id: 11635 Message-Id: <1316344999-26642-3-git-send-email-dbaryshkov@gmail.com> To: openembedded-devel@lists.openembedded.org Cc: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- .../qpe-fix-lnkproperties-visibility.patch | 22 ++++++++++++++++++++ recipes-opie/libqpe/libqpe-opie_1.2.5.bb | 3 +- recipes-opie/libqpe/libqpe-opie_git.bb | 3 +- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 recipes-opie/libqpe/libqpe-opie/qpe-fix-lnkproperties-visibility.patch diff --git a/recipes-opie/libqpe/libqpe-opie/qpe-fix-lnkproperties-visibility.patch b/recipes-opie/libqpe/libqpe-opie/qpe-fix-lnkproperties-visibility.patch new file mode 100644 index 0000000..8b4e86f --- /dev/null +++ b/recipes-opie/libqpe/libqpe-opie/qpe-fix-lnkproperties-visibility.patch @@ -0,0 +1,22 @@ +Upstream-Status: Pending + +Make constructor and desctructor visible when compiling moc files. +This fixes the problem with LnkProperties::~LnkProperties() visibility. + +Signed-off-by: Dmitry Eremin-Solenikov + +Index: library/lnkproperties.h +=================================================================== +--- library.orig/lnkproperties.h 2011-09-05 02:13:36.000000000 +0400 ++++ library/lnkproperties.h 2011-09-05 02:14:47.000000000 +0400 +@@ -41,6 +41,10 @@ + Q_OBJECT + + public: ++// hack to fix LnkProperties::~LnkProperties() visibility ++#ifdef Q_MOC_OUTPUT_REVISION ++#define QTOPIA_INTERNAL_FSLP 1 ++#endif + // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT + // have this class. + #ifdef QTOPIA_INTERNAL_FSLP diff --git a/recipes-opie/libqpe/libqpe-opie_1.2.5.bb b/recipes-opie/libqpe/libqpe-opie_1.2.5.bb index f31bdb0..c9dab6e 100644 --- a/recipes-opie/libqpe/libqpe-opie_1.2.5.bb +++ b/recipes-opie/libqpe/libqpe-opie_1.2.5.bb @@ -1,12 +1,13 @@ require ${PN}.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_library.tar.bz2;name=split_library \ file://fix-titleheight.patch \ file://unbreak-logging-2.patch \ file://citytime-path-2.patch \ file://no-include-pro.patch \ + file://qpe-fix-lnkproperties-visibility.patch \ " SRC_URI[split_library.md5sum] = "195ede745b2d1b2111f97654151b7af4" SRC_URI[split_library.sha256sum] = "aace8f512c0f8f0e23509599c60ec12cf41145bc583d814228db0fcb356a0ea0" diff --git a/recipes-opie/libqpe/libqpe-opie_git.bb b/recipes-opie/libqpe/libqpe-opie_git.bb index 585c0ae..590829d 100644 --- a/recipes-opie/libqpe/libqpe-opie_git.bb +++ b/recipes-opie/libqpe/libqpe-opie_git.bb @@ -1,11 +1,12 @@ require ${PN}.inc PV = "${OPIE_GIT_PV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${OPIE_GIT};protocol=git;subpath=library \ file://fix-titleheight.patch \ file://unbreak-logging-2.patch \ file://citytime-path-2.patch \ file://no-include-pro.patch \ + file://qpe-fix-lnkproperties-visibility.patch \ "