jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-10 03:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt: get rid of extra spaces in license file list

Browse Source 
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Danomi Manchego 2016-03-01 21:54:40 -05:00 committed by Thomas Petazzoni
parent 1287e31d60
commit 591cd5d37d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/qt/qt.mk
View File

@ -18,9 +18,9 @@ QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR
QT_DEPENDENCIES = host-pkgconf QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES 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) ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
QT_LICENSE += or Digia Qt Commercial license QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license
endif endif
QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3 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),) ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),)
# as stated in the font source src/3rdparty/fonts/micro.bdf # as stated in the font source src/3rdparty/fonts/micro.bdf
# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.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 endif
ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),) 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 QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica
endif endif
ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y) 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 QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
endif endif
endif # QT_FONTS endif # QT_FONTS
@ -680,7 +680,7 @@ define QT_INSTALL_TARGET_FONTS_TTF
mkdir -p $(TARGET_DIR)/usr/lib/fonts mkdir -p $(TARGET_DIR)/usr/lib/fonts
cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
endef 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 \ QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \
src/3rdparty/fonts/README.DejaVu \ src/3rdparty/fonts/README.DejaVu \
src/3rdparty/fonts/COPYRIGHT.Vera src/3rdparty/fonts/COPYRIGHT.Vera