* qt 4.7.3 translation support
@ 2011-05-12 21:31 Eric Bénard
2011-05-12 21:31 ` [PATCH 1/3] qt4-native: also build lrelease Eric Bénard
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Eric Bénard @ 2011-05-12 21:31 UTC (permalink / raw)
To: openembedded-devel
Hi,
this patch should bring translation support to the qt 4.7.3 patchset posted yesterday.
It's currently only build tested for at4-embedded on armv5 so please test it and report
any problem to the list.
Thanks
Eric
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] qt4-native: also build lrelease
2011-05-12 21:31 qt 4.7.3 translation support Eric Bénard
@ 2011-05-12 21:31 ` Eric Bénard
2011-05-12 21:43 ` Otavio Salvador
2011-05-12 21:31 ` [PATCH 2/3] qt4.inc: give the right name to variable qmake will use Eric Bénard
2011-05-12 21:31 ` [PATCH 3/3] qt4-4.7.3: add translations'support Eric Bénard
2 siblings, 1 reply; 9+ messages in thread
From: Eric Bénard @ 2011-05-12 21:31 UTC (permalink / raw)
To: openembedded-devel
as this is nedded to build translations files
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/qt4/qt4-native.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/recipes/qt4/qt4-native.inc b/recipes/qt4/qt4-native.inc
index ee702e9..d99d9de 100644
--- a/recipes/qt4/qt4-native.inc
+++ b/recipes/qt4/qt4-native.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
PROVIDES = "qt4-tools-native"
-INC_PR = "r0"
+INC_PR = "r1"
inherit native
@@ -51,6 +51,7 @@ TOBUILD = "\
src/gui \
src/testlib \
src/qt3support \
+ tools/linguist/lrelease \
"
do_compile() {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] qt4.inc: give the right name to variable qmake will use
2011-05-12 21:31 qt 4.7.3 translation support Eric Bénard
2011-05-12 21:31 ` [PATCH 1/3] qt4-native: also build lrelease Eric Bénard
@ 2011-05-12 21:31 ` Eric Bénard
2011-05-12 21:43 ` Otavio Salvador
2011-05-12 21:31 ` [PATCH 3/3] qt4-4.7.3: add translations'support Eric Bénard
2 siblings, 1 reply; 9+ messages in thread
From: Eric Bénard @ 2011-05-12 21:31 UTC (permalink / raw)
To: openembedded-devel
this should prevent to have to manually copy binaries for the build
system built by qt4-native to the source tree when cross compiling qt.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/qt4/qt4.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 52fa146..dc27fe2 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -17,8 +17,9 @@ EXTRA_OEMAKE = "-e"
EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
- AR="${TARGET_PREFIX}ar cqs" \
- MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
+ AR="${TARGET_PREFIX}ar cqs" QMAKE_LRELEASE="${STAGING_BINDIR_NATIVE}/lrelease4" \
+ QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4" QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" \
+ QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
export QT_CONF_PATH="${WORKDIR}/qt.conf"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] qt4-4.7.3: add translations'support
2011-05-12 21:31 qt 4.7.3 translation support Eric Bénard
2011-05-12 21:31 ` [PATCH 1/3] qt4-native: also build lrelease Eric Bénard
2011-05-12 21:31 ` [PATCH 2/3] qt4.inc: give the right name to variable qmake will use Eric Bénard
@ 2011-05-12 21:31 ` Eric Bénard
2011-05-12 21:42 ` Otavio Salvador
` (2 more replies)
2 siblings, 3 replies; 9+ messages in thread
From: Eric Bénard @ 2011-05-12 21:31 UTC (permalink / raw)
To: openembedded-devel
this patch should bring back translations support in qt4.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
it's currently build tested for qt4-embedded.
---
recipes/qt4/qt-4.7.3.inc | 14 ++++----------
recipes/qt4/qt-4.7.3/fix-translations.patch | 22 ++++++++++++++++++++++
recipes/qt4/qt4-embedded.inc | 2 +-
recipes/qt4/qt4-x11-free.inc | 2 +-
4 files changed, 28 insertions(+), 12 deletions(-)
create mode 100644 recipes/qt4/qt-4.7.3/fix-translations.patch
diff --git a/recipes/qt4/qt-4.7.3.inc b/recipes/qt4/qt-4.7.3.inc
index 4e9c96a..4dfebd1 100644
--- a/recipes/qt4/qt-4.7.3.inc
+++ b/recipes/qt4/qt-4.7.3.inc
@@ -10,9 +10,11 @@ SRC_URI = "\
file://0006-freetype-host-includes.patch \
file://0001-Added-Openembedded-crossarch-option.patch \
file://0010-phonon-gstreamer-rgb-endianess.patch \
+ file://fix-translations.patch \
file://g++.conf \
file://linux.conf \
- "
+ "
+
# Set necessary variables in the profile
SRC_URI += "file://qte.sh"
@@ -22,7 +24,7 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
do_configure_prepend() {
for pro in $(find ${S} -name "*.pro") ; do
- sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+ sed -i 's:$$LRELEASE:${STAGING_BINDIR_NATIVE}/lrelease4:g' $pro
done
sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
@@ -34,10 +36,6 @@ do_configure_prepend() {
${S}/configure
}
-do_configure_append() {
- sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
-}
-
QT_GLFLAGS ?= ""
QT_CONFIG_FLAGS += " -javascript-jit -script -scripttools -declarative -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
@@ -48,10 +46,6 @@ do_compile() {
fi
unset CFLAGS CXXFLAGS
- install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
- install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
oe_runmake ${EXTRA_ENV}
}
diff --git a/recipes/qt4/qt-4.7.3/fix-translations.patch b/recipes/qt4/qt-4.7.3/fix-translations.patch
new file mode 100644
index 0000000..5994775
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3/fix-translations.patch
@@ -0,0 +1,22 @@
+diff --git a/translations/translations.pro b/translations/translations.pro
+index cdaf04a..24fa668 100644
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+ updateqm.CONFIG += no_link
+ QMAKE_EXTRA_COMPILERS += updateqm
+
+-isEmpty(vcproj) {
++!isEmpty(vcproj) {
+ QMAKE_LINK = @: IGNORE THIS LINE
+ OBJECTS_DIR =
+ win32:CONFIG -= embed_manifest_exe
+@@ -30,7 +30,7 @@ isEmpty(vcproj) {
+ phony_src.input = PHONY_DEPS
+ phony_src.output = phony.c
+ phony_src.variable_out = GENERATED_SOURCES
+- phony_src.commands = echo int main() { return 0; } > phony.c
++ phony_src.commands = echo "int main() { return 0\; }" > phony.c
+ phony_src.name = CREATE phony.c
+ phony_src.CONFIG += combine
+ QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index af9d545..79ce005 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "directfb tslib"
-INC_PR = "r28"
+INC_PR = "r29"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index c407422..f63c9d2 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL QPL"
DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r24"
+INC_PR = "r25"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
file://0001-cross-compile.patch \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] qt4-4.7.3: add translations'support
2011-05-12 21:31 ` [PATCH 3/3] qt4-4.7.3: add translations'support Eric Bénard
@ 2011-05-12 21:42 ` Otavio Salvador
2011-05-13 9:00 ` Eric Bénard
2011-05-13 15:53 ` [PATCH 3/3 v2] " Eric Bénard
2 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2011-05-12 21:42 UTC (permalink / raw)
To: openembedded-devel
On Thu, May 12, 2011 at 18:31, Eric Bénard <eric@eukrea.com> wrote:
> this patch should bring back translations support in qt4.
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] qt4.inc: give the right name to variable qmake will use
2011-05-12 21:31 ` [PATCH 2/3] qt4.inc: give the right name to variable qmake will use Eric Bénard
@ 2011-05-12 21:43 ` Otavio Salvador
0 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2011-05-12 21:43 UTC (permalink / raw)
To: openembedded-devel
On Thu, May 12, 2011 at 18:31, Eric Bénard <eric@eukrea.com> wrote:
> this should prevent to have to manually copy binaries for the build
> system built by qt4-native to the source tree when cross compiling qt.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] qt4-native: also build lrelease
2011-05-12 21:31 ` [PATCH 1/3] qt4-native: also build lrelease Eric Bénard
@ 2011-05-12 21:43 ` Otavio Salvador
0 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2011-05-12 21:43 UTC (permalink / raw)
To: openembedded-devel
On Thu, May 12, 2011 at 18:31, Eric Bénard <eric@eukrea.com> wrote:
> as this is nedded to build translations files
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] qt4-4.7.3: add translations'support
2011-05-12 21:31 ` [PATCH 3/3] qt4-4.7.3: add translations'support Eric Bénard
2011-05-12 21:42 ` Otavio Salvador
@ 2011-05-13 9:00 ` Eric Bénard
2011-05-13 15:53 ` [PATCH 3/3 v2] " Eric Bénard
2 siblings, 0 replies; 9+ messages in thread
From: Eric Bénard @ 2011-05-13 9:00 UTC (permalink / raw)
To: openembedded-devel
Hi,
On 12/05/2011 23:31, Eric Bénard wrote:
> this patch should bring back translations support in qt4.
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
> ---
> it's currently build tested for qt4-embedded.
> ---
forget this patch it still contains an error.
Eric
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3 v2] qt4-4.7.3: add translations'support
2011-05-12 21:31 ` [PATCH 3/3] qt4-4.7.3: add translations'support Eric Bénard
2011-05-12 21:42 ` Otavio Salvador
2011-05-13 9:00 ` Eric Bénard
@ 2011-05-13 15:53 ` Eric Bénard
2 siblings, 0 replies; 9+ messages in thread
From: Eric Bénard @ 2011-05-13 15:53 UTC (permalink / raw)
To: openembedded-devel
this patch should bring back translations support in qt4.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
v2 : build tested for qt4-embedded and qt4-x11-free
---
recipes/qt4/qt-4.7.3.inc | 14 ++++----------
recipes/qt4/qt-4.7.3/fix-translations.patch | 22 ++++++++++++++++++++++
recipes/qt4/qt4-embedded.inc | 2 +-
recipes/qt4/qt4-x11-free.inc | 2 +-
4 files changed, 28 insertions(+), 12 deletions(-)
create mode 100644 recipes/qt4/qt-4.7.3/fix-translations.patch
diff --git a/recipes/qt4/qt-4.7.3.inc b/recipes/qt4/qt-4.7.3.inc
index 4e9c96a..4dfebd1 100644
--- a/recipes/qt4/qt-4.7.3.inc
+++ b/recipes/qt4/qt-4.7.3.inc
@@ -10,9 +10,11 @@ SRC_URI = "\
file://0006-freetype-host-includes.patch \
file://0001-Added-Openembedded-crossarch-option.patch \
file://0010-phonon-gstreamer-rgb-endianess.patch \
+ file://fix-translations.patch \
file://g++.conf \
file://linux.conf \
- "
+ "
+
# Set necessary variables in the profile
SRC_URI += "file://qte.sh"
@@ -22,7 +24,7 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
do_configure_prepend() {
for pro in $(find ${S} -name "*.pro") ; do
- sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+ sed -i 's:$$LRELEASE:${STAGING_BINDIR_NATIVE}/lrelease4:g' $pro
done
sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
@@ -34,10 +36,6 @@ do_configure_prepend() {
${S}/configure
}
-do_configure_append() {
- sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
-}
-
QT_GLFLAGS ?= ""
QT_CONFIG_FLAGS += " -javascript-jit -script -scripttools -declarative -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
@@ -48,10 +46,6 @@ do_compile() {
fi
unset CFLAGS CXXFLAGS
- install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
- install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
oe_runmake ${EXTRA_ENV}
}
diff --git a/recipes/qt4/qt-4.7.3/fix-translations.patch b/recipes/qt4/qt-4.7.3/fix-translations.patch
new file mode 100644
index 0000000..fe20b5b
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3/fix-translations.patch
@@ -0,0 +1,22 @@
+diff --git a/translations/translations.pro b/translations/translations.pro
+index cdaf04a..24fa668 100644
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+ updateqm.CONFIG += no_link
+ QMAKE_EXTRA_COMPILERS += updateqm
+
+-isEmpty(vcproj) {
++!isEmpty(vcproj) {
+ QMAKE_LINK = @: IGNORE THIS LINE
+ OBJECTS_DIR =
+ win32:CONFIG -= embed_manifest_exe
+@@ -30,7 +30,7 @@ isEmpty(vcproj) {
+ phony_src.input = PHONY_DEPS
+ phony_src.output = phony.c
+ phony_src.variable_out = GENERATED_SOURCES
+- phony_src.commands = echo int main() { return 0; } > phony.c
++ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
+ phony_src.name = CREATE phony.c
+ phony_src.CONFIG += combine
+ QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index af9d545..79ce005 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "directfb tslib"
-INC_PR = "r28"
+INC_PR = "r29"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index c407422..f63c9d2 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL QPL"
DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r24"
+INC_PR = "r25"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
file://0001-cross-compile.patch \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-05-13 16:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-12 21:31 qt 4.7.3 translation support Eric Bénard
2011-05-12 21:31 ` [PATCH 1/3] qt4-native: also build lrelease Eric Bénard
2011-05-12 21:43 ` Otavio Salvador
2011-05-12 21:31 ` [PATCH 2/3] qt4.inc: give the right name to variable qmake will use Eric Bénard
2011-05-12 21:43 ` Otavio Salvador
2011-05-12 21:31 ` [PATCH 3/3] qt4-4.7.3: add translations'support Eric Bénard
2011-05-12 21:42 ` Otavio Salvador
2011-05-13 9:00 ` Eric Bénard
2011-05-13 15:53 ` [PATCH 3/3 v2] " Eric Bénard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.