[meta-kde][PATCH 1/2] qt4-native, qt4-x11-free: Rename bbappends to match current OE-Core recipes

[meta-kde][PATCH 1/2] qt4-native, qt4-x11-free: Rename bbappends to match current OE-Core recipes

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 README                                           |    3 ++-
 recipes-misc-support/qt4-native_4.8.3.bbappend   |    8 --------
 recipes-misc-support/qt4-native_4.8.4.bbappend   |    8 ++++++++
 recipes-misc-support/qt4-x11-free_4.8.3.bbappend |   12 ------------
 recipes-misc-support/qt4-x11-free_4.8.4.bbappend |   12 ++++++++++++
 5 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 recipes-misc-support/qt4-native_4.8.3.bbappend
 create mode 100644 recipes-misc-support/qt4-native_4.8.4.bbappend
 delete mode 100644 recipes-misc-support/qt4-x11-free_4.8.3.bbappend
 create mode 100644 recipes-misc-support/qt4-x11-free_4.8.4.bbappend

diff --git a/README b/README
index a6164c9..0635e10 100644
--- a/README
+++ b/README
@@ -9,6 +9,7 @@ Samuel Stirtzel <s.stirtzel@googlemail.com>
 
 Contributors:
 Copyright 2012 - Kai Kang
+Copyright 2013 - Khem Raj
 Copyright 2012 - Koen Kooi
 Copyright 2012 - Robert Yang
 Copyright 2011, 2012 - Samuel Stirtzel
@@ -46,4 +47,4 @@ FAQ / Troubleshooting:
   Q: How to report bugs / request features?
   A: Send your bugreports / feature requests to the openembedded-developer mailing list.
      Include the [meta-kde] tag in the subject for easier readability.
-     You can find the mailing list here: http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
\ No newline at end of file
+     You can find the mailing list here: http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
diff --git a/recipes-misc-support/qt4-native_4.8.3.bbappend b/recipes-misc-support/qt4-native_4.8.3.bbappend
deleted file mode 100644
index 5b04eb4..0000000
--- a/recipes-misc-support/qt4-native_4.8.3.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-# Needed by kdelibs4-native
-DEPENDS += "openssl-native"
-
-EXTRA_OECONF += "-no-pch -no-sm -openssl"
-
-TOBUILD += "src/phonon"
-
-PRINC := "${@int(PRINC) + 1}"
\ No newline at end of file
diff --git a/recipes-misc-support/qt4-native_4.8.4.bbappend b/recipes-misc-support/qt4-native_4.8.4.bbappend
new file mode 100644
index 0000000..5b04eb4
--- /dev/null
+++ b/recipes-misc-support/qt4-native_4.8.4.bbappend
@@ -0,0 +1,8 @@
+# Needed by kdelibs4-native
+DEPENDS += "openssl-native"
+
+EXTRA_OECONF += "-no-pch -no-sm -openssl"
+
+TOBUILD += "src/phonon"
+
+PRINC := "${@int(PRINC) + 1}"
\ No newline at end of file
diff --git a/recipes-misc-support/qt4-x11-free_4.8.3.bbappend b/recipes-misc-support/qt4-x11-free_4.8.3.bbappend
deleted file mode 100644
index 32a6f27..0000000
--- a/recipes-misc-support/qt4-x11-free_4.8.3.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-#This will add reduced visibility to some exports on Qt, otherwise KDE plugins will fail
-QT_CONFIG_FLAGS_append = " --reduce-exports"
-
-# Build OpenGL/ES support if available
-QT_GLFLAGS_omap3 = "-opengl es2 "
-DEPENDS_append_omap3 = " libgles-omap3"
-DEPENDS_append_ti33x = " libgles-omap3"
-
-# Needed by kdelibs
-QT_DISTRO_FLAGS = "-accessibility -sm"
-
-PRINC := "${@int(PRINC) + 3}"
diff --git a/recipes-misc-support/qt4-x11-free_4.8.4.bbappend b/recipes-misc-support/qt4-x11-free_4.8.4.bbappend
new file mode 100644
index 0000000..32a6f27
--- /dev/null
+++ b/recipes-misc-support/qt4-x11-free_4.8.4.bbappend
@@ -0,0 +1,12 @@
+#This will add reduced visibility to some exports on Qt, otherwise KDE plugins will fail
+QT_CONFIG_FLAGS_append = " --reduce-exports"
+
+# Build OpenGL/ES support if available
+QT_GLFLAGS_omap3 = "-opengl es2 "
+DEPENDS_append_omap3 = " libgles-omap3"
+DEPENDS_append_ti33x = " libgles-omap3"
+
+# Needed by kdelibs
+QT_DISTRO_FLAGS = "-accessibility -sm"
+
+PRINC := "${@int(PRINC) + 3}"
-- 
1.7.9.5

