Patchwork [1/1] qextserialport : fix download and bump version

login
register
mail settings
Submitter Sagaert Johan
Date Nov. 7, 2012, 7:39 p.m.
Message ID <1352317186-2905-1-git-send-email-sagaert.johan@skynet.be>
Download mbox | patch
Permalink /patch/197725/
State Accepted
Commit 35b7560a1bf9bc3a46ff9d3942fb38bc51c6e378
Headers show

Comments

Sagaert Johan - Nov. 7, 2012, 7:39 p.m.
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
---
 package/qextserialport/qextserialport-no-examples.patch | 17 -----------------
 package/qextserialport/qextserialport.mk                | 12 +++++++-----
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 package/qextserialport/qextserialport-no-examples.patch
Peter Korsgaard - Nov. 7, 2012, 10:32 p.m.
>>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:

 Sagaert> Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>

Thanks, but it still doesn't build with a base Qt config here as it
tries to link with QtGui / QtNetwork, which imho doesn't make much sense
for a serial lib.

Now, I know next to nothing about qmake, but it is probably related to
the windows version using QtGui.

Thomas, can you take a look at it?
Sagaert Johan - Nov. 7, 2012, 10:59 p.m.
Hi

I enabled it because my customer will write his GUI software in QT, so I decided I would include it in the build.
I have no clue how to use it, but I think it encapsulates serial comm. The QT way with cross platform qt api's.

I did not try to build that package for my linux host.

Regards Johan

-----Oorspronkelijk bericht-----
Van: Peter Korsgaard [mailto:jacmet@gmail.com] Namens Peter Korsgaard
Verzonden: woensdag 7 november 2012 23:33
Aan: Sagaert Johan; thomas.petazzoni@free-electrons.com
CC: buildroot@busybox.net
Onderwerp: Re: [PATCH 1/1] qextserialport : fix download and bump version

>>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:

 Sagaert> Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>

Thanks, but it still doesn't build with a base Qt config here as it tries to link with QtGui / QtNetwork, which imho doesn't make
much sense for a serial lib.

Now, I know next to nothing about qmake, but it is probably related to the windows version using QtGui.

Thomas, can you take a look at it?

--
Bye, Peter Korsgaard
Thomas Petazzoni - Nov. 7, 2012, 11:02 p.m.
On Wed, 07 Nov 2012 23:32:45 +0100, Peter Korsgaard wrote:
> >>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:
> 
>  Sagaert> Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
> 
> Thanks, but it still doesn't build with a base Qt config here as it
> tries to link with QtGui / QtNetwork, which imho doesn't make much sense
> for a serial lib.
> 
> Now, I know next to nothing about qmake, but it is probably related to
> the windows version using QtGui.
> 
> Thomas, can you take a look at it?

I'll have a look, but I can't say when. I'll most likely be very busy
over the next 3 weeks or so.

Best regards,

Thomas
Thiago Correa - Nov. 7, 2012, 11:26 p.m.
On Wed, Nov 7, 2012 at 8:32 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>
> >>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:
>
>  Sagaert> Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
>
> Thanks, but it still doesn't build with a base Qt config here as it
> tries to link with QtGui / QtNetwork, which imho doesn't make much sense
> for a serial lib.
>

It's quite likely one of the examples being built.
The changeset removes a patch that removes the examples, but you don't
actually have to do that, you can build from within src and the .pro
in there will most likely have a line with QT -= gui, just like the
QtSerialPort package I sent a while back.

The toplevel .pro file tells qmake that those listed folders should be
built and each contain a .pro file inside that matches the folder
name. It will simply iterate thru them and call qmake over them.
Those "subprojects" contain the actual description of how to build the
project, which qmake reads.
Thomas Petazzoni - Nov. 8, 2012, 7:24 a.m.
Dear Thiago A. CorrĂȘa,

On Wed, 7 Nov 2012 21:26:19 -0200, Thiago A. CorrĂȘa wrote:

> It's quite likely one of the examples being built.

Indeed. The examples patch removal was here for a reason: it shouldn't
have been removed. Some of the examples requires the GUI, and I didn't
bother making the examples conditional on whether the GUI was available
or not. This example patch should be re-added in one form or another.

Best regards,

Thomas
Peter Korsgaard - Nov. 8, 2012, 11:33 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 Sagaert> Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
 >> 
 >> Thanks, but it still doesn't build with a base Qt config here as it
 >> tries to link with QtGui / QtNetwork, which imho doesn't make much sense
 >> for a serial lib.
 >> 
 >> Now, I know next to nothing about qmake, but it is probably related to
 >> the windows version using QtGui.
 >> 
 >> Thomas, can you take a look at it?

 Thomas> I'll have a look, but I can't say when. I'll most likely be
 Thomas> very busy over the next 3 weeks or so.

Ok, then I'll commit Johan's patch. It's not 100% correct, but it's
atleast better than what we have now (where download even doesn't work).

Patch

diff --git a/package/qextserialport/qextserialport-no-examples.patch b/package/qextserialport/qextserialport-no-examples.patch
deleted file mode 100644
index c7d2d41..0000000
--- a/package/qextserialport/qextserialport-no-examples.patch
+++ /dev/null
@@ -1,17 +0,0 @@ 
-Disable compilation of examples
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: qextserialport-ef4af2a2ee3f/qextserialport.pro
-===================================================================
---- qextserialport-ef4af2a2ee3f.orig/qextserialport.pro
-+++ qextserialport-ef4af2a2ee3f/qextserialport.pro
-@@ -1,7 +1,4 @@
- #
- TEMPLATE = subdirs
- CONFIG   += ordered
--SUBDIRS  = src \
--           examples/enumerator \
--           examples/event
--
-+SUBDIRS  = src
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
index 6ffb9eb..f240cda 100644
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -4,9 +4,11 @@ 
 #
 #############################################################
 
-QEXTSERIALPORT_VERSION     = ef4af2a2ee3f
-QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/hg/
-QEXTSERIALPORT_SITE_METHOD = hg
+QEXTSERIALPORT_VERSION     = f83b4e7ca922e53
+QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/git/
+QEXTSERIALPORT_SITE_METHOD = git
+
+QEXTSERIALPORT_LICENSE = MIT
 
 QEXTSERIALPORT_DEPENDENCIES = qt
 
@@ -24,12 +26,12 @@  define QEXTSERIALPORT_INSTALL_STAGING_CMDS
 	mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort
 	cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/
 	cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/
-	cp -a $(@D)/src/build/*.so* $(STAGING_DIR)/usr/lib/
+	cp -a $(@D)/*.so* $(STAGING_DIR)/usr/lib/
 	cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 endef
 
 define QEXTSERIALPORT_INSTALL_TARGET_CMDS
-	cp -a $(@D)/src/build/*.so.* $(TARGET_DIR)/usr/lib
+	cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib
 endef
 
 $(eval $(generic-package))