diff options
52 files changed, 615 insertions, 228 deletions
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index a5fdb33895..cc0d11e515 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -4,8 +4,8 @@ # FILES_${PN} += "${libdir}/perl5 ${datadir}/perl5" -DEPENDS += "perl perl-native" -RDEPENDS += "perl" +DEPENDS += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}" +RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" # Determine the staged version of perl from the perl configuration file def get_perl_version(d): diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 4fff5974c1..3250528c7a 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -9,7 +9,7 @@ EXTRA_CPANFLAGS ?= "" export PERLCONFIGTARGET = "${@is_target(d)}" # Env var which tells perl where the perl include files are -export PERL_INC = "${STAGING_DIR}/${BUILD_SYS}/lib/perl/${@get_perl_version(d)}/CORE" +export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} diff --git a/conf/machine/db1200.conf b/conf/machine/db1200.conf index 5fafb0cd56..cbde602824 100644 --- a/conf/machine/db1200.conf +++ b/conf/machine/db1200.conf @@ -1,7 +1,6 @@ # Alchemy db1200 TARGET_ARCH = "mipsel" -PACKAGE_ARCHS = "${TARGET_ARCH} ${MACHINE}" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf new file mode 100644 index 0000000000..0cfa50c69e --- /dev/null +++ b/conf/machine/include/tune-ppc440e.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=440fp" +PACKAGE_ARCH = "ppc440" diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf index 2336ecbcf3..a6f31ab84a 100644 --- a/conf/machine/sequoia.conf +++ b/conf/machine/sequoia.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc440" +PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc440e" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" @@ -25,4 +25,4 @@ ERASEBLOCK_SIZE = "0x10000" IMAGE_FSTYPES = "jffs2" #tune for the AMCC440 cpu -require conf/machine/include/tune-ppc440.conf +require conf/machine/include/tune-ppc440e.conf diff --git a/packages/clamav/clamav-0.88.7/.mtn2git_empty b/packages/billiardz/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/clamav/clamav-0.88.7/.mtn2git_empty +++ b/packages/billiardz/files/.mtn2git_empty diff --git a/packages/billiardz/files/gcc4.patch b/packages/billiardz/files/gcc4.patch new file mode 100644 index 0000000000..30d7eda9e8 --- /dev/null +++ b/packages/billiardz/files/gcc4.patch @@ -0,0 +1,45 @@ +diff -Naur billiardz-0.1.4-orig/src/ButtonListener.h billiardz-0.1.4/src/ButtonListener.h +--- billiardz-0.1.4-orig/src/ButtonListener.h 2002-11-05 07:01:51.000000000 +0100 ++++ billiardz-0.1.4/src/ButtonListener.h 2007-03-26 21:10:11.000000000 +0200 +@@ -9,6 +9,7 @@ + { + public: + virtual void buttonClicked(Button *button) = 0; ++ virtual ~ButtonListener() {} + }; + + #endif /* _BUTTONLISTENER_H_ */ +diff -Naur billiardz-0.1.4-orig/src/CueStickListener.h billiardz-0.1.4/src/CueStickListener.h +--- billiardz-0.1.4-orig/src/CueStickListener.h 2002-09-13 02:02:23.000000000 +0200 ++++ billiardz-0.1.4/src/CueStickListener.h 2007-03-26 21:11:14.000000000 +0200 +@@ -12,6 +12,7 @@ + virtual bool cueBallHit(CueStick *stick, Ball *ball) = 0; + virtual void stickMoved(CueStick *stick, Fixed oldAngle, + Fixed newAngle) = 0; ++ virtual ~CueStickListener() {} + }; + + #endif /* _CUESTICKLISTENER_H_ */ +diff -Naur billiardz-0.1.4-orig/src/PoolGame.h billiardz-0.1.4/src/PoolGame.h +--- billiardz-0.1.4-orig/src/PoolGame.h 2002-11-05 07:01:36.000000000 +0100 ++++ billiardz-0.1.4/src/PoolGame.h 2007-03-26 21:40:58.000000000 +0200 +@@ -6,6 +6,7 @@ + + class Player; + class PoolTable; ++class PoolRoom; + class Physics; + class Rules; + class Sprite; +diff -Naur billiardz-0.1.4-orig/src/main.cpp billiardz-0.1.4/src/main.cpp +--- billiardz-0.1.4-orig/src/main.cpp 2003-11-03 07:56:29.000000000 +0100 ++++ billiardz-0.1.4/src/main.cpp 2007-03-26 23:27:11.000000000 +0200 +@@ -51,7 +51,7 @@ + + return interval; + } +- ++#define SDL_main main + #ifdef __cplusplus + extern "C" { + #endif diff --git a/packages/clamav/clamav-0.88.7/clamd.conf b/packages/clamav/clamav-0.88.7/clamd.conf deleted file mode 100644 index 485c80d420..0000000000 --- a/packages/clamav/clamav-0.88.7/clamd.conf +++ /dev/null @@ -1,25 +0,0 @@ -## Please read the clamd.conf(5) manual before editing this file. -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket -User clamav -AllowSupplementaryGroups -ScanMail -ScanArchive -ArchiveMaxRecursion 5 -ArchiveMaxFiles 1000 -ArchiveMaxFileSize 10M -ArchiveMaxCompressionRatio 250 -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogFile /var/log/clamav/clamav.log -LogTime -LogFileMaxSize 0 -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -ScanOLE2 -ScanPE -DetectBrokenExecutables -ScanHTML -ArchiveBlockMax diff --git a/packages/clamav/clamav-0.88.7/cross-compile-fix.patch b/packages/clamav/clamav-0.88.7/cross-compile-fix.patch deleted file mode 100644 index 690d680c66..0000000000 --- a/packages/clamav/clamav-0.88.7/cross-compile-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ -Add some caching of values which can't be determined when -cross-compiling. This lets us define the values via the site files. - ---- clamav-0.88.4/configure.in 2006/09/12 05:49:09 1.1 -+++ clamav-0.88.4/configure.in 2006/09/12 06:24:27 -@@ -56,19 +56,18 @@ - - dnl Check for broken snprintf (code by Phil Oleson <oz*nixil.net>) - if test "x$ac_cv_func_snprintf" = "xyes" ; then -- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) -- AC_TRY_RUN( -- [ -+ AC_CACHE_CHECK([whether snprintf correctly terminates long strings], -+ [clamav_av_func_working_snprintf_long], [ -+ AC_TRY_RUN( -+ [ - #include <stdio.h> - int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} -- ], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) -- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -- ] -- ) -+ ]) -+ ]) -+ if test "x$clamav_av_func_working_snprintf_long" = "xno"; then -+ AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) -+ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -+ fi - fi - - have_pthreads=no -@@ -331,18 +330,28 @@ - AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) - - dnl check for in_port_t definition --AC_TRY_RUN([ --#include <sys/types.h> --#include <netinet/in.h> --int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } --], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined)) -+AC_CACHE_CHECK([for in_port_t], [clamav_av_have_in_port_t], [ -+ AC_TRY_RUN([ -+ #include <sys/types.h> -+ #include <netinet/in.h> -+ int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } -+ ]) -+ ]) -+if test "$clamav_av_have_in_port_t" = "yes"; then -+ AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]) -+fi - - dnl check for in_addr_t definition --AC_TRY_RUN([ --#include <sys/types.h> --#include <netinet/in.h> --int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } --], AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]), AC_MSG_RESULT(in_addr_t is not defined)) -+AC_CACHE_CHECK([for in_addr_t], [clamav_av_have_in_addr_t], [ -+ AC_TRY_RUN([ -+ #include <sys/types.h> -+ #include <netinet/in.h> -+ int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } -+ ]) -+ ]) -+if test "$clamav_av_have_in_addr_t" = "yes"; then -+ AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]) -+fi - - case "$target_os" in - linux*) diff --git a/packages/clamav/clamav-0.88.7/freshclam.conf b/packages/clamav/clamav-0.88.7/freshclam.conf deleted file mode 100644 index 770490b3ab..0000000000 --- a/packages/clamav/clamav-0.88.7/freshclam.conf +++ /dev/null @@ -1,19 +0,0 @@ -## Please read the freshclam.conf(5) manual before editing this file. - -# Comment or remove the line below. -Example - -# Uncomment the following line and replace XY with your country -# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. -# Default: There is no default, which results in an error when running freshclam -#DatabaseMirror db.XY.clamav.net - -DatabaseMirror database.clamav.net -DatabaseOwner clamav -UpdateLogFile /var/log/clamav/freshclam.log -LogFileMaxSize 0 -MaxAttempts 5 -Checks 24 -DatabaseDirectory /var/lib/clamav/ -NotifyClamd -DNSDatabaseInfo current.cvd.clamav.net diff --git a/packages/clamav/clamav-0.88.7/libtool-fix.patch b/packages/clamav/clamav-0.88.7/libtool-fix.patch deleted file mode 100644 index 05a4876dd0..0000000000 --- a/packages/clamav/clamav-0.88.7/libtool-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use our own libtool that knows about cross compiling, not the libtool -that is included. - ---- clamav-0.88.4/acinclude.m4 2006/09/12 08:07:27 1.1 -+++ clamav-0.88.4/acinclude.m4 2006/09/12 08:16:31 -@@ -520,7 +520,7 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL="$host_alias-libtool" - AC_SUBST(LIBTOOL)dnl - - # Prevent multiple expansion -@@ -1238,7 +1238,7 @@ - rm="rm -f" - - # Global variables: --default_ofile=libtool -+default_ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except M$VC, diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc index c00da1d6d7..6bdd36c7d2 100644 --- a/packages/clamav/clamav.inc +++ b/packages/clamav/clamav.inc @@ -10,7 +10,7 @@ DESCRIPTION_${PN}-daemon = "An on-demand file scanning service for Clam AntiViru HOMEPAGE = "http://www.clamav.net/" SECTION = "network" LICENSE = "GPL" -DEPENDS = "zlib bzip2 gmp" +DEPENDS = "zlib bzip2 gmp curl virtual/libintl" RDEPENDS_${PN} = "${PN}-data" RDEPENDS_${PN}-daemon = "${PN}-data ${PN}-conf" RDEPENDS_${PN}-freshclam = "${PN}-conf" @@ -33,6 +33,8 @@ inherit autotools update-rc.d binconfig # Don't check for clamav uid/gid - they don't exist on the host # Put virus definitions in /var/lib not /usr/lib EXTRA_OECONF = "--disable-clamav \ + --with-zlib=${STAGING_DIR}/${HOST_SYS} \ + --with-libcurl \ --with-dbdir=${localstatedir}/lib/clamav" do_install_append() { @@ -62,13 +64,15 @@ do_stage () { install -m 0644 libclamav/clamav.h ${STAGING_INCDIR} } -PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib" +PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib \ + ${PN}-clamconf" FILES_${PN} = "${bindir}/clamscan \ ${bindir}/sigtool \ ${bindir}/clamdscan" FILES_${PN}-lib = "${libdir}/libclamav.so.*" FILES_${PN}-conf = "${sysconfdir}/clamd.conf" +FILES_${PN}-clamconf = "${bindir}/clamconf" FILES_${PN}-freshclam = "${bindir}/freshclam \ ${sysconfdir}/freshclam.conf \ ${sysconfdir}/init.d/clamav-freshclam \ diff --git a/packages/clamav/clamav_0.88.7.bb b/packages/clamav/clamav_0.88.7.bb deleted file mode 100644 index 2728c31590..0000000000 --- a/packages/clamav/clamav_0.88.7.bb +++ /dev/null @@ -1,5 +0,0 @@ -require clamav.inc - -PR = "r1" - -SRC_URI_append += " file://libtool-fix.patch;patch=1" diff --git a/packages/clamav/clamav_0.90.2.bb b/packages/clamav/clamav_0.90.2.bb index fe3061606a..e721558efe 100644 --- a/packages/clamav/clamav_0.90.2.bb +++ b/packages/clamav/clamav_0.90.2.bb @@ -1,17 +1,3 @@ require clamav.inc -PR = "r1" - -# 0.9x requires curl for incremental database updates -DEPENDS += "curl" -DEPENDS += "virtual/libintl" -# Don't check for clamav uid/gid - they don't exist on the host -# Put virus definitions in /var/lib not /usr/lib -EXTRA_OECONF = "--disable-clamav \ - --with-zlib=${STAGING_DIR}/${HOST_SYS} \ - --with-libcurl \ - --with-dbdir=${localstatedir}/lib/clamav" - -# Package up configuration utility - new for 0.9x -PACKAGES += "${PN}-clamconf" -FILES_${PN}-clamconf = "${bindir}/clamconf" +PR = "r1" diff --git a/packages/clamav/clamav_0.90.3.bb b/packages/clamav/clamav_0.90.3.bb new file mode 100644 index 0000000000..fec4ae59d8 --- /dev/null +++ b/packages/clamav/clamav_0.90.3.bb @@ -0,0 +1,3 @@ +require clamav.inc + +PR = "r0" diff --git a/packages/clamav/clamav-0.90.2/clamd.conf b/packages/clamav/files/clamd.conf index 74ebcf5c3f..74ebcf5c3f 100644 --- a/packages/clamav/clamav-0.90.2/clamd.conf +++ b/packages/clamav/files/clamd.conf diff --git a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch b/packages/clamav/files/cross-compile-fix.patch index f7ab4aa69f..f7ab4aa69f 100644 --- a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch +++ b/packages/clamav/files/cross-compile-fix.patch diff --git a/packages/clamav/clamav-0.90.2/freshclam.conf b/packages/clamav/files/freshclam.conf index fd45b0dd85..fd45b0dd85 100644 --- a/packages/clamav/clamav-0.90.2/freshclam.conf +++ b/packages/clamav/files/freshclam.conf diff --git a/packages/evince/evince/no-help-dir.patch b/packages/evince/evince/no-help-dir.patch new file mode 100644 index 0000000000..b242b65f76 --- /dev/null +++ b/packages/evince/evince/no-help-dir.patch @@ -0,0 +1,12 @@ +Index: evince-0.9.0/Makefile.am +=================================================================== +--- evince-0.9.0.orig/Makefile.am 2007-05-30 21:17:51.000000000 +0100 ++++ evince-0.9.0/Makefile.am 2007-05-30 21:17:58.000000000 +0100 +@@ -6,7 +6,6 @@ + properties \ + shell \ + po \ +- help \ + test + + if ENABLE_THUMBNAILER diff --git a/packages/evince/evince_0.9.0.bb b/packages/evince/evince_0.9.0.bb index 8689d1d371..64e2e41275 100644 --- a/packages/evince/evince_0.9.0.bb +++ b/packages/evince/evince_0.9.0.bb @@ -9,7 +9,8 @@ PR = "r1" inherit gnome pkgconfig gtk-icon-cache SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \ - file://no-icon-theme.diff;patch=1;pnum=0" + file://no-icon-theme.diff;patch=1;pnum=0 \ + file://no-help-dir.patch;patch=1" -EXTRA_OECONF = "--without-libgnome --disable-thumbnailer" +EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper" diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc index 37fa996b53..f0113b0d58 100644 --- a/packages/gaim/pidgin.inc +++ b/packages/gaim/pidgin.inc @@ -19,16 +19,19 @@ EXTRA_OECONF = " \ --with-gnutls-libs=${STAGING_LIBDIR} \ " -PACKAGES =+ "libpurple libpurple-dev libpurple-dbg finch finch-dev finch-dbg" +PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg" LEAD_SONAME = "libpurple.so.0" -FILES_libpurple = "${libdir}/libpurple*.so.*" +FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*" FILES_libpurple-dev = "${libdir}/libpurple* \ ${libdir}/purple-2/*.la " FILES_libpurple-dbg = "${libdir}/.debug/libpurple* \ ${libdir}/purple-2/.debug" -FILES_finch = "${bindir}/finch" +FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*" +FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*" +FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so" +FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*" FILES_finch-dev = "${libdir}/finch/*.la" FILES_finch-dbg = "${bindir}/.debug/finch \ ${libdir}/finch/.debug" @@ -53,22 +56,22 @@ python populate_packages_prepend () { do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', output_pattern='pidgin-plugin-%s', description='Pidgin plugin %s', - prepend=True) + prepend=True, extra_depends='') do_split_packages(d, purple, '^lib(.*)\.so$', output_pattern='libpurple-protocol-%s', description='Libpurple protocol plugin for %s', - prepend=True) + prepend=True, extra_depends='') do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', - prepend=True) + prepend=True, extra_depends='') do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', output_pattern='finch-plugin-%s', description='Finch plugin %s', - prepend=True) + prepend=True, extra_depends='') } diff --git a/packages/gaim/pidgin_2.0.0.bb b/packages/gaim/pidgin_2.0.0.bb index a39e7aeaf9..411b49ff4b 100644 --- a/packages/gaim/pidgin_2.0.0.bb +++ b/packages/gaim/pidgin_2.0.0.bb @@ -5,4 +5,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://gconf-no-errors.patch;patch=1 \ " - +PR = "r2" diff --git a/packages/icu/icu_3.6.bb b/packages/icu/icu_3.6.bb index d67d565aa1..39162d2179 100644 --- a/packages/icu/icu_3.6.bb +++ b/packages/icu/icu_3.6.bb @@ -1,5 +1,7 @@ require icu-3.6.inc +DEPENDS += "icu-native" + PR = "r1" do_configure_append() { diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index 27cce24e93..a6c0f78b3b 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -1,5 +1,5 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts +key=....F9:-:gpe-contacts +key=....F10:-:gpe-calendar key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop @@ -11,17 +11,17 @@ key=...*4:-:~display-brightness.sh up # LCD Softkeys # Please note that the space _between_ two softkeys can be used, too ;) -#key=....F5:-: -key=....F15:-:~matchbox-remote -next -#key=....F6:-: -key=....F16:-:sylpheed -#key=....F7:-: -key=....F17:-:gpe-contacts -#key=....F8:-: -key=....F18:-:gpe-calendar -#key=....F19:-: -#key=....F19:-: -#key=....F10:-: +#key=....F20:-: +key=....F21:-:~matchbox-remote -next +#key=....F22:-: +key=....F23:-:sylpheed +#key=....F24:-: +key=....F25:-:gpe-contacts +#key=....F26:-: +key=....F27:-:gpe-calendar +#key=....F28:-: +#key=....F29:-: +#key=....F30:-: # VT changing key=...*Left:-:~chvt 1 diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index 433221a586..a6c0f78b3b 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -11,17 +11,17 @@ key=...*4:-:~display-brightness.sh up # LCD Softkeys # Please note that the space _between_ two softkeys can be used, too ;) -#key=....F5:-: -key=....F15:-:~matchbox-remote -next -#key=....F6:-: -key=....F16:-:sylpheed -#key=....F7:-: -key=....F17:-:gpe-contacts -#key=....F8:-: -key=....F18:-:gpe-calendar -#key=....F19:-: -#key=....F19:-: -#key=....F10:-: +#key=....F20:-: +key=....F21:-:~matchbox-remote -next +#key=....F22:-: +key=....F23:-:sylpheed +#key=....F24:-: +key=....F25:-:gpe-contacts +#key=....F26:-: +key=....F27:-:gpe-calendar +#key=....F28:-: +#key=....F29:-: +#key=....F30:-: # VT changing key=...*Left:-:~chvt 1 diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index 8b6d2b5aa2..d1258b89db 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -1,7 +1,10 @@ inherit gpe -DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch" -RDEPENDS_append_openzaurus = " display-brightness" +DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch display-brightness" + +RDEPENDS_append_spitz = " display-brightness" +RDEPENDS_append_akita = " display-brightness" +RDEPENDS_append_c7x0 = " display-brightness" SECTION = "gpe" LICENSE = "GPL" @@ -12,7 +15,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r7" +PR = "r10" SRC_URI += " file://keylaunchrc" SRC_URI += " file://makefile-fix.patch;patch=1" diff --git a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb index 299d813964..58e85781a3 100644 --- a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb +++ b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb @@ -11,6 +11,8 @@ S = "${WORKDIR}/linux-2.6.12-rc5" inherit kernel +COMPATIBLE_MACHINE = "h6300" + do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config oe_runmake oldconfig diff --git a/packages/linux/linux-h6300-omap1_2.6.14.3.bb b/packages/linux/linux-h6300-omap1_2.6.14.3.bb index ea5aeeea1a..7726bad494 100644 --- a/packages/linux/linux-h6300-omap1_2.6.14.3.bb +++ b/packages/linux/linux-h6300-omap1_2.6.14.3.bb @@ -11,6 +11,8 @@ S = "${WORKDIR}/linux-2.6.14" inherit kernel +COMPATIBLE_MACHINE = "h6300" + do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config oe_runmake oldconfig diff --git a/packages/linux/linux-h6300-omap1_2.6.16.16.bb b/packages/linux/linux-h6300-omap1_2.6.16.16.bb index d1d82adde9..8b5f627846 100644 --- a/packages/linux/linux-h6300-omap1_2.6.16.16.bb +++ b/packages/linux/linux-h6300-omap1_2.6.16.16.bb @@ -12,6 +12,8 @@ S = "${WORKDIR}/linux-2.6.16" inherit kernel +COMPATIBLE_MACHINE = "h6300" + do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config oe_runmake oldconfig diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb index 09916c9022..512f3ac14d 100644 --- a/packages/linux/linux-mtx-1_2.4.27.bb +++ b/packages/linux/linux-mtx-1_2.4.27.bb @@ -43,6 +43,7 @@ S = "${WORKDIR}/linux" inherit kernel +COMPATIBLE_MACHINE = "mtx-1" COMPATIBLE_HOST = "mipsel.*-linux" ARCH = "mips" KERNEL_OUTPUT = "arch/mips/zboot/images/mtx-1.flash.bin" diff --git a/packages/linux/linux-mtx-1u_2.4.27.bb b/packages/linux/linux-mtx-1u_2.4.27.bb index 8ab1c5bbd1..00132f54cd 100644 --- a/packages/linux/linux-mtx-1u_2.4.27.bb +++ b/packages/linux/linux-mtx-1u_2.4.27.bb @@ -1,5 +1,7 @@ include linux-mtx-1_2.4.27.bb +COMPATIBLE_MACHINE = "mtx-1u" + PR = "r11" SRC_URI += "\ diff --git a/packages/linux/linux-mtx-2_2.4.27.bb b/packages/linux/linux-mtx-2_2.4.27.bb index 9a64ebb492..29c938a5c4 100644 --- a/packages/linux/linux-mtx-2_2.4.27.bb +++ b/packages/linux/linux-mtx-2_2.4.27.bb @@ -51,6 +51,7 @@ S = "${WORKDIR}/linux" inherit kernel +COMPATIBLE_MACHINE = "mtx-2" COMPATIBLE_HOST = "mipsel.*-linux" ARCH = "mips" KERNEL_OUTPUT = "arch/mips/zboot/images/mtx-2.flash.bin" diff --git a/packages/linux/linux-mtx-3_2.6.15.bb b/packages/linux/linux-mtx-3_2.6.15.bb index a5ea530425..178519d798 100644 --- a/packages/linux/linux-mtx-3_2.6.15.bb +++ b/packages/linux/linux-mtx-3_2.6.15.bb @@ -18,6 +18,7 @@ S = "${WORKDIR}/linux" inherit kernel +COMPATIBLE_MACHINE = "mtx-3" COMPATIBLE_HOST = "arm.*-linux" ARCH = "arm" KERNEL_OUTPUT = "arch/arm/zboot/images/mtx-3.flash.bin" diff --git a/packages/linux/linux-tornado-omap2_2.6.16.16.bb b/packages/linux/linux-tornado-omap2_2.6.16.16.bb index 2115a275ef..f76442401f 100644 --- a/packages/linux/linux-tornado-omap2_2.6.16.16.bb +++ b/packages/linux/linux-tornado-omap2_2.6.16.16.bb @@ -12,6 +12,8 @@ S = "${WORKDIR}/linux-2.6.16" inherit kernel +COMPATIBLE_MACHINE = "htctornado" + do_configure() { rm -f ${S}/.config diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index 1ac858f7b9..91b38a0bea 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -2,18 +2,16 @@ SHOWCURSOR="no" -matchbox-desktop --icon-size 96 \ - --icon-padding 60 \ - --font sans-16 \ - --titlefont sans-20:bold \ - --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & -# --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel-2 --start-applets=openmoko-panel-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & +matchbox-panel-2 \ + --start-applets=openmoko-panel-mainmenu,systray \ + --end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock & #start some old-style panel plugins to get a keyboard and battery status mbinputmgr & +mb-applet-startup-monitor & openmoko-footer & +openmoko-today --desktop & openmoko-dialer & exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@ diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 6daacb2842..18781493f6 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" -RDEPENDS = "matchbox-panel-2 matchbox-wm gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" +RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r9" +PR = "r11" inherit openmoko-base diff --git a/packages/opie-multikey/files/ru.keymap b/packages/opie-multikey/files/ru.keymap new file mode 100644 index 0000000000..9f5d1e360b --- /dev/null +++ b/packages/opie-multikey/files/ru.keymap @@ -0,0 +1,255 @@ +# Created by Anton Kachalov (mouse@altlinux.ru) +title = Russian +sw = RU + +1 0x1000 0 2 # and you can write whatever you want after the last element + + + "9 9 2 1" + ". c None" + "a c #000000" + "........." + "........." + ".aa.aa.aa" + ".a..a..a." + ".aa.aa.a." + ".a...a.a." + ".aa.aa.aa" + "........." + "........." + +1 0 0x0451 2 # CYRILLIC SMALL LETTER IO +1 0 0x31 2 # 1 +1 0 0x32 2 # 2 +1 0 0x33 2 # 3 +1 0 0x34 2 # 4 +1 0 0x35 2 # 5 +1 0 0x36 2 # 6 +1 0 0x37 2 # 7 +1 0 0x38 2 # 8 +1 0 0x39 2 # 9 +1 0 0x30 2 # 0 +1 0 0x2d 2 # - +1 0 0x3d 2 # = +1 0x1003 0 2 + + "9 9 2 1" + ". c None" + "a c #000000" + "........." + "........." + "...a....." + "..aa....." + ".aaaaaaaa" + "..aa....." + "...a....." + "........." + "........." + + +2 0x1001 0x9 3 # tab char, but why doesnt this work...? + + + "11 9 2 1" + ". c None" + "a c #000000" + "..........." + "..........." + ".....a..a.." + ".....aa.a.." + ".aaaaaaaa.." + ".....aa.a.." + ".....a..a.." + "..........." + "..........." +2 0 0x0439 2 # CYRILLIC SMALL LETTER SHORT I +2 0 0x0446 2 # CYRILLIC SMALL LETTER TSE +2 0 0x0443 2 # CYRILLIC SMALL LETTER U +2 0 0x043a 2 # CYRILLIC SMALL LETTER KA +2 0 0x0435 2 # CYRILLIC SMALL LETTER IE +2 0 0x043d 2 # CYRILLIC SMALL LETTER EN +2 0 0x0433 2 # CYRILLIC SMALL LETTER GHE +2 0 0x0448 2 # CYRILLIC SMALL LETTER SHA +2 0 0x0449 2 # CYRILLIC SMALL LETTER SHCHA +2 0 0x0437 2 # CYRILLIC SMALL LETTER ZE +2 0 0x0445 2 # CYRILLIC SMALL LETTER HA +2 0 0x044a 2 # CYRILLIC SMALL LETTER HARD SIGN +2 0 0x2f 4 # / + +3 0x1024 0 4 + "17 7 2 1" + " c None" + ". c #000000" + " " + " .. . .. .. " + " . . . . . . " + " . ... .. . " + " . . . . . " + " .. . . . .. " + " " +3 0 0x0444 2 # CYRILLIC SMALL LETTER EF +3 0 0x044b 2 # CYRILLIC SMALL LETTER YERU +3 0 0x0432 2 # CYRILLIC SMALL LETTER VE +3 0 0x0430 2 # CYRILLIC SMALL LETTER A +3 0 0x043f 2 # CYRILLIC SMALL LETTER PE +3 0 0x0440 2 # CYRILLIC SMALL LETTER ER +3 0 0x043e 2 # CYRILLIC SMALL LETTER O +3 0 0x043b 2 # CYRILLIC SMALL LETTER EL +3 0 0x0434 2 # CYRILLIC SMALL LETTER DE +3 0 0x0436 2 # CYRILLIC SMALL LETTER ZHE +3 0 0x044d 2 # CYRILLIC SMALL LETTER E +3 0x1004 0 5 # ENTER + "16 9 2 1" + ". c None" + "a c #000000" + "................" + "................" + "...........a...." + "....aa.....a...." + "...aa......a...." + "..aaaaaaaaaa...." + "...aa..........." + "....aa.........." + "................" + +4 0x1020 0 5 + "21 7 2 1" + " c None" + ". c #000000" + " " + " .. . . ... ... ... " + " . . . . . . " + " . ... . .. . " + " . . . . . . " + " .. . . ... . . " + " " +4 0 0x044f 2 # CYRILLIC SMALL LETTER YA +4 0 0x0447 2 # CYRILLIC SMALL LETTER CHE +4 0 0x0441 2 # CYRILLIC SMALL LETTER ES +4 0 0x043c 2 # CYRILLIC SMALL LETTER EM +4 0 0x0438 2 # CYRILLIC SMALL LETTER I +4 0 0x0442 2 # CYRILLIC SMALL LETTER TE +4 0 0x044c 2 # CYRILLIC SMALL LETTER SOFT SIGN +4 0 0x0431 2 # CYRILLIC SMALL LETTER BE +4 0 0x044e 2 # CYRILLIC SMALL LETTER YU +4 0 0x2e 2 # . +4 0x1020 0 5 # SHIFT + "21 7 2 1" + " c None" + ". c #000000" + " " + " .. . . ... ... ... " + " . . . . . . " + " . ... . .. . " + " . . . . . . " + " .. . . ... . . " + " " + +5 0x1021 0 3 + "17 7 2 1" + " c None" + ". c #000000" + " " + " .. ... .. . " + " . . . . . " + " . . .. . " + " . . . . . " + " .. . . . ... " + " " +5 0x1023 0 3 + "13 7 2 1" + " c None" + ". c #000000" + " " + " . . ... " + " . . . . " + " ... . . " + " . . . . " + " . . ... . " + " " +5 0 0x20 16 +5 0x1023 0 3 + "13 7 2 1" + " c None" + ". c #000000" + " " + " . . ... " + " . . . . " + " ... . . " + " . . . . " + " . . ... . " + " " +5 0x1021 0 3 + "17 7 2 1" + " c None" + ". c #000000" + " " + " .. ... .. . " + " . . . . . " + " . . .. . " + " . . . . . " + " .. . . . ... " + " " +5 0x1030 0 2 #original code is F1, but i'll use it for turning on/off the config dialog + "13 7 2 1" + " c None" + ". c #000000" + " " + " . " + " ... " + " ..... " + " . " + " . " + " " + +# shift table +0x0451 0x0401 # CYRILLIC SMALL LETTER IO -> CYRILLIC CAPITAL LETTER IO +0x31 0x21 # 1 -> ! +0x32 0x22 # 2 -> " +0x33 0x4e # 3 -> N +0x34 0x3b # 4 -> ; +0x35 0x25 # 5 -> % +0x36 0x3a # 6 -> : +0x37 0x3f # 7 -> ? +0x38 0x2a # 8 -> * +0x39 0x28 # 9 -> ( +0x30 0x29 # 0 -> ) +0x2d 0x5f # - -> _ +0x3d 0x2b # = -> + + +0x0439 0x0419 # CYRILLIC SMALL LETTER SHORT I -> CYRILLIC CAPITAL LETTER SHORT I +0x0446 0x0426 # CYRILLIC SMALL LETTER TSE -> CYRILLIC CAPITAL LETTER TSE +0x0443 0x0423 # CYRILLIC SMALL LETTER U -> CYRILLIC CAPITAL LETTER U +0x043a 0x041a # CYRILLIC SMALL LETTER KA -> CYRILLIC CAPITAL LETTER KA +0x0435 0x0415 # CYRILLIC SMALL LETTER IE -> CYRILLIC CAPITAL LETTER IE +0x043d 0x041d # CYRILLIC SMALL LETTER EN -> CYRILLIC CAPITAL LETTER EN +0x0433 0x0413 # CYRILLIC SMALL LETTER GHE -> CYRILLIC CAPITAL LETTER GHE +0x0448 0x0428 # CYRILLIC SMALL LETTER SHA -> CYRILLIC CAPITAL LETTER SHA +0x0449 0x0429 # CYRILLIC SMALL LETTER SHCHA -> CYRILLIC CAPITAL LETTER SHCHA +0x0437 0x0417 # CYRILLIC SMALL LETTER ZE -> CYRILLIC CAPITAL LETTER ZE +0x0445 0x0425 # CYRILLIC SMALL LETTER HA -> CYRILLIC CAPITAL LETTER HA +0x044a 0x042a # CYRILLIC SMALL LETTER HARD SIGN -> CYRILLIC CAPITAL LETTER HARD SIGN + +0x0444 0x0424 # CYRILLIC SMALL LETTER EF -> CYRILLIC CAPITAL LETTER EF +0x044b 0x042b # CYRILLIC SMALL LETTER YERU -> CYRILLIC CAPITAL LETTER YERU +0x0432 0x0412 # CYRILLIC SMALL LETTER VE -> CYRILLIC CAPITAL LETTER VE +0x0430 0x0410 # CYRILLIC SMALL LETTER A -> CYRILLIC CAPITAL LETTER A +0x043f 0x041f # CYRILLIC SMALL LETTER PE -> CYRILLIC CAPITAL LETTER PE +0x0440 0x0420 # CYRILLIC SMALL LETTER ER -> CYRILLIC CAPITAL LETTER ER +0x043e 0x041e # CYRILLIC SMALL LETTER O -> CYRILLIC CAPITAL LETTER O +0x043b 0x041b # CYRILLIC SMALL LETTER EL -> CYRILLIC CAPITAL LETTER EL +0x0434 0x0414 # CYRILLIC SMALL LETTER DE -> CYRILLIC CAPITAL LETTER DE +0x0436 0x0416 # CYRILLIC SMALL LETTER ZHE -> CYRILLIC CAPITAL LETTER ZHE +0x044d 0x042d # CYRILLIC SMALL LETTER E -> CYRILLIC CAPITAL LETTER E + +0x044f 0x042f # CYRILLIC SMALL LETTER YA -> CYRILLIC CAPITAL LETTER YA +0x0447 0x0427 # CYRILLIC SMALL LETTER CHE -> CYRILLIC CAPITAL LETTER CHE +0x0441 0x0421 # CYRILLIC SMALL LETTER ES -> CYRILLIC CAPITAL LETTER ES +0x043c 0x041c # CYRILLIC SMALL LETTER EM -> CYRILLIC CAPITAL LETTER EM +0x0438 0x0418 # CYRILLIC SMALL LETTER I -> CYRILLIC CAPITAL LETTER I +0x0442 0x0422 # CYRILLIC SMALL LETTER TE -> CYRILLIC CAPITAL LETTER TE +0x044c 0x042c # CYRILLIC SMALL LETTER SOFT SIGN -> CYRILLIC CAPITAL LETTER SOFT SIGN +0x0431 0x0411 # CYRILLIC SMALL LETTER BE -> CYRILLIC CAPITAL LETTER BE +0x044e 0x042e # CYRILLIC SMALL LETTER YU -> CYRILLIC CAPITAL LETTER YU +0x2f 0x7c # / -> | +0x2e 0x2c # . -> , diff --git a/packages/opie-multikey/opie-multikey.inc b/packages/opie-multikey/opie-multikey.inc index e936072b4c..9676111efa 100644 --- a/packages/opie-multikey/opie-multikey.inc +++ b/packages/opie-multikey/opie-multikey.inc @@ -32,5 +32,6 @@ do_install() { install -d ${D}${palmtopdir}/share/multikey/ install -m 0644 ${WORKDIR}/share/multikey/*.keymap ${D}${palmtopdir}/share/multikey/ install -m 0644 ${WORKDIR}/share/multikey/README ${D}${palmtopdir}/share/multikey/ + install -m 0644 ${FILESDIR}/ru.keymap ${D}${palmtopdir}/share/multikey/ } diff --git a/packages/perl/libxml-parser-perl-native_2.34.bb b/packages/perl/libxml-parser-perl-native_2.34.bb index 8932656171..99b61dc412 100644 --- a/packages/perl/libxml-parser-perl-native_2.34.bb +++ b/packages/perl/libxml-parser-perl-native_2.34.bb @@ -5,4 +5,5 @@ inherit native require libxml-parser-perl_${PV}.bb DEPENDS = "perl-native expat-native" +RDEPENDS = "perl-native" EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'" diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb index 0b0cd750b0..46ce6512ca 100644 --- a/packages/perl/libxml-parser-perl_2.34.bb +++ b/packages/perl/libxml-parser-perl_2.34.bb @@ -1,7 +1,7 @@ SECTION = "libs" LICENSE = "Artistic" DEPENDS += "expat-native" -PR = "r9" +PR = "r10" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index 42a376c323..d603c9d67d 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r18" +PR = "r19" # Major part of version PVM = "5.8" @@ -58,10 +58,15 @@ do_configure() { # Fixups for uclibc if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then sed -i -e "s,\(d_crypt_r=\)'define',\1'undef',g" \ + -e "s,\(crypt_r_proto=\)'\w+',\1'0',g" \ -e "s,\(d_getnetbyname_r=\)'define',\1'undef',g" \ + -e "s,\(getnetbyname_r_proto=\)'\w+',\1'0',g" \ -e "s,\(d_getnetbyaddr_r=\)'define',\1'undef',g" \ + -e "s,\(getnetbyaddr_r_proto=\)'\w+',\1'0',g" \ -e "s,\(d_getnetent_r=\)'define',\1'undef',g" \ + -e "s,\(getnetent_r_proto=\)'\w+',\1'0',g" \ -e "s,\(d_sockatmark=\)'define',\1'undef',g" \ + -e "s,\(d_sockatmarkproto=\)'\w+',\1'0',g" \ config.sh-${TARGET_ARCH}-${TARGET_OS} fi @@ -121,9 +126,25 @@ do_install() { fi } do_stage() { - install -d ${STAGING_DIR}/${HOST_SYS}/perl/ + install -d ${STAGING_DIR}/${HOST_SYS}/perl \ + ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV} \ + ${STAGING_LIBDIR}/perl/${PV}/CORE + # target config, used by cpan.bbclass to extract version information install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ + # target configuration, used by native perl when cross-compiling install lib/Config_heavy.pl ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/Config_heavy-target.pl + # perl shared library headers + for i in av.h embed.h gv.h keywords.h op.h perlio.h pp.h regexp.h \ + uconfig.h XSUB.h cc_runtime.h embedvar.h handy.h opnames.h \ + perliol.h pp_proto.h regnodes.h unixish.h config.h EXTERN.h \ + hv.h malloc_ctl.h pad.h perlsdio.h proto.h scope.h utf8.h \ + cop.h fakesdio.h INTERN.h mg.h patchlevel.h perlsfio.h \ + reentr.h sv.h utfebcdic.h cv.h fakethr.h intrpvar.h \ + nostdio.h perlapi.h perlvars.h reentr.inc thrdvar.h util.h \ + dosish.h form.h iperlsys.h opcode.h perl.h perly.h regcomp.h \ + thread.h warnings.h; do + install $i ${STAGING_LIBDIR}/perl/${PV}/CORE + done } PACKAGES = "perl-dbg perl perl-misc perl-lib perl-dev perl-pod perl-doc" diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb index 7e221f4113..433afb52d2 100644 --- a/packages/webkit/webkit_svn.bb +++ b/packages/webkit/webkit_svn.bb @@ -1,9 +1,10 @@ -DEPENDS = "flex-native icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo gtk+" +DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+" # Yes, this is wrong... PV = "0.0+svn${SRCDATE}" +PR = "r1" -inherit qmake +inherit qmake pkgconfig SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ @@ -22,14 +23,32 @@ SRC_URI = "\ S = "${WORKDIR}/" -do_configure() { - qmake2 CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug +do_configure_append() { + qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug mkdir -p WebKitBuilds/Debug cd WebKitBuilds/Debug - PWD=`pwd` qmake2 -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro + PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro } -do_compile() { +do_compile_prepend() { cd ${S}/WebKitBuilds/Debug - oe_runmake } + +do_install() { + install -d ${D}${bindir} + install -d ${D}${libdir} + install -d ${D}${libdir}/pkgconfig + + install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir} + cp -pPR WebKitBuilds/Debug/lib/*.so* ${D}${libdir} + cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ +} + + +PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher" + +FILES_webkit-gdklauncher = "${bindir}/GdkLauncher" +FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher" + + + diff --git a/packages/clamav/clamav-0.90.2/.mtn2git_empty b/packages/xorg-app/xrandr/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/clamav/clamav-0.90.2/.mtn2git_empty +++ b/packages/xorg-app/xrandr/.mtn2git_empty diff --git a/packages/xorg-app/xrandr/resolve_symbol_clash.patch b/packages/xorg-app/xrandr/resolve_symbol_clash.patch new file mode 100644 index 0000000000..80d8960c94 --- /dev/null +++ b/packages/xorg-app/xrandr/resolve_symbol_clash.patch @@ -0,0 +1,35 @@ +--- + xrandr.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: xrandr-1.2.0/xrandr.c +=================================================================== +--- xrandr-1.2.0.orig/xrandr.c 2007-02-19 05:26:50.000000000 +0000 ++++ xrandr-1.2.0/xrandr.c 2007-05-28 19:22:30.000000000 +0100 +@@ -163,7 +163,7 @@ reflection_name (Rotation rotation) + + #if HAS_RANDR_1_2 + typedef enum _policy { +- clone, extend ++ policy_clone, extend + } policy_t; + + typedef enum _relation { +@@ -1398,7 +1398,7 @@ main (int argc, char **argv) + #if HAS_RANDR_1_2 + output_t *output = NULL; + char *crtc; +- policy_t policy = clone; ++ policy_t policy = policy_clone; + Bool setit_1_2 = False; + Bool query_1_2 = False; + Bool query_1 = False; +@@ -1634,7 +1634,7 @@ main (int argc, char **argv) + continue; + } + if (!strcmp ("--clone", argv[i])) { +- policy = clone; ++ policy = policy_clone; + setit_1_2 = True; + continue; + } diff --git a/packages/xorg-app/xrandr_1.2.0.bb b/packages/xorg-app/xrandr_1.2.0.bb index 57bd51fd65..f876ba6b47 100644 --- a/packages/xorg-app/xrandr_1.2.0.bb +++ b/packages/xorg-app/xrandr_1.2.0.bb @@ -5,4 +5,6 @@ LICENSE= "BSD-X" DEPENDS += " libxrandr libxrender virtual/libx11" PE = "1" +PR = "r1" +SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
\ No newline at end of file diff --git a/packages/xserver-common/files/Xserver-udev-input-helper.patch b/packages/xserver-common/files/Xserver-udev-input-helper.patch new file mode 100644 index 0000000000..b4adc9ab96 --- /dev/null +++ b/packages/xserver-common/files/Xserver-udev-input-helper.patch @@ -0,0 +1,11 @@ +--- xserver-common-1.8/X11/Xserver.orig 2006-05-07 17:40:10.540539080 +0200 ++++ xserver-common-1.8/X11/Xserver 2006-05-07 17:40:35.187792128 +0200 +@@ -27,7 +27,7 @@ + + export USER=root + +-ARGS="-br -pn" ++ARGS="-br -pn $INPUT_EXTRA_ARGS" + + # use ucb 1x00 touchscreen if present + if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then diff --git a/packages/xserver-common/files/at-fix-slcxxxx.patch b/packages/xserver-common/files/at-fix-slcxxxx.patch new file mode 100644 index 0000000000..cc2af5a245 --- /dev/null +++ b/packages/xserver-common/files/at-fix-slcxxxx.patch @@ -0,0 +1,8 @@ +--- xserver-common-1.8/X11/slcXXXX.xmodmap.orig 2006-05-07 14:22:14.500971520 +0200 ++++ xserver-common-1.8/X11/slcXXXX.xmodmap 2006-05-07 14:22:28.955774056 +0200 +@@ -10,3 +10,5 @@ + keycode 80 = F28 + keycode 81 = F29 + keycode 86 = F30 ++ ++keycode 20 = minus at at diff --git a/packages/xserver-common/files/load-xmodmap-k26.patch b/packages/xserver-common/files/load-xmodmap-k26.patch new file mode 100644 index 0000000000..bc5a20bb6f --- /dev/null +++ b/packages/xserver-common/files/load-xmodmap-k26.patch @@ -0,0 +1,23 @@ +--- xserver-common-1.8/X11/Xinit.d/12keymap.orig 2006-04-14 22:57:16.200518376 +0200 ++++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-04-14 23:01:46.938359968 +0200 +@@ -4,18 +4,10 @@ + + case $MACHINE in + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") +- case `uname -r` in +- 2.4*) +- xmodmap - < /etc/X11/shepherd.xmodmap +- ;; +- esac ++ xmodmap - < /etc/X11/shepherd.xmodmap + ;; + "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz") +- case `uname -r` in +- 2.4*) +- xmodmap - < /etc/X11/slcXXXX.xmodmap +- ;; +- esac ++ xmodmap - < /etc/X11/slcXXXX.xmodmap + ;; + "Sharp-Collie") + xmodmap - < /etc/X11/collie.xmodmap diff --git a/packages/xserver-common/files/softkeys-c7x0.patch b/packages/xserver-common/files/softkeys-c7x0.patch new file mode 100644 index 0000000000..6ef2d9fb59 --- /dev/null +++ b/packages/xserver-common/files/softkeys-c7x0.patch @@ -0,0 +1,52 @@ +--- xserver-common-1.8/X11/shepherd.xmodmap.orig 2006-04-15 13:10:03.845853928 +0200 ++++ xserver-common-1.8/X11/shepherd.xmodmap 2006-04-15 13:11:14.996037456 +0200 +@@ -1,49 +0,0 @@ +-keycode 38 = Mode_switch +-keycode 31 = w W caret +-keycode 13 = e E equal +-keycode 26 = r R plus +-keycode 28 = t T bracketleft +-keycode 33 = y y bracketright +-keycode 29 = u U braceleft +-keycode 17 = i I braceright +-!keycode 73 = Tab Tab Caps_Lock +-keycode 12 = d D periodcentered +-keycode 14 = f F backslash +-keycode 15 = g G semicolon +-keycode 16 = h H colon +-keycode 18 = j J asterisk +-keycode 19 = k K currency +-keycode 20 = l L bar +-keycode 10 = b B underscore +-keycode 66 = minus minus at +-keycode 71 = comma slash less +-keycode 72 = period question greater +- +-! Side keys +-keycode 134 = Down +-keycode 133 = Up +-keycode 131 = Return +-keycode 132 = Escape +- +-!Special keys +-!keycode 96 = XF86Calendar +-!keycode 97 = telephone +-!keycode 98 = XF86Mail +-!keycode 48 = XF86HomePage +-!keycode 37 = XF86Start +- +-clear Shift +-clear Lock +-clear Control +-clear Mod1 +-clear Mod2 +-clear Mod3 +-clear Mod4 +-clear Mod5 +- +-add Shift = Shift_L Shift_R +-!add Lock = Caps_Lock +-add Control = Control_L Control_R +-add Mod1 = Alt_L Alt_R +-add Mod2 = Mode_switch +- diff --git a/packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch b/packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch new file mode 100644 index 0000000000..2f029e5352 --- /dev/null +++ b/packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch @@ -0,0 +1,20 @@ +--- xserver-common-1.8/X11/slcXXXX.xmodmap.orig 2006-04-15 13:03:51.471463440 +0200 ++++ xserver-common-1.8/X11/slcXXXX.xmodmap 2006-04-15 13:05:04.576349808 +0200 +@@ -1,5 +1,12 @@ +-keycode 88 = XF86Calendar +-keycode 89 = telephone +-keycode 40 = XF86Start +-keycode 90 = XF86Mail +- ++ ++keycode 90 = F20 ++keycode 87 = F21 ++keycode 88 = F22 ++keycode 89 = F23 ++keycode 83 = F24 ++keycode 84 = F25 ++keycode 85 = F26 ++keycode 79 = F27 ++keycode 80 = F28 ++keycode 81 = F29 ++keycode 86 = F30 diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb index 48320ba006..388f477606 100644 --- a/packages/xserver-common/xserver-common_1.16.bb +++ b/packages/xserver-common/xserver-common_1.16.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r2" +PR = "r4" PACKAGE_ARCH = "all" @@ -11,7 +11,13 @@ inherit gpe SRC_URI_append = " file://setDPI.sh \ file://xserver-imageon.patch;patch=1 \ - file://calibrate-only-if-ts.patch;patch=1" + file://calibrate-only-if-ts.patch;patch=1 \ + file://softkeys-slcxxxx-xmodmap.patch;patch=1 \ + file://softkeys-c7x0.patch;patch=1 \ + file://at-fix-slcxxxx.patch;patch=1 \ + file://load-xmodmap-k26.patch;patch=1 \ + file://Xserver-udev-input-helper.patch;patch=1 \ + " do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" diff --git a/packages/xserver-common/xserver-common_svn.bb b/packages/xserver-common/xserver-common_svn.bb index e272ac1a87..bf5b70a84f 100644 --- a/packages/xserver-common/xserver-common_svn.bb +++ b/packages/xserver-common/xserver-common_svn.bb @@ -6,8 +6,16 @@ DEPENDS = "xmodmap xrandr xdpyinfo xtscal" PV = "1.12+svn${SRCDATE}" S = "${WORKDIR}/xserver-common" +PR = "r1" + SRC_URI = "${GPE_SVN} \ file://Makefile.translation \ file://Makefile.dpkg_ipkg \ file://svn_makefiles.patch;patch=1 \ - file://keyboardless-buttonmap.patch;patch=1" + file://keyboardless-buttonmap.patch;patch=1 \ + file://softkeys-slcxxxx-xmodmap.patch;patch=1 \ + file://softkeys-c7x0.patch;patch=1 \ + file://at-fix-slcxxxx.patch;patch=1 \ + file://load-xmodmap-k26.patch;patch=1 \ + file://Xserver-udev-input-helper.patch;patch=1" + |