diff mbox

[2/5] Revert "qt5base: install bundled fonts to target"

Message ID 1478601048-21388-3-git-send-email-anaumann@ultratronik.de
State Rejected
Headers show

Commit Message

Andreas Naumann Nov. 8, 2016, 10:30 a.m. UTC 
qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645

This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384.

Conflicts:
	package/qt5/qt5base/qt5base.mk

Conflicts:
	package/qt5/qt5base/qt5base.mk

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/qt5base/qt5base.mk | 7 -------
 1 file changed, 7 deletions(-)

Comments

Arnout Vandecappelle Nov. 8, 2016, 10:50 p.m. UTC | #1 
On 08-11-16 11:30, Andreas Naumann wrote:
> qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645
> 
> This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384.
> 
> Conflicts:
> 	package/qt5/qt5base/qt5base.mk
> 
> Conflicts:
> 	package/qt5/qt5base/qt5base.mk
> 
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>

 Remove the Conflicts: lines. Otherwise looks good.

 Regards,
 Arnout

> ---
>  package/qt5/qt5base/qt5base.mk | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index f4ca921..e49718e 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -234,13 +234,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
>  	fi
>  endef
>  
> -define QT5BASE_INSTALL_TARGET_FONTS
> -	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
> -		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
> -		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
> -	fi
> -endef
> -
>  define QT5BASE_INSTALL_TARGET_EXAMPLES
>  	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
>  		mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \
>
diff mbox

Patch

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index f4ca921..e49718e 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -234,13 +234,6 @@  define QT5BASE_INSTALL_TARGET_PLUGINS
 	fi
 endef
 
-define QT5BASE_INSTALL_TARGET_FONTS
-	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
-		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
-	fi
-endef
-
 define QT5BASE_INSTALL_TARGET_EXAMPLES
 	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
 		mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \