From b6b6af9be48002cb4a978aa93a827d1b6d11efad Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 30 May 2007 06:49:50 +0000 Subject: perl/perl-native 5.8.8: Change the installation directories used for perl-native to remove the various directories and to remove the host specific path components. This is to make it easier to refer to the staged perl location from other places, such as when trying to tell things where the perl include files are located. --- packages/perl/perl-native_5.8.8.bb | 16 ++++++++++++++-- packages/perl/perl_5.8.8.bb | 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb index c9d9b51771..782a61fafe 100644 --- a/packages/perl/perl-native_5.8.8.bb +++ b/packages/perl/perl-native_5.8.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r7" +PR = "r8" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" @@ -26,7 +26,16 @@ do_configure () { -Dcf_by="Open Embedded" \ -Dprefix=${prefix} \ -Dvendorprefix=${prefix} \ - -Dsiteprefix=${prefix}/local \ + -Dvendorprefix=${prefix} \ + -Dsiteprefix=${prefix} \ + \ + -Dprivlib=${STAGING_LIBDIR}/perl/${PV} \ + -Darchlib=${STAGING_LIBDIR}/perl/${PV} \ + -Dvendorlib=${STAGING_LIBDIR}/perl/${PV} \ + -Dvendorarch=${STAGING_LIBDIR}/perl/${PV} \ + -Dsitelib=${STAGING_LIBDIR}/perl/${PV} \ + -Dsitearch=${STAGING_LIBDIR}/perl/${PV} \ + \ -Duseshrplib \ -Dusethreads \ -Duseithreads \ @@ -50,6 +59,9 @@ do_configure () { do_stage_append() { # We need a hostperl link for building perl ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl + # Store native config in non-versioned directory + install -d ${STAGING_DIR}/${HOST_SYS}/perl + install config.sh ${STAGING_DIR}/${HOST_SYS}/perl } PARALLEL_MAKE = "" diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index 3dfe17cad8..42a376c323 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 = "r17" +PR = "r18" # Major part of version PVM = "5.8" @@ -37,7 +37,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ HOSTPERL = "${STAGING_BINDIR_NATIVE}/perl${PV}" # Where to find .so files - use the -native versions not those from the target build -export PERLHOSTLIB = "${STAGING_DIR}/${BUILD_SYS}/lib/perl5/${PV}/${BUILD_ARCH}-${BUILD_OS}-thread-multi/" +export PERLHOSTLIB = "${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/" do_configure() { # Make hostperl in build directory be the native perl @@ -123,7 +123,7 @@ do_install() { do_stage() { install -d ${STAGING_DIR}/${HOST_SYS}/perl/ install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ - install lib/Config_heavy.pl ${STAGING_DIR}/${BUILD_SYS}/lib/perl5/${PV}/Config_heavy-target.pl + install lib/Config_heavy.pl ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/Config_heavy-target.pl } PACKAGES = "perl-dbg perl perl-misc perl-lib perl-dev perl-pod perl-doc" -- cgit v1.2.3 From 39611c22b7715ebba0f61c7a32a237373243d699 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 30 May 2007 06:55:33 +0000 Subject: perl 5.8.8: Patch MakeMaker in perl-native to check for PERL_INC in the environment and use that instead of the configured location of PERL_INC. Without this PERL_INC for non-native recipes ends up pointing at where the headers will be located on the target. In theory we could override this in cpan class when calling build.PL but for some packages, such as libxml-parser-perl, that only fixes the top-level makefile and is not propagated to the sub-makefiles. This change results in MakeMaker always picking up the correct staged location of the include files without effecting where they expect to be found on the target. --- classes/cpan.bbclass | 3 +++ packages/perl/perl-5.8.8/native-perlinc.patch | 16 ++++++++++++++++ packages/perl/perl-native_5.8.8.bb | 5 +++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 packages/perl/perl-5.8.8/native-perlinc.patch diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 3b1a2b72ca..4fff5974c1 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -8,6 +8,9 @@ EXTRA_CPANFLAGS ?= "" # Env var which tells perl if it should use host (no) or target (yes) settings 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" + cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then diff --git a/packages/perl/perl-5.8.8/native-perlinc.patch b/packages/perl/perl-5.8.8/native-perlinc.patch new file mode 100644 index 0000000000..aea38a0b56 --- /dev/null +++ b/packages/perl/perl-5.8.8/native-perlinc.patch @@ -0,0 +1,16 @@ +Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm +=================================================================== +--- perl-5.8.8.orig/lib/ExtUtils/MM_Unix.pm 2007-05-30 15:16:47.000000000 +1000 ++++ perl-5.8.8/lib/ExtUtils/MM_Unix.pm 2007-05-30 15:18:12.000000000 +1000 +@@ -1597,6 +1597,11 @@ + $self->{PERL_LIB} ||= $Config{privlibexp}; + $self->{PERL_ARCHLIB} ||= $Config{archlibexp}; + $self->{PERL_INC} = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now ++ # Check for environment override so we'll find the headers in the correct place ++ if (defined $ENV{PERL_INC}) ++ { ++ $self->{PERL_INC} = $ENV{PERL_INC}; ++ } + my $perl_h; + + if (not -f ($perl_h = $self->catfile($self->{PERL_INC},"perl.h")) diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb index 782a61fafe..de7e4ffa3f 100644 --- a/packages/perl/perl-native_5.8.8.bb +++ b/packages/perl/perl-native_5.8.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r8" +PR = "r9" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" @@ -12,7 +12,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://Configure-multilib.patch;patch=1 \ file://perl-configpm-switch.patch;patch=1 \ file://native-nopacklist.patch;patch=1 \ - file://native-no-gdbminc.patch;patch=1" + file://native-no-gdbminc.patch;patch=1 \ + file://native-perlinc.patch;patch=1" S = "${WORKDIR}/perl-${PV}" -- cgit v1.2.3 From 290ca8b6c88511606acfff39a20e414c58a0a724 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 30 May 2007 07:00:11 +0000 Subject: perl-native 5.8.8: Fix an issues with the perl makedepend script not properly terminating a quote. This is in theory the fix for the /bin/sh -> /bin/dash problems with perl, however since I don't have any issues here with dash (ubuntu 6.10) I can't confirm this. The patch is an obvious fix though so I'm adding it. --- packages/perl/perl-5.8.8/native-makedepend-dash.patch | 13 +++++++++++++ packages/perl/perl-native_5.8.8.bb | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/perl/perl-5.8.8/native-makedepend-dash.patch diff --git a/packages/perl/perl-5.8.8/native-makedepend-dash.patch b/packages/perl/perl-5.8.8/native-makedepend-dash.patch new file mode 100644 index 0000000000..1f15474377 --- /dev/null +++ b/packages/perl/perl-5.8.8/native-makedepend-dash.patch @@ -0,0 +1,13 @@ +Index: perl-5.8.8/makedepend.SH +=================================================================== +--- perl-5.8.8.orig/makedepend.SH 2007-05-24 12:06:52.000000000 +1000 ++++ perl-5.8.8/makedepend.SH 2007-05-24 12:27:33.000000000 +1000 +@@ -128,7 +128,7 @@ + *.y) filebase=`basename $file .y` ;; + esac + case "$file" in +- */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;; ++ */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;; + *) finc= ;; + esac + $echo "Finding dependencies for $filebase$_o." diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb index de7e4ffa3f..d4896daa12 100644 --- a/packages/perl/perl-native_5.8.8.bb +++ b/packages/perl/perl-native_5.8.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r9" +PR = "r10" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" @@ -13,7 +13,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://perl-configpm-switch.patch;patch=1 \ file://native-nopacklist.patch;patch=1 \ file://native-no-gdbminc.patch;patch=1 \ - file://native-perlinc.patch;patch=1" + file://native-perlinc.patch;patch=1 \ + file://native-makedepend-dash.patch;patch=1" S = "${WORKDIR}/perl-${PV}" -- cgit v1.2.3 From 1e8d1070cb56fbddd5fdae1ff5b94de635b6da23 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 30 May 2007 07:01:46 +0000 Subject: perl 5.8.8: Bump PR on modules to force the -native versions to be rebuilt to take into account the new staging location of perl. This will also force a rebuild of libxml-parser-perl which should now work. --- packages/perl/libalgorithm-diff-perl_1.1902.bb | 2 +- packages/perl/libarchive-tar-perl_1.30.bb | 2 +- packages/perl/libcache-cache-perl_1.05.bb | 2 +- packages/perl/libclass-container-perl_0.12.bb | 2 +- packages/perl/libclass-data-inheritable-perl_0.06.bb | 2 +- packages/perl/libcompress-zlib-perl_1.42.bb | 2 +- packages/perl/libdata-optlist-perl_0.101.bb | 2 +- packages/perl/libdevel-stacktrace-perl_1.13.bb | 2 +- packages/perl/libdigest-sha1-perl_2.11.bb | 2 +- packages/perl/liberror-perl_0.17004.bb | 2 +- packages/perl/libexception-class-perl_1.23.bb | 2 +- packages/perl/libextutils-cbuilder-perl_0.18.bb | 2 +- packages/perl/libextutils-depends-perl_0.205.bb | 2 +- packages/perl/libextutils-parsexs-perl_2.16.bb | 2 +- packages/perl/libextutils-pkgconfig-perl_1.07.bb | 2 +- packages/perl/libhtml-mason-perl_1.35.bb | 2 +- packages/perl/libintl-perl_1.16.bb | 2 +- packages/perl/libio-zlib-perl_1.04.bb | 2 +- packages/perl/libipc-sharelite-perl_0.09.bb | 2 +- packages/perl/liblocale-gettext-perl_1.05.bb | 2 +- packages/perl/liblog-dispatch-perl_2.13.bb | 2 +- packages/perl/liblog-log4perl-perl_1.06.bb | 2 +- packages/perl/libmail-sendmail-perl_0.79.bb | 2 +- packages/perl/libmath-bigint-gmp-perl_1.18.bb | 2 +- packages/perl/libmodule-build-perl_0.2805.bb | 2 +- packages/perl/libnet-ip-perl_1.25.bb | 2 +- packages/perl/libnetserver-generic-perl_1.03.bb | 2 +- packages/perl/libparams-util-perl_0.20.bb | 2 +- packages/perl/libparams-validate-perl_0.86.bb | 2 +- packages/perl/libperl6-junction-perl_1.10.bb | 2 +- packages/perl/libsub-exporter-perl_0.970.bb | 2 +- packages/perl/libsub-install-perl_0.922.bb | 2 +- packages/perl/libsub-uplevel-perl_0.13.bb | 2 +- packages/perl/libtest-builder-tester-perl_1.01.bb | 2 +- packages/perl/libtest-differences-perl_0.47.bb | 2 +- packages/perl/libtest-exception-perl_0.22.bb | 2 +- packages/perl/libtest-mockmodule-perl_0.05.bb | 2 +- packages/perl/libtest-output-perl_0.10.bb | 2 +- packages/perl/libtext-diff-perl_0.35.bb | 2 +- packages/perl/liburi-perl_1.35.bb | 1 + packages/perl/libversion-perl_0.6701.bb | 2 +- packages/perl/libxml-parser-perl_2.34.bb | 2 +- packages/perl/libyaml-perl_0.62.bb | 2 +- 43 files changed, 43 insertions(+), 42 deletions(-) diff --git a/packages/perl/libalgorithm-diff-perl_1.1902.bb b/packages/perl/libalgorithm-diff-perl_1.1902.bb index 947b1a1191..4adc4e81f0 100644 --- a/packages/perl/libalgorithm-diff-perl_1.1902.bb +++ b/packages/perl/libalgorithm-diff-perl_1.1902.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars \ perl-module-strict perl-module-vars" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-${PV}.tar.gz" diff --git a/packages/perl/libarchive-tar-perl_1.30.bb b/packages/perl/libarchive-tar-perl_1.30.bb index 1c7a1d88c9..f9485a7548 100644 --- a/packages/perl/libarchive-tar-perl_1.30.bb +++ b/packages/perl/libarchive-tar-perl_1.30.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS += "libio-zlib-perl" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-${PV}.tar.gz" diff --git a/packages/perl/libcache-cache-perl_1.05.bb b/packages/perl/libcache-cache-perl_1.05.bb index 2a810b7815..60908ad648 100644 --- a/packages/perl/libcache-cache-perl_1.05.bb +++ b/packages/perl/libcache-cache-perl_1.05.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-${PV}.tar.gz" diff --git a/packages/perl/libclass-container-perl_0.12.bb b/packages/perl/libclass-container-perl_0.12.bb index 7122d83601..81b00f544a 100644 --- a/packages/perl/libclass-container-perl_0.12.bb +++ b/packages/perl/libclass-container-perl_0.12.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libparams-validate-perl-native" RDEPENDS = "libparams-validate-perl" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Class-Container-${PV}.tar.gz" diff --git a/packages/perl/libclass-data-inheritable-perl_0.06.bb b/packages/perl/libclass-data-inheritable-perl_0.06.bb index 837968f93a..6bb5c597ed 100644 --- a/packages/perl/libclass-data-inheritable-perl_0.06.bb +++ b/packages/perl/libclass-data-inheritable-perl_0.06.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Class::Data::Inheritable - Inheritable, overridable class data" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-${PV}.tar.gz" diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb index 3447db0a5a..3326d961bf 100644 --- a/packages/perl/libcompress-zlib-perl_1.42.bb +++ b/packages/perl/libcompress-zlib-perl_1.42.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Compress::Zlib - Interface to zlib compression library" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r8" +PR = "r9" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-${PV}.tar.gz" diff --git a/packages/perl/libdata-optlist-perl_0.101.bb b/packages/perl/libdata-optlist-perl_0.101.bb index 2b3cc2a979..084a055329 100644 --- a/packages/perl/libdata-optlist-perl_0.101.bb +++ b/packages/perl/libdata-optlist-perl_0.101.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS += "libsub-install-perl-native libparams-util-perl-native" RDEPENDS += "perl-module-list-util libparams-util-perl perl-module-strict \ libsub-install-perl perl-module-warnings " -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-${PV}.tar.gz" diff --git a/packages/perl/libdevel-stacktrace-perl_1.13.bb b/packages/perl/libdevel-stacktrace-perl_1.13.bb index e5e3dcaada..fd1b290364 100644 --- a/packages/perl/libdevel-stacktrace-perl_1.13.bb +++ b/packages/perl/libdevel-stacktrace-perl_1.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Devel::StackTrace - Stack trace and stack trace frame objects" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-${PV}.tar.gz" diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb index c851ec87c0..c6d629417f 100644 --- a/packages/perl/libdigest-sha1-perl_2.11.bb +++ b/packages/perl/libdigest-sha1-perl_2.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r12" +PR = "r13" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz" diff --git a/packages/perl/liberror-perl_0.17004.bb b/packages/perl/liberror-perl_0.17004.bb index a2ba120148..9e5b2b4d71 100644 --- a/packages/perl/liberror-perl_0.17004.bb +++ b/packages/perl/liberror-perl_0.17004.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Error - Error/exception handling in an OO-ish way" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-${PV}.tar.gz" diff --git a/packages/perl/libexception-class-perl_1.23.bb b/packages/perl/libexception-class-perl_1.23.bb index 62df7e58c6..b26af13d84 100644 --- a/packages/perl/libexception-class-perl_1.23.bb +++ b/packages/perl/libexception-class-perl_1.23.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libclass-data-inheritable-perl-native libdevel-stacktrace-perl-native" RDEPENDS = "libclass-data-inheritable-perl libdevel-stacktrace-perl" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-${PV}.tar.gz" diff --git a/packages/perl/libextutils-cbuilder-perl_0.18.bb b/packages/perl/libextutils-cbuilder-perl_0.18.bb index d446c9934a..aedb04f707 100644 --- a/packages/perl/libextutils-cbuilder-perl_0.18.bb +++ b/packages/perl/libextutils-cbuilder-perl_0.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ExtUtils::CBuilder - Compile and link C code for Perl modules" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-${PV}.tar.gz" diff --git a/packages/perl/libextutils-depends-perl_0.205.bb b/packages/perl/libextutils-depends-perl_0.205.bb index 274550dbd3..af4f6ffd8f 100644 --- a/packages/perl/libextutils-depends-perl_0.205.bb +++ b/packages/perl/libextutils-depends-perl_0.205.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ExtUtils::Depends - Easily build XS extensions that depend on XS extensions" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-${PV}.tar.gz" diff --git a/packages/perl/libextutils-parsexs-perl_2.16.bb b/packages/perl/libextutils-parsexs-perl_2.16.bb index bf18dadd38..431b04127b 100644 --- a/packages/perl/libextutils-parsexs-perl_2.16.bb +++ b/packages/perl/libextutils-parsexs-perl_2.16.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ExtUtils::ParseXS - converts Perl XS code into C code" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-${PV}.tar.gz" diff --git a/packages/perl/libextutils-pkgconfig-perl_1.07.bb b/packages/perl/libextutils-pkgconfig-perl_1.07.bb index e0b807f374..d023beac69 100644 --- a/packages/perl/libextutils-pkgconfig-perl_1.07.bb +++ b/packages/perl/libextutils-pkgconfig-perl_1.07.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ExtUtils::PkgConfig - simplistic interface to pkg-config" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-${PV}.tar.gz" diff --git a/packages/perl/libhtml-mason-perl_1.35.bb b/packages/perl/libhtml-mason-perl_1.35.bb index 7b6ede5d49..71e96005e8 100644 --- a/packages/perl/libhtml-mason-perl_1.35.bb +++ b/packages/perl/libhtml-mason-perl_1.35.bb @@ -10,7 +10,7 @@ RDEPENDS_${PN} = "libexception-class-perl libparams-validate-perl \ perl-module-exporter-heavy perl-module-cwd perl-module-scalar-util \ perl-module-list-util perl-module-bytes perl-module-file-glob \ perl-module-data-dumper" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/HTML-Mason-${PV}.tar.gz" diff --git a/packages/perl/libintl-perl_1.16.bb b/packages/perl/libintl-perl_1.16.bb index e987934c65..e7cebd7458 100644 --- a/packages/perl/libintl-perl_1.16.bb +++ b/packages/perl/libintl-perl_1.16.bb @@ -3,7 +3,7 @@ LICENSE = "Artistic|GPL" RDEPENDS = "perl-module-vars perl-module-locale perl-module-io-handle \ perl-module-symbol perl-module-selectsaver perl-module-io \ perl-module-integer perl-module-exporter-heavy" -PR = "r2" +PR = "r3" SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz" diff --git a/packages/perl/libio-zlib-perl_1.04.bb b/packages/perl/libio-zlib-perl_1.04.bb index 1c99166e16..40292f1a95 100644 --- a/packages/perl/libio-zlib-perl_1.04.bb +++ b/packages/perl/libio-zlib-perl_1.04.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libcompress-zlib-perl-native" RDEPENDS += "libcompress-zlib-perl" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-${PV}.tar.gz" diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb index 5c2f7fcae2..6cef180374 100644 --- a/packages/perl/libipc-sharelite-perl_0.09.bb +++ b/packages/perl/libipc-sharelite-perl_0.09.bb @@ -1,7 +1,7 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r12" +PR = "r13" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-${PV}.tar.gz" diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb index 621243cd8f..763a5680cf 100644 --- a/packages/perl/liblocale-gettext-perl_1.05.bb +++ b/packages/perl/liblocale-gettext-perl_1.05.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Locale::gettext - message handling functions" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/libintl" -PR = "r8" +PR = "r9" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${PV}.tar.gz" diff --git a/packages/perl/liblog-dispatch-perl_2.13.bb b/packages/perl/liblog-dispatch-perl_2.13.bb index 85fdf7e616..ee4a2198c1 100644 --- a/packages/perl/liblog-dispatch-perl_2.13.bb +++ b/packages/perl/liblog-dispatch-perl_2.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Log::Dispatch - Dispatches messages to one or more outputs" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-${PV}.tar.gz" diff --git a/packages/perl/liblog-log4perl-perl_1.06.bb b/packages/perl/liblog-log4perl-perl_1.06.bb index 16ec9f57f9..beecaad0fb 100644 --- a/packages/perl/liblog-log4perl-perl_1.06.bb +++ b/packages/perl/liblog-log4perl-perl_1.06.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Log::Log4perl - Log4j implementation for Perl" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MS/MSCHILLI/Log-Log4perl-${PV}.tar.gz" diff --git a/packages/perl/libmail-sendmail-perl_0.79.bb b/packages/perl/libmail-sendmail-perl_0.79.bb index 1ed84fd150..b333c8239b 100644 --- a/packages/perl/libmail-sendmail-perl_0.79.bb +++ b/packages/perl/libmail-sendmail-perl_0.79.bb @@ -1,6 +1,6 @@ SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://www.cpan.org/modules/by-module/Mail/Mail-Sendmail-${PV}.tar.gz" diff --git a/packages/perl/libmath-bigint-gmp-perl_1.18.bb b/packages/perl/libmath-bigint-gmp-perl_1.18.bb index 3eb24eda10..6a0e91d00c 100644 --- a/packages/perl/libmath-bigint-gmp-perl_1.18.bb +++ b/packages/perl/libmath-bigint-gmp-perl_1.18.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "gmp-native" RDEPENDS += "gmp" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TE/TELS/math/Math-BigInt-GMP-${PV}.tar.gz" diff --git a/packages/perl/libmodule-build-perl_0.2805.bb b/packages/perl/libmodule-build-perl_0.2805.bb index ae7ac7e973..8a7ce9fa04 100644 --- a/packages/perl/libmodule-build-perl_0.2805.bb +++ b/packages/perl/libmodule-build-perl_0.2805.bb @@ -8,7 +8,7 @@ DEPENDS = "libyaml-perl-native libversion-perl-native \ libarchive-tar-perl-native" RDEPENDS = "libyaml-perl libversion-perl libextutils-cbuilder-perl \ libextutils-parsexs-perl libarchive-tar-perl" -PR = "r4" +PR = "r5" S = "${WORKDIR}/Module-Build-${PV}" diff --git a/packages/perl/libnet-ip-perl_1.25.bb b/packages/perl/libnet-ip-perl_1.25.bb index f51cc18fc7..351e96187e 100644 --- a/packages/perl/libnet-ip-perl_1.25.bb +++ b/packages/perl/libnet-ip-perl_1.25.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS += "libio-zlib-perl perl-module-math-bigint" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-${PV}.tar.gz" diff --git a/packages/perl/libnetserver-generic-perl_1.03.bb b/packages/perl/libnetserver-generic-perl_1.03.bb index 5b0ecb1800..c4153b8c4c 100644 --- a/packages/perl/libnetserver-generic-perl_1.03.bb +++ b/packages/perl/libnetserver-generic-perl_1.03.bb @@ -1,6 +1,6 @@ SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://www.cpan.org/modules/by-module/NetServer/NetServer-Generic-${PV}.tar.gz" diff --git a/packages/perl/libparams-util-perl_0.20.bb b/packages/perl/libparams-util-perl_0.20.bb index b6d1feabaf..ef5b6e186a 100644 --- a/packages/perl/libparams-util-perl_0.20.bb +++ b/packages/perl/libparams-util-perl_0.20.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-exporter perl-module-overload \ perl-module-scalar-util perl-module-strict perl-module-vars" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${PV}.tar.gz" diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb index db1a7bd812..52c23333e9 100644 --- a/packages/perl/libparams-validate-perl_0.86.bb +++ b/packages/perl/libparams-validate-perl_0.86.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r12" +PR = "r13" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-${PV}.tar.gz" diff --git a/packages/perl/libperl6-junction-perl_1.10.bb b/packages/perl/libperl6-junction-perl_1.10.bb index 81840b0b11..8cfef00670 100644 --- a/packages/perl/libperl6-junction-perl_1.10.bb +++ b/packages/perl/libperl6-junction-perl_1.10.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl6::Junction - Perl6 style Junction operators in Perl5." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Perl6-Junction-${PV}.tar.gz" diff --git a/packages/perl/libsub-exporter-perl_0.970.bb b/packages/perl/libsub-exporter-perl_0.970.bb index b6ac2b17ee..44756601a2 100644 --- a/packages/perl/libsub-exporter-perl_0.970.bb +++ b/packages/perl/libsub-exporter-perl_0.970.bb @@ -5,7 +5,7 @@ DEPENDS += "libdata-optlist-perl-native libsub-install-perl-native \ libparams-util-perl-native" RDEPENDS += "perl-module-carp libdata-optlist-perl libparams-util-perl \ perl-module-strict libsub-install-perl perl-module-warnings" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Exporter-${PV}.tar.gz" diff --git a/packages/perl/libsub-install-perl_0.922.bb b/packages/perl/libsub-install-perl_0.922.bb index 119094bf95..72bbfcc73b 100644 --- a/packages/perl/libsub-install-perl_0.922.bb +++ b/packages/perl/libsub-install-perl_0.922.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \ perl-module-warnings" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Install-${PV}.tar.gz" diff --git a/packages/perl/libsub-uplevel-perl_0.13.bb b/packages/perl/libsub-uplevel-perl_0.13.bb index 38d3fcd593..032d924856 100644 --- a/packages/perl/libsub-uplevel-perl_0.13.bb +++ b/packages/perl/libsub-uplevel-perl_0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Sub::Uplevel - apparently run a function in a higher stack frame" SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-${PV}.tar.gz" diff --git a/packages/perl/libtest-builder-tester-perl_1.01.bb b/packages/perl/libtest-builder-tester-perl_1.01.bb index 1fd884cfff..0704506ac7 100644 --- a/packages/perl/libtest-builder-tester-perl_1.01.bb +++ b/packages/perl/libtest-builder-tester-perl_1.01.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-strict perl-module-carp perl-module-exporter \ perl-module-symbol perl-module-vars" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-${PV}.tar.gz" diff --git a/packages/perl/libtest-differences-perl_0.47.bb b/packages/perl/libtest-differences-perl_0.47.bb index a66a39182e..e76f35ff0d 100644 --- a/packages/perl/libtest-differences-perl_0.47.bb +++ b/packages/perl/libtest-differences-perl_0.47.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS += "libtext-diff-perl-native" RDEPENDS += "perl-module-carp perl-module-constant perl-module-exporter \ perl-module-strict libtext-diff-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Test-Differences-${PV}.tar.gz" diff --git a/packages/perl/libtest-exception-perl_0.22.bb b/packages/perl/libtest-exception-perl_0.22.bb index b095ea3e4a..021770b01a 100644 --- a/packages/perl/libtest-exception-perl_0.22.bb +++ b/packages/perl/libtest-exception-perl_0.22.bb @@ -5,7 +5,7 @@ DEPENDS += "libsub-uplevel-perl-native" RDEPENDS += "perl-module-base perl-module-carp perl-module-strict \ libsub-uplevel-perl perl-module-test-builder \ perl-module-warnings" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/Test-Exception-${PV}.tar.gz" diff --git a/packages/perl/libtest-mockmodule-perl_0.05.bb b/packages/perl/libtest-mockmodule-perl_0.05.bb index e30a81cb18..422bd41ed0 100644 --- a/packages/perl/libtest-mockmodule-perl_0.05.bb +++ b/packages/perl/libtest-mockmodule-perl_0.05.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \ perl-module-vars " -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/Test-MockModule-${PV}.tar.gz" diff --git a/packages/perl/libtest-output-perl_0.10.bb b/packages/perl/libtest-output-perl_0.10.bb index fb5bebdefe..3a2452ecfd 100644 --- a/packages/perl/libtest-output-perl_0.10.bb +++ b/packages/perl/libtest-output-perl_0.10.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libsub-exporter-perl-native" RDEPENDS += "libsub-exporter-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SS/SSORICHE/Test-Output-${PV}.tar.gz" diff --git a/packages/perl/libtext-diff-perl_0.35.bb b/packages/perl/libtext-diff-perl_0.35.bb index 126d091d8e..07dde46945 100644 --- a/packages/perl/libtext-diff-perl_0.35.bb +++ b/packages/perl/libtext-diff-perl_0.35.bb @@ -5,7 +5,7 @@ DEPENDS += "libalgorithm-diff-perl-native" RDEPENDS += "libalgorithm-diff-perl perl-module-carp perl-module-constant \ perl-module-exporter perl-module-strict perl-module-carp \ perl-module-strict " -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Text-Diff-${PV}.tar.gz" diff --git a/packages/perl/liburi-perl_1.35.bb b/packages/perl/liburi-perl_1.35.bb index c62de2c0fa..23116aced9 100644 --- a/packages/perl/liburi-perl_1.35.bb +++ b/packages/perl/liburi-perl_1.35.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Manipulates and accesses URI strings" SECTION = "libs" LICENSE = "Artistic|GPL" #RDEPENDS += " libmime-base64-perl libnet-perl" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-${PV}.tar.gz" diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb index 246a663d10..817824edec 100644 --- a/packages/perl/libversion-perl_0.6701.bb +++ b/packages/perl/libversion-perl_0.6701.bb @@ -1,7 +1,7 @@ DESCRIPTION = "version - Perl extension for Version Objects" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r7" +PR = "r8" SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-${PV}.tar.gz" diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb index 52adf2b2bf..0b0cd750b0 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 = "r8" +PR = "r9" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" diff --git a/packages/perl/libyaml-perl_0.62.bb b/packages/perl/libyaml-perl_0.62.bb index f8b75b10b7..f6398097b8 100644 --- a/packages/perl/libyaml-perl_0.62.bb +++ b/packages/perl/libyaml-perl_0.62.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-${PV}.tar.gz" -- cgit v1.2.3 From f9ef49020cb889e0abba839eb8fab9bed657dca8 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 30 May 2007 09:00:31 +0000 Subject: sdl-perl 1.20.3: Fix the build of sdl-perl * Use the cpan class to do all the work instead of manually trying to do what cpan.bbclass does. * Add some sed to stop it searching the system paths for SDL headers and to work around it expecting smpeg.h to be in an smpeg subdirectory. * Update the homepage URL. NOTE: The source for this version is no longer available, but it is the version shipped by most distro's. I just grabbed the source from an "apt-get source sdl-perl". Fixes #413. --- packages/sdlperl/sdl-perl_1.20.3.bb | 40 +++++++++---------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/packages/sdlperl/sdl-perl_1.20.3.bb b/packages/sdlperl/sdl-perl_1.20.3.bb index 80bd899dfc..6820fa05ce 100644 --- a/packages/sdlperl/sdl-perl_1.20.3.bb +++ b/packages/sdlperl/sdl-perl_1.20.3.bb @@ -1,40 +1,18 @@ DESCRIPTION = "Perl bindings for SDL" -HOMEPAGE = "http://bloodgate.com/perl" SECTION = "libs" +HOMEPAGE = "http://sdl.perl.org/" LICENSE = "GPL" DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg" +PR = "r1" -SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz \ - file://Makefile.patch;patch=1;pnum=0" +SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz" S = "${WORKDIR}/SDL_perl-${PV}" -do_configure () { - if [ -x ${S}/configure ] ; then - cfgcmd="${S}/configure \ - -GL -GLU" - oenote "Running $cfgcmd..." - $cfgcmd || oefatal "oe_runconf failed" - if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then - . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh - sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new - mv Makefile.new Makefile - fi - else - oefatal "no configure script found" - fi -} - -do_stage () { - install -d ${STAGING_LIBDIR}/perl5/vendor_perl - install -m 0644 ${S}/lib/SDL.pm ${STAGING_LIBDIR}/perl5/vendor_perl -} +inherit cpan -do_compile () { - oe_runmake PASTHRU_INC="${CFLAGS}" +do_configure_prepend() { + # Search staging area for includes + sed -i -e 's:/usr/\(local/\)\{0,1\}include:${STAGING_INCDIR}:g' Makefile.linux + # smpeg.h isn't in a subdirectry + sed -i -e 's:#include :#include :g' SDL_perl.xs } - -do_install () { - oe_runmake install_vendor -} - -FILES_${PN} += '${libdir}/perl5' -- cgit v1.2.3 From 801b33435917f1f3307616ad0ff908776e31f3ea Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 May 2007 09:35:41 +0000 Subject: empathy: sync with poky --- packages/telepathy/empathy-0.5/.mtn2git_empty | 0 packages/telepathy/empathy-0.5/no-gnome.diff | 146 ++++++++++++++++++++++++++ packages/telepathy/empathy_0.5.bb | 6 +- 3 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 packages/telepathy/empathy-0.5/.mtn2git_empty create mode 100644 packages/telepathy/empathy-0.5/no-gnome.diff diff --git a/packages/telepathy/empathy-0.5/.mtn2git_empty b/packages/telepathy/empathy-0.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/telepathy/empathy-0.5/no-gnome.diff b/packages/telepathy/empathy-0.5/no-gnome.diff new file mode 100644 index 0000000000..29d6276f51 --- /dev/null +++ b/packages/telepathy/empathy-0.5/no-gnome.diff @@ -0,0 +1,146 @@ +Index: libempathy-gtk/gossip-ui-utils.c +=================================================================== +--- libempathy-gtk/gossip-ui-utils.c (revision 99) ++++ libempathy-gtk/gossip-ui-utils.c (working copy) +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include + +@@ -1280,13 +1280,14 @@ + gossip_url_show (const char *url) + { + gchar *real_url; +- GError *error = NULL; ++ GnomeVFSResult res; + + real_url = fixup_url (url); +- gnome_url_show (real_url, &error); +- if (error) { +- g_warning ("Couldn't show URL:'%s'", real_url); +- g_error_free (error); ++ res = gnome_vfs_url_show (real_url); ++ if (res != GNOME_VFS_OK) { ++ g_warning ("Couldn't show URL %s: %s", ++ real_url, ++ gnome_vfs_result_to_string (res)); + } + + g_free (real_url); +Index: src/empathy-chat-main.c +=================================================================== +--- src/empathy-chat-main.c (revision 99) ++++ src/empathy-chat-main.c (working copy) +@@ -28,9 +28,6 @@ + #include + #include + +-#include +-#include +- + #include + #include + #include +@@ -162,7 +159,6 @@ + main (int argc, char *argv[]) + { + EmpathyChandler *chandler; +- GnomeProgram *program; + gchar *localedir; + + localedir = gossip_paths_get_locale_path (); +@@ -171,14 +167,8 @@ + textdomain (GETTEXT_PACKAGE); + g_free (localedir); + +- program = gnome_program_init ("empathy-chat", +- PACKAGE_VERSION, +- LIBGNOMEUI_MODULE, +- argc, argv, +- GNOME_PROGRAM_STANDARD_PROPERTIES, +- GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME, +- NULL); +- ++ gtk_init (&argc, &argv); ++ + gtk_window_set_default_icon_name ("empathy"); + + if (g_getenv ("EMPATHY_DEBUG")) { +@@ -194,7 +184,6 @@ + + gtk_main (); + +- g_object_unref (program); + g_object_unref (chandler); + + return EXIT_SUCCESS; +Index: src/empathy-main.c +=================================================================== +--- src/empathy-main.c (revision 99) ++++ src/empathy-main.c (working copy) +@@ -28,9 +28,6 @@ + #include + #include + +-#include +-#include +- + #include + #include + #include +@@ -136,7 +133,6 @@ + McAccountMonitor *monitor; + EmpathyFilter *filter; + gchar *localedir; +- GnomeProgram *program; + gboolean no_connect = FALSE; + GOptionContext *context; + GOptionEntry options[] = { +@@ -157,14 +153,8 @@ + + g_set_application_name (PACKAGE_NAME); + +- program = gnome_program_init ("empathy", +- PACKAGE_VERSION, +- LIBGNOMEUI_MODULE, +- argc, argv, +- GNOME_PROGRAM_STANDARD_PROPERTIES, +- "goption-context", context, +- GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME, +- NULL); ++ gtk_init (&argc, &argv); ++ /* TODO: option parsing */ + + gtk_window_set_default_icon_name ("empathy"); + +@@ -204,7 +194,6 @@ + g_object_unref (monitor); + g_object_unref (mc); + g_object_unref (icon); +- g_object_unref (program); + + return EXIT_SUCCESS; + } +Index: configure.ac +=================================================================== +--- configure.ac (revision 99) ++++ configure.ac (working copy) +@@ -62,12 +62,13 @@ + + PKG_CHECK_MODULES(EMPATHY, + [ ++ libxml-2.0 + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gtk+-2.0 >= $GTK_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED +- libgnomeui-2.0 ++ gnome-vfs-2.0 + libtelepathy >= $TELEPATHY_REQUIRED + libmissioncontrol >= $MISSION_CONTROL_REQUIRED + ]) diff --git a/packages/telepathy/empathy_0.5.bb b/packages/telepathy/empathy_0.5.bb index 39cccfbdf0..e7b2af1d57 100644 --- a/packages/telepathy/empathy_0.5.bb +++ b/packages/telepathy/empathy_0.5.bb @@ -1,16 +1,16 @@ DESCRIPTION = "Empathy: a Telepathy based IM client" HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" LICENSE = "GPL" -DEPENDS = "libgnomeui telepathy-mission-control libtelepathy gtk+ gconf libglade" +DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs" RDEPENDS = "telepathy-mission-control" RRECOMMENDS = "telepathy-gabble" -PR="r0" +PR="r1" inherit gnome SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \ - " + file://no-gnome.diff;patch=1;pnum=0" FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ ${datadir}/dbus-1/services/*.service \ -- cgit v1.2.3 From 1a241c914a27ede849021c4c4cb5f408a22cab53 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 May 2007 09:50:51 +0000 Subject: mplayer 1.0rc1: sync with svn version for pxa optimizations --- packages/mplayer/mplayer_0.0+1.0rc1.bb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 2910cbd0a4..34fe1ac123 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -34,7 +34,7 @@ PACKAGE_ARCH_mencoder_collie = "collie" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r12" +PR = "r13" PARALLEL_MAKE = "" @@ -177,13 +177,24 @@ EXTRA_OECONF = " \ EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \ --disable-encoder=vorbis_encoder" -EXTRA_OECONF_append_c7x0 = " --enable-w100 --enable-imageon " -EXTRA_OECONF_append_hx4700 = " --enable-imageon " EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2" + +#enable support for the ati imageon series (w100 and w3220) +EXTRA_OECONF_append_c7x0 = " --enable-w100 " +EXTRA_OECONF_append_hx4700 = " --enable-imageon " + +#enable pxa270 overlay support EXTRA_OECONF_append_spitz = " --enable-pxa " +EXTRA_OECONF_append_a780 = " --enable-pxa " +#build with support for the iwmmxt instruction support (pxa270 and up) TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH_spitz = "iwmmxt" +TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_a780 = "iwmmxt" +TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_hx4700= "iwmmxt" + do_configure() { cp ${WORKDIR}/vo_w100.c ${S}/libvo -- cgit v1.2.3 From 15fcad01c1b74e413dd6633ac6d2365726e12701 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Wed, 30 May 2007 09:51:59 +0000 Subject: gcc: Make gcc build on amd64 by having it forget target configure cache when configuring for build machine. Closes bug #1951 --- packages/gcc/gcc-4.1.2/cache-amnesia.patch | 13 +++++++++++++ packages/gcc/gcc_4.1.2.bb | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 packages/gcc/gcc-4.1.2/cache-amnesia.patch diff --git a/packages/gcc/gcc-4.1.2/cache-amnesia.patch b/packages/gcc/gcc-4.1.2/cache-amnesia.patch new file mode 100644 index 0000000000..ef7cd111c5 --- /dev/null +++ b/packages/gcc/gcc-4.1.2/cache-amnesia.patch @@ -0,0 +1,13 @@ +diff --git a/gcc/configure b/gcc/configure +index 44620ab..6e1830c 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -12272,7 +12272,7 @@ else + esac + saved_CFLAGS="${CFLAGS}" + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ +- ${realsrcdir}/configure \ ++ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ + --enable-languages=${enable_languages-all} \ + --target=$target_alias --host=$build_alias --build=$build_alias + CFLAGS="${saved_CFLAGS}" diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 417909eb1b..2557a2694e 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -29,6 +29,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ + file://cache-amnesia.patch;patch=1 \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " @@ -45,6 +46,7 @@ JAVA = "" LANGUAGES = "c,c++${FORTRAN}${JAVA}" require gcc3-build.inc +ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR} EXTRA_OECONF += " --disable-libssp " -- cgit v1.2.3 From c4d2a1e3fc39b16f04c2703889c3be672720578e Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Wed, 30 May 2007 10:01:45 +0000 Subject: opie-reader: fix copying of unicode text blocks, since upstream isn't likely to incorporate this one-liner patch anytime soon. --- packages/opie-reader/files/.mtn2git_empty | 0 packages/opie-reader/files/opie-reader-unicode-copy.patch | 11 +++++++++++ packages/opie-reader/opie-reader_cvs.bb | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/opie-reader/files/.mtn2git_empty create mode 100644 packages/opie-reader/files/opie-reader-unicode-copy.patch diff --git a/packages/opie-reader/files/.mtn2git_empty b/packages/opie-reader/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-reader/files/opie-reader-unicode-copy.patch b/packages/opie-reader/files/opie-reader-unicode-copy.patch new file mode 100644 index 0000000000..d7d1ae24bd --- /dev/null +++ b/packages/opie-reader/files/opie-reader-unicode-copy.patch @@ -0,0 +1,11 @@ +--- opie-reader/QTReaderApp.cpp.orig 2005-05-18 00:48:25.000000000 +0200 ++++ opie-reader/QTReaderApp.cpp 2006-04-08 15:55:43.000000000 +0200 +@@ -2558,7 +2558,7 @@ + reader->jumpto(m_savedpos); + while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF) + { +- text += ch; ++ text += QChar(ch); + } + cb->setText(text); + reader->locate(currentpos); diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index 2f844d8dfd..82b3547ae1 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -1,8 +1,10 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = r1 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};module=opie/pics \ - ${HANDHELDS_CVS};module=opie/apps" + ${HANDHELDS_CVS};module=opie/apps \ + file://opie-reader-unicode-copy.patch;patch=1" -- cgit v1.2.3 From 2a63faf24bf2c3880138734f2f14c4b2f81fd5d2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 30 May 2007 10:03:42 +0000 Subject: xrandr: fix uclibc build (from Poky) --- packages/xorg-app/xrandr/.mtn2git_empty | 0 .../xorg-app/xrandr/resolve_symbol_clash.patch | 35 ++++++++++++++++++++++ packages/xorg-app/xrandr_1.2.0.bb | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 packages/xorg-app/xrandr/.mtn2git_empty create mode 100644 packages/xorg-app/xrandr/resolve_symbol_clash.patch diff --git a/packages/xorg-app/xrandr/.mtn2git_empty b/packages/xorg-app/xrandr/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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 -- cgit v1.2.3 From a67b76f4c4dd74ce56cbba316a2e3bfeaf4d2617 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 May 2007 10:13:12 +0000 Subject: angstrom: bump xrandr to 1.2.x --- conf/distro/angstrom-2007.1.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 71303ab836..6019980ac9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -152,9 +152,14 @@ PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_libxrandr ?= "1.2.1" +PREFERRED_VERSION_xrandr ?= "1.2.0" +PREFERRED_VERSION_randrproto ?= "1.2.1" + require conf/distro/include/preferred-xorg-versions-X11R7.2.inc -#PREFERRED_VERSION_xserver-kdrive = "1.2.0" + PREFERRED_VERSION_gtk+ = "2.10.12" PREFERRED_VERSION_libgnomeui = "2.16.1" -- cgit v1.2.3 From 16c55f06c1bcb160697c5465f30434f3b26fede1 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Wed, 30 May 2007 10:15:40 +0000 Subject: opie-multikey: Let it load ru.keymap even with utf8 locale set by converting comments into utf-safe encoding. Again, can't wait for upstream for a couple of years more. --- packages/opie-multikey/files/ru.keymap | 255 +++++++++++++++++++++++++++++++ packages/opie-multikey/opie-multikey.inc | 1 + 2 files changed, 256 insertions(+) create mode 100644 packages/opie-multikey/files/ru.keymap 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/ } -- cgit v1.2.3 From 0535783ac5c2439e33959ee3598f99ba8805053e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 May 2007 10:40:10 +0000 Subject: webkit: unbreak qmake usage a bit --- packages/webkit/webkit_svn.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb index 7e221f4113..e86cfac6ac 100644 --- a/packages/webkit/webkit_svn.bb +++ b/packages/webkit/webkit_svn.bb @@ -1,4 +1,4 @@ -DEPENDS = "flex-native icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo gtk+" +DEPENDS = "flex-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo gtk+" # Yes, this is wrong... PV = "0.0+svn${SRCDATE}" @@ -22,14 +22,13 @@ 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 } -- cgit v1.2.3 From f5abde8dec243f558f89b97e379d3856bc4e3ed8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 May 2007 11:14:30 +0000 Subject: db1200: remove PACKAGE_ARCHS --- conf/machine/db1200.conf | 1 - 1 file changed, 1 deletion(-) 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" -- cgit v1.2.3 From 036cda450a113e5c31c36517d4e9dec37d5efcfd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 30 May 2007 11:32:27 +0000 Subject: libxml-parser-perl-native: fix RDEPENDS (from Poky) --- packages/perl/libxml-parser-perl-native_2.34.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/perl