[oe-commits] org.oe.dev merge of '79d34a19d4d6d66f0f6f81fdef4e9e0888e8aab8'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:31:47 UTC 2007
merge of '79d34a19d4d6d66f0f6f81fdef4e9e0888e8aab8'
and 'e1cfaab20da752e1b81ee334dc0363e1a060b89b'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 344d73d144b1bef8196ec90abf704f5fb1054c19
ViewMTN: http://monotone.openembedded.org/revision.psp?id=344d73d144b1bef8196ec90abf704f5fb1054c19
Files:
1
packages/gsm/files/interpreter-ready.patch
packages/gsm/files/magician/ldisc.patch
packages/gsm/files/magician/vendor-tihtc.patch
packages/sysvinit/sysvinit/htcuniversal
packages/sysvinit/sysvinit/htcuniversal/inittab
packages/perl/files/Makefile.SH.patch
packages/perl/perl-5.8.4/Makefile.SH.patch
packages/perl/files/Makefile.patch
packages/perl/perl-5.8.4/Makefile.patch
packages/perl/files/config.sh-arm-linux.patch
packages/perl/perl-5.8.4/config.sh-arm-linux.patch
packages/perl/files/config.sh-i686-linux
packages/perl/perl-5.8.4/config.sh-i686-linux
packages/perl/files/config.sh-mipsel-linux
packages/perl/perl-5.8.4/config.sh-mipsel-linux
packages/perl/files/uclibc.patch
packages/perl/perl-5.8.4/uclibc.patch
packages/gpephone/ptim-engine
packages/gpephone/ptim-helper
packages/gpephone/ptim-manager
packages/gsm/files/htcuniversal
packages/hwdata
packages/perl/perl-5.8.4
packages/gcc/gcc-cross-sdk_4.1.2.bb
packages/gpephone/ptim-engine/gtkmodule-location.patch
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-headers_svn.bb
packages/gpephone/ptim-helper/gtkmodule-location.patch
packages/gpephone/ptim-helper_svn.bb
packages/gpephone/ptim-manager/gtkmodule-location.patch
packages/gpephone/ptim-manager_svn.bb
packages/gsm/files/htcuniversal/default
packages/gsm/files/numeric.patch
packages/gsm/files/plugin.patch
packages/hwdata/hwdata_0.191.bb
packages/linux/linux-jlime-jornada6xx-2.6.21rc5/hp6xx-IRQ3.patch
packages/tasks/task-sdk-sbox.bb
packages/xserver-common/xserver-common_1.16.bb
conf/distro/angstrom-2007.1.conf
conf/distro/generic.conf
conf/distro/include/slugos.inc
conf/machine/htcuniversal.conf
conf/machine/netvista.conf
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-package-sdk.inc
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/gsm/files/magician/default
packages/gsm/libgsmd_svn.bb
packages/gtk+/gtk+_2.6.10.bb
packages/hal/files/99_hal
packages/hal/hal_0.5.9.bb
packages/images/opie-image.bb
packages/irda-utils/files/init
packages/irda-utils/irda-utils_0.9.16.bb
packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
packages/linux/linux-x86-2.6.20/netvista/defconfig
packages/linux/linux-x86_2.6.20.bb
packages/meta/meta-sdk-sbox.bb
packages/meta/slugos-packages.bb
packages/openmoko-base/openmoko-common_svn.bb
packages/perl/perl.inc
packages/perl/perl_5.8.4.bb
packages/perl/perl_5.8.7.bb
packages/tasks/task-base.bb
packages/tasks/task-gpephone.bb
packages/uboot/uboot-gta01_svn.bb
Diffs:
#
# mt diff -r79d34a19d4d6d66f0f6f81fdef4e9e0888e8aab8 -r344d73d144b1bef8196ec90abf704f5fb1054c19
#
#
# no changes
#
#
# mt diff -re1cfaab20da752e1b81ee334dc0363e1a060b89b -r344d73d144b1bef8196ec90abf704f5fb1054c19
#
#
#
# delete "packages/gsm/files/interpreter-ready.patch"
#
# delete "packages/gsm/files/magician/ldisc.patch"
#
# delete "packages/gsm/files/magician/vendor-tihtc.patch"
#
# delete "packages/sysvinit/sysvinit/htcuniversal"
#
# delete "packages/sysvinit/sysvinit/htcuniversal/inittab"
#
# rename "packages/perl/files/Makefile.SH.patch"
# to "packages/perl/perl-5.8.4/Makefile.SH.patch"
#
# rename "packages/perl/files/Makefile.patch"
# to "packages/perl/perl-5.8.4/Makefile.patch"
#
# rename "packages/perl/files/config.sh-arm-linux.patch"
# to "packages/perl/perl-5.8.4/config.sh-arm-linux.patch"
#
# rename "packages/perl/files/config.sh-i686-linux"
# to "packages/perl/perl-5.8.4/config.sh-i686-linux"
#
# rename "packages/perl/files/config.sh-mipsel-linux"
# to "packages/perl/perl-5.8.4/config.sh-mipsel-linux"
#
# rename "packages/perl/files/uclibc.patch"
# to "packages/perl/perl-5.8.4/uclibc.patch"
#
# add_dir "packages/gpephone/ptim-engine"
#
# add_dir "packages/gpephone/ptim-helper"
#
# add_dir "packages/gpephone/ptim-manager"
#
# add_dir "packages/gsm/files/htcuniversal"
#
# add_dir "packages/hwdata"
#
# add_dir "packages/perl/perl-5.8.4"
#
# add_file "packages/gcc/gcc-cross-sdk_4.1.2.bb"
# content [33134f6aa4bf1b75ac31f1067c54e44592025d0b]
#
# add_file "packages/gpephone/ptim-engine/gtkmodule-location.patch"
# content [7734d34598a79019370028a76dc19f23bbb44294]
#
# add_file "packages/gpephone/ptim-engine_svn.bb"
# content [9edcf54a369610d5112dca943b1c77d6e80ec6be]
#
# add_file "packages/gpephone/ptim-headers_svn.bb"
# content [f87f52cf9dd3b0fbbcd93b9dc26924797234e78b]
#
# add_file "packages/gpephone/ptim-helper/gtkmodule-location.patch"
# content [42f3650455a076c38f20562d2c5644b8c7757e19]
#
# add_file "packages/gpephone/ptim-helper_svn.bb"
# content [f1f55592accd9643cad1a245df07efeb0b9d663d]
#
# add_file "packages/gpephone/ptim-manager/gtkmodule-location.patch"
# content [2c01a48684e82d14cb9da015690dc2ad3baeef06]
#
# add_file "packages/gpephone/ptim-manager_svn.bb"
# content [b41567456c5550b64223e4dd454293d27d5a7614]
#
# add_file "packages/gsm/files/htcuniversal/default"
# content [ec5dd1432f454bf1f125b0ae7e8df2d0c09ce451]
#
# add_file "packages/gsm/files/numeric.patch"
# content [977aab49d5f8a96b98eb9900c325e8d95d323778]
#
# add_file "packages/gsm/files/plugin.patch"
# content [cdcc38e2e5945c3c6dbc3992863db070003f4208]
#
# add_file "packages/hwdata/hwdata_0.191.bb"
# content [a4e6f065bfb933c005991e7b3698b9b17758f174]
#
# add_file "packages/linux/linux-jlime-jornada6xx-2.6.21rc5/hp6xx-IRQ3.patch"
# content [3a136497a0fd2db94c22290e20b247ea480989b3]
#
# add_file "packages/tasks/task-sdk-sbox.bb"
# content [966af0a869fa2928d03db26ca956bdba685d84d1]
#
# add_file "packages/xserver-common/xserver-common_1.16.bb"
# content [924d74db820b37e3a413f6fd4245053d0c5c9336]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [b02d41c26dab03d5b3eb9cf8e69703a4b31949ab]
# to [fbe7060a08d6f32d966998ff6985714ec68764e8]
#
# patch "conf/distro/generic.conf"
# from [01da65505da77d4cce461426b4fd57709d173571]
# to [d41e94c2db44f74181c78c031835b9fb8d602ce3]
#
# patch "conf/distro/include/slugos.inc"
# from [451e0442b0304f528d736528359681c19f8c80ca]
# to [f03515b4bfc6c1f5d5ae053716f4b96897fe95f5]
#
# patch "conf/machine/htcuniversal.conf"
# from [5755816489952d2b7d223aca82210b5f0f71e801]
# to [41a8dcec6f49cc9919e47341c32894584d7f5686]
#
# patch "conf/machine/netvista.conf"
# from [fb233cc2a7ef9a66e056c0c157470c01f0893a18]
# to [76f19eb6c0b322d22ad0ff2156232a7c887f97e3]
#
# patch "packages/gcc/gcc-cross_4.1.1.bb"
# from [ce58e1a9ec5ae1d3fc7d6ce431d1b3e93feafa6c]
# to [08ec71fb53f42e993c1150f870b97f8dd17c3128]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [717b160492db6c7a6ea49578817e6a37e05a919a]
# to [f1e26091884b572a0d9a042b54ccf5dc52ca1d37]
#
# patch "packages/gcc/gcc-package-sdk.inc"
# from [9cf65e5e4df15851a857161cf97924b87187c5a0]
# to [65fed51db7cc5fb466ea0e3379ec3b2f89b84e53]
#
# patch "packages/gcc/gcc_4.1.1.bb"
# from [76ab97f248f415e44a541edd7039587f794f8e25]
# to [b2afde1514552f0661b5f862cf1f40b206ed418a]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [b82c13bcb1e040c8d9a5ef98e94b1cf35296899c]
# to [797b8f302a91cd55838d411b09ba0eb4529e165f]
#
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
# from [98f6945666320e5fb6c32cb41be5353893c54de8]
# to [922f70f98226093e81ecaae7c047b8258a8a02f3]
#
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
# from [138f2d5520ec3dc840562a758539b7d97bab7090]
# to [e362b7b67e4435829cf62a3624d24537f56d04fd]
#
# patch "packages/gsm/files/magician/default"
# from [396587576d27a7d0d54e47e09ba41984e95de005]
# to [527b11c0e4f7bbe299632422b43361ad03bad520]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [5065ec60004cca9901a244a94b9227aca18ee6bf]
# to [92c8f650cef1746ab805c766fe19dc5602989a8c]
#
# patch "packages/gtk+/gtk+_2.6.10.bb"
# from [80342192beb691618252d430bedb6c5fc58cac36]
# to [2c69f45ec2e51a207dc984c638ae2db4445d457a]
#
# patch "packages/hal/files/99_hal"
# from [55dfbb79c7de92577aae876bda269767dc02b3d8]
# to [e88c6d3d65c6b9fd39178ee7fdbff1b3c031da5b]
#
# patch "packages/hal/hal_0.5.9.bb"
# from [f26ad22177c6d80a87496017b2cd43cce4bc2617]
# to [6648c561fed4bd9019cd65e3c5e6419b8f6f0ea2]
#
# patch "packages/images/opie-image.bb"
# from [a5ccd00ff8dd180e49a2d52c9ef658ebf9a58547]
# to [6e82664c5e048a6ace172b1590aec6a3be929657]
#
# patch "packages/irda-utils/files/init"
# from [db1886c6f6bab388b0b1fbc5da3539272d3c8b94]
# to [eda79b80a7e822d35d875d415790048282aad0e8]
#
# patch "packages/irda-utils/irda-utils_0.9.16.bb"
# from [f8466d87f788b008f2171d836f596becd176e53a]
# to [97b8fb8723e2e84df08cad6c8eae15f2e960565b]
#
# patch "packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb"
# from [5a7da14de8df2623354de8d27f9e74f3624e2567]
# to [01422f4f26a644bed8747acc10c7d4d714ffeb36]
#
# patch "packages/linux/linux-x86-2.6.20/netvista/defconfig"
# from [fb1168d266eea216fb5fe45d5d428e4ed94e49ad]
# to [897d877767628f96748333c018f4aba095bdafd5]
#
# patch "packages/linux/linux-x86_2.6.20.bb"
# from [ae66df3919af320390658d391c3a027147dd7a18]
# to [09703bd6b1d70da68df2a07c38d134d5d13f5a2c]
#
# patch "packages/meta/meta-sdk-sbox.bb"
# from [9c61510cef6af145b4512e59b6e50d3e8da26c90]
# to [6e24d2ccdd6e99d6c9f698f0f2cdba71f152249a]
#
# patch "packages/meta/slugos-packages.bb"
# from [0ac6dcd1f728e071de092177cdd88493243c59df]
# to [445b494b02d0978e46722c8f134f299ed6c5a86b]
#
# patch "packages/openmoko-base/openmoko-common_svn.bb"
# from [51bdfe4c1c299937eadccfd124f0ed1455469c18]
# to [b6ea4c8929e3ea38891217c094d4a5967472e5ba]
#
# patch "packages/perl/perl.inc"
# from [8124f483118322ae43446a66c5bc7331cc2ca756]
# to [39e0c4c5bcb0949bfa32721a9bfbbf800d73ad7b]
#
# patch "packages/perl/perl_5.8.4.bb"
# from [4152b5d8fa49f91d6e76cbb22f931fcfdfc7fa62]
# to [eab2809194c8386e61c1e57d3bb452ef84f019a5]
#
# patch "packages/perl/perl_5.8.7.bb"
# from [36e95696506b8a814035e4b48b4fa3278e92ce2e]
# to [dae04c3ad54e1a290cd11b1bafe6a9b24ace86d1]
#
# patch "packages/tasks/task-base.bb"
# from [c3c6c0d2d33b6d5feac3bce39f718ee5cc7a51c8]
# to [1fe549e595dc265791d8b8d9c85a1fa065c3e230]
#
# patch "packages/tasks/task-gpephone.bb"
# from [641487d3beef947abce978ab62120e6fca6f185e]
# to [a69d4ad6e3ae1215d9f514fff89d2757f401caa2]
#
# patch "packages/uboot/uboot-gta01_svn.bb"
# from [743948f3511df9d989a93d05f8d5a74e3b01b9de]
# to [9ae962e22bf2ce38860a8a843fcc1b6a7cde7f4e]
#
============================================================
--- packages/gcc/gcc-cross-sdk_4.1.2.bb 33134f6aa4bf1b75ac31f1067c54e44592025d0b
+++ packages/gcc/gcc-cross-sdk_4.1.2.bb 33134f6aa4bf1b75ac31f1067c54e44592025d0b
@@ -0,0 +1,42 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r0"
+
+inherit sdk
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PACKAGES = "${PN}"
+
+require gcc_${PV}.bb
+require gcc4-build-sdk.inc
+require gcc-package-sdk.inc
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
+ file://100-uclibc-conf.patch;patch=1 \
+ file://110-arm-eabi.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://300-libstdc++-pic.patch;patch=1 \
+ file://301-missing-execinfo_h.patch;patch=1 \
+ file://302-c99-snprintf.patch;patch=1 \
+ file://303-c99-complex-ugly-hack.patch;patch=1 \
+ file://304-index_macro.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://740-sh-pr24836.patch;patch=1 \
+ file://800-arm-bigendian.patch;patch=1 \
+ file://801-arm-bigendian-eabi.patch;patch=1 \
+ file://arm-nolibfloat.patch;patch=1 \
+ file://arm-softfloat.patch;patch=1 \
+ file://gcc41-configure.in.patch;patch=1 \
+ file://arm-thumb.patch;patch=1 \
+ file://arm-thumb-cache.patch;patch=1 \
+ file://ldflags.patch;patch=1 \
+ file://unbreak-armv4t.patch;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ "
+
+SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
============================================================
--- packages/gpephone/ptim-engine/gtkmodule-location.patch 7734d34598a79019370028a76dc19f23bbb44294
+++ packages/gpephone/ptim-engine/gtkmodule-location.patch 7734d34598a79019370028a76dc19f23bbb44294
@@ -0,0 +1,11 @@
+--- src/Makefile.am~ 2007-04-05 16:49:43.000000000 +0200
++++ src/Makefile.am 2007-04-05 16:49:43.000000000 +0200
+@@ -3,7 +3,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`
+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+
+-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine
++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine
+
+ INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \
+ -I. $(IMENGINE_CFLAGS)
============================================================
--- packages/gpephone/ptim-engine_svn.bb 9edcf54a369610d5112dca943b1c77d6e80ec6be
+++ packages/gpephone/ptim-engine_svn.bb 9edcf54a369610d5112dca943b1c77d6e80ec6be
@@ -0,0 +1,23 @@
+DESCRIPTION = "Phone input method engine"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers"
+PV = "0.1+svn-${SRCDATE}"
+
+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"
+
+S = "${WORKDIR}/imengine"
+
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so "
+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_svn.bb f87f52cf9dd3b0fbbcd93b9dc26924797234e78b
+++ packages/gpephone/ptim-headers_svn.bb f87f52cf9dd3b0fbbcd93b9dc26924797234e78b
@@ -0,0 +1,18 @@
+DESCRIPTION = "Phone input method - shared headers"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+"
+PV = "0.1+svn-${SRCDATE}"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imheaders"
+
+S = "${WORKDIR}/imheaders"
+
+DEFAULT_PREFERENCE = "-1"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gpephone/ptim-helper/gtkmodule-location.patch 42f3650455a076c38f20562d2c5644b8c7757e19
+++ packages/gpephone/ptim-helper/gtkmodule-location.patch 42f3650455a076c38f20562d2c5644b8c7757e19
@@ -0,0 +1,22 @@
+--- src/Makefile.am~ 2007-04-05 16:40:45.000000000 +0200
++++ src/Makefile.am 2007-04-05 16:40:45.000000000 +0200
+@@ -3,7 +3,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`
+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+
+-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper
++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper
+
+ INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \
+ -I. $(IMHELPER_CFLAGS)
+--- pixmaps/Makefile.am~ 2007-04-05 16:43:16.000000000 +0200
++++ pixmaps/Makefile.am 2007-04-05 16:43:16.000000000 +0200
+@@ -1,7 +1,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`
+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+
+-pixmapsdir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps
++pixmapsdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps
+ pixmaps_DATA = \
+ next.png \
+ prev.png \
============================================================
--- packages/gpephone/ptim-helper_svn.bb f1f55592accd9643cad1a245df07efeb0b9d663d
+++ packages/gpephone/ptim-helper_svn.bb f1f55592accd9643cad1a245df07efeb0b9d663d
@@ -0,0 +1,23 @@
+DESCRIPTION = "Phone input method helper module"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers"
+PV = "0.1+svn-${SRCDATE}"
+
+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"
+
+S = "${WORKDIR}/imhelper"
+
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/helper/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/helper/*.la"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gpephone/ptim-manager/gtkmodule-location.patch 2c01a48684e82d14cb9da015690dc2ad3baeef06
+++ packages/gpephone/ptim-manager/gtkmodule-location.patch 2c01a48684e82d14cb9da015690dc2ad3baeef06
@@ -0,0 +1,21 @@
+--- src/Makefile.am~ 2007-04-05 16:01:29.000000000 +0200
++++ src/Makefile.am 2007-04-05 16:01:29.000000000 +0200
+@@ -3,7 +3,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`
+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+
+-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
+
+ INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \
+ -I. $(IMMANAGER_CFLAGS)
+--- Makefile.am~ 2007-04-05 16:21:36.000000000 +0200
++++ Makefile.am 2007-04-05 16:21:36.000000000 +0200
+@@ -3,6 +3,6 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`
+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+
+-confdir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/
++confdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/
+ conf_DATA = \
+ conf/imconfig
============================================================
--- packages/gpephone/ptim-manager_svn.bb b41567456c5550b64223e4dd454293d27d5a7614
+++ packages/gpephone/ptim-manager_svn.bb b41567456c5550b64223e4dd454293d27d5a7614
@@ -0,0 +1,23 @@
+DESCRIPTION = "Phone input method manager module"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers libiac"
+PV = "0.1+svn-${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \
+ file://gtkmodule-location.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/immanager"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/immodules/*.so ${libdir}/gtk-2.0/*/immodules/ptim"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/*.la"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gsm/files/htcuniversal/default ec5dd1432%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list