[meta-oe/meta-network/meta-gnome 0/4] bugfixes for my last series

[meta-oe/meta-network/meta-gnome 0/4] bugfixes for my last series

[Andreas Müller]

The following changes since commit cc0067dc0c7ea469057238db6422864d1bce311c:

  rp-pppoe: fix multilib SRC_URI reference (2013-05-10 09:47:01 -0400)

are available in the git repository at:
  git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git fix-low-quality-patches

Andreas Müller (4):
      gnome-terminal: add gnome-common-schemas to RRECOMMENDS
      poppler: fix config option --disable-poppler-qt to --disable-poppler-qt4
      poppler: fix build for soft FPU machines
      proftpd: pack missing files

 .../recipes-gnome/gnome/gnome-terminal_2.30.2.bb   |    3 +
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |    4 +-
 ...sh.cc-add-cast-to-fix-build-for-enable-fi.patch |   42 ++++++++++++++++++++
 meta-oe/recipes-support/poppler/poppler_0.22.3.bb  |    9 +++-
 4 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch

Andreas Müller (4):
  gnome-terminal: add gnome-common-schemas to RRECOMMENDS
  poppler: fix config option --disable-poppler-qt to
    --disable-poppler-qt4
  poppler: fix build for soft FPU machines
  proftpd: pack missing files

 .../recipes-gnome/gnome/gnome-terminal_2.30.2.bb   |    3 +
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |    4 +-
 ...sh.cc-add-cast-to-fix-build-for-enable-fi.patch |   42 ++++++++++++++++++++
 meta-oe/recipes-support/poppler/poppler_0.22.3.bb  |    9 +++-
 4 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch

-- 
1.7.4.4

[meta-oe/meta-network/meta-gnome 1/4] gnome-terminal: add gnome-common-schemas to RRECOMMENDS

[Andreas Müller]

without libgnome gnome-terminal crashes for missing font assertion:
| ERROR:terminal-app.c:1451:terminal_app_init: assertion failed: (app->system_font_desc != NULL)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-gnome/gnome/gnome-terminal_2.30.2.bb   |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
index 1afd334..0f44900 100644
--- a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
+++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "GNOME Terminal"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed"
 DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte gnome-doc-utils"
+PR = "r1"
 
 inherit gnome
 
@@ -13,3 +14,5 @@ EXTRA_OECONF += "--disable-scrollkeeper"
 
 SRC_URI[archive.md5sum] = "74c4528f00067072c2bd867d1f8fe844"
 SRC_URI[archive.sha256sum] = "2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a"
+
+RRECOMMENDS_${PN} += "gnome-common-schemas"
-- 
1.7.4.4

[meta-oe/meta-network/meta-gnome 2/4] poppler: fix config option --disable-poppler-qt to --disable-poppler-qt4

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/poppler/poppler_0.22.3.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb b/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
index 660bc0e..d3d5ce8 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
+PR = "r1"
+
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 SRC_URI[md5sum] = "be915388eaad6865cee5a156c8119ec1"
 SRC_URI[sha256sum] = "916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431"
@@ -13,7 +15,7 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "\
     --enable-xpdf-headers \
     --disable-gtk-test \
-    --disable-poppler-qt \
+    --disable-poppler-qt4 \
     --enable-zlib \
 "
 
-- 
1.7.4.4

[meta-oe/meta-network/meta-gnome 3/4] poppler: fix build for soft FPU machines

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...sh.cc-add-cast-to-fix-build-for-enable-fi.patch |   42 ++++++++++++++++++++
 meta-oe/recipes-support/poppler/poppler_0.22.3.bb  |    7 ++-
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch

diff --git a/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch b/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch
new file mode 100644
index 0000000..291c7ee
--- /dev/null
+++ b/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch
@@ -0,0 +1,42 @@
+From 8bd7428c28750f682fe3cc1a35291e5696c17638 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 12 May 2013 18:00:06 +0200
+Subject: [PATCH] splash/Splash.cc: add cast to fix build for
+ --enable-fixedpoint
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| Splash.cc:1497:30: error: conversion from 'SplashCoord {aka FixedPoint}' to 'Guchar {aka unsigned char}' is ambiguous
+| Splash.cc:1497:30: note: candidates are:
+| In file included from SplashMath.h:27:0,
+|                  from Splash.cc:44:
+| ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int()
+| ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double()
+| ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float()
+
+Upstream-Status: Submitted [1]
+
+[1] http://lists.freedesktop.org/archives/poppler/2013-May/010247.html
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ splash/Splash.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/splash/Splash.cc b/splash/Splash.cc
+index cd0ec72..6630370 100644
+--- a/splash/Splash.cc
++++ b/splash/Splash.cc
+@@ -1494,7 +1494,7 @@ inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y) {
+ #endif
+ 
+     if (t != 0) {
+-      pipe->shape = aaGamma[t];
++      pipe->shape = (int)aaGamma[t];
+       (this->*pipe->run)(pipe);
+       updateModX(x);
+       updateModY(y);
+-- 
+1.7.4.4
+
diff --git a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb b/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
index d3d5ce8..c8ff8a4 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
@@ -2,9 +2,12 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+SRC_URI = " \
+    http://poppler.freedesktop.org/${PN}-${PV}.tar.gz \
+    file://0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch \
+"
 SRC_URI[md5sum] = "be915388eaad6865cee5a156c8119ec1"
 SRC_URI[sha256sum] = "916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431"
 
-- 
1.7.4.4

[meta-oe/meta-network/meta-gnome 4/4] proftpd: pack missing files

[Andreas Müller]

WARNING: QA Issue: proftpd: Files/directories were installed but not shipped
  /home
  /home/ftp
  /home/ftp/pub

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index 806413b..3c48422 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.proftpd.org"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
            file://make.patch \
@@ -59,3 +59,5 @@ INITSCRIPT_PARAM = "defaults 85 15"
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "${FTPGROUP}"
 USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} ${FTPUSER}"
+
+FILES_${PN} += "/home/${FTPUSER}"
-- 
1.7.4.4

Re: [meta-oe/meta-network/meta-gnome 4/4] proftpd: pack missing files

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1343 bytes --]

[[oe] [meta-oe/meta-network/meta-gnome 4/4] proftpd: pack missing files] On 13.05.12 (Sun 22:48) Andreas Müller wrote:

> WARNING: QA Issue: proftpd: Files/directories were installed but not shipped
>   /home
>   /home/ftp
>   /home/ftp/pub
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

Acked-by: Joe MacDonald <joe.macdonald@windriver.com>

> ---
>  .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> index 806413b..3c48422 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.proftpd.org"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
>  
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
>             file://make.patch \
> @@ -59,3 +59,5 @@ INITSCRIPT_PARAM = "defaults 85 15"
>  USERADD_PACKAGES = "${PN}"
>  GROUPADD_PARAM_${PN} = "${FTPGROUP}"
>  USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} ${FTPUSER}"
> +
> +FILES_${PN} += "/home/${FTPUSER}"

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe/meta-network/meta-gnome 4/4] proftpd: pack missing files

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]

[[oe] [meta-oe/meta-network/meta-gnome 4/4] proftpd: pack missing files] On 13.05.12 (Sun 22:48) Andreas Müller wrote:

> WARNING: QA Issue: proftpd: Files/directories were installed but not shipped
>   /home
>   /home/ftp
>   /home/ftp/pub
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> index 806413b..3c48422 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.proftpd.org"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
>  
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
>             file://make.patch \
> @@ -59,3 +59,5 @@ INITSCRIPT_PARAM = "defaults 85 15"
>  USERADD_PACKAGES = "${PN}"
>  GROUPADD_PARAM_${PN} = "${FTPGROUP}"
>  USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} ${FTPUSER}"
> +
> +FILES_${PN} += "/home/${FTPUSER}"

I only merged this one from the series.

-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]