[oe-commits] org.oe.dev merge of '45717dd378e89bf7ba418cac08db57a5e7a55474'
svolpe commit
oe at amethyst.openembedded.net
Mon Sep 1 18:15:21 UTC 2008
merge of '45717dd378e89bf7ba418cac08db57a5e7a55474'
and '89b3663402c864c49ce19e33bca2ae6a059b54f9'
Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: 7f240085e68668b41ecb213acc53cc293588a07c
ViewMTN: http://monotone.openembedded.org/revision/info/7f240085e68668b41ecb213acc53cc293588a07c
Files:
1
packages/php/php-5.2.6/acinclude-xml2-config.patch
packages/php/php-5.2.6/pear-makefile.patch
packages/python/python-pygame-1.7.1
packages/python/python-pygame-1.7.1/Setup
packages/python/python-pygame_1.7.1.bb
packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
packages/maemo/hildon-base-lib_0.8.6-2.bb
packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
packages/maemo/hildon-fm_0.9.1-2.bb
packages/nonworking/maemo/hildon-fm_0.9.1-2.bb
packages/maemo/hildon-home
packages/nonworking/maemo/hildon-home
packages/maemo/hildon-home_0.8.20-2.bb
packages/nonworking/maemo/hildon-home_0.8.20-2.bb
packages/maemo/hildon-initscripts
packages/nonworking/maemo/hildon-initscripts
packages/maemo/hildon-initscripts_0.8.14-1.bb
packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb
packages/maemo/hildon-lgpl
packages/nonworking/maemo/hildon-lgpl
packages/maemo/hildon-lgpl_0.9.14-2.bb
packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb
packages/maemo/hildon-libs
packages/nonworking/maemo/hildon-libs
packages/maemo/hildon-libs_0.9.6-2.bb
packages/nonworking/maemo/hildon-libs_0.9.6-2.bb
packages/maemo/hildon-navigator
packages/nonworking/maemo/hildon-navigator
packages/maemo/hildon-navigator_0.9.6-2.bb
packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb
packages/maemo/osso-screenshot-tool_1.20-1.bb
packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb
packages/maemo/osso-thumbnail_0.3.1-1.bb
packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb
packages/maemo/sapwood
packages/nonworking/maemo/sapwood
packages/maemo/sapwood_1.20-1.bb
packages/nonworking/maemo/sapwood_1.20-1.bb
packages/gpe-memo
packages/nonworking/gpe-contacts
packages/nonworking/maemo
packages/proxy-libintl
packages/proxy-libintl/proxy-libintl-20080418
packages/python/python-pygame-1.8.1
packages/sugar
packages/sysstat
packages/u-boot/u-boot-git/akita
packages/u-boot/u-boot-git/c7x0
packages/dbus-java/dbus-java_2.5.bb
packages/gnash/files/libintl.patch
packages/gpe-memo/gpe-memo_0.2.bb
packages/gstreamer/gst-ffmpeg/autotools.patch
packages/nandlogical/nandlogical-static_1.0.0.bb
packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch
packages/proxy-libintl/proxy-libintl_20080418.bb
packages/python/python-pygame-1.8.1/Setup
packages/python/python-pygame_1.8.1.bb
packages/sugar/sugar-toolkit_0.82.1.bb
packages/sugar/sugar_0.82.0.bb
packages/sysstat/sysstat_8.1.5.bb
packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch
packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/apt/apt-native_0.6.46.2.bb
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-native_0.7.3.bb
packages/apt/apt-package.inc
packages/apt/apt_0.5.28.6.bb
packages/apt/apt_0.6.25.bb
packages/apt/apt_0.6.46.2.bb
packages/apt/apt_0.7.2.bb
packages/apt/apt_0.7.3.bb
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dbus-java/dbus-java_2.3.bb
packages/dbus-java/dbus-java_2.4.bb
packages/dhcp/dhcp_3.0.1.bb
packages/dhcp/dhcp_3.0.2.bb
packages/efl1/imlib2_cvs.bb
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/flumotion/flumotion_0.4.1.bb
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/freesmartphone/illume-theme-freesmartphone_git.bb
packages/gettext/gettext_0.17.bb
packages/gnash/gnash-minimal.inc
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnash/gnash-minimal_cvs.bb
packages/gstreamer/gst-ffmpeg_0.10.2.bb
packages/gstreamer/gst-ffmpeg_0.10.4.bb
packages/images/fso-image.bb
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
packages/nandlogical/nandlogical_1.0.0.bb
packages/openjade/openjade-native_1.3.2.bb
packages/openjade/openjade_1.3.2.bb
packages/openmax/libomxil-bellagio_0.9.0.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/phoneme/phoneme-advanced.inc
packages/python/python-pycap_0.1.6.bb
packages/tangogps/tangogps-fso_0.9.2.bb
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-slugos.bb
packages/telepathy/telepathy-python_0.14.0.bb
packages/u-boot/u-boot_git.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
Diffs:
#
# mt diff -r45717dd378e89bf7ba418cac08db57a5e7a55474 -r7f240085e68668b41ecb213acc53cc293588a07c
#
#
#
# add_file "packages/php/php-5.2.6/acinclude-xml2-config.patch"
# content [4080e8e868b4269682c9d79d897bbffeb000a730]
#
# add_file "packages/php/php-5.2.6/pear-makefile.patch"
# content [a628c96a8b13cab5b2845c3ce7143c1781e07b7c]
#
============================================================
--- packages/php/php-5.2.6/acinclude-xml2-config.patch 4080e8e868b4269682c9d79d897bbffeb000a730
+++ packages/php/php-5.2.6/acinclude-xml2-config.patch 4080e8e868b4269682c9d79d897bbffeb000a730
@@ -0,0 +1,18 @@
+--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200
+@@ -2359,12 +2359,9 @@
+ AC_DEFUN([PHP_SETUP_LIBXML], [
+ AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
+ [
+- for i in $PHP_LIBXML_DIR /usr/local /usr; do
+- if test -x "$i/bin/xml2-config"; then
+- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
+- break
+- fi
+- done
++
++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
++
+ ])
+
+ if test -x "$ac_cv_php_xml2_config_path"; then
============================================================
--- packages/php/php-5.2.6/pear-makefile.patch a628c96a8b13cab5b2845c3ce7143c1781e07b7c
+++ packages/php/php-5.2.6/pear-makefile.patch a628c96a8b13cab5b2845c3ce7143c1781e07b7c
@@ -0,0 +1,11 @@
+--- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200
++++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200
+@@ -6,7 +6,7 @@
+ PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
+
+ install-pear-installer: $(SAPI_CLI_PATH)
+- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
+
+ install-pear:
+ @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
#
# mt diff -r89b3663402c864c49ce19e33bca2ae6a059b54f9 -r7f240085e68668b41ecb213acc53cc293588a07c
#
#
#
# delete "packages/python/python-pygame-1.7.1"
#
# delete "packages/python/python-pygame-1.7.1/Setup"
#
# delete "packages/python/python-pygame_1.7.1.bb"
#
# rename "packages/gpe-contacts/gpe-contacts-hildon_0.40.bb"
# to "packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb"
#
# rename "packages/gpe-contacts/gpe-contacts-hildon_0.42.bb"
# to "packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb"
#
# rename "packages/maemo/hildon-base-lib_0.8.6-2.bb"
# to "packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb"
#
# rename "packages/maemo/hildon-fm_0.9.1-2.bb"
# to "packages/nonworking/maemo/hildon-fm_0.9.1-2.bb"
#
# rename "packages/maemo/hildon-home"
# to "packages/nonworking/maemo/hildon-home"
#
# rename "packages/maemo/hildon-home_0.8.20-2.bb"
# to "packages/nonworking/maemo/hildon-home_0.8.20-2.bb"
#
# rename "packages/maemo/hildon-initscripts"
# to "packages/nonworking/maemo/hildon-initscripts"
#
# rename "packages/maemo/hildon-initscripts_0.8.14-1.bb"
# to "packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb"
#
# rename "packages/maemo/hildon-lgpl"
# to "packages/nonworking/maemo/hildon-lgpl"
#
# rename "packages/maemo/hildon-lgpl_0.9.14-2.bb"
# to "packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb"
#
# rename "packages/maemo/hildon-libs"
# to "packages/nonworking/maemo/hildon-libs"
#
# rename "packages/maemo/hildon-libs_0.9.6-2.bb"
# to "packages/nonworking/maemo/hildon-libs_0.9.6-2.bb"
#
# rename "packages/maemo/hildon-navigator"
# to "packages/nonworking/maemo/hildon-navigator"
#
# rename "packages/maemo/hildon-navigator_0.9.6-2.bb"
# to "packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb"
#
# rename "packages/maemo/osso-screenshot-tool_1.20-1.bb"
# to "packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb"
#
# rename "packages/maemo/osso-thumbnail_0.3.1-1.bb"
# to "packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb"
#
# rename "packages/maemo/sapwood"
# to "packages/nonworking/maemo/sapwood"
#
# rename "packages/maemo/sapwood_1.20-1.bb"
# to "packages/nonworking/maemo/sapwood_1.20-1.bb"
#
# add_dir "packages/gpe-memo"
#
# add_dir "packages/nonworking/gpe-contacts"
#
# add_dir "packages/nonworking/maemo"
#
# add_dir "packages/proxy-libintl"
#
# add_dir "packages/proxy-libintl/proxy-libintl-20080418"
#
# add_dir "packages/python/python-pygame-1.8.1"
#
# add_dir "packages/sugar"
#
# add_dir "packages/sysstat"
#
# add_dir "packages/u-boot/u-boot-git/akita"
#
# add_dir "packages/u-boot/u-boot-git/c7x0"
#
# add_file "packages/dbus-java/dbus-java_2.5.bb"
# content [086dc07a09255825ba9edd8b9bab5b2df169cc09]
#
# add_file "packages/gnash/files/libintl.patch"
# content [8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9]
#
# add_file "packages/gpe-memo/gpe-memo_0.2.bb"
# content [388b2fac728542b4c47ba5fa38942475892fd5e8]
#
# add_file "packages/gstreamer/gst-ffmpeg/autotools.patch"
# content [26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb]
#
# add_file "packages/nandlogical/nandlogical-static_1.0.0.bb"
# content [c6eb029366961e0afd263bbe27cd2e6cd0078dcf]
#
# add_file "packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch"
# content [cd5a6eadb3df3174fd8fb17a1a794e0f11573a03]
#
# add_file "packages/proxy-libintl/proxy-libintl_20080418.bb"
# content [5f098356ea6c56a4a64655b7ed87cc62a7afed12]
#
# add_file "packages/python/python-pygame-1.8.1/Setup"
# content [afc5f4e23585b9e72e86fe289aef63f316f8fa37]
#
# add_file "packages/python/python-pygame_1.8.1.bb"
# content [7c06795fb776e2174fb4c60091adb29c826fe448]
#
# add_file "packages/sugar/sugar-toolkit_0.82.1.bb"
# content [26cbe65d86d7a8971743b26419af876eafaea7ef]
#
# add_file "packages/sugar/sugar_0.82.0.bb"
# content [a186f451e2c19db6fa16f473692cff2eafea42de]
#
# add_file "packages/sysstat/sysstat_8.1.5.bb"
# content [0dad3525c7cdc27d60bff198bc7631736117ea7d]
#
# add_file "packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch"
# content [1745cb136349f6b3095458128c6e4db6076b8864]
#
# add_file "packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch"
# content [f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f]
#
# add_file "packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch"
# content [fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2]
#
# add_file "packages/u-boot/u-boot-git/pdaXrom-u-boot.patch"
# content [4408ce632dc8396c6b94f28eef04221966d57e5f]
#
# add_file "packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch"
# content [fc8a7fd372731a45ff3a96eb8e871e75b8f11f48]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [03774e09909d289cb199f67da23c9d23a86db032]
# to [66484fcb20f6be9d0766c53ceab7a0413c0f7716]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [3695a9c6c8bc8f564bfab557a07a7e454aa63eb3]
# to [647a26cd30973ca6a2a668fa840c7bff50c53ae3]
#
# patch "conf/distro/openmoko.conf"
# from [ee68bedb7c293916d63371c4a1679786be088e72]
# to [845d053d36e06e4f45e2a0a870e3ebb6acb37b74]
#
# patch "packages/apt/apt-native_0.6.46.2.bb"
# from [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
# to [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#
# patch "packages/apt/apt-native_0.7.2.bb"
# from [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
# to [b0989d5e0870cc4e217b461d8365a97faa3193c6]
#
# patch "packages/apt/apt-native_0.7.3.bb"
# from [b0989d5e0870cc4e217b461d8365a97faa3193c6]
# to [b296813333921222120126bf76051ba8dcbd29cd]
#
# patch "packages/apt/apt-package.inc"
# from [776b438ed4e20204678a1baba2ed113b69e73334]
# to [82aefdf060f85e22aa8a3f790687444c01de80c1]
#
# patch "packages/apt/apt_0.5.28.6.bb"
# from [97cef0ebac33a0363846bc944cb9e768a614e2fa]
# to [dd4e71e08d5ca242b3f590ca87ea5d555a20bce4]
#
# patch "packages/apt/apt_0.6.25.bb"
# from [0f3a5a95b1f9de3a0c08c450223a098240be0e11]
# to [16d6cbc9351adceca7f15831bf0bfba0c2c82c12]
#
# patch "packages/apt/apt_0.6.46.2.bb"
# from [f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c]
# to [ae7a0357c0bb8db7bbe66b435fc016d45fb1db98]
#
# patch "packages/apt/apt_0.7.2.bb"
# from [63322e840f089261ba0cacb99e97bda6eb5b1998]
# to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
#
# patch "packages/apt/apt_0.7.3.bb"
# from [b35d540f7bc7597c24ad2ee48b326f68b11b2a73]
# to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
#
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
# from [cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb]
# to [21799fcb0417b38523f83c803b588582ad360d24]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [575d1bce4f960e8739b07964559e58e5768379d1]
# to [061fae181a63b2fd115413ac49ae154b1e460c30]
#
# patch "packages/dbus-java/dbus-java_2.4.bb"
# from [3be815bf6755338045753a524ff10c510c2494e9]
# to [3f5fc4bd6d7ad822cbce130de00dc47d49b71806]
#
# patch "packages/dhcp/dhcp_3.0.1.bb"
# from [508e25e8ed777c42989948a97808577033112e60]
# to [561093eb489c489029221984b0556f3de883d7c2]
#
# patch "packages/dhcp/dhcp_3.0.2.bb"
# from [22a60b2567e7a2cf31517547c1c7800734714419]
# to [ec84b1ca88bad4389f98262e2bbcb8f313bd2556]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [c32847438359b0993cb9eadcf6f4b6019585f54c]
# to [c526c87f355a9b89f816e20b1a5592773eb70178]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [793a30383983a318ac57259d83df5926de1aa01b]
# to [3dbc091185870b33314c866b8ab9802f88af1c32]
#
# patch "packages/ffmpeg/omapfbplay_git.bb"
# from [3c8cfda704e6a539e468453e2b038c001d05a9d3]
# to [490cc47f155fb1d62f9f852f8eebe2323fae27e1]
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
# from [888ee41205578b445b00295429cddc535e80a0f3]
# to [9674eb392f880147b7136e7db7db37ac7e9fa7af]
#
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
# from [3b404c6f9bbe799efebf5c54853e2ef3acc160dd]
# to [aaa2ede39c269671da1b463d943cda006ff393cf]
#
# patch "packages/freesmartphone/illume-theme-freesmartphone_git.bb"
# from [7d8251f9fa4e5a7357094ef5e02174512e643850]
# to [4e2384d985f0f4aed6d613bd4e69a5509bd23665]
#
# patch "packages/gettext/gettext_0.17.bb"
# from [d39e7c39ab4154e36e9937b5f173e7652e401999]
# to [089d02dc9fa1adf968040048a2f64700470abe3a]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [8dabbe35069c1d216e834268bca9dfc522bdea92]
# to [1d97af65dabb8f2af969bd858ef3578a722d92d2]
#
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
# from [6f9e794c7a411a20a0fdc6da96482dbd8f0f3ff2]
# to [c0be1ee88262033c9d6942a9e663cd67fd8f9cf0]
#
# patch "packages/gnash/gnash-minimal_0.8.3.bb"
# from [6396b4820385850e505d3bf5e1590f4dac5ff6b6]
# to [36448f84bc62c99b5090bf2b25d855cc753f82a3]
#
# patch "packages/gnash/gnash-minimal_cvs.bb"
# from [62f9652b7093e6633562fd3ed356c137c7dba781]
# to [db4c2629fdbc1291308a0a48419a39a584264d1d]
#
# patch "packages/gstreamer/gst-ffmpeg_0.10.2.bb"
# from [e0e185738811f0607a57b4d5b4948e0b92301af6]
# to [907ebdb116c5b75cda56d4b12d53ca1f6d6a8ba9]
#
# patch "packages/gstreamer/gst-ffmpeg_0.10.4.bb"
# from [31cd5a76daaa2a0ea225ea4270941d6d5ef2aa73]
# to [9ad7b01ede614d0fc142a01b7546007b40441f34]
#
# patch "packages/images/fso-image.bb"
# from [c1ef8880079b495bdb218a51113abbbd36449724]
# to [c8a13bba7a46ab4c7fb795f650086b0a34e45787]
#
# patch "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
# from [3665eb673cea6a75e2df36a17daa87464aeb50c4]
# to [7586b901cf335cd8829daea1fe516b43468ba635]
#
# patch "packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb"
# from [3973ded34b696092b34b03f4883501088965b583]
# to [d52dd9d399e3ae8b6c66f999229e5f797d319665]
#
# patch "packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb"
# from [b41941b0d420980c4211a1fa04fd53db33d07f92]
# to [098380e73ab98a0ac07f4437a937edd32324eea7]
#
# patch "packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb"
# from [966b5d88b9928c4b7654a06ca0c5250612b72485]
# to [0dd83a30378cbd321e2891c6fdce475de1149853]
#
# patch "packages/nandlogical/nandlogical_1.0.0.bb"
# from [f493f382978d1edc9d0c042c782c35c2142ae57c]
# to [e8d8e415634193d69b9888bc2a858b0cda67e6d9]
#
# patch "packages/openjade/openjade-native_1.3.2.bb"
# from [fe4d7272d3a91055775804bedf2ab7af3fcc45f2]
# to [71010dc2c983fe59f78867b3ee655ce1f89d7baa]
#
# patch "packages/openjade/openjade_1.3.2.bb"
# from [76bc945ead3da7d2228e8c419c0a3fa3f1fd193e]
# to [d3a31831d26d84480a79570ca2fb3c0d309d1459]
#
# patch "packages/openmax/libomxil-bellagio_0.9.0.bb"
# from [b1d186c225ca307e729a0086cd6b55dbbb70f5f2]
# to [3fa766b2661c34b5ef2f3ad60eff1fb05eeee2ec]
#
# patch "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
# from [3c5864ec8c49138cc893c47ab0e73877b04d0783]
# to [458508adc8e06b4cf1c7cf861dfebd603b5f58c8]
#
# patch "packages/phoneme/phoneme-advanced.inc"
# from [007bcceb2ee829e446bc8efb4e871e5750fabb1b]
# to [71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac]
#
# patch "packages/python/python-pycap_0.1.6.bb"
# from [5c95e2aad4740b75fcf55cd0d2136e6caf2dff31]
# to [5968e263ec11a89dcdc59e13683ea260e4e27f45]
#
# patch "packages/tangogps/tangogps-fso_0.9.2.bb"
# from [5cbb978159e893365e050b41da156f5424b7d760]
# to [625bd01843b531550ed8c10bb2dd04c1d9fab151]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [7ef80d3236128df7070e50415a62f1b4e280d8d3]
# to [345793ec80e845a64c70bf2240df3b6e604bbebe]
#
# patch "packages/tasks/task-slugos.bb"
# from [d6b87da4b933dc8e8d279fbe5f97a6c31fd1e8ec]
# to [284471adae95c9090b461c40a1d4215a4545b8cc]
#
# patch "packages/telepathy/telepathy-python_0.14.0.bb"
# from [b72e5e36875b783b40a06c426e30d901358c86a7]
# to [337dc44149aebc1554bcb6e930da136baa207cc1]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [dd5c9df20b550f8e184483944ba911d7de096d98]
# to [d93f9d9cf79035943fc20dd1da8a9819c287ce12]
#
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
# from [fa97c83984b56db433bad80d69a6a49429af862a]
# to [078fa05fc808e44e42477177038c538bc6fcff9c]
#
============================================================
--- packages/dbus-java/dbus-java_2.5.bb 086dc07a09255825ba9edd8b9bab5b2df169cc09
+++ packages/dbus-java/dbus-java_2.5.bb 086dc07a09255825ba9edd8b9bab5b2df169cc09
@@ -0,0 +1,87 @@
+DESCRIPTION = "A pure Java D-Bus Implementation"
+DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
+DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
+AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
+SECTION = "libs"
+LICENSE = "LGPLv2 AFL"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+PR = "r0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
+
+S = "${WORKDIR}/dbus-java-${PV}"
+
+inherit java-library
+
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
+do_compile () {
+ oe_runmake \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
+ JAVAC="javac" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+ CLASSPATH="${S}/classes" \
+ JAR="fastjar" \
+ bin
+
+ # Generated shell scripts will have staging paths inside them.
+ rm bin/*
+
+ # Generate them again with target paths.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ bin
+
+ # Generate man pages.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ man
+}
+
+do_install () {
+ oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar
+ oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+ oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar
+
+ install -d ${D}${bindir}
+ install bin/DBusViewer ${D}${bindir}
+ install bin/DBusCall ${D}${bindir}
+ install bin/CreateInterface ${D}${bindir}
+ install bin/ListDBus ${D}${bindir}
+ install bin/DBusDaemon ${D}${bindir}
+
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ MANPREFIX=${D}${mandir} \
+ DOCPREFIX=${D}${docdir}/${JPN} \
+ install-man
+}
+
+do_stage () {
+ oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+}
+
+PACKAGE_ARCH = "all"
+# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar
+# and dbus-bin*.jar
+PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}"
+
+FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
+FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*"
+FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
+FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}"
============================================================
--- packages/gnash/files/libintl.patch 8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
+++ packages/gnash/files/libintl.patch 8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
@@ -0,0 +1,13 @@
+Index: gnash-0.8.3/gui/am-frag/fb.am
+===================================================================
+--- gnash-0.8.3.orig/gui/am-frag/fb.am 2008-08-19 00:37:45.000000000 +0200
++++ gnash-0.8.3/gui/am-frag/fb.am 2008-08-19 00:38:04.000000000 +0200
+@@ -30,7 +30,7 @@
+ fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
+ fb_gnash_SOURCES +=
+ fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+- $(GNASH_LIBS) $(AGG_LIBS)
++ $(GNASH_LIBS) $(AGG_LIBS) $(INTLLIBS)
+ endif # BUILD_AGG_RENDERER
+ endif # BUILD_FB_GUI
+
============================================================
--- packages/gpe-memo/gpe-memo_0.2.bb 388b2fac728542b4c47ba5fa38942475892fd5e8
+++ packages/gpe-memo/gpe-memo_0.2.bb 388b2fac728542b4c47ba5fa38942475892fd5e8
@@ -0,0 +1,9 @@
+DESCRIPTION = "GPE Voice Notes Recorder"
+SECTION = "gpe/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget libgsm gpe-soundserver"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe autotools
+
======================================%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list