* [Buildroot] [PATCH 1/1] qt: get rid of extra spaces in license file list
@ 2016-03-02 2:54 Danomi Manchego
2016-03-02 18:25 ` Arnout Vandecappelle
2016-04-13 21:57 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Danomi Manchego @ 2016-03-02 2:54 UTC (permalink / raw)
To: buildroot
Use "QT_LICENSE := $(QT_LICENSE), xxxx" construct to get rid of the
extra spaces before commas added by the font license clauses.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
We discussed this over the mailing list. Since I had the changes
anyway for proof of concept, I turned it around into a patch.
---
package/qt/qt.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index c4fff2d..f29a671 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -18,9 +18,9 @@ QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR
QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES
-QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
+QT_LICENSE := LGPLv2.1 with exceptions or GPLv3
ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
-QT_LICENSE += or Digia Qt Commercial license
+QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license
endif
QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
@@ -663,14 +663,14 @@ endef
ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),)
# as stated in the font source src/3rdparty/fonts/micro.bdf
# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf
-QT_LICENSE += , Public Domain (Micro/Fixed font)
+QT_LICENSE := $(QT_LICENSE), Public Domain (Micro/Fixed font)
endif
ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),)
-QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts)
+QT_LICENSE := $(QT_LICENSE), Adobe Helvetica license (Helvetica/Japanese fonts)
QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica
endif
ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y)
-QT_LICENSE += , Freeware (Unifont font)
+QT_LICENSE := $(QT_LICENSE), Freeware (Unifont font)
QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
endif
endif # QT_FONTS
@@ -680,7 +680,7 @@ define QT_INSTALL_TARGET_FONTS_TTF
mkdir -p $(TARGET_DIR)/usr/lib/fonts
cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
endef
-QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts)
+QT_LICENSE := $(QT_LICENSE), Bitstream license (DejaVu/Vera TrueType fonts)
QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \
src/3rdparty/fonts/README.DejaVu \
src/3rdparty/fonts/COPYRIGHT.Vera
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] qt: get rid of extra spaces in license file list
2016-03-02 2:54 [Buildroot] [PATCH 1/1] qt: get rid of extra spaces in license file list Danomi Manchego
@ 2016-03-02 18:25 ` Arnout Vandecappelle
2016-04-13 21:57 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2016-03-02 18:25 UTC (permalink / raw)
To: buildroot
On 03/02/16 03:54, Danomi Manchego wrote:
> Use "QT_LICENSE := $(QT_LICENSE), xxxx" construct to get rid of the
> extra spaces before commas added by the font license clauses.
>
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> ---
>
> We discussed this over the mailing list. Since I had the changes
> anyway for proof of concept, I turned it around into a patch.
> ---
> package/qt/qt.mk | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/package/qt/qt.mk b/package/qt/qt.mk
> index c4fff2d..f29a671 100644
> --- a/package/qt/qt.mk
> +++ b/package/qt/qt.mk
> @@ -18,9 +18,9 @@ QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR
> QT_DEPENDENCIES = host-pkgconf
> QT_INSTALL_STAGING = YES
>
> -QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
> +QT_LICENSE := LGPLv2.1 with exceptions or GPLv3
> ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
> -QT_LICENSE += or Digia Qt Commercial license
> +QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license
+= could have been kept in this case, but it's nicer to have a parallel
structure in the entire file.
Regards,
Arnout
> endif
> QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
>
> @@ -663,14 +663,14 @@ endef
> ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),)
> # as stated in the font source src/3rdparty/fonts/micro.bdf
> # source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf
> -QT_LICENSE += , Public Domain (Micro/Fixed font)
> +QT_LICENSE := $(QT_LICENSE), Public Domain (Micro/Fixed font)
> endif
> ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),)
> -QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts)
> +QT_LICENSE := $(QT_LICENSE), Adobe Helvetica license (Helvetica/Japanese fonts)
> QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica
> endif
> ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y)
> -QT_LICENSE += , Freeware (Unifont font)
> +QT_LICENSE := $(QT_LICENSE), Freeware (Unifont font)
> QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
> endif
> endif # QT_FONTS
> @@ -680,7 +680,7 @@ define QT_INSTALL_TARGET_FONTS_TTF
> mkdir -p $(TARGET_DIR)/usr/lib/fonts
> cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
> endef
> -QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts)
> +QT_LICENSE := $(QT_LICENSE), Bitstream license (DejaVu/Vera TrueType fonts)
> QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \
> src/3rdparty/fonts/README.DejaVu \
> src/3rdparty/fonts/COPYRIGHT.Vera
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] qt: get rid of extra spaces in license file list
2016-03-02 2:54 [Buildroot] [PATCH 1/1] qt: get rid of extra spaces in license file list Danomi Manchego
2016-03-02 18:25 ` Arnout Vandecappelle
@ 2016-04-13 21:57 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2016-04-13 21:57 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 1 Mar 2016 21:54:40 -0500, Danomi Manchego wrote:
> Use "QT_LICENSE := $(QT_LICENSE), xxxx" construct to get rid of the
> extra spaces before commas added by the font license clauses.
>
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
>
> ---
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-13 21:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-02 2:54 [Buildroot] [PATCH 1/1] qt: get rid of extra spaces in license file list Danomi Manchego
2016-03-02 18:25 ` Arnout Vandecappelle
2016-04-13 21:57 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox