From patchwork Fri Dec 12 15:59:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 420535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 632C51400E9 for ; Sat, 13 Dec 2014 02:59:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A15F7341E4; Fri, 12 Dec 2014 15:59:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5Lod2m9AOxYI; Fri, 12 Dec 2014 15:59:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5D89D341D7; Fri, 12 Dec 2014 15:59:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5BD9F1C25CD for ; Fri, 12 Dec 2014 15:59:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4955E9297F for ; Fri, 12 Dec 2014 15:59:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id abC4Efui6-nG for ; Fri, 12 Dec 2014 15:59:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by whitealder.osuosl.org (Postfix) with ESMTP id 4E245812C8 for ; Fri, 12 Dec 2014 15:59:17 +0000 (UTC) Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 702F5DC14D2B7 for ; Fri, 12 Dec 2014 15:59:12 +0000 (GMT) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 12 Dec 2014 15:59:15 +0000 Received: from localhost.localdomain (192.168.154.104) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Fri, 12 Dec 2014 15:59:14 +0000 From: Vicente Olivert Riera To: Date: Fri, 12 Dec 2014 15:59:06 +0000 Message-ID: <1418399947-12517-2-git-send-email-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1418399947-12517-1-git-send-email-Vincent.Riera@imgtec.com> References: <1418399947-12517-1-git-send-email-Vincent.Riera@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.154.104] Subject: [Buildroot] [PATCH 2/3] pinentry: pinentry-qt4 - fix .moc include paths X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The include paths present in the .moc files make reference to the qt version used by the person who generated the tarball. We need to fix those paths in order to avoid build errors like these ones: In file included from pinentryconfirm.cpp:52:0: pinentryconfirm.moc:9:53: fatal error: ../../../s/pinentry/qt4/pinentryconfirm.h: No such file or directory #include "../../../s/pinentry/qt4/pinentryconfirm.h" In file included from qsecurelineedit.cpp:3602:0: qsecurelineedit.moc:9:53: fatal error: ../../../s/pinentry/qt4/qsecurelineedit.h: No such file or directory #include "../../../s/pinentry/qt4/qsecurelineedit.h" In file included from pinentrydialog.cpp:347:0: pinentrydialog.moc:9:52: fatal error: ../../../s/pinentry/qt4/pinentrydialog.h: No such file or directory #include "../../../s/pinentry/qt4/pinentrydialog.h" This issue has been reported upstream: https://bugs.g10code.com/gnupg/issue1784 Fixes: http://autobuild.buildroot.net/results/62c/62ca977a7a44d1ad2bbf9e5bc2df716d469484de/ Signed-off-by: Vicente Olivert Riera --- package/pinentry/0002-fix-moc-include-paths.patch | 62 +++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) create mode 100644 package/pinentry/0002-fix-moc-include-paths.patch diff --git a/package/pinentry/0002-fix-moc-include-paths.patch b/package/pinentry/0002-fix-moc-include-paths.patch new file mode 100644 index 0000000..ab20ef1 --- /dev/null +++ b/package/pinentry/0002-fix-moc-include-paths.patch @@ -0,0 +1,62 @@ +Fix .moc include paths + +The include paths present in the .moc files make reference to the Qt +version used by the person who generated the tarball. We need to fix +those paths in order to avoid build errors like these ones: + +In file included from pinentryconfirm.cpp:52:0: +pinentryconfirm.moc:9:53: fatal error: +../../../s/pinentry/qt4/pinentryconfirm.h: No such file or directory + #include "../../../s/pinentry/qt4/pinentryconfirm.h" + +In file included from qsecurelineedit.cpp:3602:0: +qsecurelineedit.moc:9:53: fatal error: +../../../s/pinentry/qt4/qsecurelineedit.h: No such file or directory + #include "../../../s/pinentry/qt4/qsecurelineedit.h" + +In file included from pinentrydialog.cpp:347:0: +pinentrydialog.moc:9:52: fatal error: +../../../s/pinentry/qt4/pinentrydialog.h: No such file or directory + #include "../../../s/pinentry/qt4/pinentrydialog.h" + +This issue has been reported upstream: + https://bugs.g10code.com/gnupg/issue1784 + +Signed-off-by: Vicente Olivert Riera + +diff -rup a/qt4/pinentryconfirm.moc b/qt4/pinentryconfirm.moc +--- a/qt4/pinentryconfirm.moc 2014-09-18 09:35:48.000000000 +0100 ++++ b/qt4/pinentryconfirm.moc 2014-12-12 14:41:10.574581901 +0000 +@@ -6,7 +6,7 @@ + ** WARNING! All changes made in this file will be lost! + *****************************************************************************/ + +-#include "../../../s/pinentry/qt4/pinentryconfirm.h" ++#include "pinentryconfirm.h" + #if !defined(Q_MOC_OUTPUT_REVISION) + #error "The header file 'pinentryconfirm.h' doesn't include ." + #elif Q_MOC_OUTPUT_REVISION != 63 +diff -rup a/qt4/pinentrydialog.moc b/qt4/pinentrydialog.moc +--- a/qt4/pinentrydialog.moc 2014-09-18 09:35:48.000000000 +0100 ++++ b/qt4/pinentrydialog.moc 2014-12-12 14:41:21.438771625 +0000 +@@ -6,7 +6,7 @@ + ** WARNING! All changes made in this file will be lost! + *****************************************************************************/ + +-#include "../../../s/pinentry/qt4/pinentrydialog.h" ++#include "pinentrydialog.h" + #if !defined(Q_MOC_OUTPUT_REVISION) + #error "The header file 'pinentrydialog.h' doesn't include ." + #elif Q_MOC_OUTPUT_REVISION != 63 +diff -rup a/qt4/qsecurelineedit.moc b/qt4/qsecurelineedit.moc +--- a/qt4/qsecurelineedit.moc 2014-09-18 09:35:48.000000000 +0100 ++++ b/qt4/qsecurelineedit.moc 2014-12-12 14:41:35.279013320 +0000 +@@ -6,7 +6,7 @@ + ** WARNING! All changes made in this file will be lost! + *****************************************************************************/ + +-#include "../../../s/pinentry/qt4/qsecurelineedit.h" ++#include "qsecurelineedit.h" + #if !defined(Q_MOC_OUTPUT_REVISION) + #error "The header file 'qsecurelineedit.h' doesn't include ." + #elif Q_MOC_OUTPUT_REVISION != 63