[oe-commits] org.oe.dev merge of 'a1b53f4890a543077cd9692d6f36d55601cf5cba'
mickeyl commit
oe at amethyst.openembedded.net
Fri Apr 11 10:21:04 UTC 2008
merge of 'a1b53f4890a543077cd9692d6f36d55601cf5cba'
and 'e7f793242547302eb26367c08896596376eba484'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 73afefc579a532c3525cc1ea4007a16ddf2608f2
ViewMTN: http://monotone.openembedded.org/revision/info/73afefc579a532c3525cc1ea4007a16ddf2608f2
Files:
1
packages/e17/enna/locale-is-broken.patch
packages/e17/entice_cvs.bb
conf/distro/include/sane-srcdates.inc
packages/e17/edje-viewer_cvs.bb
packages/e17/enna_cvs.bb
packages/e17/examine_cvs.bb
packages/e17/exhibit_cvs.bb
packages/e17/expedite_cvs.bb
packages/efl1/ecore_cvs.bb
packages/efl1/edb_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/epsilon_cvs.bb
packages/efl1/etk_cvs.bb
packages/efl1/evolve_cvs.bb
packages/efl1/exml_cvs.bb
packages/wv/wv-1.2.0
packages/uclibc/files/unistd_arm.patch
packages/wv/wv-1.2.0/pkgconfig.patch
packages/xorg-lib/libx11/x11_disable_makekeys.patch
classes/packaged-staging.bbclass
packages/jikes/jikes-initial.bb
packages/uclibc/uclibc_0.9.29.bb
packages/wv/wv_1.2.0.bb
Diffs:
#
# mt diff -ra1b53f4890a543077cd9692d6f36d55601cf5cba -r73afefc579a532c3525cc1ea4007a16ddf2608f2
#
#
#
# delete "packages/e17/enna/locale-is-broken.patch"
#
# delete "packages/e17/entice_cvs.bb"
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [534cab07a9373e1020839557e2432ce088c550e8]
# to [6d8dc481cd8a7bfae0c08d3d57a9df16e93942ec]
#
# patch "packages/e17/edje-viewer_cvs.bb"
# from [c67aeed187c3498ae31201e23527742188a003ff]
# to [8e755650d0094e711959475da50250b14f586f19]
#
# patch "packages/e17/enna_cvs.bb"
# from [829b76d4efae3a18edc2a557c1e41e509f4b1c30]
# to [291a2e69ce792de23fc6762fa03daadc1ba31430]
#
# patch "packages/e17/examine_cvs.bb"
# from [61fe2242600f8ed7c398a64d329d89d6208c6a10]
# to [9ca27ead428451e9f3791414f613edfe4f774159]
#
# patch "packages/e17/exhibit_cvs.bb"
# from [692c70acbd1a0589a77ca74304075419d2c345f4]
# to [300a7d6927ab40b6eb531c2bb1e498cef76349a1]
#
# patch "packages/e17/expedite_cvs.bb"
# from [7bff7eaadd81a76cda1e16c2d802fde4ddabfbd3]
# to [c2201217a18512fb65479d200e92b543d38b4623]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [74d5840965d9e8477bcde441cc02899c2baf051b]
# to [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
#
# patch "packages/efl1/edb_cvs.bb"
# from [8dbf42fc209cfd4e3abc970b18a7225533056354]
# to [cfec22c11caa4150e22a2640ef1292b5fc9dd9df]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [45f56ca80c3ce2f61d98980e32989c248e15a909]
# to [d3da1a158da97f38b8d2c32c4994ac557c07dc4e]
#
# patch "packages/efl1/edje_cvs.bb"
# from [7fd344e45307e880572dab5a4ab2d8f8467ba1df]
# to [c97e863a88bf2970d41f1107b5d64b248abf57e0]
#
# patch "packages/efl1/embryo_cvs.bb"
# from [54dc755d8be69024d06ad360043068177617795e]
# to [d1e3b9f6212724c6df80aec5468b565a407a77bb]
#
# patch "packages/efl1/epsilon_cvs.bb"
# from [7ec5c502b536c6c127630cb9fb7208aa661fef65]
# to [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
#
# patch "packages/efl1/etk_cvs.bb"
# from [3652bdb36bf19ea1def63385eb4968b9a0cfbac1]
# to [3e7539181f23c07253051ade9077c03e6c48806a]
#
# patch "packages/efl1/evolve_cvs.bb"
# from [8aa01b6c728b2a3f2b4327d628ddf5d6595cbbdb]
# to [255d1c4417fe86d3fa23bd78aa933c787617f9f2]
#
# patch "packages/efl1/exml_cvs.bb"
# from [7ae5127036e12c4f7b4225f0136bc6647f68a96b]
# to [e40fb4d779a5a3c3a797e02df43c0a44bb4991bb]
#
============================================================
--- conf/distro/include/sane-srcdates.inc 534cab07a9373e1020839557e2432ce088c550e8
+++ conf/distro/include/sane-srcdates.inc 6d8dc481cd8a7bfae0c08d3d57a9df16e93942ec
@@ -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 = "20080409"
+EFL_SRCDATE = "20080411"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/e17/edje-viewer_cvs.bb c67aeed187c3498ae31201e23527742188a003ff
+++ packages/e17/edje-viewer_cvs.bb 8e755650d0094e711959475da50250b14f586f19
@@ -2,7 +2,7 @@ PV = "0.0.0+cvs${SRCDATE}"
DEPENDS = "etk"
LICENSE = "MIT BSD"
PV = "0.0.0+cvs${SRCDATE}"
-PR = "r3"
+PR = "r0"
inherit e
============================================================
--- packages/e17/enna_cvs.bb 829b76d4efae3a18edc2a557c1e41e509f4b1c30
+++ packages/e17/enna_cvs.bb 291a2e69ce792de23fc6762fa03daadc1ba31430
@@ -4,13 +4,13 @@ PV = "0.2.0+cvs${SRCDATE}"
DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib"
SECTION = "x11/multimedia"
PV = "0.2.0+cvs${SRCDATE}"
+PR = "r0"
inherit e
-SRC_URI = "${E_CVS};module=misc/enna \
- file://locale-is-broken.patch;patch=1"
+SRC_URI = "${E_CVS};module=misc/enna"
S = "${WORKDIR}/enna"
do_configure_prepend() {
- touch po/Makefile.in.in
+ autopoint
}
============================================================
--- packages/e17/examine_cvs.bb 61fe2242600f8ed7c398a64d329d89d6208c6a10
+++ packages/e17/examine_cvs.bb 9ca27ead428451e9f3791414f613edfe4f774159
@@ -1,14 +1,11 @@ LICENSE = "MIT BSD"
DESCRIPTION = "Examine, the program configurator"
DEPENDS = "ewl"
LICENSE = "MIT BSD"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.0.1+cvs${SRCDATE}"
PR = "r0"
inherit e
-SRC_URI = "${E_CVS};module=e17/apps/examine"
-S = "${WORKDIR}/examine"
-
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
============================================================
--- packages/e17/exhibit_cvs.bb 692c70acbd1a0589a77ca74304075419d2c345f4
+++ packages/e17/exhibit_cvs.bb 300a7d6927ab40b6eb531c2bb1e498cef76349a1
@@ -1,10 +1,7 @@ LICENSE = "MIT BSD"
DESCRIPTION = "Exhibit is the ETK picture viewer"
DEPENDS = "evas ecore epsilon edje eet etk efreet"
LICENSE = "MIT BSD"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.1.1+cvs${SRCDATE}"
PR = "r0"
inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/exhibit"
-S = "${WORKDIR}/${PN}"
============================================================
--- packages/e17/expedite_cvs.bb 7bff7eaadd81a76cda1e16c2d802fde4ddabfbd3
+++ packages/e17/expedite_cvs.bb c2201217a18512fb65479d200e92b543d38b4623
@@ -3,13 +3,10 @@ PV = "0.6.0+cvs${SRCDATE}"
RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
LICENSE = "MIT BSD"
PV = "0.6.0+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
inherit autotools
-SRC_URI = "${E_CVS};module=e17/apps/expedite"
-S = "${WORKDIR}/${PN}"
-
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
============================================================
--- packages/efl1/ecore_cvs.bb 74d5840965d9e8477bcde441cc02899c2baf051b
+++ packages/efl1/ecore_cvs.bb db9ceefb6209514dcc2b22c3b7d8e0816820f762
@@ -1,5 +1,5 @@ require ecore.inc
require ecore.inc
-PR = "r1"
+PR = "r0"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/efl1/edb_cvs.bb 8dbf42fc209cfd4e3abc970b18a7225533056354
+++ packages/efl1/edb_cvs.bb cfec22c11caa4150e22a2640ef1292b5fc9dd9df
@@ -2,5 +2,6 @@ PV = "1.0.5.042+cvs${SRCDATE}"
LICENSE = "MIT BSD"
DEPENDS = "zlib"
PV = "1.0.5.042+cvs${SRCDATE}"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/edbus_cvs.bb 45f56ca80c3ce2f61d98980e32989c248e15a909
+++ packages/efl1/edbus_cvs.bb d3da1a158da97f38b8d2c32c4994ac557c07dc4e
@@ -2,7 +2,7 @@ PV = "0.1.0.042+cvs${SRCDATE}"
DEPENDS = "dbus ecore efreet ewl"
LICENSE = "MIT BSD"
PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r3"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/edje_cvs.bb 7fd344e45307e880572dab5a4ab2d8f8467ba1df
+++ packages/efl1/edje_cvs.bb c97e863a88bf2970d41f1107b5d64b248abf57e0
@@ -2,7 +2,7 @@ PV = "0.5.0.042+cvs${SRCDATE}"
DEPENDS = "eet evas ecore embryo edje-native"
LICENSE = "MIT BSD"
PV = "0.5.0.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/embryo_cvs.bb 54dc755d8be69024d06ad360043068177617795e
+++ packages/efl1/embryo_cvs.bb d1e3b9f6212724c6df80aec5468b565a407a77bb
@@ -1,7 +1,7 @@ PV = "0.9.1.042+cvs${SRCDATE}"
DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
LICENSE = "MIT BSD"
PV = "0.9.1.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/epsilon_cvs.bb 7ec5c502b536c6c127630cb9fb7208aa661fef65
+++ packages/efl1/epsilon_cvs.bb 06a4ccc0ac1208566731c847fc2ac20246de3ec5
@@ -4,7 +4,7 @@ PV = "0.3.0.012+cvs${SRCDATE}"
# can also depend on xine for movie thumbnails
DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
PV = "0.3.0.012+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/etk_cvs.bb 3652bdb36bf19ea1def63385eb4968b9a0cfbac1
+++ packages/efl1/etk_cvs.bb 3e7539181f23c07253051ade9077c03e6c48806a
@@ -2,12 +2,10 @@ PV = "0.1.0.042+cvs${SRCDATE}"
DEPENDS = "evas ecore edje"
LICENSE = "MIT"
PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
inherit efl
-SRC_URI += "file://etk_scrolled_view_dragable_combined_bouncy.patch;patch=1"
-
RRECOMMENDS_${PN} = "\
etk-engines-software-x11 \
etk-engines-evas \
============================================================
--- packages/efl1/evolve_cvs.bb 8aa01b6c728b2a3f2b4327d628ddf5d6595cbbdb
+++ packages/efl1/evolve_cvs.bb 255d1c4417fe86d3fa23bd78aa933c787617f9f2
@@ -2,5 +2,6 @@ PV = "0.0.0+cvs${SRCDATE}"
LICENSE = "MIT"
DEPENDS = "etk evolve-native"
PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/exml_cvs.bb 7ae5127036e12c4f7b4225f0136bc6647f68a96b
+++ packages/efl1/exml_cvs.bb e40fb4d779a5a3c3a797e02df43c0a44bb4991bb
@@ -2,6 +2,7 @@ PV = "0.1.1+cvs${SRCDATE}"
LICENSE = "MIT"
DEPENDS = "libxml2 libxslt ecore"
PV = "0.1.1+cvs${SRCDATE}"
+PR = "r0"
inherit efl
#
# mt diff -re7f793242547302eb26367c08896596376eba484 -r73afefc579a532c3525cc1ea4007a16ddf2608f2
#
#
#
# add_dir "packages/wv/wv-1.2.0"
#
# add_file "packages/uclibc/files/unistd_arm.patch"
# content [a6fa257e62c58f7720ff770fd7399ea40362b47e]
#
# 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 "classes/packaged-staging.bbclass"
# from [af2dc7a8ccc45ac795724160291eddb776b619b5]
# to [6e8ca636a852ed0e8d6e34c083750fe3195f9d27]
#
# patch "packages/jikes/jikes-initial.bb"
# from [fe4dcedb069cf9c4991b1281d359485ce377b155]
# to [acb7ab273c93fa5264bb5d431ef94cf91cb08c8b]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [dcea97ba0c59569369e1dfcb5835ea52674d209e]
# to [e670b8966480e150375aa74c2bd62de6c8e5315b]
#
# patch "packages/wv/wv_1.2.0.bb"
# from [6c83952d5cd537068999ca340f7e8e9135646cbd]
# to [7743cc48881ffaa7c086c1eddb3fd768237ea42e]
#
============================================================
--- packages/uclibc/files/unistd_arm.patch a6fa257e62c58f7720ff770fd7399ea40362b47e
+++ packages/uclibc/files/unistd_arm.patch a6fa257e62c58f7720ff770fd7399ea40362b47e
@@ -0,0 +1,30 @@
+Index: uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh
+===================================================================
+--- uClibc-0.9.29.orig/extra/scripts/gen_bits_syscall_h.sh 2006-12-12 04:30:02.000000000 +0100
++++ uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh 2008-03-10 23:20:52.000000000 +0100
+@@ -24,8 +24,8 @@
+ ( echo "#include <asm/unistd.h>";
+ echo "#include <asm/unistd.h>" |
+ $CC -E $CC_SYSNUM_ARGS $INCLUDE_OPTS - |
+- sed -ne 's/^[ ]*#define[ ]*__NR_\([A-Za-z0-9_]*\).*/UCLIBC_\1 __NR_\1/gp' \
+- -e 's/^[ ]*#undef[ ]*__NR_\([A-Za-z0-9_]*\).*/UNDEFUCLIBC_\1 __NR_\1/gp' # needed to strip out any kernel-internal defines
++ sed -ne 's/^[ ]*#define[ ]*\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/UCLIBC\1\2 \1\2/gp' \
++ -e 's/^[ ]*#undef[ ]*\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/UNDEFUCLIBC\1\2 \1\2/gp' # needed to strip out any kernel-internal defines
+ ) |
+ $CC -E $INCLUDE_OPTS - |
+ ( echo "/* WARNING!!! AUTO-GENERATED FILE!!! DO NOT EDIT!!! */" ; echo ;
+@@ -35,10 +35,10 @@
+ echo "#ifndef _SYSCALL_H" ;
+ echo "# error \"Never use <bits/sysnum.h> directly; include <sys/syscall.h> instead.\"" ;
+ echo "#endif" ; echo ;
+- sed -ne 's/^UCLIBC_\([A-Za-z0-9_]*\) *\(.*\)/#undef __NR_\1\
+-#define __NR_\1 \2\
+-#define SYS_\1 __NR_\1/gp' \
+- -e 's/^UNDEFUCLIBC_\([A-Za-z0-9_]*\).*/#undef __NR_\1/gp'
++ sed -ne 's/^UCLIBC\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\) *\(.*\)/#undef \1\2\
++#define \1\2 \3\
++#define SYS_\2 \1\2/gp' \
++ -e 's/^UNDEFUCLIBC\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/#undef \1\2/gp'
+ echo ;
+ echo "#endif" ;
+ )
============================================================
--- 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
============================================================
--- classes/packaged-staging.bbclass af2dc7a8ccc45ac795724160291eddb776b619b5
+++ classes/packaged-staging.bbclass 6e8ca636a852ed0e8d6e34c083750fe3195f9d27
@@ -233,9 +233,15 @@ staging_packager () {
echo "Priority: Optional" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
echo "Maintainer: ${MAINTAINER}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
echo "Architecture: ${PSTAGE_PKGARCH}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
- echo "Source: ${SRC_URI}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
-
- ${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}
+
+ # Protect against empty SRC_URI
+ if [ "${SRC_URI}" != "" ] ; then
+ echo "Source: ${SRC_URI}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ else
+ echo "Source: OpenEmbedded" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ fi
+
+ ${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}
${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
}
============================================================
--- packages/jikes/jikes-initial.bb fe4dcedb069cf9c4991b1281d359485ce377b155
+++ packages/jikes/jikes-initial.bb acb7ab273c93fa5264bb5d431ef94cf91cb08c8b
@@ -2,8 +2,7 @@ DEPENDS = "jikes-native classpath-initia
DEPENDS = "jikes-native classpath-initial"
-# Packaged-staging needs a Source: field to put in the packages, so SRC_URI can't be empty
-SRC_URI = "file://dummy"
+SRC_URI = ""
S = "${WORKDIR}"
============================================================
--- packages/uclibc/uclibc_0.9.29.bb dcea97ba0c59569369e1dfcb5835ea52674d209e
+++ packages/uclibc/uclibc_0.9.29.bb e670b8966480e150375aa74c2bd62de6c8e5315b
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
UCLIBC_BASE ?= "0.9.29"
-PR = "r12"
+PR = "r13"
require uclibc.inc
@@ -16,6 +16,7 @@ SRC_URI += "file://uClibc.machine file:/
SRC_URI += "file://uClibc.machine file://uClibc.distro \
file://errno_values.h.patch;patch=1 \
file://termios.h.patch;patch=1 \
+ file://unistd_arm.patch;patch=1 \
file://uClibc-0.9.29-001-fix-mmap.patch;patch=1 \
file://uClibc-0.9.29-002-atmel.1.patch;patch=1 \
file://uClibc-0.9.29-avr32-fix-sa_onstack.patch;patch=1 \
============================================================
--- 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