Skip to contentSkip to conversation

qt/qt5script: Remove the GPLv2 licence file

PATCH New Julien Corjon 2 participants 4 messages Jul 22, 2015

lore
Share & tools
lore

Julien Corjon

author
#0 lore raw

PATCH 1/2 qt/qt5script: Remove the GPLv2 licence file

Signed-off-by Julien Corjon <[email protected]>
---
 package/qt5/qt5script/qt5script.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5script/qt5script.mk +1 -1
index 7f0efbb..c654fe5 100644
@@ -12,7 +12,7 @@ QT5SCRIPT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5SCRIPT_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5SCRIPT_LICENSE = Commercial license
 QT5SCRIPT_REDISTRIBUTE = NO
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 2/2 qt/qt5base: Fix big endian image conversion

Signed-off-by Julien Corjon <[email protected]>
---
 .../qt5base/0007-big_endian-fix_destformat.patch   | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/qt5/qt5base/0007-big_endian-fix_destformat.patch
package/qt5/qt5base/0007-big_endian-fix_destformat.patch new file +34 -0
new file mode 100644
index 0000000..b30d220
@@ -0,0 +1,34 @@
+From 02ab210ea9bc5ee53fa4f1db2f068ce24272a6cd Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <[email protected]>
+Date: Fri, 3 Jul 2015 14:19:02 +0200
+Subject: [PATCH] Fix compile error on big endian
+
+DestFormat is not defined here but should be Format_RGBX8888
+
+Change-Id: Ie33989a6fc31650434281a6b7b0f4806524268af
+Reviewed-by: Konstantin Ritt <[email protected]>
+Reviewed-by: Timo Jyrinki <[email protected]>
+Reviewed-by: Simon Hausmann <[email protected]>
+
+Upstream-Status: https://codereview.qt-project.org/#/c/120654/
+Signed-off-by: Julien Corjon <[email protected]>
+---
+ src/gui/image/qimage_conversions.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
+index e0ca2c5..02f32aa 100644
+--- a/src/gui/image/qimage_conversions.cpp
++++ b/src/gui/image/qimage_conversions.cpp
+@@ -1103,7 +1103,7 @@ static bool mask_alpha_converter_rgbx_inplace(QImageData *data, Qt::ImageConvers
+         }
+         rgb_data += pad;
+     }
+-    data->format = DestFormat;
++    data->format = QImage::Format_RGBX8888;
+     return true;
+ #endif
+ }
+-- 
+2.1.0
+
Signature · 1 line
2.1.0
Applied
#2 lore raw

PATCH 2/2 qt/qt5base: Fix big endian image conversion

Dear Julien Corjon,

Quoted 5 lines · Julien Corjon
Signed-off-by Julien Corjon <[email protected]>
---
 .../qt5base/0007-big_endian-fix_destformat.patch   | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/qt5/qt5base/0007-big_endian-fix_destformat.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 qt/qt5script: Remove the GPLv2 licence file

In reply to Julien Corjon

Dear Julien Corjon,

package/qt5/qt5script/qt5script.mk QT5SCRIPT_INSTALL_STAGING = YES · line 14

Quoted 13 lines · Julien Corjon
Signed-off-by Julien Corjon <[email protected]>
---
 package/qt5/qt5script/qt5script.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5script/qt5script.mk +0 -0
index 7f0efbb..c654fe5 100644
@@ -12,7 +12,7 @@ QT5SCRIPT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5SCRIPT_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2

Is the "or GPLv2" still valid, despite the GPLv2 file not being there?

package/qt5/qt5script/qt5script.mk QT5SCRIPT_INSTALL_STAGING = YES · line 18

Quoted 5 lines
package/qt5/qt5script/qt5script.mk +1 -1
-QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5SCRIPT_LICENSE = Commercial license
 QT5SCRIPT_REDISTRIBUTE = NO

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com