Skip to contentSkip to conversation

qtbase_git: restore 0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch in SRC_URI

PATCH New Martin Jansa 1 participant 2 messages Oct 10, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 qtbase_git: restore 0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch in SRC_URI

* commit 105ad2a18e20f2b07d20a1640917e69950c8496b
Author: Eric B<C3><A9>nard <[email protected]>
Date: Mon Oct 7 22:54:12 2013 +0200
Subject: qtbase: update to 5.1.1
removed it from SRC_URI in qtbase.inc, but it's still needed for qtbase_git

---
 recipes-qt/qt5/qtbase_git.bb | 2 ++
 1 file changed, 2 insertions(+)
recipes-qt/qt5/qtbase_git.bb +2 -0
index 2994d3f..30d5b23 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
+SRC_URI += "file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch"
+
 SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a"
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 2/2 qtbase: Disable fontconfig by default

* it was explicitly disabled in
commit 1b14686657cddcc5bb37a5c7db8a35f1c4903ee3
Author: Philip Craig <[email protected]>
Date: Wed Jun 26 02:13:02 2013 +0000
Subject: qtbase: disable fontconfig support by default
* and then accidentaly enabled with PACKAGECONFIG changes commit ebdd83f6b7e5c3296e5ebd3b7b0c1e0defe5aba5
Author: Martin Jansa <[email protected]>
Date: Sat Jul 20 00:02:57 2013 +0200
Subject: qtbase: explicitly enable or disable all deps
* Thanks to Nicolas Dechesne for reporting it

---
 recipes-qt/qt5/qtbase.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtbase.inc +1 -1
index 559f54d..d1831a1 100644
@@ -40,7 +40,7 @@ RDEPENDS_${PN}-tools += "perl"
 PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
 PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
 PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}"
-PACKAGECONFIG_FONTS ?= "fontconfig freetype"
+PACKAGECONFIG_FONTS ?= "freetype"
 PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
 PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
 PACKAGECONFIG_DISTRO ?= ""
Signature · 1 line
1.8.3.2