* [meta-qt3] [PATCH 1/5] qt-x11-free-native: add qt3-cstddef.patch
2011-12-08 15:18 [meta-qt3] [PATCH 0/5] Qt3 fixes Paul Eggleton
@ 2011-12-08 15:18 ` Paul Eggleton
2011-12-08 15:18 ` [meta-qt3] [PATCH 2/5] qt-x11-free: remove version 3.3.6 Paul Eggleton
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2011-12-08 15:18 UTC (permalink / raw)
To: yocto
When building on Fedora 15 the build failed with the error mentioned in
this patch ("qvaluelist.h: error: 'ptrdiff_t' does not name a type"), so
it is needed by the native recipe as well.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
index 779513e..15f71d4 100644
--- a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
+++ b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL | QPL"
DEPENDS = "xmu-native"
HOMEPAGE = "http://www.trolltech.com"
-PR = "r1"
+PR = "r2"
PROVIDES += "qt-x11-free-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
@@ -13,7 +13,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
file://LICENSE.QPL;md5=fff372435cb41647bc0b3cb940ea5c51"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
- file://no-examples.patch"
+ file://no-examples.patch \
+ file://qt3-cstddef.patch"
S = "${WORKDIR}/qt-x11-free-${PV}"
#
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [meta-qt3] [PATCH 2/5] qt-x11-free: remove version 3.3.6
2011-12-08 15:18 [meta-qt3] [PATCH 0/5] Qt3 fixes Paul Eggleton
2011-12-08 15:18 ` [meta-qt3] [PATCH 1/5] qt-x11-free-native: add qt3-cstddef.patch Paul Eggleton
@ 2011-12-08 15:18 ` Paul Eggleton
2011-12-08 15:18 ` [meta-qt3] [PATCH 3/5] qt-x11-free: use INC_PR Paul Eggleton
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2011-12-08 15:18 UTC (permalink / raw)
To: yocto
We only need one version, 3.3.7 was the default preference (in the
absence of DEFAULT_PREFERENCE) and the 3.3.6 recipe depends on
uicmoc3-native which we do not have, so remove it.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
recipes-qt3/qt3/qt-x11-free_3.3.6.bb | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
delete mode 100644 recipes-qt3/qt3/qt-x11-free_3.3.6.bb
diff --git a/recipes-qt3/qt3/qt-x11-free_3.3.6.bb b/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
deleted file mode 100644
index 789e6fb..0000000
--- a/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 libxft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
-PROVIDES = "qt3x11"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
- file://configure.patch \
- file://no-examples.patch \
- file://gcc4_1-HACK.patch"
-
-require qt-x11-free-common.inc
-
-SRC_URI[md5sum] = "dc1384c03ac08af21f6fefab32d982cf"
-SRC_URI[sha256sum] = "04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [meta-qt3] [PATCH 3/5] qt-x11-free: use INC_PR
2011-12-08 15:18 [meta-qt3] [PATCH 0/5] Qt3 fixes Paul Eggleton
2011-12-08 15:18 ` [meta-qt3] [PATCH 1/5] qt-x11-free-native: add qt3-cstddef.patch Paul Eggleton
2011-12-08 15:18 ` [meta-qt3] [PATCH 2/5] qt-x11-free: remove version 3.3.6 Paul Eggleton
@ 2011-12-08 15:18 ` Paul Eggleton
2011-12-08 15:18 ` [meta-qt3] [PATCH 4/5] qt-x11-free(-native): remove erroneous PROVIDES Paul Eggleton
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2011-12-08 15:18 UTC (permalink / raw)
To: yocto
PR was being set in both the inc and the recipes, this is not correct.
Move them to use INC_PR so the recipe and inc can be updated and retain
sanity.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
recipes-qt3/qt3/qt-x11-free-common.inc | 2 +-
recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-qt3/qt3/qt-x11-free-common.inc b/recipes-qt3/qt3/qt-x11-free-common.inc
index 6aa6306..c92d883 100644
--- a/recipes-qt3/qt3/qt-x11-free-common.inc
+++ b/recipes-qt3/qt3/qt-x11-free-common.inc
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
PRIORITY = "optional"
LICENSE = "GPL | QPL"
HOMEPAGE = "http://www.trolltech.com"
-PR = "r1"
+INC_PR = "r3"
S = "${WORKDIR}/qt-x11-free-${PV}"
diff --git a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
index 94486ed..f2e8591 100644
--- a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
+++ b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
@@ -1,6 +1,6 @@
DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl"
PROVIDES = "qt3x11"
-PR = "r0"
+PR = "${INC_PR}.1"
PREFERRED_VERSION_qt-x11-free = 3.3.7
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [meta-qt3] [PATCH 4/5] qt-x11-free(-native): remove erroneous PROVIDES
2011-12-08 15:18 [meta-qt3] [PATCH 0/5] Qt3 fixes Paul Eggleton
` (2 preceding siblings ...)
2011-12-08 15:18 ` [meta-qt3] [PATCH 3/5] qt-x11-free: use INC_PR Paul Eggleton
@ 2011-12-08 15:18 ` Paul Eggleton
2011-12-08 15:18 ` [meta-qt3] [PATCH 5/5] classes: remove qt3e.bbclass Paul Eggleton
2011-12-08 18:08 ` [meta-qt3] [PATCH 0/5] Qt3 fixes Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2011-12-08 15:18 UTC (permalink / raw)
To: yocto
None of these statements do anything, because a recipe always PROVIDES
${PN} by default.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 2 --
recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 1 -
2 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
index 15f71d4..7dd9a34 100644
--- a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
+++ b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
@@ -6,7 +6,6 @@ DEPENDS = "xmu-native"
HOMEPAGE = "http://www.trolltech.com"
PR = "r2"
-PROVIDES += "qt-x11-free-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
@@ -22,7 +21,6 @@ S = "${WORKDIR}/qt-x11-free-${PV}"
# or the full qmake.oeclass.
#
-PROVIDES = "qt-x11-free-native"
export QTDIR = "${S}"
export SYSCONF_CXX = "${CCACHE} g++"
export SYSCONF_CC = "${CCACHE} gcc"
diff --git a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
index f2e8591..a67dd63 100644
--- a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
+++ b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
@@ -2,7 +2,6 @@ DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libx
PROVIDES = "qt3x11"
PR = "${INC_PR}.1"
-PREFERRED_VERSION_qt-x11-free = 3.3.7
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [meta-qt3] [PATCH 5/5] classes: remove qt3e.bbclass
2011-12-08 15:18 [meta-qt3] [PATCH 0/5] Qt3 fixes Paul Eggleton
` (3 preceding siblings ...)
2011-12-08 15:18 ` [meta-qt3] [PATCH 4/5] qt-x11-free(-native): remove erroneous PROVIDES Paul Eggleton
@ 2011-12-08 15:18 ` Paul Eggleton
2011-12-08 18:08 ` [meta-qt3] [PATCH 0/5] Qt3 fixes Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2011-12-08 15:18 UTC (permalink / raw)
To: yocto
We can't make use of this class since we don't have qt3-embedded, so
remove it.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
classes/qt3e.bbclass | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
delete mode 100644 classes/qt3e.bbclass
diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass
deleted file mode 100644
index d3d4a14..0000000
--- a/classes/qt3e.bbclass
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# override variables set by qmake_base to compile Qt/X11 apps
-#
-export QTDIR="${STAGING_DIR_HOST}/qte3"
-export QTEDIR="${STAGING_DIR_HOST}/qte3"
-export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
-export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
-export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
-export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
-export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
-export OE_QMAKE_LIBS_QT="qte"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [meta-qt3] [PATCH 0/5] Qt3 fixes
2011-12-08 15:18 [meta-qt3] [PATCH 0/5] Qt3 fixes Paul Eggleton
` (4 preceding siblings ...)
2011-12-08 15:18 ` [meta-qt3] [PATCH 5/5] classes: remove qt3e.bbclass Paul Eggleton
@ 2011-12-08 18:08 ` Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2011-12-08 18:08 UTC (permalink / raw)
To: Paul Eggleton; +Cc: yocto
On 12/08/2011 07:18 AM, Paul Eggleton wrote:
> A fix for a compile error plus a bunch of minor tidy-ups for meta-qt3.
>
> The following changes since commit 0e9784d26df51bd564b8f23bd40a6c36969abd5c:
>
> qt-x11-free-native: fix where qmake gets linked (2011-09-14 13:41:06 -0700)
>
> are available in the git repository at:
> git://git.yoctoproject.org/poky-contrib paule/qt3-fixes
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/qt3-fixes
>
> Paul Eggleton (5):
> qt-x11-free-native: add qt3-cstddef.patch
> qt-x11-free: remove version 3.3.6
> qt-x11-free: use INC_PR
> qt-x11-free(-native): remove erroneous PROVIDES
> classes: remove qt3e.bbclass
>
> classes/qt3e.bbclass | 11 -----------
> recipes-qt3/qt3/qt-x11-free-common.inc | 2 +-
> recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 7 +++----
> recipes-qt3/qt3/qt-x11-free_3.3.6.bb | 13 -------------
> recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 3 +--
> 5 files changed, 5 insertions(+), 31 deletions(-)
> delete mode 100644 classes/qt3e.bbclass
> delete mode 100644 recipes-qt3/qt3/qt-x11-free_3.3.6.bb
>
Merged into the meta-qt3 layer
Thanks for the fixes
Sau!
^ permalink raw reply [flat|nested] 7+ messages in thread