Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev

16 files changed, 37 insertions, 145 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index eb097a22ae..c1625def4b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -10078,22 +10078,6 @@ sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
 md5=38762b12b8dfeb0518e24b470b1b5675
 sha256=333f07ca8579f69f6b79e2ed1cf28c6b9353a64f7bab458950d7667abb3d8a3e
 
-[http://ftp.gnome.org/pub/GNOME/sources/gpdf/2.10/gpdf-2.10.0.tar.bz2]
-md5=9278cd3b9d06e3b1d364452f0e512fa9
-sha256=b6a5abf78363205e01bf1d238eaf4c349c9725f57aa18e2adc0445268540c7e6
-
-[http://ftp.gnome.org/pub/GNOME/sources/gpdf/2.7/gpdf-2.7.90.tar.bz2]
-md5=e0282b35b20b6634fdef14834eb5fb89
-sha256=a145e535bb707c67907a5591edab8ee64f5723e9c66a94ad120abb98e40d99f1
-
-[http://ftp.gnome.org/pub/GNOME/sources/gpdf/2.8/gpdf-2.8.0.tar.bz2]
-md5=a1c054d5de1d5ef361006975c57b45f5
-sha256=2fd7305384094a36b7763d6d82f114db28ba11835a154b2aab99629d0e53211d
-
-[http://ftp.gnome.org/pub/GNOME/sources/gpdf/2.8/gpdf-2.8.2.tar.bz2]
-md5=d7d87c097aa0e5fbb9a7cf2d039db609
-sha256=c1f6b7ef098408ff8108abe38a20f7845839126d62ee741e75ca7f8e086758fc
-
 [http://gpe.linuxtogo.org/download/source/gpe-aerial-0.2.11.tar.gz]
 md5=4b06838f0ad963f8c01640e8311130cb
 sha256=30be2c450915938957bcb077bc5cf17b84eb9163ebe043e7324c359fb965c721
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 960169afbd..d46a9f661f 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -512,7 +512,6 @@ PREFERRED_VERSION_gob2 ?= "2.0.14"
 PREFERRED_VERSION_gobby ?= "0.4.1"
 PREFERRED_VERSION_goffice ?= "0.2.1"
 PREFERRED_VERSION_gparted ?= "0.3.3"
-PREFERRED_VERSION_gpdf ?= "2.10.0"
 PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
 PREFERRED_VERSION_gpe-announce ?= "0.13"
 PREFERRED_VERSION_gpe-applauncher ?= "0.11"
diff --git a/recipes/estardict/estardict_0.1.bb b/recipes/estardict/estardict_0.1.bb
new file mode 100644
index 0000000000..78942355fb
--- /dev/null
+++ b/recipes/estardict/estardict_0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "EstarDict is a offline dictionary reader"
+HOMEPAGE = "http://www.vaudano.eu/wiki/en/estardict"
+AUTHOR = "Luca Vaudano"
+LICENSE = "GPLv3"
+SECTION = "e/apps"
+DEPENDS = "elementary"
+
+SRC_URI = "http://www.vaudano.eu/projects/${PN}/${PN}-${PV}.tar.gz;name=archive"
+SRC_URI[archive.md5sum] = "cb66965f3f6725cce8010bd8fd0e4618"
+SRC_URI[archive.sha256sum] = "c12fb0608d2de7bdb1b1f1002b691ceea4286e69d8374548c7549e1153c1286e"
+
+inherit autotools
diff --git a/recipes/gpdf/files/aclocal-lossage.patch b/recipes/gpdf/files/aclocal-lossage.patch
deleted file mode 100644
index cdbe8100bd..0000000000
--- a/recipes/gpdf/files/aclocal-lossage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpdf-2.7.90/Makefile.am.old	2004-08-03 20:32:38.000000000 +0100
-+++ gpdf-2.7.90/Makefile.am	2004-08-03 20:27:11.000000000 +0100
-@@ -43,7 +43,7 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install
- 
--ACLOCAL_AMFLAGS = -I $(datadir)/aclocal -I $(datadir)/aclocal/gnome2-macros
-+# ACLOCAL_AMFLAGS = -I $(datadir)/aclocal -I $(datadir)/aclocal/gnome2-macros
- 
- CLEANFILES =			\
- 	$(schema_DATA) 		\
diff --git a/recipes/gpdf/files/desktop.patch b/recipes/gpdf/files/desktop.patch
deleted file mode 100644
index e76e63328a..0000000000
--- a/recipes/gpdf/files/desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpdf-2.7.90/gpdf.desktop.in.old	2004-08-05 15:31:09.000000000 +0100
-+++ gpdf-2.7.90/gpdf.desktop.in	2004-08-05 15:31:19.000000000 +0100
-@@ -3,7 +3,7 @@
- _Name=PDF Viewer
- _Comment=View PDF files
- Exec=gpdf %U
--Icon=gnome-pdf
-+Icon=gnome-pdf.png
- Terminal=false
- Type=Application
- Categories=GNOME;Application;Graphics;VectorGraphics;Viewer;
diff --git a/recipes/gpdf/files/gpdf-2.10.0-gcc4-2.patch b/recipes/gpdf/files/gpdf-2.10.0-gcc4-2.patch
deleted file mode 100644
index d45becb346..0000000000
--- a/recipes/gpdf/files/gpdf-2.10.0-gcc4-2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur gpdf-2.10.0.orig/xpdf/TextOutputDev.h gpdf-2.10.0/xpdf/TextOutputDev.h
---- gpdf-2.10.0.orig/xpdf/TextOutputDev.h	2005-08-23 21:59:57.000000000 +0000
-+++ gpdf-2.10.0/xpdf/TextOutputDev.h	2005-08-23 22:00:10.000000000 +0000
-@@ -166,6 +166,8 @@
- // TextLine
- //------------------------------------------------------------------------
- 
-+class TextBlock;
-+
- class TextLine {
- public:
- 
-@@ -223,6 +225,8 @@
- // TextBlock
- //------------------------------------------------------------------------
- 
-+class TextPage;
-+
- class TextBlock {
- public:
-
-@@ -342,6 +346,8 @@
- // TextPage
- //------------------------------------------------------------------------
- 
-+class TextLineFrag;
-+
- class TextPage {
- public:
- 
diff --git a/recipes/gpdf/gpdf_2.10.0.bb b/recipes/gpdf/gpdf_2.10.0.bb
deleted file mode 100644
index 30c42dcb0c..0000000000
--- a/recipes/gpdf/gpdf_2.10.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r0"
-
-inherit gnome
-
-SRC_URI_append = " file://gpdf-2.10.0-gcc4-2.patch;patch=1"
-
-DEPENDS = "gtk+ libgnomeui libbonoboui gnome-vfs gconf gettext libglade \
-	libgnomeprint libgnomeprintui gnome-common"
-
-EXTRA_OECONF = "--disable-schemas-install"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
-}
diff --git a/recipes/gpdf/gpdf_2.7.90.bb b/recipes/gpdf/gpdf_2.7.90.bb
deleted file mode 100644
index 975523530a..0000000000
--- a/recipes/gpdf/gpdf_2.7.90.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r2"
-
-inherit gnome gettext
-
-DEPENDS = "gtk+ libgnomeui libbonoboui gnome-vfs gconf gettext libglade \
-	libgnomeprint libgnomeprintui gnome-common"
-
-EXTRA_OECONF = "--disable-schemas-install"
-
-SRC_URI += "file://aclocal-lossage.patch;patch=1 \
-	file://desktop.patch;patch=1"
diff --git a/recipes/gpdf/gpdf_2.8.0.bb b/recipes/gpdf/gpdf_2.8.0.bb
deleted file mode 100644
index b4afdb02b8..0000000000
--- a/recipes/gpdf/gpdf_2.8.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r0"
-
-inherit gnome
-
-DEPENDS = "gtk+ libgnomeui libbonoboui gnome-vfs gconf gettext libglade \
-	libgnomeprint libgnomeprintui gnome-common"
-
-EXTRA_OECONF = "--disable-schemas-install"
-
-SRC_URI += "file://aclocal-lossage.patch;patch=1 \
-	file://desktop.patch;patch=1"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
-}
diff --git a/recipes/gpdf/gpdf_2.8.2.bb b/recipes/gpdf/gpdf_2.8.2.bb
deleted file mode 100644
index 3943ff93e1..0000000000
--- a/recipes/gpdf/gpdf_2.8.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r0"
-
-inherit gnome
-
-DEPENDS = "gtk+ libgnomeui libbonoboui gnome-vfs gconf gettext libglade \
-	libgnomeprint libgnomeprintui gnome-common"
-
-EXTRA_OECONF = "--disable-schemas-install"
-
-SRC_URI += "file://aclocal-lossage.patch;patch=1"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
-}
diff --git a/recipes/gtk+/gtk+-2.18.6/no-demos.patch b/recipes/gtk+/gtk+-2.18.6/no-demos.patch
new file mode 100644
index 0000000000..0fc4c48d1a
--- /dev/null
+++ b/recipes/gtk+/gtk+-2.18.6/no-demos.patch
@@ -0,0 +1,10 @@
+--- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
++++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Makefile.am for GTK+
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb
index cba32e507e..9321b43dfa 100644
--- a/recipes/gtk+/gtk+_2.18.6.bb
+++ b/recipes/gtk+/gtk+_2.18.6.bb
@@ -1,10 +1,13 @@
 require gtk+.inc
 
-PR = "${INC_PR}.1"
+SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
+"
+
+PR = "${INC_PR}.3"
 
 BBCLASSEXTEND = "native"
 
-DEPENDS_virtclass-native = "atk-native pango-native cairo-native libxrender-native"
+DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native"
 
 # Enable xkb selectively
 XKBTOGGLE = " --disable-xkb"
diff --git a/recipes/tasks/task-gpe-desktopapps.bb b/recipes/tasks/task-gpe-desktopapps.bb
index 25c055f446..5b6f721e0a 100644
--- a/recipes/tasks/task-gpe-desktopapps.bb
+++ b/recipes/tasks/task-gpe-desktopapps.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 
 inherit task
@@ -9,6 +9,5 @@ RDEPENDS_${PN} = "\
     firefox \
     thunderbird \
     galculator \
-    gnumeric \
-    gpdf"
+    gnumeric"
 
diff --git a/recipes/tasks/task-gpe.bb b/recipes/tasks/task-gpe.bb
index 0bf1325da0..785f0184b1 100644
--- a/recipes/tasks/task-gpe.bb
+++ b/recipes/tasks/task-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 
 inherit task
@@ -120,8 +120,7 @@ RDEPENDS_gpe-task-desktopapps = "\
     firefox \
     thunderbird \
     galculator \
-    gnumeric \
-    gpdf"
+    gnumeric"
 #    totem"
 
 RDEPENDS_gpe-task-sectest = "\
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 1593006a99..b7b03bc507 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r43"
+PR = "r44"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -16,6 +16,7 @@ RDEPENDS_${PN} += "\
 		dosbox \
 		enotes \
 		epdfview \
+		estardict \
 		fbreader \
 		ffalarms \
 		gpe-calendar \
diff --git a/recipes/tasks/task-shr.bb b/recipes/tasks/task-shr.bb
index 607827a6c3..355b04de75 100644
--- a/recipes/tasks/task-shr.bb
+++ b/recipes/tasks/task-shr.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Fat Image Feed"
-PR = "r5"
+PR = "r6"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -29,12 +29,11 @@ RDEPENDS_${PN}-apps += "\
 	midori \
 	intone \
 "
-RDEPENDS_${PN}-apps += "\
+RDEPENDS_${PN}-cli += "\
+   task-cli-tools \
+   task-cli-tools-debug \
    task-shr-minimal-cli \
-        screen \
         rsync \
-        mdbus2 \
-        mterm2 \
 	openssh-sftp-server \
 "