Re: [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed

From: Denys Dmytriyenko <denys@ti.com>
To: "Chengalvala, Vivek" <vchengalvala@ti.com>
Cc: "meta-arago@arago-project.org" <meta-arago@arago-project.org>
Subject: Re: [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
Date: Thu, 12 Nov 2015 12:24:38 -0500	[thread overview]
Message-ID: <20151112172438.GS3272@edge> (raw)
In-Reply-To: <FCB36D0BED1F0D4EA8E6242507E4245B0CB0201E@DFLE08.ent.ti.com>

Since September

On Thu, Nov 12, 2015 at 12:11:53PM -0500, Chengalvala, Vivek wrote:
> The commit message from when the qt5 version was pinned says " 
> arago-fido-config: temporarily pin meta-qt5 to avoid breaking qtwebkit". Is 
> that resolved?
> 
> 
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-bounces@arago-project.org] On Behalf Of Stiffler, Jacob
> Sent: Thursday, November 12, 2015 11:56 AM
> To: Dmytriyenko, Denys
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
> 
> No reason other than following coresdk.
> 
> Do you plan on updating the arago-fido-config.txt to use the tip of the master branch on meta-qt5?
> 
> On 11/12/2015 11:44 AM, Denys Dmytriyenko wrote:
> > Yeah, I meant to un-pin meta-qt5 some time ago right after 2015.01. 
> > Any particular reason you want it pinned now?
> >
> >
> > On Thu, Nov 12, 2015 at 10:03:28AM -0500, Jacob Stiffler wrote:
> >> In our configs, we have the meta-qt5 layer frozen at 
> >> 97ce05c0b2a81f05388d7f727741529fb9177775.
> >>
> >> How will we get this upstream patch?
> >>
> >> Thanks,
> >> Jake
> >>
> >> On 11/11/2015 9:04 PM, Denys Dmytriyenko wrote:
> >>> From: Denys Dmytriyenko <denys@ti.com>
> >>>
> >>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >>> ---
> >>>   ...xpand-path-increase-change-to-2-more-path.patch | 28 ----------------------
> >>>   .../recipes-qt/qt5/nativesdk-qtbase_%.bbappend     |  5 ----
> >>>   2 files changed, 33 deletions(-)
> >>>   delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> >>>   delete mode 100644 
> >>> meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >>>
> >>> diff --git 
> >>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
> >>> xpand-path-increase-change-to-2-more-path.patch 
> >>> b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
> >>> xpand-path-increase-change-to-2-more-path.patch
> >>> deleted file mode 100644
> >>> index fc54c64..0000000
> >>> --- 
> >>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
> >>> xpand-path-increase-change-to-2-more-path.patch
> >>> +++ /dev/null
> >>> @@ -1,28 +0,0 @@
> >>> -From cfa358e04b9e7c66d59db3000b2a2ab2ebf543c8 Mon Sep 17 00:00:00 
> >>> 2001
> >>> -From: Denys Dmytriyenko <denys@ti.com>
> >>> -Date: Tue, 25 Aug 2015 11:26:48 -0400
> >>> -Subject: [PATCH] configure: expand path increase change to 2 more 
> >>> paths
> >>> -
> >>> -Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >>> ----
> >>> - configure | 4 ++--
> >>> - 1 file changed, 2 insertions(+), 2 deletions(-)
> >>> -
> >>> -diff --git a/configure b/configure
> >>> -index bea14af..fe18487 100755
> >>> ---- a/configure
> >>> -+++ b/configure
> >>> -@@ -3853,8 +3853,8 @@ static const char qt_configure_installation          [12+11]    = "qt_instdate=2
> >>> - /* Installation Info */
> >>> - static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> >>> - #ifdef QT_BUILD_QMAKE
> >>> --static const char qt_configure_ext_prefix_path_str   [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> >>> --static const char qt_configure_host_prefix_path_str  [256 + 12] = 
> >>> "qt_hpfxpath=$QT_HOST_PREFIX";
> >>> -+static const char qt_configure_ext_prefix_path_str   [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> >>> -+static const char qt_configure_host_prefix_path_str  [512 + 12] = 
> >>> -+"qt_hpfxpath=$QT_HOST_PREFIX";
> >>> - #endif
> >>> -
> >>> - static const short qt_configure_str_offsets[] = {
> >>> ---
> >>> -2.2.0
> >>> -
> >>> diff --git 
> >>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend 
> >>> b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >>> deleted file mode 100644
> >>> index 39f739a..0000000
> >>> --- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >>> +++ /dev/null
> >>> @@ -1,5 +0,0 @@
> >>> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >>> -
> >>> -SRC_URI += "file://0001-configure-expand-path-increase-change-to-2-more-path.patch"
> >>> -
> >>> -PR_append = "-arago0"
> >> _______________________________________________
> >> meta-arago mailing list
> >> meta-arago@arago-project.org
> >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago