[oe-commits] org.oe.dev merge of '5a505039c2ab39aac1ef64bce007b50966455de6'

[oe commit]

merge of '5a505039c2ab39aac1ef64bce007b50966455de6'
     and '8d5cab38d57a71302b83b51e588b7f781dfb1c41'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5337d5d3a5f52fa403d3827653b9c8fffda4d9b1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5337d5d3a5f52fa403d3827653b9c8fffda4d9b1
Files:
1
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/poppler/poppler
packages/poppler/poppler/fix-splash.patch
packages/poppler/poppler-data_0.1.bb
packages/poppler/poppler.inc
packages/poppler/poppler0.6_cvs.bb
packages/poppler/poppler_0.5.4.bb
packages/poppler/poppler_0.5.9.bb
Diffs:

#
# mt diff -r5a505039c2ab39aac1ef64bce007b50966455de6 -r5337d5d3a5f52fa403d3827653b9c8fffda4d9b1
#
# 
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [917f5caeabbd29912246a902cb4d3458f7febf57]
#    to [16bddc59b08f01efdbe92c1b55cf7becaaa916c8]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [172c156032ce87fb7210144f8b5f5a05cd2ec05c]
#    to [d412d09a1a11c807708fd23821ffd71220d1bd62]
# 
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	917f5caeabbd29912246a902cb4d3458f7febf57
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	16bddc59b08f01efdbe92c1b55cf7becaaa916c8
@@ -1,6 +1,7 @@
 #!/bin/sh
+SHOWCURSOR="no"
 
-SHOWCURSOR="no"
+hsetroot -center /usr/share/pixmaps/booting.png
 
 openmoko-today &
 openmoko-dialer &
============================================================
--- packages/openmoko2/openmoko-session2.bb	172c156032ce87fb7210144f8b5f5a05cd2ec05c
+++ packages/openmoko2/openmoko-session2.bb	d412d09a1a11c807708fd23821ffd71220d1bd62
@@ -1,9 +1,10 @@ RDEPENDS = "matchbox-common matchbox-app
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RDEPENDS+= "hsetroot openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r25"
+PR = "r27"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}


