Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

13 files changed, 207 insertions, 26 deletions

diff --git a/recipes/beecrypt/beecrypt_3.1.0.bb b/recipes/beecrypt/beecrypt_3.1.0.bb
index 720d99a416..8de6232fc5 100644
--- a/recipes/beecrypt/beecrypt_3.1.0.bb
+++ b/recipes/beecrypt/beecrypt_3.1.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
          file://x64fix.patch;patch=1"
 
-PR = "r3"
+PR = "r4"
 
 inherit autotools
 acpaths=""
diff --git a/recipes/beecrypt/files/x64fix.patch b/recipes/beecrypt/files/x64fix.patch
index 9ee75c1404..b8b50766fd 100644
--- a/recipes/beecrypt/files/x64fix.patch
+++ b/recipes/beecrypt/files/x64fix.patch
@@ -1,11 +1,13 @@
 Index: beecrypt-3.1.0/configure.ac
 ===================================================================
---- beecrypt-3.1.0.orig/configure.ac	2008-08-16 12:08:02.000000000 +0100
-+++ beecrypt-3.1.0/configure.ac	2008-08-16 12:08:26.000000000 +0100
-@@ -754,15 +754,6 @@
+--- beecrypt-3.1.0.orig/configure.ac	2003-08-17 06:46:57.000000000 +0000
++++ beecrypt-3.1.0/configure.ac	2009-03-20 14:36:59.000000000 +0000
+@@ -752,19 +752,6 @@
  
- # Check where to install the libraries
- bc_libalt=
+ AC_SUBST([MAYBE_OPT])
+ 
+-# Check where to install the libraries
+-bc_libalt=
 -case $target_os in
 -linux*)
 -  case $bc_target_arch in
@@ -15,6 +17,38 @@ Index: beecrypt-3.1.0/configure.ac
 -  esac
 -  ;;
 -esac
- AC_SUBST(LIBALT,$bc_libalt)
- 
+-AC_SUBST(LIBALT,$bc_libalt)
+-
  # Generate output files.
