[oe-commits] org.oe.dev merge of '4d01e12fde33f43c99f3c6215f4514d9f9d24479'
florian commit
openembedded-commits at lists.openembedded.org
Fri Jul 13 10:51:44 UTC 2007
merge of '4d01e12fde33f43c99f3c6215f4514d9f9d24479'
and 'aa44d626baaae40ee498aea453176a8aea90d9fc'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 866fdd5b1f5c959e08133230487c4695dd958233
ViewMTN: http://monotone.openembedded.org/revision.psp?id=866fdd5b1f5c959e08133230487c4695dd958233
Files:
1
packages/gparted
packages/gparted/files
packages/parted/files
conf/machine/include/palm.conf
packages/autoconf/autoconf-2.61/config-site.patch
packages/automake/automake-native_1.10.bb
packages/automake/automake_1.10.bb
packages/evince/evince_0.9.2.bb
packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
packages/gparted/files/cross.patch
packages/gparted/files/gparted-0.3.3-llabs.patch
packages/gparted/gparted_0.3.3.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
packages/m4/m4-native_1.4.8.bb
packages/parted/files/cross-gross-hack.patch
packages/parted/files/syscalls.h
packages/parted/files/syscalls.patch
conf/distro/angstrom-2007.1.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/h4000.conf
conf/machine/htcblueangel.conf
conf/machine/palmld.conf
conf/machine/palmtt3.conf
conf/machine/palmtx.conf
conf/machine/palmz72.conf
packages/autoconf/autoconf_2.61.bb
packages/gcc/gcc_csl-arm-2005q3.bb
packages/glib-2.0/glib-2.0_2.12.12.bb
packages/glib-2.0/glib.inc
packages/linux/fsg3-kernel_2.6.18.bb
packages/parted/parted_1.8.7.bb
packages/tasks/task-base.bb
packages/tasks/task-openmoko.bb
site/common-glibc
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-helper_svn.bb
Diffs:
#
# mt diff -r4d01e12fde33f43c99f3c6215f4514d9f9d24479 -r866fdd5b1f5c959e08133230487c4695dd958233
#
#
#
# add_dir "packages/gparted"
#
# add_dir "packages/gparted/files"
#
# add_dir "packages/parted/files"
#
# add_file "conf/machine/include/palm.conf"
# content [67ba46a49721b82b7690b3214c3a2d5451076c5b]
#
# add_file "packages/autoconf/autoconf-2.61/config-site.patch"
# content [b83a5c63b39c809371af530d1b25b207e7c27dbe]
#
# add_file "packages/automake/automake-native_1.10.bb"
# content [515a0d90c13871057bedf62fc57fab2658deedf4]
#
# add_file "packages/automake/automake_1.10.bb"
# content [2ae0e8bb93521eb42b59f40ca0d76baee5220450]
#
# add_file "packages/evince/evince_0.9.2.bb"
# content [c874b55da09d3037d303e145d2cc1507fa7402e6]
#
# add_file "packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch"
# content [008311dc2f647e2edbc8237be354fcf5f5e71e2f]
#
# add_file "packages/gparted/files/cross.patch"
# content [2a152c6b48120b9b9a1b3db21b186a1da798b917]
#
# add_file "packages/gparted/files/gparted-0.3.3-llabs.patch"
# content [9242da34ef46c00a04dababab07118a03585a308]
#
# add_file "packages/gparted/gparted_0.3.3.bb"
# content [a638e0b0aafd82a9f334598772c46d4af04360af]
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# add_file "packages/m4/m4-native_1.4.8.bb"
# content [c4a8093ea1425f950c9db692a37b1bac632dc4eb]
#
# add_file "packages/parted/files/cross-gross-hack.patch"
# content [4442d2403c1b2ad039f7f337220985ca4e31dfb3]
#
# add_file "packages/parted/files/syscalls.h"
# content [9ff44c11dc2d4a6ce3154f105c87965271e7da07]
#
# add_file "packages/parted/files/syscalls.patch"
# content [f02b0412dedb9f31aa19360d79847f6b176d75c4]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [492fb6241aa69eb82747c0c5b369480a2ed86c6f]
# to [8b80a1c95dae22cddbcc5efbca4f834aab273d56]
#
# patch "conf/machine/fic-gta01.conf"
# from [1c3c67459b5584e2defd8c40e278b0e5bfff7066]
# to [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
#
# patch "conf/machine/fic-gta02.conf"
# from [f432dd6889c55c316032a7acbf4d55670603e3e1]
# to [35a3ed508f3117b908249db21b5778bc4578be37]
#
# patch "conf/machine/h4000.conf"
# from [1d9bd156a1998140041d4a105ac52b00cf910841]
# to [0f9f407e263722cada91fcbbddd485ba1f0a85b9]
#
# patch "conf/machine/htcblueangel.conf"
# from [c6770b35cf50ebebdd92334753ebe6f8c86bdaaa]
# to [29e2ddc11eb786ac0f566be156d09a5f96617a8b]
#
# patch "conf/machine/palmld.conf"
# from [35967f1aae7db5a316327dcc9e656a7fd33fb278]
# to [5733d4803a281832c68a5a1ff2eb4ead15b8fbba]
#
# patch "conf/machine/palmtt3.conf"
# from [8eb9d7e7f6949204fa8741d734439d4c836f99e1]
# to [15cbbe4d9939a58685fb5359794329dd50b69f91]
#
# patch "conf/machine/palmtx.conf"
# from [60acb514b53dbef8a4ff57caa014edbde0c28384]
# to [62107e3db846dc2f8067bbca79d8050d6ccb4e4c]
#
# patch "conf/machine/palmz72.conf"
# from [2643dcd48c5ef8d7db0dafebc412aac90abf7a6a]
# to [ba207859b5c17a96fc5a1ab6c25d178e8f9159fc]
#
# patch "packages/autoconf/autoconf_2.61.bb"
# from [5b63219a0f5805d538df64bc42bf4707ec3de7c9]
# to [135bc1ab5bc4874de77b64ca663c3fe9d595cdc9]
#
# patch "packages/gcc/gcc_csl-arm-2005q3.bb"
# from [f98dfc1e2c2356f88fadc3cab92e030e0d162c0d]
# to [abae682fa0bd645ccf732fd208f25c9391aecd71]
#
# patch "packages/glib-2.0/glib-2.0_2.12.12.bb"
# from [030996100e8c5110ee7690dae2a49a7cef321ecf]
# to [83e73c427da8f2e30cb58950bde9a902e2900d65]
#
# patch "packages/glib-2.0/glib.inc"
# from [3b5260371e84b9c12db9a8cdc8c5809bab8d2ec5]
# to [29039e156a12c5bbeada136e27b7e662b1928c8c]
#
# patch "packages/linux/fsg3-kernel_2.6.18.bb"
# from [ce39fe5171bf38acd7aea7c3116494648d56f9b4]
# to [4ac230c89fa86ba1e2157648762a1d6ad36bbc76]
#
# patch "packages/parted/parted_1.8.7.bb"
# from [869ca28033957bf8a0406bc4d16876bd71dff378]
# to [d6afd38558136f4935253ac51b004acc3fd7bbdd]
#
# patch "packages/tasks/task-base.bb"
# from [8063e1b226de759fef34b1a23b3845f05b89bb7c]
# to [2b89141c35420f2a2ec89ff47305e1e4034c4067]
#
# patch "packages/tasks/task-openmoko.bb"
# from [4c34acfd5d530e57627e163ab546ffbfebf5988d]
# to [ec3fef5477399d4762dbd4338b3c5f44bafa2f96]
#
# patch "site/common-glibc"
# from [b92f57d8679d30d91088f81d8515234d2f26b728]
# to [7048580f000406f0acd052f1c85074d6d322c430]
#
============================================================
--- conf/machine/include/palm.conf 67ba46a49721b82b7690b3214c3a2d5451076c5b
+++ conf/machine/include/palm.conf 67ba46a49721b82b7690b3214c3a2d5451076c5b
@@ -0,0 +1,89 @@
+#
+# Hardware-based properties
+#
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_pcmcia_core = "pcmcia-core"
+module_autoload_pda_power = "pda_power"
+module_autoload_pxa2xx_core = "pxa2xx-core"
+module_autoload_pxapwm_bl = "pxapwm_bl"
+module_autoload_snd = "snd"
+module_autoload_snd-ac97-codec = "snd-ac97-codec"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"
+module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
+module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmz72_battery = "palmz72_battery"
+module_autoload_i2c-dev = "i2c-dev"
+module_autoload_i2c-pxa = "i2c-pxa"
+
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-ac97-bus \
+ kernel-module-apm-power \
+ kernel-module-backlight \
+ kernel-module-battery \
+ kernel-module-led-class \
+ kernel-module-lcd \
+ kernel-module-gpioed \
+ kernel-module-gpioed-ng \
+ kernel-module-external-power \
+ kernel-module-snd \
+ kernel-module-snd-ac97-codec \
+ kernel-module-snd-page-alloc \
+ kernel-module-snd-pcm \
+ kernel-module-snd-seq \
+ kernel-module-snd-seq-device \
+ kernel-module-snd-seq-midi-event \
+ kernel-module-snd-seq-oss \
+ kernel-module-snd-timer \
+ kernel-module-soundcore \
+ "
============================================================
--- packages/autoconf/autoconf-2.61/config-site.patch b83a5c63b39c809371af530d1b25b207e7c27dbe
+++ packages/autoconf/autoconf-2.61/config-site.patch b83a5c63b39c809371af530d1b25b207e7c27dbe
@@ -0,0 +1,13 @@
+Index: autoconf-2.61/lib/autoconf/general.m4
+===================================================================
+--- autoconf-2.61.orig/lib/autoconf/general.m4 2007-07-10 15:09:01.000000000 +0100
++++ autoconf-2.61/lib/autoconf/general.m4 2007-07-10 15:09:17.000000000 +0100
+@@ -1767,7 +1767,7 @@
+ m4_define([AC_SITE_LOAD],
+ [# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+- set x "$CONFIG_SITE"
++ set x $CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
============================================================
--- packages/automake/automake-native_1.10.bb 515a0d90c13871057bedf62fc57fab2658deedf4
+++ packages/automake/automake-native_1.10.bb 515a0d90c13871057bedf62fc57fab2658deedf4
@@ -0,0 +1,3 @@
+PV := "${PV}"
+
+require automake-native.inc
============================================================
--- packages/automake/automake_1.10.bb 2ae0e8bb93521eb42b59f40ca0d76baee5220450
+++ packages/automake/automake_1.10.bb 2ae0e8bb93521eb42b59f40ca0d76baee5220450
@@ -0,0 +1,31 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+ ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+
+S = "${WORKDIR}/automake-${PV}"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+inherit autotools
+
+export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+
+require automake.inc
+
+do_install () {
+ oe_runmake 'DESTDIR=${D}' install
+ install -d ${D}${datadir}
+ if [ ! -e ${D}${datadir}/aclocal ]; then
+ ln -sf aclocal-1.9 ${D}${datadir}/aclocal
+ fi
+ if [ ! -e ${D}${datadir}/automake ]; then
+ ln -sf automake-1.9 ${D}${datadir}/automake
+ fi
+}
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/evince/evince_0.9.2.bb c874b55da09d3037d303e145d2cc1507fa7402e6
+++ packages/evince/evince_0.9.2.bb c874b55da09d3037d303e145d2cc1507fa7402e6
@@ -0,0 +1,16 @@
+DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
+LICENSE = "GPL"
+SECTION = "x11/office"
+DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+RDEPENDS = "espgs "
+RRECOMMENDS = "gnome-vfs-plugin-file"
+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-help-dir.patch;patch=1"
+
+EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
+
============================================================
--- packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch 008311dc2f647e2edbc8237be354fcf5f5e71e2f
+++ packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch 008311dc2f647e2edbc8237be354fcf5f5e71e2f
@@ -0,0 +1,12 @@
+--- gcc-2005q3/gcc/config/arm/linux-eabi.h~ 2007-07-10 09:19:47.000000000 +0930
++++ gcc-2005q3/gcc/config/arm/linux-eabi.h 2007-07-10 10:42:37.000000000 +0930
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++ " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+ GNU/Linux binaries on an EABI system. */
============================================================
--- packages/gparted/files/cross.patch 2a152c6b48120b9b9a1b3db21b186a1da798b917
+++ packages/gparted/files/cross.patch 2a152c6b48120b9b9a1b3db21b186a1da798b917
@@ -0,0 +1,12 @@
+diff -ur gparted-0.3.3.org/configure.in gparted-0.3.3/configure.in
+--- gparted-0.3.3.org/configure.in 2006-12-06 15:23:35.000000000 +0200
++++ gparted-0.3.3/configure.in 2007-07-10 02:10:59.000000000 +0300
+@@ -37,7 +37,7 @@
+ AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
+ LIBS_save="$LIBS"
+ LIBS="-lparted -luuid -ldl"
+-AC_TRY_RUN(
++AC_TRY_LINK(
+ #include <stdio.h>
+ #include <parted/parted.h>
+
============================================================
--- packages/gparted/files/gparted-0.3.3-llabs.patch 9242da34ef46c00a04dababab07118a03585a308
+++ packages/gparted/files/gparted-0.3.3-llabs.patch 9242da34ef46c00a04dababab07118a03585a308
@@ -0,0 +1,72 @@
+--- src/GParted_Core.cc 2006/09/25 21:49:32 1.1
++++ src/GParted_Core.cc 2006/09/25 22:03:31
+@@ -1604,7 +1604,7 @@ bool GParted_Core::copy_filesystem( cons
+
+ while ( succes &&
+ timer .elapsed() <= smallest_time &&
+- std::llabs( done ) + N <= length &&
++ llabs( done ) + N <= length &&
+ optimal_blocksize * 2 < N )
+ {
+ if ( done != 0 )
+@@ -1648,7 +1648,7 @@ bool GParted_Core::copy_filesystem( cons
+ dst_device,
+ src_start + ( dst_start > src_start ? 0 : done ),
+ dst_start + ( dst_start > src_start ? 0 : done ),
+- length - std::llabs( done ),
++ length - llabs( done ),
+ optimal_blocksize,
+ operationdetail,
+ readonly,
+@@ -1822,7 +1822,7 @@ bool GParted_Core::copy_blocks( const Gl
+ if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
+ {
+ Glib::ustring error_message ;
+- buf = static_cast<char *>( malloc( std::llabs( blocksize ) * 512 ) ) ;
++ buf = static_cast<char *>( malloc( llabs( blocksize ) * 512 ) ) ;
+ if ( buf )
+ {
+ ped_device_sync( lp_device_dst ) ;
+@@ -1843,7 +1843,7 @@ bool GParted_Core::copy_blocks( const Gl
+ operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
+
+ Glib::Timer timer_progress_timeout, timer_total ;
+- while( succes && std::llabs( done ) < length )
++ while( succes && llabs( done ) < length )
+ {
+ succes = copy_block( lp_device_src,
+ lp_device_dst,
+@@ -1858,7 +1858,7 @@ bool GParted_Core::copy_blocks( const Gl
+ if ( timer_progress_timeout .elapsed() >= 0.5 )
+ {
+ set_progress_info( length,
+- std::llabs( done + blocksize ),
++ llabs( done + blocksize ),
+ timer_total,
+ operationdetail .get_last_child() .get_last_child(),
+ readonly ) ;
+@@ -1877,13 +1877,13 @@ bool GParted_Core::copy_blocks( const Gl
+
+ //final description
+ operationdetail .get_last_child() .get_last_child() .set_description(
+- String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ;
++ String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), llabs( done ), length ), FONT_ITALIC ) ;
+
+ if ( ! succes && ! error_message .empty() )
+ operationdetail .get_last_child() .add_child(
+ OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ;
+
+- total_done += std::llabs( done ) ;
++ total_done += llabs( done ) ;
+
+ //close and destroy the devices..
+ ped_device_close( lp_device_src ) ;
+@@ -1912,7 +1912,7 @@ bool GParted_Core::copy_block( PedDevice
+
+ if ( blocksize < 0 )
+ {
+- blocksize = std::llabs( blocksize ) ;
++ blocksize = llabs( blocksize ) ;
+ offset_src -= ( blocksize -1 ) ;
+ offset_dst -= ( blocksize -1 ) ;
+ }
============================================================
--- packages/gparted/gparted_0.3.3.bb a638e0b0aafd82a9f334598772c46d4af04360af
+++ packages/gparted/gparted_0.3.3.bb a638e0b0aafd82a9f334598772c46d4af04360af
@@ -0,0 +1,10 @@
+DESCRIPTION = "GNOME Partition Manager"
+LICENSE = "GPL"
+DEPENDS = "gtkmm parted"
+PR = "r1"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gparted/gparted-${PV}.tar.bz2 \
+ file://cross.patch;patch=1 \
+ file://gparted-0.3.3-llabs.patch;patch=1;pnum=0"
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -raa44d626baaae40ee498aea453176a8aea90d9fc -r866fdd5b1f5c959e08133230487c4695dd958233
#
#
#
# patch "packages/gpephone/ptim-engine_svn.bb"
# from [9edcf54a369610d5112dca943b1c77d6e80ec6be]
# to [7faa1b8b01b548efede423f2c32b31a4ae6ece7c]
#
# patch "packages/gpephone/ptim-helper_svn.bb"
# from [f1f55592accd9643cad1a245df07efeb0b9d663d]
# to [eaf5cdd4d29b32dfccd466b4b0e57015d3114c71]
#
============================================================
--- packages/gpephone/ptim-engine_svn.bb 9edcf54a369610d5112dca943b1c77d6e80ec6be
+++ packages/gpephone/ptim-engine_svn.bb 7faa1b8b01b548efede423f2c32b31a4ae6ece7c
@@ -1,16 +1,16 @@ PV = "0.1+svn-${SRCDATE}"
DESCRIPTION = "Phone input method engine"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers"
PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
inherit gpephone pkgconfig autotools
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine \
- file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine"
S = "${WORKDIR}/imengine"
============================================================
--- packages/gpephone/ptim-helper_svn.bb f1f55592accd9643cad1a245df07efeb0b9d663d
+++ packages/gpephone/ptim-helper_svn.bb eaf5cdd4d29b32dfccd466b4b0e57015d3114c71
@@ -1,16 +1,16 @@ PV = "0.1+svn-${SRCDATE}"
DESCRIPTION = "Phone input method helper module"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers"
PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
inherit gpephone pkgconfig autotools
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper \
- file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper"
S = "${WORKDIR}/imhelper"
More information about the Openembedded-commits
mailing list