Skip to contentSkip to conversation

poppler: fix ambiguity on math functions related to gcc-6

PATCH In review Derek Straka 2 participants 4 messages Jun 17, 2016 – Jun 22, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 poppler: fix ambiguity on math functions related to gcc-6

---
 .../poppler/0002-fix-gcc-6-math-ambiguous-errors.patch        | 11 +++++++++++
 meta-oe/recipes-support/poppler/poppler_0.43.0.bb             |  4 +---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch
meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch new file +11 -0
new file mode 100644
index 0000000..406009f
@@ -0,0 +1,11 @@
+--- poppler-0.45.0/poppler/CairoOutputDev.cc.orig	2016-06-17 14:23:35.399083929 -0400
++++ poppler-0.45.0/poppler/CairoOutputDev.cc	2016-06-17 14:36:53.351097825 -0400
+@@ -42,7 +42,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <assert.h>
+ #include <cairo.h>
+ 
meta-oe/recipes-support/poppler/poppler_0.43.0.bb +1 -3
index 743e0aa..9abcd2c 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRC_URI = " \
     http://poppler.freedesktop.org/${BP}.tar.xz \
     file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \
+    file://0002-fix-gcc-6-math-ambiguous-errors.patch \
 "
 SRC_URI[md5sum] = "1d2b001663119855cdfbc0713dbfb9c6"
 SRC_URI[sha256sum] = "c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456"
@@ -53,6 +54,3 @@ FILES_libpoppler = "${libdir}/libpoppler.so.*"
 FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
 
 RDEPENDS_libpoppler = "poppler-data"
-
-# http://errors.yoctoproject.org/Errors/Details/68605/
-PNBLACKLIST[poppler] ?= "BROKEN: fails to build with gcc-6"
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/2 Remove blacklisted recipes due to poppler build failures

---
 meta-efl/recipes-efl/efl/epdf_svn.bb                 | 2 --
 meta-gnome/recipes-gnome/evince/evince_3.18.2.bb     | 2 --
 meta-gnome/recipes-support/tracker/tracker_0.14.2.bb | 2 --
 meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb         | 2 --
 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb     | 2 --
 5 files changed, 10 deletions(-)
meta-efl/recipes-efl/efl/epdf_svn.bb +0 -2
index a4c7d49..e32a5fd 100644
@@ -25,5 +25,3 @@ EXTRA_OECONF = "\
 
 # Some upgrade path tweaking, as in evas
 AUTO_LIBNAME_PKGS = ""