[meta-kde][PATCH 2/2] recipes: Remove the multiline comments

[Khem Raj]

These are now flagged as errors by bitbake
and parsing is terminated

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-kde-base/kdelibs4-native_git.bb |    2 --
 recipes-kde-base/kdelibs4_git.bb        |    2 --
 2 files changed, 4 deletions(-)

diff --git a/recipes-kde-base/kdelibs4-native_git.bb b/recipes-kde-base/kdelibs4-native_git.bb
index 3f31391..30485e3 100644
--- a/recipes-kde-base/kdelibs4-native_git.bb
+++ b/recipes-kde-base/kdelibs4-native_git.bb
@@ -11,8 +11,6 @@ SRC_URI = "git://anongit.kde.org/kdelibs.git;branch=master \
 	  file://0002-Fix-openssl-check.patch \
 	  file://0004-Fix-the-path-to-Icemaker.patch \
 	  "
-#file://0003-Fix-FindKDE4Internals-cmake-file.patch \
-
 ## Tag v4.9.0
 SRCREV = "bfdb17858efeeabf74ccb4a4010e250bcde6aa42"
 PV = "4.9.0+git${SRCPV}"
diff --git a/recipes-kde-base/kdelibs4_git.bb b/recipes-kde-base/kdelibs4_git.bb
index 8779572..a66c189 100644
--- a/recipes-kde-base/kdelibs4_git.bb
+++ b/recipes-kde-base/kdelibs4_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://anongit.kde.org/kdelibs.git;branch=master \
     file://0006-Fix-makekdewidget-executable-path.patch \
     "
 
-#     file://0003-Fix-FindKDE4Internals-cmake-file.patch \
-
 ## Tag v4.9.0
 SRCREV = "bfdb17858efeeabf74ccb4a4010e250bcde6aa42"
 PV = "4.9.0+git${SRCPV}"
-- 
1.7.9.5

Re: [meta-kde][PATCH 1/2] qt4-native, qt4-x11-free: Rename bbappends to match current OE-Core recipes

[Otavio Salvador]

On Mon, Jan 21, 2013 at 4:35 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  README                                           |    3 ++-
>  recipes-misc-support/qt4-native_4.8.3.bbappend   |    8 --------
>  recipes-misc-support/qt4-native_4.8.4.bbappend   |    8 ++++++++
>  recipes-misc-support/qt4-x11-free_4.8.3.bbappend |   12 ------------
>  recipes-misc-support/qt4-x11-free_4.8.4.bbappend |   12 ++++++++++++
>  5 files changed, 22 insertions(+), 21 deletions(-)
>  delete mode 100644 recipes-misc-support/qt4-native_4.8.3.bbappend
>  create mode 100644 recipes-misc-support/qt4-native_4.8.4.bbappend
>  delete mode 100644 recipes-misc-support/qt4-x11-free_4.8.3.bbappend
>  create mode 100644 recipes-misc-support/qt4-x11-free_4.8.4.bbappend
>
> diff --git a/README b/README
> index a6164c9..0635e10 100644
> --- a/README
> +++ b/README
> @@ -9,6 +9,7 @@ Samuel Stirtzel <s.stirtzel@googlemail.com>
>
>  Contributors:
>  Copyright 2012 - Kai Kang
> +Copyright 2013 - Khem Raj
>  Copyright 2012 - Koen Kooi
>  Copyright 2012 - Robert Yang
>  Copyright 2011, 2012 - Samuel Stirtzel
> @@ -46,4 +47,4 @@ FAQ / Troubleshooting:
>    Q: How to report bugs / request features?
>    A: Send your bugreports / feature requests to the openembedded-developer mailing list.
>       Include the [meta-kde] tag in the subject for easier readability.
> -     You can find the mailing list here: http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> \ No newline at end of file
> +     You can find the mailing list here: http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> diff --git a/recipes-misc-support/qt4-native_4.8.3.bbappend b/recipes-misc-support/qt4-native_4.8.3.bbappend
> deleted file mode 100644
> index 5b04eb4..0000000
> --- a/recipes-misc-support/qt4-native_4.8.3.bbappend
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -# Needed by kdelibs4-native
> -DEPENDS += "openssl-native"
> -
> -EXTRA_OECONF += "-no-pch -no-sm -openssl"
> -
> -TOBUILD += "src/phonon"
> -
> -PRINC := "${@int(PRINC) + 1}"
> \ No newline at end of file
> diff --git a/recipes-misc-support/qt4-native_4.8.4.bbappend b/recipes-misc-support/qt4-native_4.8.4.bbappend
> new file mode 100644
> index 0000000..5b04eb4
> --- /dev/null
> +++ b/recipes-misc-support/qt4-native_4.8.4.bbappend
> @@ -0,0 +1,8 @@
> +# Needed by kdelibs4-native
> +DEPENDS += "openssl-native"
> +
> +EXTRA_OECONF += "-no-pch -no-sm -openssl"
> +
> +TOBUILD += "src/phonon"
> +
> +PRINC := "${@int(PRINC) + 1}"
> \ No newline at end of file

