[oe-commits] org.oe.dev merge of '3948c8054b50f67afee06a66abbab4a35915d297'

pfalcon commit openembedded-commits at lists.openembedded.org
Fri Nov 30 15:06:30 UTC 2007


merge of '3948c8054b50f67afee06a66abbab4a35915d297'
     and 'cefef520b1840df3899cd9fc5a4fc3cb9faa38ce'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 134d7336225003c72a1d58fe031dcd5c6075f1c8
ViewMTN: http://monotone.openembedded.org/revision/info/134d7336225003c72a1d58fe031dcd5c6075f1c8
Files:
1
packages/apex/nslu2
packages/apex/files
packages/gtk+/gdk-pixbuf-csource_2.10.14.bb
packages/gtk+/gdk-pixbuf_2.10.14.bb
packages/gpephone/libabenabler2
packages/gpephone/libiac-0.1
packages/libical
packages/libical/libical
packages/linux/linux-ixp4xx
packages/wesnoth
packages/gcc/gcc-4.2.1/pr34130.patch
packages/gcc/gcc-4.2.2/pr34130.patch
packages/gpephone/contact_svn.bb
packages/gpephone/libabenabler2/i18n.patch
packages/gpephone/libabenabler2_svn.bb
packages/gpephone/libcalenabler2_svn.bb
packages/gpephone/libiac-0.1/po.patch
packages/gpephone/ptim-engine_1.0.bb
packages/gpephone/ptim-headers_1.0.bb
packages/gpephone/ptim-helper_1.0.bb
packages/gpephone/ptim-manager_1.0.bb
packages/images/nslu2-minimal-image.bb
packages/libical/libical/pthread-link.patch
packages/libical/libical_0.27.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc831x-nand.patch
packages/linux/linux-ixp4xx/defconfig-2.6.18
packages/linux/linux-ixp4xx/defconfig-2.6.19
packages/linux/linux-ixp4xx/defconfig-2.6.20
packages/linux/linux-ixp4xx/defconfig-2.6.21.6
packages/linux/linux-ixp4xx/defconfig-2.6.22
packages/linux/linux-ixp4xx/defconfig-2.6.23.8
packages/linux/linux-ixp4xx.inc
packages/linux/linux-ixp4xx_2.6.18.bb
packages/linux/linux-ixp4xx_2.6.19.bb
packages/linux/linux-ixp4xx_2.6.20.bb
packages/linux/linux-ixp4xx_2.6.21.6.bb
packages/linux/linux-ixp4xx_2.6.23.8.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/subversion/subversion_1.4.5.bb
packages/uboot/u-boot_1.3.0.bb
packages/wesnoth/wesnoth_svn.bb
packages/xorg-lib/libx11-native_1.1.1.bb
classes/base.bbclass
classes/nslu2-image.bbclass
conf/checksums.ini
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/include/slugos.inc
conf/distro/slugos.conf
conf/machine/include/ixp4xx.inc
conf/machine/mpc8313e-rdb.conf
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
packages/gpephone/libabenabler2_1.0.bb
packages/gpephone/libiac_0.1.bb
packages/images/slugos-image.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-efika-2.6.20/defconfig
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-openmoko/defconfig-2.6.22.5
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23.bb
packages/meta/meta-toolchain.bb
packages/netbase/netbase/interfaces
packages/netbase/netbase_4.21.bb
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tinymail/libtinymail_svn.bb
packages/tinymail/tmut_svn.bb
packages/uboot/u-boot_git.bb
packages/xorg-driver/xorg-driver-common.inc
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/zaurusd/files/zaurus-hinge.bl-off
packages/zaurusd/files/zaurus-hinge.bl-on
packages/zaurusd/files/zaurus-hinge.matchbox-landscape
packages/zaurusd/files/zaurus-hinge.matchbox-portrait
packages/zaurusd/zaurusd_svn.bb
packages/gpe-login/files/size-autolock-properly.patch
packages/matchbox-applet-inputmanager/files/visibility-protocol.patch
packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch
packages/gpe-login/gpe-login_0.90.bb
packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
packages/matchbox-keyboard/matchbox-keyboard_svn.bb
packages/xkbd/xkbd_0.8.15.bb
Diffs:

