* [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
@ 2014-07-09 14:15 Massimo Callegari
2014-07-10 6:17 ` Fatih Aşıcı
0 siblings, 1 reply; 6+ messages in thread
From: Massimo Callegari @ 2014-07-09 14:15 UTC (permalink / raw)
To: buildroot
Amend the previous. There were minor things missing
Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
---
?package/qt5/Config.in ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ?1 +
?package/qt5/qt5webkit-examples/Config.in ? ? ? ? ? | 10 +++++
?.../qt5webkit-examples-0001-build.patch ? ? ? ? ? ?| 21 ++++++++++
?.../qt5/qt5webkit-examples/qt5webkit-examples.mk ? | 46 ++++++++++++++++++++++
?4 files changed, 78 insertions(+)
?create mode 100644 package/qt5/qt5webkit-examples/Config.in
?create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
?create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index efdd9d4..1f6920a 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
?source "package/qt5/qt5serialport/Config.in"
?source "package/qt5/qt5svg/Config.in"
?source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5webkit-examples/Config.in"
?source "package/qt5/qt5websockets/Config.in"
?source "package/qt5/qt5x11extras/Config.in"
?source "package/qt5/qt5xmlpatterns/Config.in"
diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in
new file mode 100644
index 0000000..2840733
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
+bool "qt5webkit examples"
+depends on BR2_PACKAGE_QT5WEBKIT
+help
+ ?Qt is a cross-platform application and UI framework for
+ ?developers using C++.
+
+ ?This package corresponds to the qt5webkit examples module.
+
+ ?http://qt-project.org
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
new file mode 100644
index 0000000..505f40c
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
@@ -0,0 +1,21 @@
+diff -Naur a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro
+--- a/examples/webkitwidgets/webkitwidgets.pro2014-06-19 12:08:33.000000000 +0200
++++ b/examples/webkitwidgets/webkitwidgets.pro2014-07-09 14:14:20.247975538 +0200
+@@ -8,5 +8,6 @@
+ ? ? ? ? ? ? framecapture \
+ ? ? ? ? ? ? browser \
+ ? ? ? ? ? ? embedded \
+- ? ? ? ? ? ?scroller \
+- ? ? ? ? ? ?xmlpatterns
++ ? ? ? ? ? ?scroller
++ ? ? ? ? ? ?
++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
+diff -Naur a/qtwebkit-examples.pro b/qtwebkit-examples.pro
+--- a/qtwebkit-examples.pro2014-06-19 12:08:33.000000000 +0200
++++ b/qtwebkit-examples.pro2014-07-09 14:14:09.095975663 +0200
+@@ -3,3 +3,4 @@
+ load(qt_parts)
+?
+ SUBDIRS += doc
++SUBDIRS += examples
+
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
new file mode 100644
index 0000000..fd66941
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# qt5webkitexamples
+#
+################################################################################
+
+QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
+QT5WEBKIT_EXAMPLES_SITE = $(QT5_SITE)
+QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz
+QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit
+QT5WEBKIT_EXAMPLES_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5WEBKIT_EXAMPLES_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5webkitexamples.
+else
+QT5WEBKIT_EXAMPLES_LICENSE = Commercial license
+QT5WEBKIT_EXAMPLES_REDISTRIBUTE = NO
+endif
+
+define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS
+(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5WEBKIT_EXAMPLES_BUILD_CMDS
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE), y)
+define QT5WEBKIT_EXAMPLES_INSTALL_QML
+ ? ?cp -af $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples
+endef
+endif
+
+define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS
+ ? ?cp -af $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples
+ ? ?$(QT5WEBKIT_EXAMPLES_INSTALL_QML)
+endef
+
+$(eval $(generic-package))
--?
1.8.1.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140709/79ddfc06/attachment.html>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
2014-07-09 14:15 [Buildroot] [PATCH 1/1] New package: qt5webkit-examples Massimo Callegari
@ 2014-07-10 6:17 ` Fatih Aşıcı
2014-07-10 8:28 ` Massimo Callegari
0 siblings, 1 reply; 6+ messages in thread
From: Fatih Aşıcı @ 2014-07-10 6:17 UTC (permalink / raw)
To: buildroot
Hi Massimo,
On Wednesday 09 July 2014 17:15:18 Massimo Callegari wrote:
> Amend the previous. There were minor things missing
>
> Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
You should include a changelog in the new revisions of your patches as
described in here:
http://buildroot.org/downloads/manual/manual.html#_patch_revision_changelog
> ---
> package/qt5/Config.in | 1 +
> package/qt5/qt5webkit-examples/Config.in | 10 +++++
> .../qt5webkit-examples-0001-build.patch | 21 ++++++++++
> .../qt5/qt5webkit-examples/qt5webkit-examples.mk | 46
> ++++++++++++++++++++++ 4 files changed, 78 insertions(+)
> create mode 100644 package/qt5/qt5webkit-examples/Config.in
> create mode 100644
> package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch create
> mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk
>
> diff --git a/package/qt5/Config.in b/package/qt5/Config.in
> index efdd9d4..1f6920a 100644
> --- a/package/qt5/Config.in
> +++ b/package/qt5/Config.in
> @@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
> source "package/qt5/qt5serialport/Config.in"
> source "package/qt5/qt5svg/Config.in"
> source "package/qt5/qt5webkit/Config.in"
> +source "package/qt5/qt5webkit-examples/Config.in"
> source "package/qt5/qt5websockets/Config.in"
> source "package/qt5/qt5x11extras/Config.in"
> source "package/qt5/qt5xmlpatterns/Config.in"
> diff --git a/package/qt5/qt5webkit-examples/Config.in
> b/package/qt5/qt5webkit-examples/Config.in new file mode 100644
> index 0000000..2840733
> --- /dev/null
> +++ b/package/qt5/qt5webkit-examples/Config.in
> @@ -0,0 +1,10 @@
> +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
> +bool "qt5webkit examples"
> +depends on BR2_PACKAGE_QT5WEBKIT
> +help
> + Qt is a cross-platform application and UI framework for
> + developers using C++.
> +
> + This package corresponds to the qt5webkit examples module.
What about this:
This package contains examples for the qt5webkit module.
> +
> + http://qt-project.org
> diff --git
> a/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
> b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch new
Each patch must include a "Signed-off-by" line:
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches
> file mode 100644
> index 0000000..505f40c
> --- /dev/null
> +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
> @@ -0,0 +1,21 @@
> +diff -Naur a/examples/webkitwidgets/webkitwidgets.pro
> b/examples/webkitwidgets/webkitwidgets.pro +---
> a/examples/webkitwidgets/webkitwidgets.pro2014-06-19 12:08:33.000000000
> +0200 ++++ b/examples/webkitwidgets/webkitwidgets.pro2014-07-09
> 14:14:20.247975538 +0200 +@@ -8,5 +8,6 @@
> + framecapture \
> + browser \
> + embedded \
> +- scroller \
> +- xmlpatterns
> ++ scroller
> ++
> ++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
> +diff -Naur a/qtwebkit-examples.pro b/qtwebkit-examples.pro
> +--- a/qtwebkit-examples.pro2014-06-19 12:08:33.000000000 +0200
> ++++ b/qtwebkit-examples.pro2014-07-09 14:14:09.095975663 +0200
> +@@ -3,3 +3,4 @@
> + load(qt_parts)
> +
> + SUBDIRS += doc
> ++SUBDIRS += examples
> +
> diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
> b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk new file mode
> 100644
> index 0000000..fd66941
> --- /dev/null
> +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
> @@ -0,0 +1,46 @@
> +##########################################################################
> ###### +#
> +# qt5webkitexamples
Nit pick: s/qt5webkitexamples/qt5webkit-examples/
> +#
> +##########################################################################
> ###### +
> +QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
> +QT5WEBKIT_EXAMPLES_SITE = $(QT5_SITE)
> +QT5WEBKIT_EXAMPLES_SOURCE =
> qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz
> +QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit
If qt5xmlpatterns package is selected, you must add it to _DEPENDENCIES.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
2014-07-10 6:17 ` Fatih Aşıcı
@ 2014-07-10 8:28 ` Massimo Callegari
2014-07-11 9:27 ` Fatih Aşıcı
0 siblings, 1 reply; 6+ messages in thread
From: Massimo Callegari @ 2014-07-10 8:28 UTC (permalink / raw)
To: buildroot
Hi,
going to submit a new patch.
Please guys, don't be too picky. I don't have much time to decorate this patch with flowers and unicorns. I do it while I work so please bare with me.
If you don't like something I guess it's faster if you change it yourself. I don't care about the ownership of this change.
Massimo
>________________________________
> Da: Fatih A??c? <fatih.asici@gmail.com>
>A: Massimo Callegari <massimocallegari@yahoo.it>
>Cc: buildroot at busybox.net
>Inviato: Gioved? 10 Luglio 2014 8:17
>Oggetto: Re: [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
>
>
>Hi Massimo,
>
>On Wednesday 09 July 2014 17:15:18 Massimo Callegari wrote:
>> Amend the previous. There were minor things missing
>>
>> Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
>
>You should include a changelog in the new revisions of your patches as
>described in here:
>
>? http://buildroot.org/downloads/manual/manual.html#_patch_revision_changelog
>
>Since the previous patch wasn't reviewed, I guessed it was not necessary.
>> ---
>>? package/qt5/Config.in? ? ? ? ? ? ? ? ? ? ? ? ? ? ? |? 1 +
>>? package/qt5/qt5webkit-examples/Config.in? ? ? ? ? | 10 +++++
>>? .../qt5webkit-examples-0001-build.patch? ? ? ? ? ? | 21 ++++++++++
>>? .../qt5/qt5webkit-examples/qt5webkit-examples.mk? | 46
>> ++++++++++++++++++++++ 4 files changed, 78 insertions(+)
>>? create mode 100644 package/qt5/qt5webkit-examples/Config.in
>>? create mode 100644
>> package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch create
>> mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk
>>
>> diff --git a/package/qt5/Config.in b/package/qt5/Config.in
>> index efdd9d4..1f6920a 100644
>> --- a/package/qt5/Config.in
>> +++ b/package/qt5/Config.in
>> @@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
>>? source "package/qt5/qt5serialport/Config.in"
>>? source "package/qt5/qt5svg/Config.in"
>>? source "package/qt5/qt5webkit/Config.in"
>> +source "package/qt5/qt5webkit-examples/Config.in"
>>? source "package/qt5/qt5websockets/Config.in"
>>? source "package/qt5/qt5x11extras/Config.in"
>>? source "package/qt5/qt5xmlpatterns/Config.in"
>> diff --git a/package/qt5/qt5webkit-examples/Config.in
>> b/package/qt5/qt5webkit-examples/Config.in new file mode 100644
>> index 0000000..2840733
>> --- /dev/null
>> +++ b/package/qt5/qt5webkit-examples/Config.in
>> @@ -0,0 +1,10 @@
>> +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
>> +bool "qt5webkit examples"
>> +depends on BR2_PACKAGE_QT5WEBKIT
>> +help
>> +? Qt is a cross-platform application and UI framework for
>> +? developers using C++.
>> +
>> +? This package corresponds to the qt5webkit examples module.
>
>What about this:
>
>? This package contains examples for the qt5webkit module.
>
>
>
>No, it is exactly what is described. The original package name is ?qtwebkit-examples-opensource-src-5.3.1
>> +
>> +? http://qt-project.org
>> diff --git
>> a/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
>> b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch new
>
>Each patch must include a "Signed-off-by" line:
>
>? http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches
>
>OK
>
>> file mode 100644
>> index 0000000..505f40c
>> --- /dev/null
>> +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
>> @@ -0,0 +1,21 @@
>> +diff -Naur a/examples/webkitwidgets/webkitwidgets.pro
>> b/examples/webkitwidgets/webkitwidgets.pro +---
>> a/examples/webkitwidgets/webkitwidgets.pro2014-06-19 12:08:33.000000000
>> +0200 ++++ b/examples/webkitwidgets/webkitwidgets.pro2014-07-09
>> 14:14:20.247975538 +0200 +@@ -8,5 +8,6 @@
>> +? ? ? ? ? ? framecapture \
>> +? ? ? ? ? ? browser \
>> +? ? ? ? ? ? embedded \
>> +-? ? ? ? ? ? scroller \
>> +-? ? ? ? ? ? xmlpatterns
>> ++? ? ? ? ? ? scroller
>> ++? ? ? ? ? ?
>> ++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
>> +diff -Naur a/qtwebkit-examples.pro b/qtwebkit-examples.pro
>> +--- a/qtwebkit-examples.pro2014-06-19 12:08:33.000000000 +0200
>> ++++ b/qtwebkit-examples.pro2014-07-09 14:14:09.095975663 +0200
>> +@@ -3,3 +3,4 @@
>> + load(qt_parts)
>> +
>> + SUBDIRS += doc
>> ++SUBDIRS += examples
>> +
>> diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
>> b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk new file mode
>> 100644
>> index 0000000..fd66941
>> --- /dev/null
>> +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
>> @@ -0,0 +1,46 @@
>> +##########################################################################
>> ###### +#
>> +# qt5webkitexamples
>
>Nit pick: s/qt5webkitexamples/qt5webkit-examples/
>
>Don't understand
>
>> +#
>> +##########################################################################
>> ###### +
>> +QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
>> +QT5WEBKIT_EXAMPLES_SITE = $(QT5_SITE)
>> +QT5WEBKIT_EXAMPLES_SOURCE =
>> qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz
>> +QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit
>
>If qt5xmlpatterns package is selected, you must add it to _DEPENDENCIES.
>
>
>
>qt5xmlpatterns is no more a dependency
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140710/0c1daec9/attachment.html>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
2014-07-10 8:28 ` Massimo Callegari
@ 2014-07-11 9:27 ` Fatih Aşıcı
0 siblings, 0 replies; 6+ messages in thread
From: Fatih Aşıcı @ 2014-07-11 9:27 UTC (permalink / raw)
To: buildroot
On Thursday 10 July 2014 11:28:59 Massimo Callegari wrote:
> Hi,
Hi,
> going to submit a new patch.
> Please guys, don't be too picky. I don't have much time to decorate this
> patch with flowers and unicorns. I do it while I work so please bare with
> me. If you don't like something I guess it's faster if you change it
> yourself. I don't care about the ownership of this change.
I'll submit your patch with some additional fixes.
>
> Massimo
>
> >________________________________
> >
> > Da: Fatih A??c? <fatih.asici@gmail.com>
> >
> >A: Massimo Callegari <massimocallegari@yahoo.it>
> >Cc: buildroot at busybox.net
> >Inviato: Gioved? 10 Luglio 2014 8:17
> >Oggetto: Re: [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
> >
> >
> >Hi Massimo,
> >
> >On Wednesday 09 July 2014 17:15:18 Massimo Callegari wrote:
> >> Amend the previous. There were minor things missing
> >>
> >> Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
> >
> >You should include a changelog in the new revisions of your patches as
> >described in here:
> >
> >
> >http://buildroot.org/downloads/manual/manual.html#_patch_revision_changel
> >og
> >
> >Since the previous patch wasn't reviewed, I guessed it was not necessary.
> >
> >> ---
> >>
> >> package/qt5/Config.in | 1 +
> >> package/qt5/qt5webkit-examples/Config.in | 10 +++++
> >> .../qt5webkit-examples-0001-build.patch | 21 ++++++++++
> >> .../qt5/qt5webkit-examples/qt5webkit-examples.mk | 46
> >>
> >> ++++++++++++++++++++++ 4 files changed, 78 insertions(+)
> >>
> >> create mode 100644 package/qt5/qt5webkit-examples/Config.in
> >> create mode 100644
> >>
> >> package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
> >> create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk
> >>
> >> diff --git a/package/qt5/Config.in b/package/qt5/Config.in
> >> index efdd9d4..1f6920a 100644
> >> --- a/package/qt5/Config.in
> >> +++ b/package/qt5/Config.in
> >> @@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
> >>
> >> source "package/qt5/qt5serialport/Config.in"
> >> source "package/qt5/qt5svg/Config.in"
> >> source "package/qt5/qt5webkit/Config.in"
> >>
> >> +source "package/qt5/qt5webkit-examples/Config.in"
> >>
> >> source "package/qt5/qt5websockets/Config.in"
> >> source "package/qt5/qt5x11extras/Config.in"
> >> source "package/qt5/qt5xmlpatterns/Config.in"
> >>
> >> diff --git a/package/qt5/qt5webkit-examples/Config.in
> >> b/package/qt5/qt5webkit-examples/Config.in new file mode 100644
> >> index 0000000..2840733
> >> --- /dev/null
> >> +++ b/package/qt5/qt5webkit-examples/Config.in
> >> @@ -0,0 +1,10 @@
> >> +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
> >> +bool "qt5webkit examples"
> >> +depends on BR2_PACKAGE_QT5WEBKIT
> >> +help
> >> + Qt is a cross-platform application and UI framework for
> >> + developers using C++.
> >> +
> >> + This package corresponds to the qt5webkit examples module.
> >
> >What about this:
> >
> > This package contains examples for the qt5webkit module.
> >
> >
> >
> >No, it is exactly what is described. The original package name is
> > qtwebkit-examples-opensource-src-5.3.1
This package does not include a new qt module. It contains just examples. It
will be better to mention it in help text.
> >> +
> >> + http://qt-project.org
> >> diff --git
> >> a/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
> >> b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch new
> >
> >Each patch must include a "Signed-off-by" line:
> >
> >
> >http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_o
> >f_the_package_patches
> >
> >OK
> >
> >> file mode 100644
> >> index 0000000..505f40c
> >> --- /dev/null
> >> +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
> >> @@ -0,0 +1,21 @@
> >> +diff -Naur a/examples/webkitwidgets/webkitwidgets.pro
> >> b/examples/webkitwidgets/webkitwidgets.pro +---
> >> a/examples/webkitwidgets/webkitwidgets.pro2014-06-19 12:08:33.000000000
> >> +0200 ++++ b/examples/webkitwidgets/webkitwidgets.pro2014-07-09
> >> 14:14:20.247975538 +0200 +@@ -8,5 +8,6 @@
> >> + framecapture \
> >> + browser \
> >> + embedded \
> >> +- scroller \
> >> +- xmlpatterns
> >> ++ scroller
> >> ++
> >> ++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
> >> +diff -Naur a/qtwebkit-examples.pro b/qtwebkit-examples.pro
> >> +--- a/qtwebkit-examples.pro2014-06-19 12:08:33.000000000 +0200
> >> ++++ b/qtwebkit-examples.pro2014-07-09 14:14:09.095975663 +0200
> >> +@@ -3,3 +3,4 @@
> >> + load(qt_parts)
> >> +
> >> + SUBDIRS += doc
> >> ++SUBDIRS += examples
> >> +
> >> diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
> >> b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk new file mode
> >> 100644
> >> index 0000000..fd66941
> >> --- /dev/null
> >> +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
> >> @@ -0,0 +1,46 @@
> >> +#######################################################################
> >> ### ###### +#
> >> +# qt5webkitexamples
> >
> >Nit pick: s/qt5webkitexamples/qt5webkit-examples/
> >
> >Don't understand
I wanted to point out the missing dash in package name.
> >> +#
> >> +#######################################################################
> >> ### ###### +
> >> +QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
> >> +QT5WEBKIT_EXAMPLES_SITE = $(QT5_SITE)
> >> +QT5WEBKIT_EXAMPLES_SOURCE =
> >> qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz
> >> +QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit
> >
> >If qt5xmlpatterns package is selected, you must add it to _DEPENDENCIES.
> >
> >
> >
> >qt5xmlpatterns is no more a dependency
It is optional; but if you do not add that dependency, there might be cases
that qt5webkit-examples is built before qt5xmlpatterns. So the result is
unpredictable. To ensure that qt5xmlpatterns is built before this package, we
add it to _DEPENDENCIES list like this:
ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y)
QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns
endif
Thanks,
Fatih
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
@ 2014-07-10 8:33 Massimo Callegari
0 siblings, 0 replies; 6+ messages in thread
From: Massimo Callegari @ 2014-07-10 8:33 UTC (permalink / raw)
To: buildroot
Changelog:
- formatted?qt5webkit-examples-0001-build.patch as requested
Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
---
?package/qt5/Config.in ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ?1 +
?package/qt5/qt5webkit-examples/Config.in ? ? ? ? ? | 10 +++++
?.../qt5webkit-examples-0001-build.patch ? ? ? ? ? ?| 30 ++++++++++++++
?.../qt5/qt5webkit-examples/qt5webkit-examples.mk ? | 46 ++++++++++++++++++++++
?4 files changed, 87 insertions(+)
?create mode 100644 package/qt5/qt5webkit-examples/Config.in
?create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
?create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index efdd9d4..1f6920a 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
?source "package/qt5/qt5serialport/Config.in"
?source "package/qt5/qt5svg/Config.in"
?source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5webkit-examples/Config.in"
?source "package/qt5/qt5websockets/Config.in"
?source "package/qt5/qt5x11extras/Config.in"
?source "package/qt5/qt5xmlpatterns/Config.in"
diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in
new file mode 100644
index 0000000..2840733
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
+bool "qt5webkit examples"
+depends on BR2_PACKAGE_QT5WEBKIT
+help
+ ?Qt is a cross-platform application and UI framework for
+ ?developers using C++.
+
+ ?This package corresponds to the qt5webkit examples module.
+
+ ?http://qt-project.org
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
new file mode 100644
index 0000000..4877102
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
@@ -0,0 +1,30 @@
+This patch improves the qt5webkit examples build for 2 aspects:
+
+# Allows to build even if qt5base examples are not enabled
+# Builds xmlpatterns example only if the qt5xmlpattern package has been built
+
+Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
+
+Index: b/examples/webkitwidgets/webkitwidgets.pro
+===================================================================
+--- /dev/null
++++ b/examples/webkitwidgets/webkitwidgets.pro
+@@ -8,5 +8,6 @@
+ ? ? ? ? ? ? framecapture \
+ ? ? ? ? ? ? browser \
+ ? ? ? ? ? ? embedded \
+- ? ? ? ? ? ?scroller \
+- ? ? ? ? ? ?xmlpatterns
++ ? ? ? ? ? ?scroller
++ ? ? ? ? ? ?
++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
+Index: b/qtwebkit-examples.pro
+===================================================================
+--- /dev/null
++++ b/qtwebkit-examples.pro
+@@ -3,3 +3,4 @@
+ load(qt_parts)
+?
+ SUBDIRS += doc
++SUBDIRS += examples
+
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
new file mode 100644
index 0000000..fd66941
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# qt5webkitexamples
+#
+################################################################################
+
+QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
+QT5WEBKIT_EXAMPLES_SITE = $(QT5_SITE)
+QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz
+QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit
+QT5WEBKIT_EXAMPLES_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5WEBKIT_EXAMPLES_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5webkitexamples.
+else
+QT5WEBKIT_EXAMPLES_LICENSE = Commercial license
+QT5WEBKIT_EXAMPLES_REDISTRIBUTE = NO
+endif
+
+define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS
+(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5WEBKIT_EXAMPLES_BUILD_CMDS
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE), y)
+define QT5WEBKIT_EXAMPLES_INSTALL_QML
+ ? ?cp -af $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples
+endef
+endif
+
+define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS
+ ? ?cp -af $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples
+ ? ?$(QT5WEBKIT_EXAMPLES_INSTALL_QML)
+endef
+
+$(eval $(generic-package))
--?
1.8.1.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140710/8869399e/attachment.html>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] New package: qt5webkit-examples
@ 2014-07-09 12:50 Massimo Callegari
0 siblings, 0 replies; 6+ messages in thread
From: Massimo Callegari @ 2014-07-09 12:50 UTC (permalink / raw)
To: buildroot
Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
---
?package/qt5/qt5webkit-examples/Config.in ? ? ? ? ? | 10 +++++
?.../qt5webkit-examples-0001-build.patch ? ? ? ? ? ?| 21 ++++++++++
?.../qt5/qt5webkit-examples/qt5webkit-examples.mk ? | 46 ++++++++++++++++++++++
?3 files changed, 77 insertions(+)
?create mode 100644 package/qt5/qt5webkit-examples/Config.in
?create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
?create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk
diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in
new file mode 100644
index 0000000..2840733
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
+bool "qt5webkit examples"
+depends on BR2_PACKAGE_QT5WEBKIT
+help
+ ?Qt is a cross-platform application and UI framework for
+ ?developers using C++.
+
+ ?This package corresponds to the qt5webkit examples module.
+
+ ?http://qt-project.org
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
new file mode 100644
index 0000000..0ff6784
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch
@@ -0,0 +1,21 @@
+diff -Naur a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro
+--- a/examples/webkitwidgets/webkitwidgets.pro2014-06-19 12:08:33.000000000 +0200
++++ b/examples/webkitwidgets/webkitwidgets.pro2014-07-09 14:14:20.247975538 +0200
+@@ -8,5 +8,6 @@
+ ? ? ? ? ? ? framecapture \
+ ? ? ? ? ? ? browser \
+ ? ? ? ? ? ? embedded \
+- ? ? ? ? ? ?scroller \
+- ? ? ? ? ? ?xmlpatterns
++ ? ? ? ? ? ?scroller
++ ? ? ? ? ? ?
++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
+diff -Naur a/qtwebkit-examples.pro b/qtwebkit-examples.pro
+--- a/qtwebkit-examples.pro2014-06-19 12:08:33.000000000 +0200
++++ b/qtwebkit-examples.pro2014-07-09 14:14:09.095975663 +0200
+@@ -3,3 +3,4 @@
+ load(qt_parts)
+?
+ SUBDIRS += doc
++SUBDIRS += examples
+\ Manca newline alla fine del file
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
new file mode 100644
index 0000000..fd66941
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# qt5webkitexamples
+#
+################################################################################
+
+QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
+QT5WEBKIT_EXAMPLES_SITE = $(QT5_SITE)
+QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz
+QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit
+QT5WEBKIT_EXAMPLES_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5WEBKIT_EXAMPLES_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5webkitexamples.
+else
+QT5WEBKIT_EXAMPLES_LICENSE = Commercial license
+QT5WEBKIT_EXAMPLES_REDISTRIBUTE = NO
+endif
+
+define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS
+(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5WEBKIT_EXAMPLES_BUILD_CMDS
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE), y)
+define QT5WEBKIT_EXAMPLES_INSTALL_QML
+ ? ?cp -af $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples
+endef
+endif
+
+define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS
+ ? ?cp -af $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples
+ ? ?$(QT5WEBKIT_EXAMPLES_INSTALL_QML)
+endef
+
+$(eval $(generic-package))
--?
1.8.1.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140709/eded0400/attachment.html>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-11 9:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-09 14:15 [Buildroot] [PATCH 1/1] New package: qt5webkit-examples Massimo Callegari
2014-07-10 6:17 ` Fatih Aşıcı
2014-07-10 8:28 ` Massimo Callegari
2014-07-11 9:27 ` Fatih Aşıcı
-- strict thread matches above, loose matches on Subject: below --
2014-07-10 8:33 Massimo Callegari
2014-07-09 12:50 Massimo Callegari
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.