Please add a new line in the end of the file to avoid future warnings about it.

> diff --git a/recipes-misc-support/qt4-x11-free_4.8.3.bbappend b/recipes-misc-support/qt4-x11-free_4.8.3.bbappend
> deleted file mode 100644
> index 32a6f27..0000000
> --- a/recipes-misc-support/qt4-x11-free_4.8.3.bbappend
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -#This will add reduced visibility to some exports on Qt, otherwise KDE plugins will fail
> -QT_CONFIG_FLAGS_append = " --reduce-exports"
> -
> -# Build OpenGL/ES support if available
> -QT_GLFLAGS_omap3 = "-opengl es2 "
> -DEPENDS_append_omap3 = " libgles-omap3"
> -DEPENDS_append_ti33x = " libgles-omap3"
> -
> -# Needed by kdelibs
> -QT_DISTRO_FLAGS = "-accessibility -sm"
> -
> -PRINC := "${@int(PRINC) + 3}"
> diff --git a/recipes-misc-support/qt4-x11-free_4.8.4.bbappend b/recipes-misc-support/qt4-x11-free_4.8.4.bbappend
> new file mode 100644
> index 0000000..32a6f27
> --- /dev/null
> +++ b/recipes-misc-support/qt4-x11-free_4.8.4.bbappend
> @@ -0,0 +1,12 @@
> +#This will add reduced visibility to some exports on Qt, otherwise KDE plugins will fail
> +QT_CONFIG_FLAGS_append = " --reduce-exports"
> +
> +# Build OpenGL/ES support if available
> +QT_GLFLAGS_omap3 = "-opengl es2 "
> +DEPENDS_append_omap3 = " libgles-omap3"
> +DEPENDS_append_ti33x = " libgles-omap3"
> +
> +# Needed by kdelibs
> +QT_DISTRO_FLAGS = "-accessibility -sm"
> +
> +PRINC := "${@int(PRINC) + 3}"
> --
> 1.7.9.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel



--
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

Re: [meta-kde][PATCH 1/2] qt4-native, qt4-x11-free: Rename bbappends to match current OE-Core recipes

[Samuel Stirtzel]

2013/1/21 Khem Raj <raj.khem@gmail.com>:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  README                                           |    3 ++-
>  recipes-misc-support/qt4-native_4.8.3.bbappend   |    8 --------
>  recipes-misc-support/qt4-native_4.8.4.bbappend   |    8 ++++++++
>  recipes-misc-support/qt4-x11-free_4.8.3.bbappend |   12 ------------
>  recipes-misc-support/qt4-x11-free_4.8.4.bbappend |   12 ++++++++++++
>  5 files changed, 22 insertions(+), 21 deletions(-)
>  delete mode 100644 recipes-misc-support/qt4-native_4.8.3.bbappend
>  create mode 100644 recipes-misc-support/qt4-native_4.8.4.bbappend
>  delete mode 100644 recipes-misc-support/qt4-x11-free_4.8.3.bbappend
>  create mode 100644 recipes-misc-support/qt4-x11-free_4.8.4.bbappend
>
> diff --git a/README b/README
> index a6164c9..0635e10 100644
> --- a/README
> +++ b/README
> @@ -9,6 +9,7 @@ Samuel Stirtzel <s.stirtzel@googlemail.com>
>
>  Contributors:
>  Copyright 2012 - Kai Kang
> +Copyright 2013 - Khem Raj
>  Copyright 2012 - Koen Kooi
>  Copyright 2012 - Robert Yang
>  Copyright 2011, 2012 - Samuel Stirtzel
> @@ -46,4 +47,4 @@ FAQ / Troubleshooting:
>    Q: How to report bugs / request features?
>    A: Send your bugreports / feature requests to the openembedded-developer mailing list.
>       Include the [meta-kde] tag in the subject for easier readability.
> -     You can find the mailing list here: http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> \ No newline at end of file
> +     You can find the mailing list here: http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> diff --git a/recipes-misc-support/qt4-native_4.8.3.bbappend b/recipes-misc-support/qt4-native_4.8.3.bbappend
> deleted file mode 100644
> index 5b04eb4..0000000
> --- a/recipes-misc-support/qt4-native_4.8.3.bbappend
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -# Needed by kdelibs4-native
> -DEPENDS += "openssl-native"
> -
> -EXTRA_OECONF += "-no-pch -no-sm -openssl"
> -
> -TOBUILD += "src/phonon"
> -
> -PRINC := "${@int(PRINC) + 1}"
> \ No newline at end of file
> diff --git a/recipes-misc-support/qt4-native_4.8.4.bbappend b/recipes-misc-support/qt4-native_4.8.4.bbappend
> new file mode 100644
> index 0000000..5b04eb4
> --- /dev/null
> +++ b/recipes-misc-support/qt4-native_4.8.4.bbappend
> @@ -0,0 +1,8 @@
> +# Needed by kdelibs4-native
> +DEPENDS += "openssl-native"
> +
> +EXTRA_OECONF += "-no-pch -no-sm -openssl"
> +
> +TOBUILD += "src/phonon"
> +
> +PRINC := "${@int(PRINC) + 1}"
> \ No newline at end of file
> diff --git a/recipes-misc-support/qt4-x11-free_4.8.3.bbappend b/recipes-misc-support/qt4-x11-free_4.8.3.bbappend
> deleted file mode 100644
> index 32a6f27..0000000
> --- a/recipes-misc-support/qt4-x11-free_4.8.3.bbappend
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -#This will add reduced visibility to some exports on Qt, otherwise KDE plugins will fail
> -QT_CONFIG_FLAGS_append = " --reduce-exports"
> -
> -# Build OpenGL/ES support if available
> -QT_GLFLAGS_omap3 = "-opengl es2 "
> -DEPENDS_append_omap3 = " libgles-omap3"
> -DEPENDS_append_ti33x = " libgles-omap3"
> -
> -# Needed by kdelibs
> -QT_DISTRO_FLAGS = "-accessibility -sm"
> -
> -PRINC := "${@int(PRINC) + 3}"
> diff --git a/recipes-misc-support/qt4-x11-free_4.8.4.bbappend b/recipes-misc-support/qt4-x11-free_4.8.4.bbappend
> new file mode 100644
> index 0000000..32a6f27
> --- /dev/null
> +++ b/recipes-misc-support/qt4-x11-free_4.8.4.bbappend
> @@ -0,0 +1,12 @@
> +#This will add reduced visibility to some exports on Qt, otherwise KDE plugins will fail
> +QT_CONFIG_FLAGS_append = " --reduce-exports"
> +
> +# Build OpenGL/ES support if available
> +QT_GLFLAGS_omap3 = "-opengl es2 "
> +DEPENDS_append_omap3 = " libgles-omap3"
> +DEPENDS_append_ti33x = " libgles-omap3"
> +
> +# Needed by kdelibs
> +QT_DISTRO_FLAGS = "-accessibility -sm"
> +
> +PRINC := "${@int(PRINC) + 3}"
> --
> 1.7.9.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Applied thanks,

the newline Otavio mentioned was added too.


FYI: I had the same change in a local update branch (it is not ready yet)
On this branch I planned the following changes:
  "Sanitize" the layer with the oe-stylize script
  Update to latest versions of kdelibs, kde-workspace, kde-runtime and
libkactivities
  Enable full Krita support again (it was broken with Qt<4.8.2)
  Add full packaging imported from rpm .spec files (don't know yet if
this will work)

After the branch is done the layer will be split to desktop and mobile versions,
because the kdelibs are built with different configure flags for
desktop and mobile profiles causing ABI incompatibility.


--
Regards
Samuel