#
# mt diff -r3948c8054b50f67afee06a66abbab4a35915d297 -r134d7336225003c72a1d58fe031dcd5c6075f1c8
#
# 
# 
# rename "packages/apex/nslu2"
#     to "packages/apex/files"
# 
# rename "packages/gtk+/gdk-pixbuf-csource_2.10.14.bb"
#     to "packages/gtk+/gdk-pixbuf_2.10.14.bb"
# 
# add_dir "packages/gpephone/libabenabler2"
# 
# add_dir "packages/gpephone/libiac-0.1"
# 
# add_dir "packages/libical"
# 
# add_dir "packages/libical/libical"
# 
# add_dir "packages/linux/linux-ixp4xx"
# 
# add_dir "packages/wesnoth"
# 
# add_file "packages/gcc/gcc-4.2.1/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gcc/gcc-4.2.2/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gpephone/contact_svn.bb"
#  content [2bdcfd37fa7331f354b090527f502870cee6fea5]
# 
# add_file "packages/gpephone/libabenabler2/i18n.patch"
#  content [a7ab56662050689df45614de35f395c80c7a8521]
# 
# add_file "packages/gpephone/libabenabler2_svn.bb"
#  content [6cedd4eaaae17335f9912cbdd4124a86765aae34]
# 
# add_file "packages/gpephone/libcalenabler2_svn.bb"
#  content [ca595393866e1e0b2240421e240db9ddbefbedff]
# 
# add_file "packages/gpephone/libiac-0.1/po.patch"
#  content [3d352daa975484e6165f89f57d100c5ec902d26d]
# 
# add_file "packages/gpephone/ptim-engine_1.0.bb"
#  content [a480d44e3eaf64f94932940abe59e48577d0190e]
# 
# add_file "packages/gpephone/ptim-headers_1.0.bb"
#  content [7760280d3c672c98d814d47e933ae1f2dd67c9f1]
# 
# add_file "packages/gpephone/ptim-helper_1.0.bb"
#  content [cded5e98aa2f79ce810ac489797a71b0fadcb1d2]
# 
# add_file "packages/gpephone/ptim-manager_1.0.bb"
#  content [0ae91fb3d366635ebd26ef4a7c29c4962b2b338a]
# 
# add_file "packages/images/nslu2-minimal-image.bb"
#  content [b79cc878de38e428c269688f55fbd183cf6081c6]
# 
# add_file "packages/libical/libical/pthread-link.patch"
#  content [c55dae0b017df7935e2310bbd89f8b588f524f6b]
# 
# add_file "packages/libical/libical_0.27.bb"
#  content [b786a23b25f8ce8c2e7b5ba0cfca389cb0a733bc]
# 
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  content [17503c55f830f3a3deb1876d7d390a42edb3bc6b]
# 
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
#  content [953bccbd5cef5767c0a922ebc7eeae4691dbfb65]
# 
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc831x-nand.patch"
#  content [ff71d36374ddc75c81a9a36be82543a7ebd0c0f9]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.18"
#  content [cdcea03246810de7302f1baefcc57d83a46cf1cc]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.19"
#  content [fda5517f2f279d5dc7d1032423bd09803c24d834]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.20"
#  content [d9deebc942c5950daead1cba30fbf9686ad1d9d3]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.21.6"
#  content [c8f2393bacd7f497d9c1c712cfe77848122b86d2]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.22"
#  content [1cb9cbc470259061b12e46464f67295c60df26dd]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.23.8"
#  content [de9465ffd409f23080029d85f44acbbc0b148eb7]
# 
# add_file "packages/linux/linux-ixp4xx.inc"
#  content [104c898701b243728e14a24a5ac89d50ede467ad]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.18.bb"
#  content [2a24b7141f003d05f2fcb1c51e20f7ac132f49aa]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.19.bb"
#  content [c7ecf27563b708812153c987f5f93f001e1bc4fb]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.20.bb"
#  content [8bbe91f941ad937cf4067ccef4fb6a670b07081c]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.21.6.bb"
#  content [f754b93eafcd639331fbc458e277dc3b7f52330d]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.23.8.bb"
#  content [74a1a67b09d506c633f8fd365bdc1b3c521a46f6]
# 
# add_file "packages/openmoko2/openmoko-sample2_svn.bb"
#  content [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# 
# add_file "packages/subversion/subversion_1.4.5.bb"
#  content [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# 
# add_file "packages/uboot/u-boot_1.3.0.bb"
#  content [8cfd5293c0214179a38b2304fbd10c77a3912aff]
# 
# add_file "packages/wesnoth/wesnoth_svn.bb"
#  content [de8bbc9e99d99055231c5edc26d756f2d06012dc]
# 
# add_file "packages/xorg-lib/libx11-native_1.1.1.bb"
#  content [6b2349caf20881e34dd3f21904c38aaa714c9e9c]
# 
# patch "classes/base.bbclass"
#  from [aa9556ce2534ddc34c19b8887bb5cd01a46e8ba1]
#    to [d94e4a54d0b01a3d7a66b2c418f28f37616379ab]
# 
# patch "classes/nslu2-image.bbclass"
#  from [a75b47c6e523125efc0f292c13f24e2059a58125]
#    to [3ba57cc877ce3060583122672952bf4a937be2d7]
# 
# patch "conf/checksums.ini"
#  from [0c319dc0108562b2156d01e7d4c7ebb878ee4588]
#    to [24dba11be6365114a3bc231951dfb98c4a566f08]
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [34775d1ce4bbde6c4b6737f60c88db04c730486a]
#    to [b133294ee7d8f57a1c315a6787746b2e85b14249]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [2d16ad483496ff951a3f0b328f54cd73337dfc61]
#    to [bc08487711a74b011fdf760aa1a788af6b5c8a6a]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [d405f584be665c3811a81f973e98574037e5001a]
#    to [8cad7fba1595a9a46320eb14f7b63799769241ec]
# 
# patch "conf/distro/include/slugos.inc"
#  from [27ec55118a85ef79a65d3627484080d6a4decbf8]
#    to [92908f6c650865377189b8bcf73206db8755e49f]
# 
# patch "conf/distro/slugos.conf"
#  from [29fd215da81e8b58c53efc27170d6a7137a64d1d]
#    to [b3258158dc8f038285e8f70a44c457e37dbb8e1b]
# 
# patch "conf/machine/include/ixp4xx.inc"
#  from [5b66cf8defe8eb514bdb3f0eeb2d69b870a8f2b1]
#    to [cb920f8ba1f7dcaa3cd855595d1197004c12a26a]
# 
# patch "conf/machine/mpc8313e-rdb.conf"
#  from [9c064b7fe3bf176ebc0002ad5266c6783fe0acb2]
#    to [ea78b004c7226c86a8a3cc969bf9582d74faaec6]
# 
# patch "packages/apex/apex-nslu2-16mb_1.5.8.bb"
#  from [fac18deeba57a44702190636a5aeb017a33d2e86]
#    to [c02440190f04b67f86510889b698f2accce6e9e3]
# 
# patch "packages/apex/apex-nslu2_1.5.8.bb"
#  from [15acb3b25031d818b76e970bb441e2b3b6844d3d]
#    to [0c9d366060fec0ba33716897bcfd5ab44db92721]
# 
# patch "packages/gpephone/libabenabler2_1.0.bb"
#  from [4f9c73be9459a6c41bed68e0a75c9b0fae0f5209]
#    to [9ac1b1b81ba12a6c94a511f5c0548973f369f362]
# 
# patch "packages/gpephone/libiac_0.1.bb"
#  from [7351c3868b4a5dd238b349704be0657dc806f68b]
#    to [6fcc6dbe39167cb3b25bd08860e5a5f6a7c19031]
# 
# patch "packages/gtk+/gdk-pixbuf_2.10.14.bb"
#  from [a2ef39d2f5b1d4cfee0c652d063ffca9ebded3d9]
#    to [3c53647f0df0c1e147fdccf3679a22bc6128bc18]
# 
# patch "packages/images/slugos-image.bb"
#  from [5fa0b69b4da806b2db1bcf584aac9b8668a1dc94]
#    to [d1b20833658ac4a2ccc5e3cb746817cbf12bf138]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
#  from [e7a24d25df10036f5defed1b674c023b5a3d1693]
#    to [e13b56cb233e5f3d8f3f318416074a901d61bca3]
# 
# patch "packages/linux/linux-efika-2.6.20/defconfig"
#  from [4469395364bee4cb298524d48db8950eb689222f]
#    to [d1c866425cb59ba390220ecbaaf58b5927ab719f]
# 
# patch "packages/linux/linux-efika_2.6.20.20.bb"
#  from [0913f4ac4c81c3bd6f01b0aa30e6dd882f270953]
#    to [eb9b7bade9c0bc806d24732363e0bb37686676b0]
# 
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5"
#  from [0ad0a08d6c357e7ddb1c404f4d28dfc5841533ba]
#    to [e99fa0ba97f837d12336a38d842736efbb729f6e]
# 
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
#  from [d9fa586ff6b631d3fe9d2a2c351310abc09112b3]
#    to [cf4bec2bd369c8bb8d1c434003bd0947e4520cfa]
# 
# patch "packages/linux/linux.inc"
#  from [14e3b9590c6a3ef9334959ab19c1b24b1954b55b]
#    to [d6f662d0c2c24eea3b90b2d9c4fcc01f9ab6779f]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [00a00d10df9de70b87c4f01ef218370ab40cc076]
#    to [1ad744b33520a65188c10577d6ef70a69a3554aa]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [5837a2cfa7fd7b8a68b416ea0f102347fee62919]
#    to [5ede0ab68d89b645b8a529a7753ba969648d4bb0]
# 
# patch "packages/netbase/netbase/interfaces"
#  from [4ec15f4071bae1c2403d78a38a92e9b21e9608bf]
#    to [cc5bda41921fddb04fb5d8c5c23b06aa3b206f00]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [7d4b4b1ee1b6a900f60e97a679a2597ee3a38fbd]
#    to [ac3c4b953184fd7098259b3a46b4934ac0926ba9]
# 
# patch "packages/tasks/task-toolchain-openmoko-sdk.bb"
#  from [7af4fab2e6a807dcffa21e3e435c72702f5f2e0f]
#    to [5baf630d26e6cc447d9e9ced5601370e57f768af]
# 
# patch "packages/tinymail/libtinymail_svn.bb"
#  from [7fd665a806fc4741c74436c9c42b38ef5cc52a08]
#    to [ad4885fe78c909dd2851854d85bfc5cee9092cb3]
# 
# patch "packages/tinymail/tmut_svn.bb"
#  from [b85aab30cf2d64ebd9b2960044dc9f7b21e707d0]
#    to [e4175f5af1c0a7862b5c52cfc5c989cc231da3da]
# 
# patch "packages/uboot/u-boot_git.bb"
#  from [6d2b75792c161c4bfe934e7f5b8ef33b78f663cb]
#    to [251b297b563be3a80a6de08089c0d3f90828d595]
# 
# patch "packages/xorg-driver/xorg-driver-common.inc"
#  from [8e3a17d5b86c5abdc417ad03bdbc969ebf7a9ada]
#    to [0049aa3e6a36c971cf59d2d82363f7970bec5e5f]
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [0d69c6f61a6ca360fcd4b18edbfa62de23b5e7f2]
#    to [646528aff2b8e45f44e9fc625cfb5816473ad872]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
#  from [681fb7690ba32eb5b1f8d88e2b4c67162ffea064]
#    to [90ab10be4b7894e29fabbe78fccead9685ff87ac]
# 
# patch "packages/zaurusd/files/zaurus-hinge.bl-off"
#  from [6b5b6c2065f8cbf3dd7bc5b7a072b9a764a11ee0]
#    to [87e4a1fb6db37f2ea10378ad5f16b108e4d776ae]
# 
# patch "packages/zaurusd/files/zaurus-hinge.bl-on"
#  from [1ee2f2e97eb96e6dbedfc4f6932cc72538219b6b]
#    to [a404c868701b2d3e35654159015ae6d17b9e7a9d]
# 
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-landscape"
#  from [e8f23204b8c84cf6729bc660e08557b142b9a44f]
#    to [6286ae2f378c8f1957380d5d7de3685230da505a]
# 
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-portrait"
#  from [9b9c517d633741164770bdcc173cafb2d78ed0fe]
#    to [96a2bedfd5c53f713a461c275b147293229eb629]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [fd7e6ab176fd80995c6a4aa697765dd21900decd]
#    to [1c6948752ce366ab73d19f934f67c028b61ebc87]
# 
============================================================
--- packages/gcc/gcc-4.2.1/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.2.1/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c	2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c	2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+             }
+           break;
+         }
+-      /* FALLTHROUGH */
++   /* If the constant is negative, we cannot simplify this.  */
++   if (tree_int_cst_sgn (c) == -1)
++     break;
++   /* FALLTHROUGH */
+     case NEGATE_EXPR:
+       if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ 	return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/gcc/gcc-4.2.2/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.2.2/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c	2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c	2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+             }
+           break;
+         }
+-      /* FALLTHROUGH */
++   /* If the constant is negative, we cannot simplify this.  */
++   if (tree_int_cst_sgn (c) == -1)
++     break;
++   /* FALLTHROUGH */
+     case NEGATE_EXPR:
+       if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ 	return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/gpephone/contact_svn.bb	2bdcfd37fa7331f354b090527f502870cee6fea5
+++ packages/gpephone/contact_svn.bb	2bdcfd37fa7331f354b090527f502870cee6fea5
@@ -0,0 +1,18 @@
+DESCRIPTION = "G(PE)^2 address book v2"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
+PV = "0.0+svn-${SRCREV}"
+PR = "r0"
+
+inherit gpephone autotools
+
+SRC_URI = ${GPEPHONE_SVN}
+
+S = "${WORKDIR}/contact/trunk"
+
+
+FILES_${PN} += "${datadir}"
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libabenabler2/i18n.patch	a7ab56662050689df45614de35f395c80c7a8521
+++ packages/gpephone/libabenabler2/i18n.patch	a7ab56662050689df45614de35f395c80c7a8521
@@ -0,0 +1,18 @@
+--- libabenabler2-1.0/Makefile.am~	2007-11-27 16:51:42.000000000 +0100
++++ libabenabler2-1.0/Makefile.am	2007-11-27 16:51:42.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS	= src include plugins test 
++SUBDIRS	= src include plugins test po
+ 
+ EXTRA_DIST			= libabenabler2.pc.in
+ 
+--- libabenabler2-1.0/configure.ac~	2007-11-27 16:51:18.000000000 +0100
++++ libabenabler2-1.0/configure.ac	2007-11-27 16:51:18.000000000 +0100
+@@ -31,6 +31,7 @@
+ plugins/Makefile
+ test/Makefile
+ libabenabler2.pc
++po/Makefile.in
+ ])
+ AC_OUTPUT
+ 
============================================================
--- packages/gpephone/libabenabler2_svn.bb	6cedd4eaaae17335f9912cbdd4124a86765aae34
+++ packages/gpephone/libabenabler2_svn.bb	6cedd4eaaae17335f9912cbdd4124a86765aae34
@@ -0,0 +1,21 @@
+DESCRIPTION = "LiPS address book library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
+PV = "0.0+svn-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+        autotools_stage_all
+}
+
+DEFAULT_PREFERENCE = "-1"
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
============================================================
--- packages/gpephone/libcalenabler2_svn.bb	ca595393866e1e0b2240421e240db9ddbefbedff
+++ packages/gpephone/libcalenabler2_svn.bb	ca595393866e1e0b2240421e240db9ddbefbedff
@@ -0,0 +1,25 @@
+DESCRIPTION = "LiPS calendar API."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 sqlite3 libical"
+PV = "0.0+svn-${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+    autotools_stage_all
+}
+
+FILES_${PN} += " ${libdir}/*.so.*"
+FILES_${PN}-dbg += "${libdir}/.debug/*.so.*"
+FILES_${PN}-dev += "${includedir} ${libdir}/*.la ${libdir}/*.so"
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libiac-0.1/po.patch	3d352daa975484e6165f89f57d100c5ec902d26d
+++ packages/gpephone/libiac-0.1/po.patch	3d352daa975484e6165f89f57d100c5ec902d26d
@@ -0,0 +1,17 @@
+--- libiac-0.1/Makefile.am~	2007-11-07 22:33:46.000000000 +0100
++++ libiac-0.1/Makefile.am	2007-11-07 22:33:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS=src 
++SUBDIRS = src po
+ 
+ EXTRA_DIST = libiac.pc.in
+ 
+--- libiac-0.1/configure.ac~	2007-11-07 22:34:12.000000000 +0100
++++ libiac-0.1/configure.ac	2007-11-07 22:34:12.000000000 +0100
+@@ -22,5 +22,5 @@
+ 
+ PKG_CHECK_MODULES(IAC, glib-2.0 dbus-1 dbus-glib-1)
+ 
+-AC_CONFIG_FILES([Makefile src/Makefile libiac.pc ])
++AC_CONFIG_FILES([Makefile src/Makefile libiac.pc po/Makefile.in])
+ AC_OUTPUT
============================================================
--- packages/gpephone/ptim-engine_1.0.bb	a480d44e3eaf64f94932940abe59e48577d0190e
+++ packages/gpephone/ptim-engine_1.0.bb	a480d44e3eaf64f94932940abe59e48577d0190e
@@ -0,0 +1,20 @@
+DESCRIPTION = "Phone input method engine"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/${P}/imengine-${PV}.tar.bz2"
+
+S = "${WORKDIR}/imengine-${PV}"
+
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pydatabase/*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la"
+
+do_stage () {
+    autotools_stage_all
+}
============================================================
--- packages/gpephone/ptim-headers_1.0.bb	7760280d3c672c98d814d47e933ae1f2dd67c9f1
+++ packages/gpephone/ptim-headers_1.0.bb	7760280d3c672c98d814%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rcefef520b1840df3899cd9fc5a4fc3cb9faa38ce -r134d7336225003c72a1d58fe031dcd5c6075f1c8
#
# 
# 
# add_file "packages/gpe-login/files/size-autolock-properly.patch"
#  content [63db2b126d2eaaa270c82ccc859e7c367b7912e5]
# 
# add_file "packages/matchbox-applet-inputmanager/files/visibility-protocol.patch"
#  content [799b8565843ed42198f73e6a69c4dbb841a1fa87]
# 
# add_file "packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch"
#  content [4957122498068bf57792326573ba5a501d74fc75]
# 
# patch "packages/gpe-login/gpe-login_0.90.bb"
#  from [0fe6a61cab9e7e30dadcb5a8368e7aacb96a5d56]
#    to [bc03131b857f9acf77c76c941a580713ef8e1ac5]
# 
# patch "packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb"
#  from [589947a0096409723c091db255f66db086f41085]
#    to [041a30d86d81e7e5ca3cc3d5cd51f7eb0362daf8]
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard_svn.bb"
#  from [074e92b268ce0255545b589da69bd19c618430c4]
#    to [1447c764eee3a22189fc39aceda9335f6bbe805e]
# 
# patch "packages/xkbd/xkbd_0.8.15.bb"
#  from [229349f47a9b63600a6fc300caecefbfa2679b4c]
#    to [9013b4a317fe2b993dc22cd9fae92e3e670c0939]
# 
============================================================
--- packages/gpe-login/files/size-autolock-properly.patch	63db2b126d2eaaa270c82ccc859e7c367b7912e5
+++ packages/gpe-login/files/size-autolock-properly.patch	63db2b126d2eaaa270c82ccc859e7c367b7912e5
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon at users.sourceforge.net>"
+# Date 1196345352 -7200
+# Node ID ebe625e21708cb9257201a4dd6e536b99f1f0220
+# Parent  976c01632feacbcce2058a061a0b1f6faed2275a
+When configuring autolock window, make sure to set not only the minimal
+("requested") size, but also the actual one. This fixes issue that after
+autolock screen have been shown in landscape mode, it no longer fits the
+screen in portrait mode.
+
+Also, gtk_widget_set_usize() marked as deprecated, replace with
+gtk_widget_set_size_request().
+
+diff -r 976c01632fea -r ebe625e21708 gpe-login.c
+--- a/gpe-login.c	Sun Nov 25 22:39:23 2007 +0200
++++ b/gpe-login.c	Thu Nov 29 16:09:12 2007 +0200
+@@ -558,7 +558,8 @@ filter (GdkXEvent *xevp, GdkEvent *ev, g
+ 	{
+ 	  spawn_xkbd ();
+ 	  gtk_label_set_markup (GTK_LABEL (label_result), "");
+-	  gtk_widget_set_usize (window, gdk_screen_width (), gdk_screen_height ());
++	  gtk_widget_set_size_request (window, gdk_screen_width (), gdk_screen_height ());
++	  gtk_window_resize (window, gdk_screen_width (), gdk_screen_height ());
+ 	  gtk_widget_show_all (window);
+       if (ownerinfo)
+         {  
============================================================
--- packages/matchbox-applet-inputmanager/files/visibility-protocol.patch	799b8565843ed42198f73e6a69c4dbb841a1fa87
+++ packages/matchbox-applet-inputmanager/files/visibility-protocol.patch	799b8565843ed42198f73e6a69c4dbb841a1fa87
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon at users.sourceforge.net>"
+# Date 1196333272 -7200
+# Node ID 4ec785864bbe896eda3b933e65a5f2d71864b9b3
+# Parent  375f9e4a30d3de9852b00cd1decb259f4f04446e
+Implement an IM [Unix-]signal-based visibility protocol, as supported
+by xkbd. By receiving SISUSR1, IM implementation toggles its visibility.
+The most valuable, default action for SIGUSR1 is process termination, so
+we can send SIGUSR1 unconditionally, replacing old method of sending
+SIGTERM (and there's also check for process existence before sending
+signal, so if process is dead, it will be just restarted).
+
+diff -r 375f9e4a30d3 -r 4ec785864bbe mbinputmgr.c
+--- a/mbinputmgr.c	Wed Nov 28 03:41:20 2007 +0200
++++ b/mbinputmgr.c	Thu Nov 29 12:47:52 2007 +0200
+@@ -1,3 +1,4 @@
++#include <signal.h>
+ #include "mbinputmgr.h"
+ 
+ static void 
+@@ -233,8 +234,10 @@ mbinputmgr_toggle_selected_method (MBInp
+   if ( (inpmgr->PidCurrent != -1) /* Something running */
+        &&  (kill(inpmgr->PidCurrent, 0) != -1) )
+     {
+-      kill(inpmgr->PidCurrent, 15); /* kill it */
+-      inpmgr->PidCurrent = -1;
++      /* Send a SIGUSR1. Smart IMs will toggle their visibility.
++         Dumb, which don't handle it at all, will just die
++	 per default action for SIGUSR1, termination. */
++      kill(inpmgr->PidCurrent, SIGUSR1);
+     }
+   else fork_exec(inpmgr, inpmgr->MethodSelected->exec);
+ }
============================================================
--- packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch	4957122498068bf57792326573ba5a501d74fc75
+++ packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch	4957122498068bf57792326573ba5a501d74fc75
@@ -0,0 +1,44 @@
+diff -r 6b20ef8fbdee src/kb.c
+--- a/src/kb.c	Tue Nov 27 21:28:21 2007 +0200
++++ b/src/kb.c	Tue Nov 27 22:27:09 2007 +0200
+@@ -954,6 +954,13 @@ void kb_send_keypress(button *b)
+   int slide_flag = 0;
+ 
+   struct keycodeEntry vk_keycodes[10];
++  
++  static KeySym ksSpace, ksBackSpace, ksReturn;
++  if (!ksSpace) {
++    ksSpace = XStringToKeysym("space");
++    ksBackSpace = XStringToKeysym("BackSpace");
++    ksReturn = XStringToKeysym("Return");
++  }
+ 
+   if (b->kb->state & KB_STATE_SHIFT || b->kb->state & KB_STATE_CAPS)
+   {
+@@ -981,20 +988,17 @@ void kb_send_keypress(button *b)
+ 	    ks = b->slide_up_ks;
+ 	    if (ks == 0) ks = b->shift_ks;
+ 	    break;
+-	  case down : /* hold ctrl */
++	  case down :
+ 	    ks = b->slide_down_ks;
+-	    if (ks == 0) slide_flag = KB_STATE_CTRL;
++	    if (ks == 0) ks = ksReturn;
+ 	    break;
+-	  case left : /* hold alt */
++	  case left :
+ 	    ks = b->slide_left_ks;
+-	    if (ks == 0) 
+-	      {
+-		ks = b->mod_ks;
+-		slide_flag = KB_STATE_MOD;
+-	      }
++	    if (ks == 0) ks = ksBackSpace;
+ 	    break;
+-	  case right : /* hold alt */
++	  case right :
+ 	    ks = b->slide_right_ks;
++	    if (ks == 0) ks = ksSpace;
+ 	    break;
+ 	  case none:
+ 	    break;
============================================================
--- packages/gpe-login/gpe-login_0.90.bb	0fe6a61cab9e7e30dadcb5a8368e7aacb96a5d56
+++ packages/gpe-login/gpe-login_0.90.bb	bc03131b857f9acf77c76c941a580713ef8e1ac5
@@ -5,7 +5,7 @@ RPROVIDES_${PN} = "gpe-session-starter"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r4"
+PR = "r5"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
@@ -18,6 +18,7 @@ SRC_URI += " file://gpe-xcalibrate-rises
 SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
 SRC_URI += " file://lock-on-supend.patch;patch=1 "
 SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
+SRC_URI += " file://size-autolock-properly.patch;patch=1 "
 
 SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
============================================================
--- packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb	589947a0096409723c091db255f66db086f41085
+++ packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb	041a30d86d81e7e5ca3cc3d5cd51f7eb0362daf8
@@ -1,13 +1,14 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox input manager"
 LICENSE = "GPL"
 DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz \
 	   file://update-to-svn.diff;patch=1 \
            file://mbinputmgr-libgtkinput.patch;patch=1 \
+	   file://visibility-protocol.patch;patch=1 \
 	   "
 
 S = "${WORKDIR}/mb-applet-input-manager-${PV}"
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard_svn.bb	074e92b268ce0255545b589da69bd19c618430c4
+++ packages/matchbox-keyboard/matchbox-keyboard_svn.bb	1447c764eee3a22189fc39aceda9335f6bbe805e
@@ -5,13 +5,13 @@ PV = "0.0+svnr${SRCREV}"
 RPROVIDES_${PN} = matchbox-keyboard-inputmethod
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR="r6"
+PR="r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
            file://smallscreen-fontsize.patch;patch=1 \
-#           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
-#           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
-#           file://4-Add-rendering-debug-logging.patch;patch=1 \
+           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
+           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
+           file://4-Add-rendering-debug-logging.patch;patch=1 \
            file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
            file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
           "
============================================================
--- packages/xkbd/xkbd_0.8.15.bb	229349f47a9b63600a6fc300caecefbfa2679b4c
+++ packages/xkbd/xkbd_0.8.15.bb	9013b4a317fe2b993dc22cd9fae92e3e670c0939
@@ -1,10 +1,11 @@ SRC_URI = "http://handhelds.org/~mallum/
 SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \
            file://libtool-lossage.patch;patch=1;pnum=1 \
 	   file://fix-equalsign.patch;patch=1 \
 	   file://fix-circumkey.patch;patch=1 \
+	   file://add-default-common-slides.patch;patch=1 \
 	   file://xkbd.png"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SECTION = "x11"
 DEPENDS = "libxpm libxtst libxft"






More information about the Openembedded-commits mailing list