From 95eea93a5dcaebe465be4ed2b7211c990d1053b8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 17:25:05 +0000 Subject: webkit-gtk: fiddle with exceptions and rtti cflags before: 3.0M armv5te/libwebkitgtk1_0.1+svnr27222-r3_armv5te.ipk after: 2.3M armv5te/libwebkitgtk1_0.1+svnr27222-r3_armv5te.ipk --- packages/webkit/files/WebKit.pri | 2 +- packages/webkit/webkit-gtk_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 0c47afe7fd..f672790d26 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -16,7 +16,7 @@ gtk-port:CONFIG += link_pkgconfig gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__ gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng -gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) +gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) -fno-exceptions -fno-rtti DEFINES += USE_SYSTEM_MALLOC CONFIG(release) { diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 262c6820db..608a4d2a5c 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -9,7 +9,7 @@ FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher" require webkit.inc -PR = "r3" +PR = "r4" do_install() { install -d ${D}${bindir} -- cgit v1.2.3 From 7d3280d01628b7f8f814b80e6d19ed76fc198b99 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 19:31:56 +0000 Subject: webkit update: update webkit srcrevs, add midori 0.13, bump openmoko-feedreader2 and openmoko-browser2 --- conf/distro/include/sane-srcrevs.inc | 10 ++++---- packages/gtk-webcore/midori_0.0.13.bb | 11 ++++++++ packages/webkit/files/WebKit.pri | 47 ++++++++++++++++++++++++++++++----- packages/webkit/files/WebKit.pro | 14 ++++++++--- packages/webkit/webkit-gtk_svn.bb | 3 +++ packages/webkit/webkit.inc | 8 +++++- 6 files changed, 77 insertions(+), 16 deletions(-) create mode 100644 packages/gtk-webcore/midori_0.0.13.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a65f477296..dff8d89328 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -62,7 +62,7 @@ SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appearance ?= "3239" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" -SRCREV_pn-openmoko-browser2 ?= "3249" +SRCREV_pn-openmoko-browser2 ?= "3646" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "3235" SRCREV_pn-openmoko-common ?= "397" @@ -73,7 +73,7 @@ SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "661" SRCREV_pn-openmoko-dialer ?= "2811" SRCREV_pn-openmoko-dialer2 ?= "3522" -SRCREV_pn-openmoko-feedreader2 ?= "3080" +SRCREV_pn-openmoko-feedreader2 ?= "3645" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" @@ -121,9 +121,9 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-webkit-gtk ?= "27222" -SRCREV_pn-webkit-qt ?= "27222" -SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-webkit-gtk ?= "28656" +SRCREV_pn-webkit-qt ?= "28656" +SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" diff --git a/packages/gtk-webcore/midori_0.0.13.bb b/packages/gtk-webcore/midori_0.0.13.bb new file mode 100644 index 0000000000..23d0179375 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.13.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "webkit-gtk libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ + " + + diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index f672790d26..640fa34174 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -11,12 +11,47 @@ qt-port:DEFINES += BUILDING_QT__=1 qt-port:!building-libs { QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR LIBS += -lQtWebKit + DEPENDPATH += $$PWD/WebKit/qt/Api +} + +gtk-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lWebKitGtk + DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport +} + +gtk-port { + CONFIG += link_pkgconfig + + DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 + + # We use FreeType directly with Cairo + PKGCONFIG += cairo-ft + + directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 + else: PKGCONFIG += cairo gtk+-2.0 + + # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) + CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) + + # We use the curl http backend on all platforms + PKGCONFIG += libcurl + + LIBS += -lWebKitGtk -ljpeg -lpng + + QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + QMAKE_LIBS += $$system(icu-config --ldflags) + + # This set of warnings is borrowed from the Mac build + QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + + # These flags are based on optimization experience from the Mac port: + # Helps code size significantly and speed a little + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + + DEPENDPATH += $$PWD/JavaScriptCore/API + INCLUDEPATH += $$PWD } -gtk-port:CONFIG += link_pkgconfig -gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl -gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__ -gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng -gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) -fno-exceptions -fno-rtti DEFINES += USE_SYSTEM_MALLOC CONFIG(release) { @@ -32,7 +67,7 @@ gtk-port:INCLUDEPATH += \ $$BASE_DIR/WebCore/platform/graphics/cairo \ $$BASE_DIR/WebCore/loader/gtk \ $$BASE_DIR/WebCore/page/gtk \ - $$BASE_DIR/WebKit/gtk/Api \ + $$BASE_DIR/WebKit/gtk/WebView \ $$BASE_DIR/WebKit/gtk/WebCoreSupport INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/ \ diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro index aab0209a93..027017bd8d 100644 --- a/packages/webkit/files/WebKit.pro +++ b/packages/webkit/files/WebKit.pro @@ -3,9 +3,15 @@ CONFIG += ordered !gtk-port:CONFIG += qt-port qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins SUBDIRS += \ - WebCore + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} -qt-port:SUBDIRS += \ - WebKit/qt/QtLauncher gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 608a4d2a5c..c726020d1a 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,5 +1,8 @@ DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" +# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need: +# DEPENDS += " gstreamer gst-plugins-base gnome-vfs " + WEBKIT_PORT = "gtk-port" WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index 2ff61091c3..81c2d91bf8 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -34,7 +34,13 @@ do_configure() { do_compile_prepend() { mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/JavaScriptCore/pcre - ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + if test -e dftables.c + then + ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + elif test -e dftables.cpp + then + ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf + fi cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/WebKitBuilds/Debug } -- cgit v1.2.3 From 6bcfbe338d719d5f7f3224aa4b06c6f49be32383 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Dec 2007 22:12:32 +0000 Subject: Add glibc-* to equivalent eglibc-* packages in RPROVIDES. --- packages/glibc/eglibc-package.bbclass | 4 +++- packages/glibc/eglibc_svn.bb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index 0cb8497733..a859ac2ca9 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" BINARY_LOCALE_ARCHES ?= "arm.*" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" -PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" RPROVIDES_eglibc = "glibc" RPROVIDES_eglibc-utils = "glibc-utils" @@ -210,6 +210,7 @@ python package_do_split_gconvs () { f.close() if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d) do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) @@ -261,6 +262,7 @@ python package_do_split_gconvs () { else: eglibc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d) + bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d) rprovides = 'virtual-locale-%s' % legitimize_package_name(name) m = re.match("(.*)_(.*)", name) if m: diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index da33cca3fa..ff68185bcc 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -2,8 +2,8 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" -PV = "2.6+svnr${SRCREV}" -PR = "r1" +PV = "2.7+svnr${SRCREV}" +PR = "r2" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://etc/ld.so.conf \ file://generate-supported.mk" -- cgit v1.2.3 From c6c56ec9b79372e509f87a08e9d0e8e60bc854b4 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Wed, 12 Dec 2007 22:33:06 +0000 Subject: mono 1.2.6pre4: add new version to OE DEFAULT_PREFERENCE is set to -1 for this version until 1.2.6 is released. --- conf/checksums.ini | 4 ++ packages/mono/files/mono-libgc-configure.patch | 20 ++++++ .../mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty | 0 .../mono/mono-1.2.5.1+1.2.6pre4/configure.patch | 23 +++++++ .../mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb | 12 ++++ packages/mono/mono_1.2.5.1+1.2.6pre4.bb | 80 ++++++++++++++++++++++ packages/mono/mono_1.2.6.inc | 13 ++++ 7 files changed, 152 insertions(+) create mode 100644 packages/mono/files/mono-libgc-configure.patch create mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty create mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch create mode 100644 packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono_1.2.6.inc diff --git a/conf/checksums.ini b/conf/checksums.ini index afa2a95e2b..dc1b06316f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7806,6 +7806,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 +[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2] +md5=391f85b4f962269e044ceac2b5235310 +sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f + [http://venge.net/monotone/downloads/monotone-0.20.tar.gz] md5=3bdf4da35ff576a401483815952f4045 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93 diff --git a/packages/mono/files/mono-libgc-configure.patch b/packages/mono/files/mono-libgc-configure.patch new file mode 100644 index 0000000000..641635da3c --- /dev/null +++ b/packages/mono/files/mono-libgc-configure.patch @@ -0,0 +1,20 @@ +Index: mono-1.2.6/libgc/configure.in +=================================================================== +--- mono-1.2.6.orig/libgc/configure.in 2007-12-12 15:02:31.000000000 -0500 ++++ mono-1.2.6/libgc/configure.in 2007-12-12 15:05:10.000000000 -0500 +@@ -17,6 +17,15 @@ + AC_PREREQ(2.53) + AC_INIT(libgc-mono, 6.6, Hans_Boehm@hp.com) + ++# the following is a very strange bug. CPPFLAGS does not get set correctly ++# if CPPFLAGS is set in the environment. The top level configure script ++# appends to the CPPFLAGS variable, and then exports it. This change should ++# be picked up by this configure script, but it is not. The original ++# env variable is still used for some reason. If CPPFLAGS is not set in the ++# environment, everything works fine. ++# Someone more experienced with autoconf will have to come up with a better fix. ++CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DUSE_COMPILER_TLS" ++echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS" + AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define) + + AC_CONFIG_SRCDIR(gcj_mlc.c) diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty b/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch b/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch new file mode 100644 index 0000000000..f033248621 --- /dev/null +++ b/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch @@ -0,0 +1,23 @@ +Index: mono-1.2.6/configure.in +=================================================================== +--- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 ++++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 +@@ -1150,6 +1150,8 @@ + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1252,6 +1254,9 @@ + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + diff --git a/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb new file mode 100644 index 0000000000..1ec7397e2b --- /dev/null +++ b/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb @@ -0,0 +1,12 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_1.2.6.inc +require mono-mcs-intermediate.inc + +DEFAULT_PREFERENCE = "-1" + diff --git a/packages/mono/mono_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono_1.2.5.1+1.2.6pre4.bb new file mode 100644 index 0000000000..e78160ee5a --- /dev/null +++ b/packages/mono/mono_1.2.5.1+1.2.6pre4.bb @@ -0,0 +1,80 @@ +require mono_1.2.6.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://configure.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_1.2.5.1-files.inc + +# Add some packages +PACKAGES_append = " mono-doc mono mono-runtime" + +FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc new file mode 100644 index 0000000000..23492e82f7 --- /dev/null +++ b/packages/mono/mono_1.2.6.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Mono Programming Language" +SECTION = "devel/mono" +LICENSE = "GPL LGPL X11" + +SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2 \ + file://mono-libgc-configure.patch;patch=1" + +S = "${WORKDIR}/mono-1.2.6" + +inherit autotools +EXTRA_OECONF_arm = "--without-tls" +EXTRA_OECONF_mipsel = "--without-tls" + -- cgit v1.2.3 From 7085289d77b701e5617fc8ab17cb4641dc32ead0 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 13 Dec 2007 00:32:58 +0000 Subject: divers: fix spelling mistake in license (GPL2 -> GPLv2). * seize the opportunity to reorder some fields according to OE style guide --- packages/enca/enca_1.9.bb | 2 +- packages/fbreader/fbreader_0.7.3d.bb | 2 +- packages/fbreader/fbreader_0.7.4q.bb | 2 +- packages/fbreader/fbreader_0.8.2a.bb | 2 +- packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb | 2 +- packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb | 2 +- packages/lua/lua-gtk2_0.3.bb | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb index 7f84ebe4fe..1db1e19be7 100644 --- a/packages/enca/enca_1.9.bb +++ b/packages/enca/enca_1.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Enca is an Extremely Naive Charset Analyser" -LICENSE = "GPL2" SECTION = "libs" PRIORITY = "optional" +LICENSE = "GPLv2" HOMEPAGE = "http://trific.ath.cx/software/enca/" PR = "r2" diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb index 9fe9c3190c..a326180997 100644 --- a/packages/fbreader/fbreader_0.7.3d.bb +++ b/packages/fbreader/fbreader_0.7.3d.bb @@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook reader" -LICENSE = "GPL2" +LICENSE = "GPLv2" HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" diff --git a/packages/fbreader/fbreader_0.7.4q.bb b/packages/fbreader/fbreader_0.7.4q.bb index bcea83a4a1..de2bf358a4 100644 --- a/packages/fbreader/fbreader_0.7.4q.bb +++ b/packages/fbreader/fbreader_0.7.4q.bb @@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook reader" -LICENSE = "GPL2" +LICENSE = "GPLv2" HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb index ca25bdc620..fa982040f9 100644 --- a/packages/fbreader/fbreader_0.8.2a.bb +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook reader" -LICENSE = "GPL2" +LICENSE = "GPLv2" HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb index 6b07f78074..1b009b5380 100644 --- a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb +++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" DESCRIPTION = "Clearlooks theme engine for GTK" -LICENSE = "GPL2" +LICENSE = "GPLv2" DEPENDS = "gtk+" PR = "r1" diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb index 68a5119aa1..d6e6de5037 100644 --- a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb +++ b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" DESCRIPTION = "Industrial theme engine for GTK" -LICENSE = "GPL2" +LICENSE = "GPLv2" DEPENDS = "gtk+" SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \ diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb index 3abca0e88a..083e9a6ca1 100644 --- a/packages/lua/lua-gtk2_0.3.bb +++ b/packages/lua/lua-gtk2_0.3.bb @@ -1,9 +1,9 @@ DESCRIPTION = "GTK bindings for LUA" -LICENSE = "GPL2" +SECTION = "libs" PRIORITY = "optional" +LICENSE = "GPLv2" DEPENDS = "gtk+ lua-native perl-native readline libffi" RDEPENDS = "lua" -SECTION = "libs" inherit gpe -- cgit v1.2.3 From 1140c9fef8e08e49bf990b072b90888df1d17de8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 13 Dec 2007 03:05:38 +0000 Subject: gpe-applauncher: Use grid layout per default. --- packages/gpephone/gpe-applauncher_0.11.bb | 4 ++-- packages/gpephone/gpe-applauncher_svn.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb index 1efcd793e0..204f7828f9 100644 --- a/packages/gpephone/gpe-applauncher_0.11.bb +++ b/packages/gpephone/gpe-applauncher_0.11.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -18,7 +18,7 @@ inherit gpephone autotools SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb index 4fe82877e3..311d2eef60 100644 --- a/packages/gpephone/gpe-applauncher_svn.bb +++ b/packages/gpephone/gpe-applauncher_svn.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" PV = "0.11+svn-${SRCREV}" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -24,7 +24,7 @@ RDEPENDS_${PN} += "gpe-applauncher-config" SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' -- cgit v1.2.3 From ec163abdb68da4938ee7ee153995fc680100a2b5 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 13 Dec 2007 09:58:00 +0000 Subject: roadmap: 1st round of updating roadmap recipies after moving zroadmap over to roadmap * refactor, unify. roadmap.inc (global), zroadmap.in (qt global) * add common qt patches >= 1.1.0 to files/qt * add zroadmap_1.1.0.bb, update zroadmap_cvs.bb (set temp local SRCDATE) * config: remove popt (used for building maps) from DEPEND in *.bb * config: s/OE_QMAKE_CXXFLAG/OE_QMAKE_CFLAG in zroadmap 1.1.0 and cvs * install: add missing icons to *.bb * many small changes ** next round of updates will make gtk2 version of roadmap kosher --- packages/roadmap/files/qt/.mtn2git_empty | 0 packages/roadmap/files/qt/qt2-fixes.patch | 10 ++++ packages/roadmap/files/qt/qt_canvas.patch | 20 ++++++++ packages/roadmap/files/qt/qt_main.patch | 61 ++++++++++++++++++++++++ packages/roadmap/files/qt/roadmap.desktop.patch | 16 +++++++ packages/roadmap/files/qt/roadmap_main.patch | 16 +++++++ packages/roadmap/files/zroadgps.png | Bin 0 -> 1949 bytes packages/roadmap/roadmap-gtk2_cvs.bb | 15 ++---- packages/roadmap/roadmap.inc | 7 +++ packages/roadmap/zroadmap-1.0.12/zroadgps.png | Bin 1949 -> 0 bytes packages/roadmap/zroadmap.inc | 13 +++++ packages/roadmap/zroadmap_1.0.12.bb | 38 ++++----------- packages/roadmap/zroadmap_1.1.0.bb | 40 ++++++++++++++++ packages/roadmap/zroadmap_cvs.bb | 44 +++++++---------- 14 files changed, 212 insertions(+), 68 deletions(-) create mode 100644 packages/roadmap/files/qt/.mtn2git_empty create mode 100644 packages/roadmap/files/qt/qt2-fixes.patch create mode 100644 packages/roadmap/files/qt/qt_canvas.patch create mode 100644 packages/roadmap/files/qt/qt_main.patch create mode 100644 packages/roadmap/files/qt/roadmap.desktop.patch create mode 100644 packages/roadmap/files/qt/roadmap_main.patch create mode 100644 packages/roadmap/files/zroadgps.png create mode 100644 packages/roadmap/roadmap.inc delete mode 100644 packages/roadmap/zroadmap-1.0.12/zroadgps.png create mode 100644 packages/roadmap/zroadmap.inc create mode 100644 packages/roadmap/zroadmap_1.1.0.bb diff --git a/packages/roadmap/files/qt/.mtn2git_empty b/packages/roadmap/files/qt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/roadmap/files/qt/qt2-fixes.patch b/packages/roadmap/files/qt/qt2-fixes.patch new file mode 100644 index 0000000000..63c1c96e53 --- /dev/null +++ b/packages/roadmap/files/qt/qt2-fixes.patch @@ -0,0 +1,10 @@ +--- src/qt/Makefile~qt2-fixes.patch ++++ src/qt/Makefile +@@ -19,7 +19,7 @@ + + ifeq ($(DESKTOP),QPE) + CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif diff --git a/packages/roadmap/files/qt/qt_canvas.patch b/packages/roadmap/files/qt/qt_canvas.patch new file mode 100644 index 0000000000..13c775c8cb --- /dev/null +++ b/packages/roadmap/files/qt/qt_canvas.patch @@ -0,0 +1,20 @@ +--- src/qt/qt_canvas.cc.old 2007-12-08 20:29:52.000000000 -0600 ++++ src/qt/qt_canvas.cc 2007-12-13 02:34:22.000000000 -0600 +@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch + *w = r.width(); + *ascent = fm.ascent(); + *descent = fm.descent(); +-#ifdef QT_NO_ROTATE ++#ifdef QT_NO_TRANSFORMATIONS + if (can_tilt) *can_tilt = 0; + #else + if (can_tilt) *can_tilt = 1; +@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo + + void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position, + int center, const char* text, int angle) { +-#ifndef QT_NO_ROTATE ++#ifndef QT_NO_TRANSFORMATIONS + if (!pixmap) { + return; + } diff --git a/packages/roadmap/files/qt/qt_main.patch b/packages/roadmap/files/qt/qt_main.patch new file mode 100644 index 0000000000..2f81128b34 --- /dev/null +++ b/packages/roadmap/files/qt/qt_main.patch @@ -0,0 +1,61 @@ +--- src/qt/qt_main.cc.old 2007-12-08 20:32:34.000000000 -0600 ++++ src/qt/qt_main.cc 2007-12-08 20:34:38.000000000 -0600 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include "qt_main.h" + + static int signalFd[2]; +@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char* + const char* tip, + RoadMapCallback callback) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. +- // This should be fixed and the ifndef removed. +- // Pascal: I believe this has been fixed now. +- + if (toolBar == 0) { + addToolbar(""); + } +@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char* + + connect(b, SIGNAL(clicked()), cb, SLOT(fire())); + } +-#endif + } + + void RMapMainWindow::addToolSpace(void) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. This should be fixed and the ifndef +- // removed. +- + addTool (NULL, NULL, NULL, NULL); + + toolBar->addSeparator(); +-#endif + } + + +@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv + + void RMapMainWindow::signalHandler(int sig) + { +- ::write(signalFd[0], &sig, sizeof(sig)); ++ write(signalFd[0], &sig, sizeof(sig)); + } + + void RMapMainWindow::handleSignal() + { + snSignal->setEnabled(false); + int tmp; +- ::read(signalFd[1], &tmp, sizeof(tmp)); ++ read(signalFd[1], &tmp, sizeof(tmp)); + QString action; + switch (tmp) { + case SIGTERM: action="SIGTERM"; break; diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/qt/roadmap.desktop.patch new file mode 100644 index 0000000000..98d5b06130 --- /dev/null +++ b/packages/roadmap/files/qt/roadmap.desktop.patch @@ -0,0 +1,16 @@ +--- src/roadmap.desktop.old 2007-12-08 23:15:45.000000000 -0600 ++++ src/roadmap.desktop 2007-12-08 23:17:48.000000000 -0600 +@@ -1,11 +1,8 @@ + [Desktop Entry] +-Comment=RoadMap + Comment=Car Navigation System + Exec=roadmap +-Icon=roadmap.png ++Icon=roadmap + Type=Application + Name=RoadMap + GenericName=Map Viewer +-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK; +-FilePattern=*roadmap;*.rdm +- ++Categories=VectorGraphics;Graphics;Viewer;GTK; diff --git a/packages/roadmap/files/qt/roadmap_main.patch b/packages/roadmap/files/qt/roadmap_main.patch new file mode 100644 index 0000000000..7b16ce28fc --- /dev/null +++ b/packages/roadmap/files/qt/roadmap_main.patch @@ -0,0 +1,16 @@ +--- src/qt/roadmap_main.cc.old 2007-12-08 15:47:05.000000000 -0600 ++++ src/qt/roadmap_main.cc 2007-12-07 20:39:15.000000000 -0600 +@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur + break; + + case ROADMAP_CURSOR_WAIT: +- mainWindow->setCursor (QCursor(Qt::WaitCursor)); ++ mainWindow->setCursor (QCursor(Qt::waitCursor)); + break; + + case ROADMAP_CURSOR_CROSS: +- mainWindow->setCursor (QCursor(Qt::CrossCursor)); ++ mainWindow->setCursor (QCursor(Qt::crossCursor)); + break; + } + } diff --git a/packages/roadmap/files/zroadgps.png b/packages/roadmap/files/zroadgps.png new file mode 100644 index 0000000000..a77b3729b7 Binary files /dev/null and b/packages/roadmap/files/zroadgps.png differ diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index cb81a44ae8..557c4a1096 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection." -AUTHOR = "Pascal Martin " -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat gtk+" -LICENSE = "GPL" +require roadmap.inc + +DEPENDS = "expat gtk+" PV = "1.0.12+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ @@ -16,7 +11,6 @@ SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ S = "${WORKDIR}/roadmap/src" -PARALLEL_MAKE = "" CFLAGS += " -I${S} " @@ -39,6 +33,5 @@ do_install() { install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ } - FILES_${PN} += "${datadir}/roadmap" diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc new file mode 100644 index 0000000000..43577badb9 --- /dev/null +++ b/packages/roadmap/roadmap.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." +PRIORITY = "optional" +AUTHOR = "Pascal Martin " +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +LICENSE = "GPL" + +PARALLEL_MAKE = "" diff --git a/packages/roadmap/zroadmap-1.0.12/zroadgps.png b/packages/roadmap/zroadmap-1.0.12/zroadgps.png deleted file mode 100644 index a77b3729b7..0000000000 Binary files a/packages/roadmap/zroadmap-1.0.12/zroadgps.png and /dev/null differ diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc new file mode 100644 index 0000000000..acee708837 --- /dev/null +++ b/packages/roadmap/zroadmap.inc @@ -0,0 +1,13 @@ +require roadmap.inc + +SECTION = "opie/applications" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb index 5b9161cfce..9a7b73d1a1 100644 --- a/packages/roadmap/zroadmap_1.0.12.bb +++ b/packages/roadmap/zroadmap_1.0.12.bb @@ -1,15 +1,6 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection. A rudimentary trip feature allows \ -RoadMap to display some basic navigation information (distance to the destination, \ -direction, speed, etc..). Voice messages are generated that duplicate some of the screen information." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin " -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -LICENSE = "GPL" -PR = "r0" +require zroadmap.inc + +PR = "r1" SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ file://qt2-fixes.patch;pnum=2;patch=1 \ @@ -17,20 +8,9 @@ SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar. file://zroadgps.png" S = "${WORKDIR}/roadmap-${PV}/src" -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} do_compile() { oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a @@ -38,16 +18,16 @@ do_compile() { } do_install() { - cd qt install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics - install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ + install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb new file mode 100644 index 0000000000..42184ce62b --- /dev/null +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -0,0 +1,40 @@ +require zroadmap.inc + +DEPENDS += "expat" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ + file://cross.patch;patch=1;pnum=2 \ + file://qt/qt2-fixes.patch;patch=1 \ + file://qt/qt_canvas.patch;patch=1 \ + file://qt/qt_main.patch;patch=1 \ + file://qt/roadmap_main.patch;patch=1 \ + file://qt/roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap-${PV}/src" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ + CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C qt qtroadmap qtroadgps +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index fd9cc5e95f..5b39faf071 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,36 +1,24 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin " -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat" -LICENSE = "GPL" -PV = "1.0.12+cvs-${SRCDATE}" +require zroadmap.inc + +DEPENDS += "expat" +SRCDATE = "20071212" +PV = "1.1.0+cvs-${SRCDATE}" PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ - file://qt2-fixes-r1.patch;pnum=1;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://cross.patch;patch=1;pnum=2 \ + file://qt/qt2-fixes.patch;patch=1 \ + file://qt/qt_canvas.patch;patch=1 \ +#upstream file://qt/qt_main.patch;patch=1 \ + file://qt/roadmap_main.patch;patch=1 \ +#upstream file://qt/roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" S = "${WORKDIR}/roadmap/src" -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} do_compile() { oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a @@ -45,10 +33,10 @@ do_install() { install -d ${D}${palmtopdir}/pics install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } -- cgit v1.2.3 From 368600baa8a10692d799bbe6111f629fbd3847d7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 13 Dec 2007 10:01:34 +0000 Subject: angstrom 2007 preferred versions: bump midori to 0.13 to get it built against a recent webkit --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 43cadd36a7..12138d0f13 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.12" +PREFERRED_VERSION_midori ?= "0.0.13" PREFERRED_VERSION_midpath ?= "0.1" PREFERRED_VERSION_midpath-alsa ?= "0.1" PREFERRED_VERSION_midpath-cldc ?= "0.1" -- cgit v1.2.3 From 22d1bec6f7e0a58a30a083b1ca5b638b58fb78dc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 13 Dec 2007 11:16:19 +0000 Subject: scons.bbclass: create ${D}${prefix} before calling scons --- classes/scons.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/scons.bbclass b/classes/scons.bbclass index 534b3bd4c7..6d0a783dc2 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -6,6 +6,7 @@ scons_do_compile() { } scons_do_install() { + install -d ${D}${prefix} ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \ oefatal "scons install execution failed." } -- cgit v1.2.3 From 60bf325ef367ef3820d3b54227815fa478d94c38 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 13 Dec 2007 11:17:10 +0000 Subject: meta angstrom 2007: add skeleton for autobuilder feed population file --- packages/meta/meta-angstrom-2007.bb | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 packages/meta/meta-angstrom-2007.bb diff --git a/packages/meta/meta-angstrom-2007.bb b/packages/meta/meta-angstrom-2007.bb new file mode 100644 index 0000000000..a3a2c78a79 --- /dev/null +++ b/packages/meta/meta-angstrom-2007.bb @@ -0,0 +1,32 @@ +# Meta file to inform the autobuilder which packages to build for the feeds +# Any changes should be discussed first on the angstrom-distro-devel mailinglist + +# Try to keep it alphabetically sorted please + +inherit meta + +RDEPENDS = "" + +# Basic tools +RDEPENDS += " \ + task-proper-tools \ + screen \ + " + +# Browsers know to work on all archs +RDEPENDS += " \ + gpe-mini-browser \ + midori \ + minimo \ + openmoko-browser2 \ + webkit-gtklauncher \ + " + +# Webservers +RDEPENDS += " \ + apache2 \ + boa \ + cherokee \ + lighttpd \ + thttpd \ + " -- cgit v1.2.3 From a7dd97057e4ff21b76276f1c89123e02dab97faf Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 13 Dec 2007 11:18:20 +0000 Subject: gconf-dbus: fix -dev packaging of svn version --- packages/gnome/gconf-dbus_svn.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index cc69079c3a..e7875dc72e 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -7,7 +7,7 @@ RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" PV = "2.16.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ file://69gconfd-dbus" @@ -19,6 +19,7 @@ PARALLEL_MAKE = "" FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" +FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" -- cgit v1.2.3 From 7a7ac89e3479c80a107f9363336567b29cd963bd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 13 Dec 2007 12:45:55 +0000 Subject: sip: upgrade sip-native and python-sip to 4.7.3 * 4.7.1 had become unfetchable * verified successful compilation in Sonkei --- packages/python/python-sip_4.7.1.bb | 42 ------------------------------------- packages/python/python-sip_4.7.3.bb | 42 +++++++++++++++++++++++++++++++++++++ packages/sip/sip-native_4.7.1.bb | 25 ---------------------- packages/sip/sip-native_4.7.3.bb | 25 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 packages/python/python-sip_4.7.1.bb create mode 100644 packages/python/python-sip_4.7.3.bb delete mode 100644 packages/sip/sip-native_4.7.1.bb create mode 100644 packages/sip/sip-native_4.7.3.bb diff --git a/packages/python/python-sip_4.7.1.bb b/packages/python/python-sip_4.7.1.bb deleted file mode 100644 index fc87b01e53..0000000000 --- a/packages/python/python-sip_4.7.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" -SECTION = "devel/python" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -AUTHOR = "Phil Thompson" -LICENSE = "GPL" -DEPENDS = "python" -RDEPENDS = "python-core" -PR = "ml0" - -SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/siplib" - -inherit qt4x11 distutils-base - -EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ - CONFIG=console \ - DESTDIR= \ - VERSION=1.0.0 \ - TARGET=sip \ - DEFINES=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR}" - - -do_configure_prepend() { - cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro -} - -do_stage() { - install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/ - # sipconfig.py sipdistutils.py - install -m 0644 sip.h ${STAGING_INCDIR}/sip.h -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" - diff --git a/packages/python/python-sip_4.7.3.bb b/packages/python/python-sip_4.7.3.bb new file mode 100644 index 0000000000..fc87b01e53 --- /dev/null +++ b/packages/python/python-sip_4.7.3.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" +SECTION = "devel/python" +HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +AUTHOR = "Phil Thompson" +LICENSE = "GPL" +DEPENDS = "python" +RDEPENDS = "python-core" +PR = "ml0" + +SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/siplib" + +inherit qt4x11 distutils-base + +EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ + CONFIG=console \ + DESTDIR= \ + VERSION=1.0.0 \ + TARGET=sip \ + DEFINES=SIP_QT_SUPPORT \ + INCLUDEPATH+=. \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + INCLUDEPATH+=${STAGING_INCDIR}" + + +do_configure_prepend() { + cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro +} + +do_stage() { + install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/ + # sipconfig.py sipdistutils.py + install -m 0644 sip.h ${STAGING_INCDIR}/sip.h +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" + diff --git a/packages/sip/sip-native_4.7.1.bb b/packages/sip/sip-native_4.7.1.bb deleted file mode 100644 index b47a3a7539..0000000000 --- a/packages/sip/sip-native_4.7.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "SIP is a C++/Python Wrapper Generator" -SECTION = "devel" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -AUTHOR = "Phil Thompson" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/sipgen" - -inherit qt4x11 native - -EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console" - -do_configure_prepend() { - cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro -} - -do_stage() { - install -m 0755 sip ${STAGING_BINDIR_NATIVE}/sip - cd ${WORKDIR}/sip-${PV} && python configure.py - install -d ${STAGING_PYDIR}/site-packages - install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages -} - diff --git a/packages/sip/sip-native_4.7.3.bb b/packages/sip/sip-native_4.7.3.bb new file mode 100644 index 0000000000..b47a3a7539 --- /dev/null +++ b/packages/sip/sip-native_4.7.3.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "SIP is a C++/Python Wrapper Generator" +SECTION = "devel" +HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +AUTHOR = "Phil Thompson" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/sipgen" + +inherit qt4x11 native + +EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console" + +do_configure_prepend() { + cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro +} + +do_stage() { + install -m 0755 sip ${STAGING_BINDIR_NATIVE}/sip + cd ${WORKDIR}/sip-${PV} && python configure.py + install -d ${STAGING_PYDIR}/site-packages + install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages +} + -- cgit v1.2.3 From 83e0c35873b9f745296b992e9bacd1926c58080c Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Thu, 13 Dec 2007 13:46:49 +0000 Subject: mono 1.2.6: update recipies from 1.2.6pre4 to 1.2.6 --- conf/checksums.ini | 2 +- .../mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty | 0 .../mono/mono-1.2.5.1+1.2.6pre4/configure.patch | 23 ------- packages/mono/mono-1.2.6/.mtn2git_empty | 0 packages/mono/mono-1.2.6/configure.patch | 23 +++++++ .../mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb | 12 ---- packages/mono/mono-mcs-intermediate_1.2.6.bb | 10 +++ packages/mono/mono_1.2.5.1+1.2.6pre4.bb | 80 ---------------------- packages/mono/mono_1.2.6.bb | 78 +++++++++++++++++++++ packages/mono/mono_1.2.6.inc | 2 +- 10 files changed, 113 insertions(+), 117 deletions(-) delete mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty delete mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch create mode 100644 packages/mono/mono-1.2.6/.mtn2git_empty create mode 100644 packages/mono/mono-1.2.6/configure.patch delete mode 100644 packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono-mcs-intermediate_1.2.6.bb delete mode 100644 packages/mono/mono_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono_1.2.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index dc1b06316f..76eacce219 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7806,7 +7806,7 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 -[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2] +[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2] md5=391f85b4f962269e044ceac2b5235310 sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty b/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch b/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch deleted file mode 100644 index f033248621..0000000000 --- a/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: mono-1.2.6/configure.in -=================================================================== ---- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 -+++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 -@@ -1150,6 +1150,8 @@ - ], [ - AC_MSG_RESULT(no) - with_tls=pthread -+ ], [ -+ AC_MSG_RESULT(yes) - ]) - fi - -@@ -1252,6 +1254,9 @@ - ], [ - with_sigaltstack=no - AC_MSG_RESULT(no) -+ ], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) - ]) - fi - diff --git a/packages/mono/mono-1.2.6/.mtn2git_empty b/packages/mono/mono-1.2.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mono/mono-1.2.6/configure.patch b/packages/mono/mono-1.2.6/configure.patch new file mode 100644 index 0000000000..f033248621 --- /dev/null +++ b/packages/mono/mono-1.2.6/configure.patch @@ -0,0 +1,23 @@ +Index: mono-1.2.6/configure.in +=================================================================== +--- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 ++++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 +@@ -1150,6 +1150,8 @@ + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1252,6 +1254,9 @@ + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + diff --git a/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb deleted file mode 100644 index 1ec7397e2b..0000000000 --- a/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb +++ /dev/null @@ -1,12 +0,0 @@ -# This is a straw-man recipe for step 1 in the two-step build of -# mono. Because it's impossible to build the mcs directory -# in cross-compile mode, this recipe will do a native build, -# then tar the resulting install tree for usage by the mono -# package in step 2. -# See http://www.mono-project.com/Mono:ARM - -require mono_1.2.6.inc -require mono-mcs-intermediate.inc - -DEFAULT_PREFERENCE = "-1" - diff --git a/packages/mono/mono-mcs-intermediate_1.2.6.bb b/packages/mono/mono-mcs-intermediate_1.2.6.bb new file mode 100644 index 0000000000..53ff1b25aa --- /dev/null +++ b/packages/mono/mono-mcs-intermediate_1.2.6.bb @@ -0,0 +1,10 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_1.2.6.inc +require mono-mcs-intermediate.inc + diff --git a/packages/mono/mono_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono_1.2.5.1+1.2.6pre4.bb deleted file mode 100644 index e78160ee5a..0000000000 --- a/packages/mono/mono_1.2.5.1+1.2.6pre4.bb +++ /dev/null @@ -1,80 +0,0 @@ -require mono_1.2.6.inc - -DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" - -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI += "file://configure.patch;patch=1" - -# Per http://www.mono-project.com/Mono:ARM -EXTRA_OECONF += " --disable-mcs-build " -# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) - -do_install_prepend() { - install -d ${D} - pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz - popd -} - -do_install_append() { - # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), - # however, jay is not being cross-compiled and thus only - # available for the buildhost architecture, so remove it - # entirely - pushd ${D} - rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ - ./usr/share/jay/README.jay \ - ./usr/bin/jay - popd - - # Not packaged with the default rules and apparently - # not used for anything - rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml -} - -inherit mono - -# Import file definitions from Debian -require mono_1.2.5.1-files.inc - -# Add some packages -PACKAGES_append = " mono-doc mono mono-runtime" - -FILES_mono-doc_append = " /usr/share/libgc-mono/ " - -FILES_mono = "" -ALLOW_EMPTY_mono = "1" -RDEPENDS_mono = "mono-common mono-jit" - -FILES_mono-runtime = "" -ALLOW_EMPTY_mono-runtime = "1" -RDEPENDS_mono-runtime = "mono-jit mono-gac" - -RDEPENDS_mono-jit = "mono-common" - -FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ - /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" -FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ - /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" - -# Packages not included in Debian -PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ - libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ - libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" - -FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" -FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" -FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" - -FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" -FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" - -FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" -FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" - -# Move .pc files -FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" -PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb new file mode 100644 index 0000000000..5c5d8476bb --- /dev/null +++ b/packages/mono/mono_1.2.6.bb @@ -0,0 +1,78 @@ +require mono_1.2.6.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +PR = "r1" + +SRC_URI += "file://configure.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_1.2.5.1-files.inc + +# Add some packages +PACKAGES_append = " mono-doc mono mono-runtime" + +FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc index 23492e82f7..c9644cbce5 100644 --- a/packages/mono/mono_1.2.6.inc +++ b/packages/mono/mono_1.2.6.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Mono Programming Language" SECTION = "devel/mono" LICENSE = "GPL LGPL X11" -SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2 \ +SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \ file://mono-libgc-configure.patch;patch=1" S = "${WORKDIR}/mono-1.2.6" -- cgit v1.2.3 From f57931308d556462ea030f151705c7a86ea37efe Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Thu, 13 Dec 2007 14:05:34 +0000 Subject: angstrom-2007-preferred-versions.inc: add mono-mcs-intermediate as it must match mono version --- conf/distro/include/angstrom-2007-preferred-versions.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 43cadd36a7..4658d40d7f 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1274,6 +1274,7 @@ PREFERRED_VERSION_modutils-cross ?= "2.4.27" PREFERRED_VERSION_modutils-initscripts ?= "1.0" PREFERRED_VERSION_moin ?= "1.5.8" PREFERRED_VERSION_mono ?= "1.2.5.1" +PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1" PREFERRED_VERSION_mono-native ?= "1.2.5.1" PREFERRED_VERSION_monotone-4 ?= "0.19" PREFERRED_VERSION_monotone-5 ?= "0.25.2" -- cgit v1.2.3 From f68e25bb2d1d3bf2ce83c4abc9997557ec4eb5c8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 15:31:51 +0000 Subject: moko-autorev.inc: remove openmoko 2007.1 stuff (won't receive updates) --- conf/distro/include/moko-autorev.inc | 22 ---------------------- conf/distro/include/sane-srcrevs.inc | 1 + 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 316fc5a4de..2cc722f013 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -10,31 +10,19 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" -SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-calculator ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-common ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-contacts ?= "${AUTOREV}" SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dates ?= "${AUTOREV}" SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dialer ?= "${AUTOREV}" SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}" SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-footer ?= "${AUTOREV}" -SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}" -SRCREV_pn-openmoko-libs ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-messages ?= "${AUTOREV}" SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}" @@ -46,21 +34,11 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-session ?= "${AUTOREV}" -SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" -SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}" -SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}" -SRCREV_pn-openmoko-tasks ?= "${AUTOREV}" SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}" SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-today ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index dff8d89328..2a3017afdf 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -94,6 +94,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900" SRCREV_pn-openmoko-panel-gsm ?= "3256" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-usb ?= "3360" +SRCREV_pn-openmoko-sample2 ?= "3528" SRCREV_pn-openmoko-session ?= "152" SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" -- cgit v1.2.3 From 9446fabed66082e46191b788c46969d9d4ac858f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 13 Dec 2007 17:08:09 +0000 Subject: libart: add config file for armeb, closes #3469 --- packages/gnome/libart-lgpl/armeb/.mtn2git_empty | 0 packages/gnome/libart-lgpl/armeb/art_config.h | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 packages/gnome/libart-lgpl/armeb/.mtn2git_empty create mode 100644 packages/gnome/libart-lgpl/armeb/art_config.h diff --git a/packages/gnome/libart-lgpl/armeb/.mtn2git_empty b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/libart-lgpl/armeb/art_config.h b/packages/gnome/libart-lgpl/armeb/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/packages/gnome/libart-lgpl/armeb/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 4 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; -- cgit v1.2.3 From 797990ba0f2ebd7b153e54e095d42927642ae27d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 13 Dec 2007 17:13:25 +0000 Subject: angstrom autobuilder: add meta-angstrom-2007 --- contrib/angstrom/build-release.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 5f885b1377..79bb97e0de 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -36,6 +36,7 @@ do_report_success() { for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk do BUILD_MACHINE=$machine + BUILD_CLEAN="libtool-cross" BUILD_TARGETS="minimal-image console-image" do_build done @@ -59,7 +60,7 @@ done for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie do BUILD_MACHINE=$machine - BUILD_TARGETS="minimal-image console-image x11-image" + BUILD_TARGETS="minimal-image console-image minimal-gpe-image x11-image" do_build done @@ -76,16 +77,25 @@ done for machine in fic-gta01 a780 do BUILD_MACHINE=$machine - BUILD_TARGETS="openmoko-image" + BUILD_TARGETS="minimal-openmoko-image openmoko-image" BUILD_CLEAN="qmake2-native" do_build done -#native toolchain +# populate feeds for machine in ep93xx a780 efika collie ixp4xxbe do BUILD_MACHINE=$machine - BUILD_TARGETS="gcc binutils pkgconfig make automake autoconf libtool m4 perl python gdb strace screen" + BUILD_TARGETS="meta-angstrom-2007" do_build done +#cross toolchain +#for machine in ep93xx a780 efika collie ixp4xxbe +#do +# BUILD_MACHINE=$machine +# BUILD_TARGETS="meta-toolchain" +# BUILD_CLEAN="meta-toolchain" +# do_build +#done + -- cgit v1.2.3 From e8e8079c03ede45d1ec0d2a0fd4c0f1ae167d956 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 22:58:13 +0000 Subject: libgsmd svn add gta02 specific version --- packages/gsm/files/default | 8 ++++- packages/gsm/files/fic-gta02/.mtn2git_empty | 0 packages/gsm/files/fic-gta02/gsmd | 49 +++++++++++++++++++++++++++++ packages/gsm/gsmd.inc | 1 - packages/gsm/libgsmd-devel_svn.bb | 2 ++ packages/gsm/libgsmd_svn.bb | 2 ++ 6 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 packages/gsm/files/fic-gta02/.mtn2git_empty create mode 100644 packages/gsm/files/fic-gta02/gsmd diff --git a/packages/gsm/files/default b/packages/gsm/files/default index 761100f702..d4014611d9 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -3,12 +3,18 @@ . /etc/init.d/functions case `cpuinfo_id` in - "GTA01"|"GTA02") + "GTA01") GSMD_OPTS="-s 115200 -F" GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" GSM_DEV="/dev/ttySAC0" ;; + "GTA02") + GSMD_OPTS="-s 115200 -F" + GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" + GSM_DEV="/dev/ttySAC1" + ;; "HTC Apache"|"HTC Blueangel"|"HTC Universal") GSMD_OPTS="-s 115200 -F" GSM_DEV="/dev/ttyS0" diff --git a/packages/gsm/files/fic-gta02/.mtn2git_empty b/packages/gsm/files/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gsm/files/fic-gta02/gsmd b/packages/gsm/files/fic-gta02/gsmd new file mode 100644 index 0000000000..d8323e202c --- /dev/null +++ b/packages/gsm/files/fic-gta02/gsmd @@ -0,0 +1,49 @@ +#!/bin/sh +# +# gsmd This shell script starts and stops gsmd. +# +# chkconfig: 345 90 40 +# description: Gsmd manages access to a serial- or USB-connected GSM +# processname: gsmd + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +[ -f /etc/default/rcS ] && . /etc/default/rcS +[ -f /etc/default/gsmd ] && . /etc/default/gsmd + +case "$1" in + start) + stty -F "$GSM_DEV" -crtscts + [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) + stty -F "$GSM_DEV" -echo + [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) + [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) + [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) + + echo -n "Starting GSM daemon: " + start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 & + + if [ $? = 0 ]; then + echo "gsmd." + else + echo "(failed.)" + fi + ;; + stop) + echo -n "Stopping GSM daemon: " + start-stop-daemon -K -x /usr/sbin/gsmd + stty -F "$GSM_DEV" -crtscts + [ -n "$GSM_POW" ] && echo "0" >$GSM_POW + echo "gsmd." + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index c8167d648e..d14e1519dc 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,7 +5,6 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r39" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/packages/gsm/libgsmd-devel_svn.bb b/packages/gsm/libgsmd-devel_svn.bb index d584e88d38..9449c9b3ef 100644 --- a/packages/gsm/libgsmd-devel_svn.bb +++ b/packages/gsm/libgsmd-devel_svn.bb @@ -3,6 +3,8 @@ CONFLICTNAME = "gsmd" require gsmd.inc +PR = "r40" + PROVIDES += "libgsmd" RPROVIDES_${PN}-tools = "lib${CONFLICTNAME}-tools" diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 9d3ca19c04..59301e8366 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -3,3 +3,5 @@ CONFLICTNAME = "gsmd-devel" require gsmd.inc +PR = "r40" + -- cgit v1.2.3 From 661d86969203a5dfb3788e4cde3c43c56b84e071 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:01:42 +0000 Subject: disapproval of revision '246f9c04a53439921ddf3390aeea277ba55bba13' --- packages/gsm/files/default | 8 +---- packages/gsm/files/fic-gta02/.mtn2git_empty | 0 packages/gsm/files/fic-gta02/gsmd | 49 ----------------------------- packages/gsm/gsmd.inc | 1 + packages/gsm/libgsmd-devel_svn.bb | 2 -- packages/gsm/libgsmd_svn.bb | 2 -- 6 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 packages/gsm/files/fic-gta02/.mtn2git_empty delete mode 100644 packages/gsm/files/fic-gta02/gsmd diff --git a/packages/gsm/files/default b/packages/gsm/files/default index d4014611d9..761100f702 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -3,18 +3,12 @@ . /etc/init.d/functions case `cpuinfo_id` in - "GTA01") + "GTA01"|"GTA02") GSMD_OPTS="-s 115200 -F" GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" GSM_DEV="/dev/ttySAC0" ;; - "GTA02") - GSMD_OPTS="-s 115200 -F" - GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" - GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" - GSM_DEV="/dev/ttySAC1" - ;; "HTC Apache"|"HTC Blueangel"|"HTC Universal") GSMD_OPTS="-s 115200 -F" GSM_DEV="/dev/ttyS0" diff --git a/packages/gsm/files/fic-gta02/.mtn2git_empty b/packages/gsm/files/fic-gta02/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gsm/files/fic-gta02/gsmd b/packages/gsm/files/fic-gta02/gsmd deleted file mode 100644 index d8323e202c..0000000000 --- a/packages/gsm/files/fic-gta02/gsmd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# gsmd This shell script starts and stops gsmd. -# -# chkconfig: 345 90 40 -# description: Gsmd manages access to a serial- or USB-connected GSM -# processname: gsmd - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS -[ -f /etc/default/gsmd ] && . /etc/default/gsmd - -case "$1" in - start) - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) - stty -F "$GSM_DEV" -echo - [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) - - echo -n "Starting GSM daemon: " - start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 & - - if [ $? = 0 ]; then - echo "gsmd." - else - echo "(failed.)" - fi - ;; - stop) - echo -n "Stopping GSM daemon: " - start-stop-daemon -K -x /usr/sbin/gsmd - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && echo "0" >$GSM_POW - echo "gsmd." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index d14e1519dc..c8167d648e 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,6 +5,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" +PR = "r39" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/packages/gsm/libgsmd-devel_svn.bb b/packages/gsm/libgsmd-devel_svn.bb index 9449c9b3ef..d584e88d38 100644 --- a/packages/gsm/libgsmd-devel_svn.bb +++ b/packages/gsm/libgsmd-devel_svn.bb @@ -3,8 +3,6 @@ CONFLICTNAME = "gsmd" require gsmd.inc -PR = "r40" - PROVIDES += "libgsmd" RPROVIDES_${PN}-tools = "lib${CONFLICTNAME}-tools" diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 59301e8366..9d3ca19c04 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -3,5 +3,3 @@ CONFLICTNAME = "gsmd-devel" require gsmd.inc -PR = "r40" - -- cgit v1.2.3 From 93ecb6b1ee315caafe63e3d0cac0174a05dea179 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:02:32 +0000 Subject: uboot-openmoko svn remove glamo-ram-init.patch; has been applied upstream --- packages/uboot/files/glamo-ram-init.patch | 21 --------------------- packages/uboot/uboot-openmoko_svn.bb | 3 +-- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 packages/uboot/files/glamo-ram-init.patch diff --git a/packages/uboot/files/glamo-ram-init.patch b/packages/uboot/files/glamo-ram-init.patch deleted file mode 100644 index 4c12074347..0000000000 --- a/packages/uboot/files/glamo-ram-init.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/board/neo1973/common/lowlevel_init.S b/board/neo1973/common/lowlevel_init.S -index 582aa0e..92a9c7b 100644 ---- a/board/neo1973/common/lowlevel_init.S -+++ b/board/neo1973/common/lowlevel_init.S -@@ -67,11 +67,11 @@ - #define B0_PMC 0x0 /* normal */ - - /* BANK1CON */ --#define B1_Tacs 0x0 /* 0clk */ --#define B1_Tcos 0x1 /* 1clk */ --#define B1_Tacc 0x4 /* 4clk */ --#define B1_Tcoh 0x1 /* 1clk */ --#define B1_Tah 0x0 /* 0clk */ -+#define B1_Tacs 0x3 /* 4clk */ -+#define B1_Tcos 0x3 /* 4clk */ -+#define B1_Tacc 0x7 /* 14clk */ -+#define B1_Tcoh 0x3 /* 4clk */ -+#define B1_Tah 0x3 /* 4clk */ - #define B1_Tacp 0x0 - #define B1_PMC 0x0 - diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 36ec1e130e..2ce92ad4a9 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" PV = "1.3.0${LOCALVERSION}" -PR = "r0" +PR = "r1" SRCREV_FORMAT = "patches" @@ -20,7 +20,6 @@ SRC_URI = "\ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ file://makefile-no-dirafter.patch;patch=1 \ - file://glamo-ram-init.patch;patch=1 \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From 8f3ca10fbd4d6634c7c8d25570e436847e777264 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:10:20 +0000 Subject: python-pyqt 4.3.1 update to 4.3.3 --- packages/python/python-pyqt_4.3.1.bb | 71 ------------------------------------ packages/python/python-pyqt_4.3.3.bb | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 packages/python/python-pyqt_4.3.1.bb create mode 100644 packages/python/python-pyqt_4.3.3.bb diff --git a/packages/python/python-pyqt_4.3.1.bb b/packages/python/python-pyqt_4.3.1.bb deleted file mode 100644 index d9c45ec14c..0000000000 --- a/packages/python/python-pyqt_4.3.1.bb +++ /dev/null @@ -1,71 +0,0 @@ -DESCRIPTION = "Python Qt4 Bindings" -HOMEPAGE = "http://riverbankcomputing.co.uk" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core" -SRCNAME = "pyqt" -PR = "ml0" - -SRC_URI = "\ - http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://01_configure.dpatch;patch=1 \ - file://02_htmllinks.dpatch;patch=1 \ - file://03_qreal.dpatch;patch=1 \ - file://04_qreal_api_fixes.dpatch;patch=1" -S = "${WORKDIR}/PyQt-x11-gpl-${PV}" - -inherit qt4x11 sip distutils-base - -PARALLEL_MAKE = "" - -QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" -EXTRA_OEMAKE = " MAKEFLAGS= " - -SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -# SIP_MODULES += "QtAssistant" -EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - DEFINES+=QT_NO_FPU" - -FIX_QREAL = "\ - QtCore/qtimeline.sip \ - QtCore/qrect.sip \ - QtGui/qtransform.sip \ -" - -do_generate_prepend() { - for i in ${FIX_QREAL}; do - sed -i -e s,qreal,float,g sip/$i - done -} - -do_configure_prepend() { - echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages - for module in ${SIP_MODULES} - do - install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 - for module in ${SIP_MODULES} - do - echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so - done - cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ - cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb new file mode 100644 index 0000000000..d9c45ec14c --- /dev/null +++ b/packages/python/python-pyqt_4.3.3.bb @@ -0,0 +1,71 @@ +DESCRIPTION = "Python Qt4 Bindings" +HOMEPAGE = "http://riverbankcomputing.co.uk" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python-core" +SRCNAME = "pyqt" +PR = "ml0" + +SRC_URI = "\ + http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://01_configure.dpatch;patch=1 \ + file://02_htmllinks.dpatch;patch=1 \ + file://03_qreal.dpatch;patch=1 \ + file://04_qreal_api_fixes.dpatch;patch=1" +S = "${WORKDIR}/PyQt-x11-gpl-${PV}" + +inherit qt4x11 sip distutils-base + +PARALLEL_MAKE = "" + +QMAKE_PROFILES = "pyqt.pro" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_OEMAKE = " MAKEFLAGS= " + +SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" +# SIP_MODULES += "QtAssistant" +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + DEFINES+=QT_NO_FPU" + +FIX_QREAL = "\ + QtCore/qtimeline.sip \ + QtCore/qrect.sip \ + QtGui/qtransform.sip \ +" + +do_generate_prepend() { + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done +} + +do_configure_prepend() { + echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro +} + +do_stage() { + install -d ${STAGING_SIPDIR}/qt/ + install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages + for module in ${SIP_MODULES} + do + install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so + done +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 + for module in ${SIP_MODULES} + do + echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so + done + cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ + cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" -- cgit v1.2.3 From d090606e4961c3d1efcaec58cb1d162eb7b5b4a1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:12:08 +0000 Subject: python-pyqt 4.3.3 change sip tag --- packages/python/python-pyqt_4.3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index d9c45ec14c..2d30922408 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,7 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -- cgit v1.2.3 From b89fec52bff373fb1efd7f6b24b52b282770d03e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Dec 2007 00:09:22 +0000 Subject: pointercal 0.0 add file for e680 --- packages/pointercal/files/e680/.mtn2git_empty | 0 packages/pointercal/files/e680/pointercal | 1 + packages/pointercal/pointercal_0.0.bb | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 packages/pointercal/files/e680/.mtn2git_empty create mode 100644 packages/pointercal/files/e680/pointercal diff --git a/packages/pointercal/files/e680/.mtn2git_empty b/packages/pointercal/files/e680/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pointercal/files/e680/pointercal b/packages/pointercal/files/e680/pointercal new file mode 100644 index 0000000000..8b0651dd21 --- /dev/null +++ b/packages/pointercal/files/e680/pointercal @@ -0,0 +1 @@ +-19857 -412 18085522 189 -23922 22734294 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index 4fa8c1cc0e..e79ee0b889 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r4" +PR = "r5" SRC_URI = "file://pointercal" S = "${WORKDIR}" -- cgit v1.2.3 From 299011d1da4cb08ac521ff94bce8377110019ebc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Dec 2007 00:14:22 +0000 Subject: matchbox-keyboard-inputmethod svn catch up fic-gta01-font-size patch and also apply for gta02 --- packages/matchbox-keyboard/files/fic-gta01-font-size.patch | 8 ++++---- packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch index 3a09ac5bc2..c25aa74ca4 100644 --- a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch +++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch @@ -1,12 +1,12 @@ Index: matchbox-keyboard/src/matchbox-keyboard.c =================================================================== ---- matchbox-keyboard.orig/src/matchbox-keyboard.c 2007-08-19 17:26:59.000000000 +0200 -+++ matchbox-keyboard/src/matchbox-keyboard.c 2007-08-19 17:27:06.000000000 +0200 -@@ -52,7 +52,7 @@ +--- matchbox-keyboard.orig/src/matchbox-keyboard.c ++++ matchbox-keyboard/src/matchbox-keyboard.c +@@ -54,7 +54,7 @@ kb->row_spacing = 5; kb->font_family = strdup("sans"); -- kb->font_pt_size = 5; +- kb->font_pt_size = 6; + kb->font_pt_size = 3; kb->font_variant = strdup("bold"); diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 2b84a19bd7..4384b6db7d 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -3,21 +3,21 @@ LICENSE = "GPL" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" RCONFLICTS_${PN} = "matchbox-keyboard" RPROVIDES_${PN} = "matchbox-keyboard" -#DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r9" +PR = "r10" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ - file://smallscreen-fontsize.patch;patch=1 \ + file://smallscreen-fontsize.patch;patch=1 \ file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ file://4-Add-rendering-debug-logging.patch;patch=1 \ file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \ file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ - file://80matchboxkeyboard" + file://80matchboxkeyboard" SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://fic-gta01-font-size.patch;patch=1" S = "${WORKDIR}/matchbox-keyboard" -- cgit v1.2.3 From 01b315d005188bca40f6713d485234ce97c65b7b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Dec 2007 00:19:36 +0000 Subject: sip.bbclass: =+ emits problems with task dependencies, using += now --- classes/sip.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sip.bbclass b/classes/sip.bbclass index 6f77f460dc..ae186bd04a 100644 --- a/classes/sip.bbclass +++ b/classes/sip.bbclass @@ -4,7 +4,7 @@ # yes, python-sip is actually a build-time dependency, since # the recipe installs sip.h -DEPENDS =+ "sip-native python-sip" +DEPENDS += "sip-native python-sip" # default stuff, do not uncomment # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0" -- cgit v1.2.3 From 0a080ee0fd673cc529dda6e9f464de6b011e58ca Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Dec 2007 00:47:44 +0000 Subject: python-pyqt 4.3.3 set sip tag back to 4.3.2 until we actually have Qt 4.3.3 in OE --- packages/python/python-pyqt_4.3.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 2d30922408..74a16c4720 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +# NOTE: match with qt version we have in OE +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -- cgit v1.2.3 From 8e148d8850646c085f55247d06eb1c5a09a56e85 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 14 Dec 2007 14:12:02 +0000 Subject: opie-citytime: replace recommendation for timezones with tzdata --- packages/opie-citytime/opie-citytime.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/opie-citytime/opie-citytime.inc b/packages/opie-citytime/opie-citytime.inc index a2fe0972af..529eba0d7f 100644 --- a/packages/opie-citytime/opie-citytime.inc +++ b/packages/opie-citytime/opie-citytime.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Opie Time-zone / world clock settings" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -RRECOMMENDS = "timezones" +RRECOMMENDS = "tzdata" +PR = "r1" APPNAME = "citytime" -- cgit v1.2.3