+ AC_CONFIG_FILES([Makefile
+                  Doxyfile
+Index: beecrypt-3.1.0/Makefile.am
+===================================================================
+--- beecrypt-3.1.0.orig/Makefile.am	2003-08-17 06:46:57.000000000 +0000
++++ beecrypt-3.1.0/Makefile.am	2009-03-20 14:36:59.000000000 +0000
+@@ -43,9 +43,7 @@
+ 
+ BEECRYPT_OBJECTS = aes.lo aesopt.lo base64.lo beecrypt.lo blockmode.lo blockpad.lo blowfish.lo blowfishopt.lo dhaes.lo dldp.lo dlkp.lo dlpk.lo dlsvdp-dh.lo dsa.lo elgamal.lo endianness.lo entropy.lo fips186.lo hmac.lo hmacmd5.lo hmacsha1.lo hmacsha256.lo md5.lo memchunk.lo mp.lo mpopt.lo mpbarrett.lo mpnumber.lo mpprime.lo mtprng.lo rsa.lo rsakp.lo rsapk.lo sha1.lo sha1opt.lo sha256.lo timestamp.lo
+ 
+-libaltdir=$(prefix)/lib@LIBALT@
+-
+-libalt_LTLIBRARIES = libbeecrypt.la
++lib_LTLIBRARIES = libbeecrypt.la
+ 
+ libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c rsa.c rsakp.c rsapk.c sha1.c sha256.c timestamp.c
+ 
+Index: beecrypt-3.1.0/java/Makefile.am
+===================================================================
+--- beecrypt-3.1.0.orig/java/Makefile.am	2003-06-25 19:25:41.000000000 +0000
++++ beecrypt-3.1.0/java/Makefile.am	2009-03-20 14:37:19.000000000 +0000
+@@ -26,9 +26,7 @@
+ 
+ BEECRYPT_JAVA_OBJECTS = javaglue.lo
+ 
+-libaltdir=$(prefix)/lib@LIBALT@
+-
+-libalt_LTLIBRARIES = libbeecrypt_java.la
++lib_LTLIBRARIES = libbeecrypt_java.la
+ 
+ noinst_HEADERS = javaglue.h
+ 
diff --git a/recipes/llvm/llvm-2.5/fix-build.patch b/recipes/llvm/llvm-2.5/fix-build.patch
new file mode 100644
index 0000000000..000fd4aca5
--- /dev/null
+++ b/recipes/llvm/llvm-2.5/fix-build.patch
@@ -0,0 +1,24 @@
+Index: llvm-2.5/tools/llvm-config/CMakeLists.txt
+===================================================================
+--- llvm-2.5.orig/tools/llvm-config/CMakeLists.txt	2009-01-07 20:24:44.000000000 +0100
++++ llvm-2.5/tools/llvm-config/CMakeLists.txt	2009-03-20 14:18:37.637615308 +0100
+@@ -83,13 +83,13 @@
+   COMMENT "Checking for cyclic dependencies between LLVM libraries.")
+ 
+ add_custom_command(OUTPUT ${LLVM_CONFIG}
+-  COMMAND echo 's,@LLVM_CPPFLAGS@,${CMAKE_CPP_FLAGS},' > temp.sed
+-  COMMAND echo 's,@LLVM_CFLAGS@,${CMAKE_C_FLAGS},' >> temp.sed
+-  COMMAND echo 's,@LLVM_CXXFLAGS@,${CMAKE_CXX_FLAGS},' >> temp.sed
++  COMMAND echo 's!@LLVM_CPPFLAGS@!${CMAKE_CPP_FLAGS}!' > temp.sed
++  COMMAND echo 's!@LLVM_CFLAGS@!${CMAKE_C_FLAGS}!' >> temp.sed
++  COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_FLAGS}!' >> temp.sed
+   # TODO: Use general flags for linking, not just for shared libs:
+-  COMMAND echo 's,@LLVM_LDFLAGS@,${CMAKE_SHARED_LINKER_FLAGS},' >> temp.sed
+-  COMMAND echo 's,@LIBS@,,' >> temp.sed                    # TODO: System libs
+-  COMMAND echo 's,@LLVM_BUILDMODE@,${CMAKE_BUILD_TYPE},' >> temp.sed
++  COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed
++  COMMAND echo 's!@LIBS@!!' >> temp.sed                    # TODO: System libs
++  COMMAND echo 's!@LLVM_BUILDMODE@!${CMAKE_BUILD_TYPE}!' >> temp.sed
+   COMMAND sed -f temp.sed < ${LLVM_CONFIG_IN} > ${LLVM_CONFIG}
+   COMMAND ${CMAKE_COMMAND} -E remove -f temp.sed
+   COMMAND cat ${FINAL_LIBDEPS} >> ${LLVM_CONFIG}
diff --git a/recipes/llvm/llvm_2.5.bb b/recipes/llvm/llvm_2.5.bb
new file mode 100644
index 0000000000..c0ce3345b8
--- /dev/null
+++ b/recipes/llvm/llvm_2.5.bb
@@ -0,0 +1,65 @@
+# TODO:
+# - packages examples
+# - fix staging (and probably llvm-config script)
+
+DESCRIPTION = "The Low Level Virtual Machine"
+HOMEPAGE = "http://llvm.org"
+LICENSE = "various"
+
+SRC_URI = "\
+  http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz \
+  file://fix-build.patch;patch=1 \
+"
+
+DEPENDS = "llvm-native"
+
+inherit cmake
+
+OECMAKE_SOURCEPATH = ".."
+OECMAKE_BUILDPATH = "build"
+EXTRA_OEMAKE = "-C build"
+EXTRA_OECMAKE = "\
+  -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/tblgen \
+  -DLLVM_TARGETS_TO_BUILD=${@get_llvm_arch(d)} \
+  -DCMAKE_LINKER:FILEPATH=${LD} \
+  -DCMAKE_AR:FILEPATH=${AR} \
+  -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \
+  -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \
+  -DCMAKE_RANLIB:FILEPATH=${RANLIB} \
+  -DCMAKE_STRIP:FILEPATH=${STRIP} \
+"
+
+do_stage() {
+  oe_runmake DESTDIR="${STAGE_TEMP}" install
+
+  install -d ${STAGING_BINDIR_CROSS}
+
+  # Fix some paths in the script to make it work correctly
+  sed -e's^my.*ABS_RUN_DIR =.*^my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";^' \
+      -e's^my.*INCLUDEDIR =.*^my $INCLUDEDIR = "${STAGING_INCDIR}";^' \
+      -e's^my.*LIBDIR.*^my $LIBDIR = "${STAGING_LIBDIR}";^' \
+      -e's^my.*BINDIR.*^my $BINDIR = "${STAGING_BINDIR}";^' \
+      build/bin/llvm-config > ${STAGING_BINDIR_CROSS}/llvm-config
+
+  chmod +x ${STAGING_BINDIR_CROSS}/llvm-config
+}
+
+# Retrieve the target in a way that is compatible to the arch
+# value in llvm (>= 2.5)
+def get_llvm_arch(d):
+  import bb;
+
+  arch = bb.data.getVar('TARGET_ARCH', d, 1)
+  if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686":
+    arch = "X86"
+  elif arch == "arm":
+    arch = "ARM"
+  elif arch == "mipsel":
+    arch = "Mips"
+  elif arch == "powerpc":
+    arch = "PowerPC"
+  else:
+    oefatal("Your target architecture is not supported by this recipe");
+
+  return arch
+
diff --git a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch
index 39978cfd11..b3188de32f 100644
--- a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch
+++ b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch
@@ -1,17 +1,17 @@
---- mozilla/js/src/Makefile.in.orig	2006-12-12 11:46:02.000000000 +0000
-+++ mozilla/js/src/Makefile.in	2006-12-12 11:46:27.000000000 +0000
-@@ -319,20 +319,8 @@
+--- /tmp/Makefile.in	2009-03-20 10:34:54.000000000 +0100
++++ mozilla-central/js/src/Makefile.in	2009-03-20 10:35:18.000000000 +0100
+@@ -507,20 +507,8 @@
  
- jsopcode.h jsopcode.c: jsopcode.tbl
+ export:: jsautocfg.h
  
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
- 	touch $@
--else
--ifeq ($(OS_ARCH),WINCE)
+-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
 -jsautocfg.h:
 -	touch $@
 -else
+-ifeq ($(OS_ARCH),WINCE)
+ jsautocfg.h:
+ 	touch $@
+-else
 -jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
 -	@rm -f $@ jsautocfg.tmp
 -	./jscpucfg > jsautocfg.tmp
diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb
index a714c882c7..fad2203ed5 100644
--- a/recipes/mozilla/fennec_hg.bb
+++ b/recipes/mozilla/fennec_hg.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Mozilla Mobile browser"
 DEPENDS += "cairo alsa-lib "
 
-PV = "0.9+1.0a2"
-MOZPV = "1.0a2"
-PR = "r2"
+PV = "0.9+1.0b2pre"
+MOZPV = "1.0b2pre"
+PR = "r3"
 PE = "1"
 
-SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=df94feb90a4f \
-           hg://hg.mozilla.org/;module=mobile-browser;rev=0361cd36d50d \
+SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=451c1f1753f0 \
+           hg://hg.mozilla.org/;module=mobile-browser;rev=9435ee77dda3 \
            file://jsautocfg.h \
            file://jsautocfg-dontoverwrite.patch;patch=1 \
 "
@@ -33,6 +33,12 @@ do_configure_prepend() {
 }
 
 do_compile_prepend() {
+	# A compile time assert is broken:
+	# http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prlog.h#259
+	for i in $(find ${S} -name "autoconf.mk") ; do 
+		sed -i -e s:fsigned-char:fno-signed-char:g $i
+	done
+
 	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
 	cp ${WORKDIR}/jsautocfg.h ${S}/objdir/xulrunner/js/src/
 	sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \
diff --git a/recipes/rpm/files/rpmconfigdir.patch b/recipes/rpm/files/rpmconfigdir.patch
new file mode 100644
index 0000000000..24f884c9f0
--- /dev/null
+++ b/recipes/rpm/files/rpmconfigdir.patch
@@ -0,0 +1,27 @@
+Index: rpm-4.4.2.3/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/Makefile.am	2009-03-18 17:12:48.000000000 +0000
++++ rpm-4.4.2.3/Makefile.am	2009-03-18 17:32:34.000000000 +0000
+@@ -122,14 +122,14 @@
+ 
+ install-data-local:
+ 	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
+-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmt
+-	@@LN_S@ rpmb $(DESTDIR)$(libdir)/rpm/rpmt
+-	@rm -f $(DESTDIR)$(libdir)/rpm/rpme
+-	@@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpme
+-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmu
+-	@@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpmu
+-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmv
+-	@@LN_S@ rpmq $(DESTDIR)$(libdir)/rpm/rpmv
++	@rm -f $(DESTDIR)@RPMCONFIGDIR@/rpmt
++	@@LN_S@ rpmb $(DESTDIR)@RPMCONFIGDIR@/rpmt
++	@rm -f $(DESTDIR)@RPMCONFIGDIR@/rpme
++	@@LN_S@ rpmi $(DESTDIR)@RPMCONFIGDIR@/rpme
++	@rm -f $(DESTDIR)@RPMCONFIGDIR@/rpmu
++	@@LN_S@ rpmi $(DESTDIR)@RPMCONFIGDIR@/rpmu
++	@rm -f $(DESTDIR)@RPMCONFIGDIR@/rpmv
++	@@LN_S@ rpmq $(DESTDIR)@RPMCONFIGDIR@/rpmv
+ 	rm -f $(DESTDIR)$(bindir)/rpmbuild
+ 	@LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild
+ 	rm -f $(DESTDIR)$(bindir)/rpmquery
diff --git a/recipes/rpm/rpm-native_4.4.2.3.bb b/recipes/rpm/rpm-native_4.4.2.3.bb
index 5ed737e366..935d07723f 100644
--- a/recipes/rpm/rpm-native_4.4.2.3.bb
+++ b/recipes/rpm/rpm-native_4.4.2.3.bb
@@ -1,7 +1,7 @@
 require rpm_${PV}.bb
 inherit native
 
-DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
+DEPENDS = "beecrypt-native gettext-native zlib-native file-native popt-native python-native"
 
 export localstatedir = "${layout_localstatedir}"
 export varprefix = "${layout_localstatedir}"
diff --git a/recipes/rpm/rpm_4.4.2.3.bb b/recipes/rpm/rpm_4.4.2.3.bb
index 6c2dc55e69..db88282f33 100644
--- a/recipes/rpm/rpm_4.4.2.3.bb
+++ b/recipes/rpm/rpm_4.4.2.3.bb
@@ -7,6 +7,7 @@ PR = "r13"
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
 	   file://cross_libpaths.patch;patch=1 \
+	   file://rpmconfigdir.patch;patch=1 \
 	   file://weakdeps.patch;patch=1;pnum=0 \
 	   file://tagsbackport.patch;patch=1;pnum=0 \
 	   file://missingok.patch;patch=1;pnum=0 \
@@ -30,7 +31,7 @@ EXTRA_OECONF = "--with-python \
 		--without-efence"
 
 PACKAGES += "python-rpm"
-FILES_python-rpm = "${libdir}/python*/site-recipes/rpm/_*"
+FILES_python-rpm = "${libdir}/python*/site-packages/rpm/_*"
 
 # Handle the db MUTEX settings here, the POSIX library is
 # the default - "POSIX/pthreads/library".
diff --git a/recipes/sqlite/sqlite3_3.6.5.bb b/recipes/sqlite/sqlite3_3.6.5.bb
new file mode 100644
index 0000000000..479516d261
--- /dev/null
+++ b/recipes/sqlite/sqlite3_3.6.5.bb
@@ -0,0 +1,3 @@
+require sqlite3.inc
+
+PR = "r0"
diff --git a/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
new file mode 100644
index 0000000000..667e516fa0
--- /dev/null
+++ b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
@@ -0,0 +1,7 @@
+require swt3.4-gtk_${PV}.bb
+
+PR = "r0"
+
+DEPENDS += "libhildon libhildonfm"
+
+SRC_URI += "file://swt-hildon.patch;patch=1"
diff --git a/recipes/swt/swt3.4-gtk_3.4.2.bb b/recipes/swt/swt3.4-gtk_3.4.2.bb
new file mode 100644
index 0000000000..f4b6a85f37
--- /dev/null
+++ b/recipes/swt/swt3.4-gtk_3.4.2.bb
@@ -0,0 +1,14 @@
+require swt-gtk.inc
+
+PR = "r0"
+
+SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/swt-3.4.2-gtk-linux-x86.zip \
+           file://Makefile"
+
+# A number which is used by SWT to mark the shared libraries.
+SWTVERSION = "3452"
+SWT_API_VERSION = "3.4"
+
+PROVIDES = "swt3.4-gtk"
+
+RCONFLICTS = "libswt3.3-gtk-java"
diff --git a/recipes/yum/files/paths2.patch b/recipes/yum/files/paths2.patch
index db614dfbbd..2e11bdc71e 100644
--- a/recipes/yum/files/paths2.patch
+++ b/recipes/yum/files/paths2.patch
@@ -13,7 +13,7 @@
 -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
 +PYSYSDIR = $(prefix)
  PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
- PKGDIR = $(PYLIBDIR)/site-recipes/$(PACKAGE)
+ PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
  
  all: 
  	echo "Nothing to do"
@@ -27,7 +27,7 @@
 -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
 +PYSYSDIR = $(prefix)
  PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
- PKGDIR = $(PYLIBDIR)/site-recipes/$(PACKAGE)
+ PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
  
  all: 
  	echo "Nothing to do"