[oe-commits] org.oe.dev merge of '486564afb93dc07dd531c82b2f7735424a813a69'
oe commit
oe at amethyst.openembedded.net
Thu Apr 10 20:14:21 UTC 2008
merge of '486564afb93dc07dd531c82b2f7735424a813a69'
and '894eccb0f6fd46f8c72a9457612feba217d953b6'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 75b50263119e17063f5623d4e95924b911df6537
ViewMTN: http://monotone.openembedded.org/revision/info/75b50263119e17063f5623d4e95924b911df6537
Files:
1
packages/freesmartphone/py-odeviced_svn.bb
packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch
packages/jamvm/jamvm_1.5.1.bb
packages/jikes/files/dummy
packages/python/python-pyrtc_svn.bb
conf/distro/chinook-compat.conf
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
contrib/python/generate-manifest-2.5.py
packages/glib-2.0/glib-2.0_2.16.1.bb
packages/jikes/jikes-initial.bb
packages/python/python-2.5-manifest.inc
packages/python/python-dbus_0.82.4.bb
packages/python/python-pydirectfb_cvs.bb
packages/python/python-pyserial_2.2.bb
packages/python/python_2.5.2.bb
packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
packages/wv/wv-1.2.0
packages/wv/wv-1.2.0/pkgconfig.patch
packages/xorg-lib/libx11/x11_disable_makekeys.patch
packages/wv/wv_1.2.0.bb
Diffs:
#
# mt diff -r486564afb93dc07dd531c82b2f7735424a813a69 -r75b50263119e17063f5623d4e95924b911df6537
#
#
#
# add_file "packages/freesmartphone/py-odeviced_svn.bb"
# content [357fa2e5ba56a15fff85342eda1fb75ebba36c44]
#
# add_file "packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch"
# content [73f93c002ddc4e9a8bacabba9bf1e817609f773c]
#
# add_file "packages/jamvm/jamvm_1.5.1.bb"
# content [34c70036ace803ee38b54d6bdf1596e7a3d6345d]
#
# add_file "packages/jikes/files/dummy"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/python/python-pyrtc_svn.bb"
# content [bfeeeeccaeaceda2fa0fee0dfffed426bfcad026]
#
# patch "conf/distro/chinook-compat.conf"
# from [bc6984bba9a01e6ec920c499c8fbacfe7533e83e]
# to [271e8379588ab95358ace72a9bc2946e8fcca2b7]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [1474e937489b8938c1858d53c427068ce882e743]
# to [534cab07a9373e1020839557e2432ce088c550e8]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69]
# to [077bda507fb3d6f90f3109998534f4439fbf0588]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [16126e312062487bf91b7314da2178b5146d04f0]
# to [ccd26c481e9a850b5cb869f898e0a08bc214b6e3]
#
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
# from [3a48d903a74285a67c66bab7fd96be2bf1e1270a]
# to [2facce514edcf565a81d088b6aa171df585c7adc]
#
# patch "packages/jikes/jikes-initial.bb"
# from [acb7ab273c93fa5264bb5d431ef94cf91cb08c8b]
# to [fe4dcedb069cf9c4991b1281d359485ce377b155]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [173662ecbf40b201a0b75f4180dd8d97c2f50227]
# to [ce2d4136b474c7f902281410e54cde0b27751287]
#
# patch "packages/python/python-dbus_0.82.4.bb"
# from [ef44ee10f31374784359fe76d1f10cabda60f104]
# to [3e0066b265c8f44920ed83586b7da71bc0969a94]
#
# patch "packages/python/python-pydirectfb_cvs.bb"
# from [6710bb7fc1c4c248b7377e85e8c5cc3cc75b0bd5]
# to [341bfdf2405b9abb8350735871a219edebbeebc4]
#
# patch "packages/python/python-pyserial_2.2.bb"
# from [366eca22065252052faee65474af77f0773998c5]
# to [c2c2f3211d6a1333edaba6a7a93d57141b467b61]
#
# patch "packages/python/python_2.5.2.bb"
# from [c372778f3b501ac0ddf12f07516438198387bec8]
# to [43c9ad955282b5022b3a3db8b5b179589957f666]
#
# patch "packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb"
# from [0bdc20dd566d6175fff6c13e3c54b17e8b1542b9]
# to [b75660af4d2976417371bd6521760757571bf7bd]
#
# patch "packages/s3c24xx-utils/s3c24xx-gpio_svn.bb"
# from [e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff]
# to [7cee2203504f78f69abd1d1993c7f7b8955ebb4d]
#
# patch "packages/s3c24xx-utils/sjf2410-linux-native_svn.bb"
# from [9063b21889a311b3259a27e13d933e6cb7360f5f]
# to [9a022b0f5e9ee48883d86a30efdf184681913e3a]
#
============================================================
--- packages/freesmartphone/py-odeviced_svn.bb 357fa2e5ba56a15fff85342eda1fb75ebba36c44
+++ packages/freesmartphone/py-odeviced_svn.bb 357fa2e5ba56a15fff85342eda1fb75ebba36c44
@@ -0,0 +1,22 @@
+DESCRIPTION = "The Open Device Daemon Prototype in Python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python"
+LICENSE = "GPLv2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit distutils
+
+#inherit update-rc.d
+#INITSCRIPT_NAME = "py-odeviced"
+#INITSCRIPT_PARAMS = "defaults 20"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced"
+S = "${WORKDIR}/py-odeviced"
+
+RDEPENDS_${PN} += "\
+ python-dbus \
+ python-pygobject \
+"
============================================================
--- packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch 73f93c002ddc4e9a8bacabba9bf1e817609f773c
+++ packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch 73f93c002ddc4e9a8bacabba9bf1e817609f773c
@@ -0,0 +1,76 @@
+Source: http://bugzilla.gnome.org/show_bug.cgi?id=522335
+
+This patch fixes the following error.
+
+| make[4]: Entering directory `/home/khem/oe/build/eglibc/tmp-qemuarm/work/armv5te-angstrom-linux-gnueabi/glib-2.0-2.16.1-r3/glib-2.16.1/glib'
+| if ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I.. -I.. -DG_LOG_DOMAIN=\"GLib\" -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DPCRE_STATIC -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -pthread -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -Wall -MT gtester.o -MD -MP -MF ".deps/gtester.Tpo" -c -o gtester.o gtester.c; \
+| then mv -f ".deps/gtester.Tpo" ".deps/gtester.Po"; else rm -f ".deps/gtester.Tpo"; exit 1; fi
+| gtester.c: In function 'launch_test_binary':
+| gtester.c:276: error: 'ARG_MAX' undeclared (first use in this function)
+| gtester.c:276: error: (Each undeclared identifier is reported only once
+| gtester.c:276: error: for each function it appears in.)
+| gtester.c:276: warning: unused variable 'argv'
+| make[4]: *** [gtester.o] Error 1
+
+
+Index: glib-2.16.1/glib/gtester.c
+===================================================================
+--- glib-2.16.1.orig/glib/gtester.c (Revision 6750)
++++ glib-2.16.1/glib/gtester.c (Arbeitskopie)
+@@ -273,7 +273,8 @@
+ GTestLogBuffer *tlb;
+ GSList *slist, *free_list = NULL;
+ GError *error = NULL;
+- const gchar *argv[ARG_MAX];
++ int argc = 0;
++ const gchar **argv;
+ GPid pid = 0;
+ gint report_pipe[2] = { -1, -1 };
+ guint child_report_cb_id = 0;
+@@ -289,7 +290,34 @@
+ return FALSE;
+ }
+
++ /* setup argc */
++ for (slist = subtest_args; slist; slist = slist->next)
++ argc++;
++ /* argc++; */
++ if (subtest_quiet)
++ argc++;
++ if (subtest_verbose)
++ argc++;
++ if (!subtest_mode_fatal)
++ argc++;
++ if (subtest_mode_quick)
++ argc++;
++ else
++ argc++;
++ if (subtest_mode_perf)
++ argc++;
++ if (gtester_list_tests)
++ argc++;
++ if (subtest_seedstr)
++ argc++;
++ argc++;
++ if (skip_tests)
++ argc++;
++ for (slist = subtest_paths; slist; slist = slist->next)
++ argc++;
++
+ /* setup argv */
++ argv = g_malloc ((argc + 1) * sizeof(gchar *));
+ argv[i++] = binary;
+ for (slist = subtest_args; slist; slist = slist->next)
+ argv[i++] = (gchar*) slist->data;
+@@ -343,8 +371,10 @@
+ else
+ g_warning ("Failed to execute test binary: %s: %s", argv[0], error->message);
+ g_clear_error (&error);
++ g_free (argv);
+ return FALSE;
+ }
++ g_free (argv);
+
+ subtest_running = TRUE;
+ subtest_io_pending = TRUE;
+
============================================================
--- packages/jamvm/jamvm_1.5.1.bb 34c70036ace803ee38b54d6bdf1596e7a3d6345d
+++ packages/jamvm/jamvm_1.5.1.bb 34c70036ace803ee38b54d6bdf1596e7a3d6345d
@@ -0,0 +1,12 @@
+require jamvm.inc
+
+SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
+
+PR = "r0"
+
+do_configure_prepend() {
+ # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+ # configured in OE.
+ sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/dll.c
+}
+
============================================================
--- packages/jikes/files/dummy da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/jikes/files/dummy da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
+++ packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
+RTC (Real Time Clock) found in most PCs and SOCs"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+LICENSE = "GPLv2"
+SRCNAME = "pyrtc"
+DEPENDS = "python-cython-native"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
============================================================
--- conf/distro/chinook-compat.conf bc6984bba9a01e6ec920c499c8fbacfe7533e83e
+++ conf/distro/chinook-compat.conf 271e8379588ab95358ace72a9bc2946e8fcca2b7
@@ -61,8 +61,10 @@ PREFERRED_VERSION_gcc-cross = "3.4.4cs20
PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+#PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+
# Use recent enough version of the headers to let HAL build successfully.
PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -165,7 +167,7 @@ PREFERRED_PROVIDER_classpath = "classpat
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97"
+PREFERRED_VERSION_classpath = "0.97.1"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
@@ -200,3 +202,5 @@ PKG_libconic = "libconic0"
PKG_osso-ic-oss = "osso-ic"
PKG_libconic = "libconic0"
+
+PKG_libgcc = "libgcc1"
============================================================
--- conf/distro/include/sane-srcdates.inc 1474e937489b8938c1858d53c427068ce882e743
+++ conf/distro/include/sane-srcdates.inc 534cab07a9373e1020839557e2432ce088c550e8
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080330"
+EFL_SRCDATE = "20080409"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69
+++ conf/distro/include/sane-srcrevs.inc 077bda507fb3d6f90f3109998534f4439fbf0588
@@ -142,12 +142,14 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-opkg-sdk ?= "4235"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
+SRCREV_pn-py-odeviced = "161"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "88"
SRCREV_pn-pyneog ?= "88"
SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-python-pyrtc = "152"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
============================================================
--- contrib/python/generate-manifest-2.5.py 16126e312062487bf91b7314da2178b5146d04f0
+++ contrib/python/generate-manifest-2.5.py ccd26c481e9a850b5cb869f898e0a08bc214b6e3
@@ -318,7 +318,7 @@ if __name__ == "__main__":
m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core python-stringold python-lang",
"unittest.*" )
- m.addPackage( 0, "python-xml", "Python basic XML support.", "python-core python-re python-netclient",
+ m.addPackage( 1, "python-xml", "Python basic XML support.", "python-core python-re",
"lib-dynload/pyexpat.so xml xmllib.*" ) # package
m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core python-xml python-netserver python-lang",
============================================================
--- packages/glib-2.0/glib-2.0_2.16.1.bb 3a48d903a74285a67c66bab7fd96be2bf1e1270a
+++ packages/glib-2.0/glib-2.0_2.16.1.bb 2facce514edcf565a81d088b6aa171df585c7adc
@@ -1,9 +1,10 @@ require glib.inc
require glib.inc
-PR = "r3"
+PR = "r4"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
file://configure-libtool.patch;patch=1 \
file://gcc-4.2-inline-fix.patch;patch=1 \
+ file://hurd-arg-max.patch;patch=1 \
"
============================================================
--- packages/jikes/jikes-initial.bb acb7ab273c93fa5264bb5d431ef94cf91cb08c8b
+++ packages/jikes/jikes-initial.bb fe4dcedb069cf9c4991b1281d359485ce377b155
@@ -2,7 +2,8 @@ DEPENDS = "jikes-native classpath-initia
DEPENDS = "jikes-native classpath-initial"
-SRC_URI = ""
+# Packaged-staging needs a Source: field to put in the packages, so SRC_URI can't be empty
+SRC_URI = "file://dummy"
S = "${WORKDIR}"
============================================================
--- packages/python/python-2.5-manifest.inc 173662ecbf40b201a0b75f4180dd8d97c2f50227
+++ packages/python/python-2.5-manifest.inc ce2d4136b474c7f902281410e54cde0b27751287
@@ -1,5 +1,5 @@
########################################################################################################################
-### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Fri Mar 21 18:43:05 2008
+### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Thu Apr 10 16:47:00 2008
###
### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
###
@@ -208,8 +208,8 @@ DESCRIPTION_python-xml="Python basic XML
FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml0"
-RDEPENDS_python-xml="python-core python-re python-netclient"
+PR_python-xml="ml1"
+RDEPENDS_python-xml="python-core python-re"
FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
DESCRIPTION_python-mime="Python MIME Handling APIs"
============================================================
--- packages/python/python-dbus_0.82.4.bb ef44ee10f31374784359fe76d1f10cabda60f104
+++ packages/python/python-dbus_0.82.4.bb 3e0066b265c8f44920ed83586b7da71bc0969a94
@@ -3,8 +3,8 @@ DEPENDS = "expat dbus dbus-glib virtual/
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "MIT"
DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
-RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml3"
+RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
+PR = "ml4"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
S = "${WORKDIR}/dbus-python-${PV}"
============================================================
--- packages/python/python-pydirectfb_cvs.bb 6710bb7fc1c4c248b7377e85e8c5cc3cc75b0bd5
+++ packages/python/python-pydirectfb_cvs.bb 341bfdf2405b9abb8350735871a219edebbeebc4
@@ -2,6 +2,7 @@ LICENSE = "GPL"
SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "GPL"
+DEPENDS = "directfb"
SRCNAME = "pydirectfb"
PV = "0.0.0+cvs${SRCDATE}"
PR = "ml0"
============================================================
--- packages/python/python-pyserial_2.2.bb 366eca22065252052faee65474af77f0773998c5
+++ packages/python/python-pyserial_2.2.bb c2c2f3211d6a1333edaba6a7a93d57141b467b61
@@ -3,12 +3,13 @@ SRCNAME = "pyserial"
PRIORITY = "optional"
LICENSE = "PSF"
SRCNAME = "pyserial"
-RDEPENDS = "python-fcntl python-io"
+RDEPENDS = "python-fcntl python-io python-stringold"
+PR = "r2"
-PR = "r1"
-
SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.zip"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
+# FIXME might stop packaging serialwin32 and serialjava files
+
============================================================
--- packages/python/python_2.5.2.bb c372778f3b501ac0ddf12f07516438198387bec8
+++ packages/python/python_2.5.2.bb 43c9ad955282b5022b3a3db8b5b179589957f666
@@ -5,7 +5,8 @@ DEPENDS_sharprom = "python-native readli
PRIORITY = "optional"
DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml1"
+# bump this on every change in contrib/python/generate-manifest-2.5.py
+PR = "ml2"
PYTHON_MAJMIN = "2.5"
============================================================
--- packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb 0bdc20dd566d6175fff6c13e3c54b17e8b1542b9
+++ packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b75660af4d2976417371bd6521760757571bf7bd
@@ -3,7 +3,7 @@ LICENSE = "GPL"%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r894eccb0f6fd46f8c72a9457612feba217d953b6 -r75b50263119e17063f5623d4e95924b911df6537
#
#
#
# add_dir "packages/wv/wv-1.2.0"
#
# add_file "packages/wv/wv-1.2.0/pkgconfig.patch"
# content [b429d69751733123d1f22c6a8bdbc8f81248e1d1]
#
# add_file "packages/xorg-lib/libx11/x11_disable_makekeys.patch"
# content [954ac7351076f80c008c2f4dde4293b419e1c899]
#
# patch "packages/wv/wv_1.2.0.bb"
# from [6c83952d5cd537068999ca340f7e8e9135646cbd]
# to [7743cc48881ffaa7c086c1eddb3fd768237ea42e]
#
============================================================
--- packages/wv/wv-1.2.0/pkgconfig.patch b429d69751733123d1f22c6a8bdbc8f81248e1d1
+++ packages/wv/wv-1.2.0/pkgconfig.patch b429d69751733123d1f22c6a8bdbc8f81248e1d1
@@ -0,0 +1,13 @@
+Index: wv-1.2.0/wv-1.0.pc.in
+===================================================================
+--- wv-1.2.0.orig/wv-1.0.pc.in 2008-03-19 22:25:18.000000000 +0000
++++ wv-1.2.0/wv-1.0.pc.in 2008-03-19 22:26:32.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: wvWare
+ Description: Word Document Filter library and utilities
+ Version: @VERSION@
+-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
+-Cflags: -I${includedir}/wv @GSF_CFLAGS@
++Requires: libgsf-1
++Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
++Cflags: -I${includedir}/wv
============================================================
--- packages/xorg-lib/libx11/x11_disable_makekeys.patch 954ac7351076f80c008c2f4dde4293b419e1c899
+++ packages/xorg-lib/libx11/x11_disable_makekeys.patch 954ac7351076f80c008c2f4dde4293b419e1c899
@@ -0,0 +1,30 @@
+---
+ src/util/Makefile.am | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+Index: libX11-1.1.2/src/util/Makefile.am
+===================================================================
+--- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100
++++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100
+@@ -1,21 +1,4 @@
+ # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh
+
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
============================================================
--- packages/wv/wv_1.2.0.bb 6c83952d5cd537068999ca340f7e8e9135646cbd
+++ packages/wv/wv_1.2.0.bb 7743cc48881ffaa7c086c1eddb3fd768237ea42e
@@ -1,10 +1,11 @@ LICENSE = "GPLv2"
DESCRIPTION = "Programs for accessing Microsoft Word documents"
HOMEPAGE = "http://wvware.sourceforge.net/"
LICENSE = "GPLv2"
-DEPENDS = "libgsf"
-PR = "r2"
+DEPENDS = "libgsf glib-2.0"
+PR = "r3"
-SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
+ file://pkgconfig.patch;patch=1"
inherit autotools pkgconfig
@@ -12,11 +13,6 @@ EXTRA_OECONF = ""
EXTRA_OECONF = ""
-do_compile_append () {
- cp wv-1.0.pc wv-1.0.pc.old
- sed 's:${STAGING_DIR_HOST}::g' < wv-1.0.pc.old > wv-1.0.pc
-}
-
do_stage () {
autotools_stage_all
}
More information about the Openembedded-commits
mailing list