[oe-commits] org.oe.dev merge of '13e5ed574ff68fd3103e4c1f055e4a3704124d00'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 09:59:51 UTC 2007
merge of '13e5ed574ff68fd3103e4c1f055e4a3704124d00'
and '3c0d5598d4768723f8ae136268f15cc2a98c7e77'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ea2a23cae4f4d939a07f699c39b603c4c2559ad1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ea2a23cae4f4d939a07f699c39b603c4c2559ad1
Files:
1
packages/openmoko2/openmoko-tasks2_svn.bb
contrib/python/generate-manifest-2.5.py
packages/python/python-2.5-manifest.inc
packages/python/python_2.5.1.bb
packages/tasks/task-openmoko.bb
packages/librsvg/librsvg_2.11.1.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gpe-bootsplash/files/angstrom/splash-p.svg
packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
packages/gpephone/libsettings_0.3.bb
Diffs:
#
# mt diff -r13e5ed574ff68fd3103e4c1f055e4a3704124d00 -rea2a23cae4f4d939a07f699c39b603c4c2559ad1
#
#
#
# add_file "packages/openmoko2/openmoko-tasks2_svn.bb"
# content [450e5e7f51113ebcee7b13cd3dca55240602492b]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [5e2c4eeae20efcc683a01183fd67d30123f8c597]
# to [90398aba7274ea64d9a4977150cd9ef93776d19d]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [a74424a3075d7b89ba717468b2314ab62775f5f4]
# to [8f4af7922885099c50e0dfdadbed99abe53fd2fe]
#
# patch "packages/python/python_2.5.1.bb"
# from [1c43c7d7b6a272f1d3fd288f6428e3d8f97b9599]
# to [8def8e66f0d5def464971fd93ac725b403d4e709]
#
# patch "packages/tasks/task-openmoko.bb"
# from [6b1416c92dd8ec8abdc9cdb30e309d9b3885f8d9]
# to [d07b9cd90e2a77b275934886cf40b954014b09c2]
#
============================================================
--- packages/openmoko2/openmoko-tasks2_svn.bb 450e5e7f51113ebcee7b13cd3dca55240602492b
+++ packages/openmoko2/openmoko-tasks2_svn.bb 450e5e7f51113ebcee7b13cd3dca55240602492b
@@ -0,0 +1,13 @@
+DESCRIPTION = "The OpenMoko Agenda"
+SECTION = "openmoko/pim"
+DEPENDS = "dbus-glib eds-dbus libmokoui2"
+RDEPENDS = "libedata-cal"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--enable-omoko --disable-gtk"
============================================================
--- contrib/python/generate-manifest-2.5.py 5e2c4eeae20efcc683a01183fd67d30123f8c597
+++ contrib/python/generate-manifest-2.5.py 90398aba7274ea64d9a4977150cd9ef93776d19d
@@ -9,11 +9,11 @@ VERSION = "2.5.1"
import time
VERSION = "2.5.1"
-# increase when touching python-core
-BASEREV = 0
+# increase when touching python-core, this should be the same ml version as in python_2.5.1.bb
+BASEREV = 1
__author__ = "Michael 'Mickey' Lauer <mickey at Vanille.de>"
-__version__ = "20070815"
+__version__ = "20070823"
class MakefileMaker:
============================================================
--- packages/python/python-2.5-manifest.inc a74424a3075d7b89ba717468b2314ab62775f5f4
+++ packages/python/python-2.5-manifest.inc 8f4af7922885099c50e0dfdadbed99abe53fd2fe
@@ -1,5 +1,5 @@
########################################################################################################################
-### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Wed Aug 15 19:49:20 2007
+### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Thu Aug 23 10:20:20 2007
###
### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
###
@@ -13,282 +13,282 @@ DESCRIPTION_python-profile="Python Basic
PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
DESCRIPTION_python-profile="Python Basic Profiling Support"
-PR_python-profile="ml0"
+PR_python-profile="ml1"
RDEPENDS_python-profile="python-core"
FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* "
DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml0"
+PR_python-threading="ml1"
RDEPENDS_python-threading="python-core python-lang"
FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* "
DESCRIPTION_python-distutils="Python Distribution Utilities"
-PR_python-distutils="ml0"
+PR_python-distutils="ml1"
RDEPENDS_python-distutils="python-core"
FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils "
DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-PR_python-textutils="ml0"
+PR_python-textutils="ml1"
RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* "
DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml0"
+PR_python-codecs="ml1"
RDEPENDS_python-codecs="python-core"
FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* "
DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml0"
+PR_python-pickle="ml1"
RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so "
DESCRIPTION_python-datetime="Python Calendar and Time support"
-PR_python-datetime="ml0"
+PR_python-datetime="ml1"
RDEPENDS_python-datetime="python-core python-codecs"
FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so "
DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml2"
+PR_python-core="ml3"
RDEPENDS_python-core=""
FILES_python-core="/usr/lib/python2.5/__future__.* /usr/lib/python2.5/copy.* /usr/lib/python2.5/copy_reg.* /usr/lib/python2.5/ConfigParser.* /usr/lib/python2.5/getopt.* /usr/lib/python2.5/linecache.* /usr/lib/python2.5/new.* /usr/lib/python2.5/os.* /usr/lib/python2.5/posixpath.* /usr/lib/python2.5/warnings.* /usr/lib/python2.5/site.* /usr/lib/python2.5/stat.* /usr/lib/python2.5/UserDict.* /usr/lib/python2.5/UserList.* /usr/lib/python2.5/UserString.* /usr/lib/python2.5/lib-dynload/binascii.so /usr/lib/python2.5/lib-dynload/struct.so /usr/lib/python2.5/lib-dynload/time.so /usr/lib/python2.5/lib-dynload/xreadlines.so /usr/lib/python2.5/types.* /usr/bin/python* "
DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml0"
+PR_python-io="ml1"
RDEPENDS_python-io="python-core python-math"
FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* "
DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml0"
+PR_python-compiler="ml1"
RDEPENDS_python-compiler="python-core"
FILES_python-compiler="${libdir}/python2.5/compiler "
DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml0"
+PR_python-compression="ml1"
RDEPENDS_python-compression="python-core python-zlib"
FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* "
DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml0"
+PR_python-re="ml1"
RDEPENDS_python-re="python-core"
FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* "
DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-PR_python-xmlrpc="ml0"
+PR_python-xmlrpc="ml1"
RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* "
DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml0"
+PR_python-terminal="ml1"
RDEPENDS_python-terminal="python-core python-io"
FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* "
DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml0"
+PR_python-email="ml1"
RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image"
FILES_python-email="${libdir}/python2.5/email "
DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml0"
+PR_python-image="ml1"
RDEPENDS_python-image="python-core"
FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
DESCRIPTION_python-core-dbg="Python core module debug information"
-PR_python-core-dbg="ml0"
+PR_python-core-dbg="ml1"
RDEPENDS_python-core-dbg="python-core"
FILES_python-core-dbg="/usr/lib/python2.5/lib-dynload/.debug /usr/bin/.debug /usr/lib/.debug "
DESCRIPTION_python-resource="Python Resource Control Interface"
-PR_python-resource="ml0"
+PR_python-resource="ml1"
RDEPENDS_python-resource="python-core"
FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so "
DESCRIPTION_python-devel="Python Development Package"
-PR_python-devel="ml0"
+PR_python-devel="ml1"
RDEPENDS_python-devel="python-core"
FILES_python-devel="/usr/include /usr/lib/python2.5/config "
DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml0"
+PR_python-math="ml1"
RDEPENDS_python-math="python-core"
FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* "
DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml0"
+PR_python-hotshot="ml1"
RDEPENDS_python-hotshot="python-core"
FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so "
DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-PR_python-unixadmin="ml0"
+PR_python-unixadmin="ml1"
RDEPENDS_python-unixadmin="python-core"
FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* "
DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml0"
+PR_python-syslog="ml1"
RDEPENDS_python-syslog="python-core"
FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so "
DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
-PR_python-tkinter="ml0"
+PR_python-tkinter="ml1"
RDEPENDS_python-tkinter="python-core"
FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk "
DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml0"
+PR_python-gdbm="ml1"
RDEPENDS_python-gdbm="python-core"
FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so "
DESCRIPTION_python-fcntl="Python's fcntl Interface"
-PR_python-fcntl="ml0"
+PR_python-fcntl="ml1"
RDEPENDS_python-fcntl="python-core"
FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml0"
+PR_python-netclient="ml1"
RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* "
DESCRIPTION_python-pprint="Python Pretty-Print Support"
-PR_python-pprint="ml0"
+PR_python-pprint="ml1"
RDEPENDS_python-pprint="python-core"
FILES_python-pprint="${libdir}/python2.5/pprint.* "
DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-PR_python-netserver="ml0"
+PR_python-netserver="ml1"
RDEPENDS_python-netserver="python-core python-netclient"
FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* "
DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml0"
+PR_python-curses="ml1"
RDEPENDS_python-curses="python-core"
FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so "
DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
-PR_python-smtpd="ml0"
+PR_python-smtpd="ml1"
RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
FILES_python-smtpd="/usr/bin/smtpd.* "
DESCRIPTION_python-html="Python HTML Processing"
-PR_python-html="ml0"
+PR_python-html="ml1"
RDEPENDS_python-html="python-core"
FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* "
DESCRIPTION_python-readline="Python Readline Support"
-PR_python-readline="ml0"
+PR_python-readline="ml1"
RDEPENDS_python-readline="python-core"
FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* "
DESCRIPTION_python-subprocess="Python Subprocess Support"
-PR_python-subprocess="ml0"
+PR_python-subprocess="ml1"
RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle"
FILES_python-subprocess="${libdir}/python2.5/subprocess.* "
DESCRIPTION_python-pydoc="Python Interactive Help Support"
-PR_python-pydoc="ml0"
+PR_python-pydoc="ml1"
RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.5/pydoc.* "
DESCRIPTION_python-logging="Python Logging Support"
-PR_python-logging="ml0"
+PR_python-logging="ml1"
RDEPENDS_python-logging="python-core"
FILES_python-logging="${libdir}/python2.5/logging "
DESCRIPTION_python-mailbox="Python Mailbox Format Support"
-PR_python-mailbox="ml0"
+PR_python-mailbox="ml1"
RDEPENDS_python-mailbox="python-core python-mime"
FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml0"
+PR_python-xml="ml1"
RDEPENDS_python-xml="python-core python-re"
FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
DESCRIPTION_python-mime="Python MIME Handling APIs"
-PR_python-mime="ml0"
+PR_python-mime="ml1"
RDEPENDS_python-mime="python-core python-io"
FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-PR_python-sqlite3="ml0"
+PR_python-sqlite3="ml1"
RDEPENDS_python-sqlite3="python-core"
FILES_python-sqlite3="${libdir}/python2.5/sqlite3 "
DESCRIPTION_python-tests="Python Tests"
-PR_python-tests="ml0"
+PR_python-tests="ml1"
RDEPENDS_python-tests="python-core"
FILES_python-tests="${libdir}/python2.5/test "
DESCRIPTION_python-unittest="Python Unit Testing Framework"
-PR_python-unittest="ml0"
+PR_python-unittest="ml1"
RDEPENDS_python-unittest="python-core python-stringold python-lang"
FILES_python-unittest="${libdir}/python2.5/unittest.* "
DESCRIPTION_python-stringold="Python String APIs [deprecated]"
-PR_python-stringold="ml0"
+PR_python-stringold="ml1"
RDEPENDS_python-stringold="python-core python-re"
FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* "
DESCRIPTION_python-robotparser="Python robots.txt parser"
-PR_python-robotparser="ml0"
+PR_python-robotparser="ml1"
RDEPENDS_python-robotparser="python-core python%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r3c0d5598d4768723f8ae136268f15cc2a98c7e77 -rea2a23cae4f4d939a07f699c39b603c4c2559ad1
#
#
#
# add_file "packages/librsvg/librsvg_2.11.1.bb"
# content [59bdb0233bda87be9c3b73a68049d017505cb1f7]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [ffa657fea62b85620be6838f5166e8c9d3be06ee]
# to [676175db27daa339198d202c9132f968138f7f10]
#
# patch "packages/gpe-bootsplash/files/angstrom/splash-p.svg"
# from [6be1f5435b8289fbc1de3c211009b92b7f27c96b]
# to [7cf599aa7f704cf4cf87639ddf59a8706bffb64d]
#
# patch "packages/gpe-bootsplash/gpe-bootsplash_1.15.bb"
# from [ec2e88f8463e277d67b8e301d189e6d150571985]
# to [9ba1f9aab7534858cfcdcb71836bf5268f118a7e]
#
# patch "packages/gpephone/libsettings_0.3.bb"
# from [61c18c3f3f7c85c3f6b358e60597da6b601f3126]
# to [0be3d5ce6ebc66f934461ed122c1ef795c929608]
#
============================================================
--- packages/librsvg/librsvg_2.11.1.bb 59bdb0233bda87be9c3b73a68049d017505cb1f7
+++ packages/librsvg/librsvg_2.11.1.bb 59bdb0233bda87be9c3b73a68049d017505cb1f7
@@ -0,0 +1,36 @@
+DESCRIPTION = "Library for rendering SVG files"
+SECTION = "x11/utils"
+DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
+LICENSE = "LGPL"
+
+PR = "r2"
+
+inherit autotools pkgconfig gnome
+
+EXTRA_OECONF = "--disable-mozilla-plugin"
+
+
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_rsvg = "${bindir}/rsvg \
+ ${bindir}/rsvg-view \
+ ${bindir}/rsvg-convert \
+ ${datadir}/pixmaps/svg-viewer.svg"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
+ ${libdir}/gtk-2.0/*/*.la \
+ ${libdir}/gtk-2.0/*/*/*.la \
+ "
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+ ${libdir}/gtk-2.0/*/*/.debug"
+
+pkg_postinst_librsvg-gtk() {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+ gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb ffa657fea62b85620be6838f5166e8c9d3be06ee
+++ packages/fbreader/fbreader_0.8.2a.bb 676175db27daa339198d202c9132f968138f7f10
@@ -1,9 +1,9 @@ PRIORITY = "optional"
DESCRIPTION = "FBreader is an ebook reader"
LICENSE = "GPL2"
HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
-DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget libiconv"
PR = "r5"
# The RESOLUTION is defined at compile time which makes
============================================================
--- packages/gpe-bootsplash/files/angstrom/splash-p.svg 6be1f5435b8289fbc1de3c211009b92b7f27c96b
+++ packages/gpe-bootsplash/files/angstrom/splash-p.svg 7cf599aa7f704cf4cf87639ddf59a8706bffb64d
@@ -13,13 +13,15 @@
height="1052.3622"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.43+0.44pre4"
+ inkscape:version="0.45"
version="1.0"
- sodipodi:docbase="j:\"
- sodipodi:docname="foo.svg"
+ sodipodi:docbase="/tmp"
+ sodipodi:docname="splash-p.svg"
inkscape:export-filename="/Users/koen/Projects/Ångström/angstrom-background.png"
inkscape:export-xdpi="55.049999"
- inkscape:export-ydpi="55.049999">
+ inkscape:export-ydpi="55.049999"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
<defs
id="defs4">
<linearGradient
@@ -167,8 +169,8 @@
inkscape:current-layer="layer1"
inkscape:window-width="1280"
inkscape:window-height="968"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
+ inkscape:window-x="1600"
+ inkscape:window-y="0" />
<metadata
id="metadata7">
<rdf:RDF>
@@ -258,9 +260,16 @@
id="path621"
sodipodi:nodetypes="cssssss" />
</g>
- <path
- style="font-size:24px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
- d="M 245.74955,585.39436 L 245.74955,563.04013 L 229.53613,563.04013 L 229.53613,553.78626 L 255.57587,553.78626 L 255.57587,589.5196 C 251.74354,592.60423 247.51823,594.94559 242.89991,596.54362 C 238.28153,598.10453 233.35199,598.88497 228.11133,598.88497 C 216.64728,598.88497 207.67256,595.09426 201.18722,587.51275 C 194.7346,579.89412 191.50831,569.30236 191.50831,555.73741 C 191.50831,542.13535 194.7346,531.54357 201.18722,523.96205 C 207.67256,516.34345 216.64728,512.53413 228.11133,512.53409 C 232.89341,512.53413 237.42988,513.2031 241.72077,514.54092 C 246.04429,515.87893 250.02392,517.84862 253.65974,520.45003 L 253.65974,532.43548 C 249.99117,528.90496 246.09344,526.24769 241.96641,524.46377 C 237.83933,522.67994 233.49936,521.788 228.94657,521.78795 C 219.97182,521.788 213.22443,524.63108 208.70434,530.31713 C 204.21697,536.00327 201.97331,544.47669 201.97331,555.73741 C 201.97331,566.96099 204.21697,575.41583 208.70434,581.10192 C 213.22443,586.78803 219.97182,589.63111 228.94657,589.63111 C 232.45124,589.63111 235.57928,589.29665 238.3307,588.62766 C 241.08198,587.92154 243.55497,586.84379 245.74955,585.39436 M 283.67911,523.2931 L 283.67911,554.5667 L 296.15855,554.5667 C 300.77687,554.56674 304.34708,553.21029 306.86922,550.49727 C 309.39128,547.7843 310.65233,543.91922 310.65237,538.90206 C 310.65233,533.92208 309.39128,530.0756 306.86922,527.36255 C 304.34708,524.64967 300.77687,523.29317 296.15855,523.2931 L 283.67911,523.2931 M 273.75456,514.0392 L 296.15855,514.0392 C 304.37982,514.0393 310.5868,516.15765 314.77941,520.39429 C 319.00466,524.59392 321.11732,530.76314 321.11738,538.90206 C 321.11732,547.11537 319.00466,553.32174 314.77941,557.52129 C 310.5868,561.72088 304.37982,563.8206 296.15855,563.8206 L 283.67911,563.8206 L 283.67911,597.26835 L 273.75456,597.26835 L 273.75456,514.0392 M 334.48116,514.0392 L 380.86136,514.0392 L 380.86136,523.51607 L 344.40574,523.51607 L 344.40574,548.15592 L 379.33828,548.15592 L 379.33828,557.6328 L 344.40574,557.6328 L 344.40574,587.79148 L 381.74574,587.79148 L 381.74574,597.26835 L 334.48116,597.26835 L 334.48116,514.0392 M 439.62269,587.79148 L 474.26044,587.79148 L 474.26044,597.26835 L 427.68376,597.26835 L 427.68376,587.79148 C 431.45047,583.36893 436.57654,577.44127 443.06193,570.00844 C 449.58002,562.53845 453.6743,557.72568 455.34478,555.57013 C 458.52195,551.5193 460.73286,548.10022 461.97759,545.31284 C 463.25492,542.48842 463.89366,539.71969 463.89371,537.00668 C 463.89366,532.58416 462.51797,528.97927 459.76663,526.19189 C 457.04802,523.40465 453.49414,522.01099 449.10509,522.01091 C 445.99341,522.01099 442.70157,522.62423 439.22963,523.85054 C 435.79044,525.07703 432.10555,526.93521 428.17507,529.42518 L 428.17507,518.05293 C 432.17107,516.23201 435.90505,514.85693 439.37705,513.92775 C 442.84898,512.99869 446.02614,512.53413 448.90857,512.53409 C 456.50756,512.53413 462.56709,514.68968 467.08726,519.00062 C 471.60732,523.31175 473.86735,529.07217 473.8674,536.28195 C 473.86735,539.70114 473.29415,542.95298 472.14783,546.03756 C 471.03411,549.08504 468.98695,552.68997 466.00634,556.8523 C 465.18746,557.9301 462.5835,561.05189 458.19443,566.21767 C 453.80533,571.34634 447.61475,578.53761 439.62269,587.79148 M 495.14137,583.10876 L 505.50815,583.10876 L 505.50815,597.26835 L 495.14137,597.26835 L 495.14137,583.10876 M 524.66944,514.0392 L 571.83575,514.0392 L 571.83575,518.83342 L 545.20645,597.26835 L 534.83968,597.26835 L 559.89676,523.51607 L 524.66944,523.51607 L 524.66944,514.0392"
- id="text1326" />
+ <text
+ xml:space="preserve"
+ style="font-size:96px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="192.20483"
+ y="568.35547"
+ id="text2200"
+ sodipodi:linespacing="100%"><tspan
+ sodipodi:role="line"
+ id="tspan2202"
+ x="192.20483"
+ y="568.35547">GPE 2.8</tspan></text>
</g>
</svg>
============================================================
--- packages/gpe-bootsplash/gpe-bootsplash_1.15.bb ec2e88f8463e277d67b8e301d189e6d150571985
+++ packages/gpe-bootsplash/gpe-bootsplash_1.15.bb 9ba1f9aab7534858cfcdcb71836bf5268f118a7e
@@ -1,10 +1,10 @@ LICENSE = "GPL"
inherit gpe
DEPENDS = "gtk+ libsvg-cairo"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
SRC_URI += "file://splash-p.svg \
file://splash-l.svg \
============================================================
--- packages/gpephone/libsettings_0.3.bb 61c18c3f3f7c85c3f6b358e60597da6b601f3126
+++ packages/gpephone/libsettings_0.3.bb 0be3d5ce6ebc66f934461ed122c1ef795c929608
@@ -6,8 +6,6 @@ inherit gpephone pkgconfig autotools
inherit gpephone pkgconfig autotools
-SRC_URI = "${GPEPHONE_MIRROR}/${PN}/${P}.tar.gz"
-
FILES_${PN} += " ${libdir}/*.so.*"
FILES_${PN}-dbg += "${libdir}/.debug/*.so.*"
FILES_${PN}-dev += "${includedir} ${libdir}/*.la ${libdir}/*.so"
More information about the Openembedded-commits
mailing list