-
-PNBLACKLIST[epdf] ?= "Depends on broken poppler"
meta-gnome/recipes-gnome/evince/evince_3.18.2.bb +0 -2
index 4fa11a5..fe63093 100644
@@ -46,5 +46,3 @@ FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
                           ${libdir}/evince/*/backends/*.a"
 FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
 FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
-
-PNBLACKLIST[evince] ?= "Depends on broken poppler"
meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +0 -2
index 7e6c400..ff53669 100644
@@ -83,5 +83,3 @@ FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
 
 SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac"
 SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1"
-
-PNBLACKLIST[tracker] ?= "Depends on broken poppler"
meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb +0 -2
index 3c134bb..29ed4d9 100644
@@ -30,5 +30,3 @@ CFLAGS += "-fPIC"
 
 FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug"
 FILES_${PN}  += "${datadir}/appdata"
-
-PNBLACKLIST[gimp] ?= "Depends on broken poppler"
meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb +0 -2
index 5a0fc6d..66385a4 100644
@@ -27,5 +27,3 @@ FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \
                     ${libdir}/tumbler-1/plugins/.debug \
                     ${libdir}/tumbler-1/plugins/cache/.debug \
 "
-
-PNBLACKLIST[tumbler] ?= "Depends on broken poppler"
Signature · 1 line
1.9.1
#2 lore raw

Re: [meta-oe][PATCH 2/2] Remove blacklisted recipes due to poppler build failures

Quoted 24 lines · Derek Straka
---
 meta-efl/recipes-efl/efl/epdf_svn.bb                 | 2 --
 meta-gnome/recipes-gnome/evince/evince_3.18.2.bb     | 2 --
 meta-gnome/recipes-support/tracker/tracker_0.14.2.bb | 2 --
 meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb         | 2 --
 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb     | 2 --
 5 files changed, 10 deletions(-)
meta-efl/recipes-efl/efl/epdf_svn.bb +0 -2
index a4c7d49..e32a5fd 100644
@@ -25,5 +25,3 @@ EXTRA_OECONF = "\
 
 # Some upgrade path tweaking, as in evas
 AUTO_LIBNAME_PKGS = ""
-
-PNBLACKLIST[epdf] ?= "Depends on broken poppler"
meta-gnome/recipes-gnome/evince/evince_3.18.2.bb +0 -0
index 4fa11a5..fe63093 100644

meta-gnome/recipes-gnome/evince/evince_3.18.2.bb FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \ · line 50

Quoted 5 lines
meta-gnome/recipes-gnome/evince/evince_3.18.2.bb +0 -2
@@ -46,5 +46,3 @@ FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
                           ${libdir}/evince/*/backends/*.a"
 FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
 FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
-
-PNBLACKLIST[evince] ?= "Depends on broken poppler"

evince is broken on it's own:

| ../../evince-3.18.2/libdocument/ev-document-misc.c: In function 'ev_document_misc_format_date':
| ../../evince-3.18.2/libdocument/ev-document-misc.c:534:33: error: '%c' yields only last 2 digits of year in some locales [-Werror=format-y2k]
|   len = strftime (s, sizeof (s), fmt_hack, &t);
|                                  ^~~~~~~~
Quoted 38 lines
meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +0 -2
index 7e6c400..ff53669 100644
@@ -83,5 +83,3 @@ FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
 
 SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac"
 SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1"
-
-PNBLACKLIST[tracker] ?= "Depends on broken poppler"
meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb +0 -2
index 3c134bb..29ed4d9 100644
@@ -30,5 +30,3 @@ CFLAGS += "-fPIC"
 
 FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug"
 FILES_${PN}  += "${datadir}/appdata"
-
-PNBLACKLIST[gimp] ?= "Depends on broken poppler"
meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb +0 -2
index 5a0fc6d..66385a4 100644
@@ -27,5 +27,3 @@ FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \
                     ${libdir}/tumbler-1/plugins/.debug \
                     ${libdir}/tumbler-1/plugins/cache/.debug \
 "
-
-PNBLACKLIST[tumbler] ?= "Depends on broken poppler"
Signature · 7 lines
1.9.1

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

Re: [meta-oe][PATCH 2/2] Remove blacklisted recipes due to poppler build failures

Patch to fix evince coming shortly

Quoted 91 lines · Martin Jansa

Review

Quoted 10 lines · Derek Straka
---
 meta-efl/recipes-efl/efl/epdf_svn.bb                 | 2 --
 meta-gnome/recipes-gnome/evince/evince_3.18.2.bb     | 2 --
 meta-gnome/recipes-support/tracker/tracker_0.14.2.bb | 2 --
 meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb         | 2 --
 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb     | 2 --
 5 files changed, 10 deletions(-)
(quoted diff) +0 -0

b/meta-efl/recipes-efl/efl/epdf_svn.bb

Review

Quoted 10 lines

index a4c7d49..e32a5fd 100644

meta-efl/recipes-efl/efl/epdf_svn.bb +0 -2
@@ -25,5 +25,3 @@ EXTRA_OECONF = "\
 
 # Some upgrade path tweaking, as in evas
 AUTO_LIBNAME_PKGS = ""
-
-PNBLACKLIST[epdf] ?= "Depends on broken poppler"
(quoted diff) +0 -0

b/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb

meta-gnome/recipes-gnome/evince/evince_3.18.2.bb FILES_${PN}-staticdev +=

Quoted 4 lines

index 4fa11a5..fe63093 100644

meta-gnome/recipes-gnome/evince/evince_3.18.2.bb +0 -0
@@ -46,5 +46,3 @@ FILES_${PN}-staticdev +=

"${libdir}/nautilus/extensions-2.0/*.a \

meta-gnome/recipes-gnome/evince/evince_3.18.2.bb FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \ · line 50

Quoted 5 lines
meta-gnome/recipes-gnome/evince/evince_3.18.2.bb +0 -2
                           ${libdir}/evince/*/backends/*.a"
 FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
 FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
-
-PNBLACKLIST[evince] ?= "Depends on broken poppler"

evince is broken on it's own:

| ../../evince-3.18.2/libdocument/ev-document-misc.c: In function 'ev_document_misc_format_date':
| ../../evince-3.18.2/libdocument/ev-document-misc.c:534:33: error: '%c' yields only last 2 digits of year in some locales [-Werror=format-y2k]
| len = strftime (s, sizeof (s), fmt_hack, &t);
| ^~~~~~~~

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb

meta-gnome/recipes-support/tracker/tracker_0.14.2.bb FILES_${PN}-nautilus-extension +=

Quoted 4 lines

index 7e6c400..ff53669 100644

meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +0 -0
@@ -83,5 +83,3 @@ FILES_${PN}-nautilus-extension +=

"${libdir}/nautilus/extensions-2.0/*.so"

meta-gnome/recipes-support/tracker/tracker_0.14.2.bb FILES_${PN}-nautilus-extension += · line 84

Quoted 3 lines
meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +0 -0
 SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac"
 SRC_URI[sha256sum] =

"9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1"

Review

Quoted 3 lines
meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +0 -2
-
-PNBLACKLIST[tracker] ?= "Depends on broken poppler"
(quoted diff) +0 -0

b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb

Review

Quoted 10 lines

index 3c134bb..29ed4d9 100644

meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb +0 -2
@@ -30,5 +30,3 @@ CFLAGS += "-fPIC"
 
 FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug"
 FILES_${PN}  += "${datadir}/appdata"
-
-PNBLACKLIST[gimp] ?= "Depends on broken poppler"
(quoted diff) +0 -0

b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb

Quoted 12 lines

index 5a0fc6d..66385a4 100644

meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb +0 -3
@@ -27,5 +27,3 @@ FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \
                     ${libdir}/tumbler-1/plugins/.debug \
                     ${libdir}/tumbler-1/plugins/cache/.debug \
 "
-
-PNBLACKLIST[tumbler] ?= "Depends on broken poppler"
--

1.9.1

Quoted 5 lines

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
Martin 'JaMa' Jansa jabber: [email protected]