#
# mt diff -r8d5cab38d57a71302b83b51e588b7f781dfb1c41 -r5337d5d3a5f52fa403d3827653b9c8fffda4d9b1
#
# 
# 
# add_dir "packages/poppler/poppler"
# 
# add_file "packages/poppler/poppler/fix-splash.patch"
#  content [ed3e214ddd4ce15110460d3cafede1777a2db07b]
# 
# patch "packages/poppler/poppler-data_0.1.bb"
#  from [e142dba0e6915a95fdc7994982d12d8d99985298]
#    to [444ed4ed227bb0caf206ac7db37720ca27dc5638]
# 
# patch "packages/poppler/poppler.inc"
#  from [a6771820c70794fab92d6a9af14c558b7493a212]
#    to [a03389bf4210b0e2a5cd72edceb29b6a7b494e16]
# 
# patch "packages/poppler/poppler0.6_cvs.bb"
#  from [0eb50012481924d447c07b60366c172118c1ec08]
#    to [87ae679552880fb362462db841ae658b41d855a7]
# 
# patch "packages/poppler/poppler_0.5.4.bb"
#  from [d9062908e84dc810b531c5a1f607a926cbbfa6eb]
#    to [005f0377958f60da665f7636069213238822ff73]
# 
# patch "packages/poppler/poppler_0.5.9.bb"
#  from [b079c20842d11be30315f70ccc4fe3848e93df52]
#    to [1bdb83cfbb92515cb45010e1eeff27111e204058]
# 
============================================================
--- packages/poppler/poppler/fix-splash.patch	ed3e214ddd4ce15110460d3cafede1777a2db07b
+++ packages/poppler/poppler/fix-splash.patch	ed3e214ddd4ce15110460d3cafede1777a2db07b
@@ -0,0 +1,28 @@
+--- poppler/splash/SplashMath.h	2007/04/25 19:59:10	1.3
++++ poppler/splash/SplashMath.h	2007/06/01 18:34:48	1.4
+@@ -8,7 +8,7 @@
+ #define SPLASHMATH_H
+ 
+ #if USE_FIXEDPOINT
+-#include "FixedPoint.h"
++#include "goo/FixedPoint.h"
+ #else
+ #include <math.h>
+ #endif
+--- poppler/splash/SplashFTFont.cc	2007/04/25 19:59:10	1.8
++++ poppler/splash/SplashFTFont.cc	2007/06/01 18:34:48	1.9
+@@ -127,10 +127,10 @@
+   matrix.yx = (FT_Fixed)((mat[1] / size).getRaw());
+   matrix.xy = (FT_Fixed)((mat[2] / size).getRaw());
+   matrix.yy = (FT_Fixed)((mat[3] / size).getRaw());
+-  textMatrix.xx = (FT_Fixed)((textMat[0] / (size * textScale)).getRaw());
+-  textMatrix.yx = (FT_Fixed)((textMat[1] / (size * textScale)).getRaw());
+-  textMatrix.xy = (FT_Fixed)((textMat[2] / (size * textScale)).getRaw());
+-  textMatrix.yy = (FT_Fixed)((textMat[3] / (size * textScale)).getRaw());
++  textMatrix.xx = (FT_Fixed)((textMat[0] / (textScale * size)).getRaw());
++  textMatrix.yx = (FT_Fixed)((textMat[1] / (textScale * size)).getRaw());
++  textMatrix.xy = (FT_Fixed)((textMat[2] / (textScale * size)).getRaw());
++  textMatrix.yy = (FT_Fixed)((textMat[3] / (textScale * size)).getRaw());
+ #else
+   matrix.xx = (FT_Fixed)((mat[0] / size) * 65536);
+   matrix.yx = (FT_Fixed)((mat[1] / size) * 65536);
============================================================
--- packages/poppler/poppler-data_0.1.bb	e142dba0e6915a95fdc7994982d12d8d99985298
+++ packages/poppler/poppler-data_0.1.bb	444ed4ed227bb0caf206ac7db37720ca27dc5638
@@ -1,6 +1,6 @@ LICENSE = "Adobe"
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 LICENSE = "Adobe"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
============================================================
--- packages/poppler/poppler.inc	a6771820c70794fab92d6a9af14c558b7493a212
+++ packages/poppler/poppler.inc	a03389bf4210b0e2a5cd72edceb29b6a7b494e16
@@ -21,3 +21,8 @@ do_stage() {
 do_stage() {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libpoppler libpoppler-glib"
+FILES_libpoppler = "${libdir}/libpoppler.so.*"
+FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
+
============================================================
--- packages/poppler/poppler0.6_cvs.bb	0eb50012481924d447c07b60366c172118c1ec08
+++ packages/poppler/poppler0.6_cvs.bb	87ae679552880fb362462db841ae658b41d855a7
@@ -1,6 +1,6 @@ PV = "0.5.9+cvs${SRCDATE}"
 require poppler.inc
 PV = "0.5.9+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler"
 S = "${WORKDIR}/poppler"
============================================================
--- packages/poppler/poppler_0.5.4.bb	d9062908e84dc810b531c5a1f607a926cbbfa6eb
+++ packages/poppler/poppler_0.5.4.bb	005f0377958f60da665f7636069213238822ff73
@@ -1,2 +1,2 @@ require poppler.inc
 require poppler.inc
+PR = "r3"
-PR = "r2"
============================================================
--- packages/poppler/poppler_0.5.9.bb	b079c20842d11be30315f70ccc4fe3848e93df52
+++ packages/poppler/poppler_0.5.9.bb	1bdb83cfbb92515cb45010e1eeff27111e204058
@@ -1,5 +1,7 @@ require poppler.inc
 require poppler.inc
 
-# does not build, use cvs for now and eventually try to bump to 0.6.0 (or 1.0)
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
 
+SRC_URI += "file://fix-splash.patch;patch=1"
+EXTRA_OECONF_append = " --disable-abiword-output "
+