Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 56 insertions, 4 deletions

diff --git a/package/cryptsetup/patches/patch-lib_libdevmapper_c b/package/cryptsetup/patches/patch-lib_libdevmapper_c
new file mode 100644
index 000000000..731f8bc4d
--- /dev/null
+++ b/package/cryptsetup/patches/patch-lib_libdevmapper_c
@@ -0,0 +1,10 @@
+--- cryptsetup-1.6.3.orig/lib/libdevmapper.c	2013-11-14 08:31:44.000000000 +0100
++++ cryptsetup-1.6.3/lib/libdevmapper.c	2014-01-08 10:15:32.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <linux/fs.h>
+ #include <uuid/uuid.h>
+ #include <sys/utsname.h>
++#include <sys/stat.h>
+ 
+ #include "internal.h"
+ 
diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh
index 18ec3a2e4..b9250d32f 100644
--- a/package/cryptsetup/patches/patch-ltmain_sh
+++ b/package/cryptsetup/patches/patch-ltmain_sh
@@ -1,6 +1,6 @@
---- cryptsetup-1.3.1.orig/ltmain.sh	2011-04-18 13:06:09.000000000 +0200
-+++ cryptsetup-1.3.1/ltmain.sh	2011-07-18 13:28:01.000000000 +0200
-@@ -5840,7 +5840,7 @@ func_mode_link ()
+--- cryptsetup-1.6.3.orig/ltmain.sh	2013-12-08 18:15:38.000000000 +0100
++++ cryptsetup-1.6.3/ltmain.sh	2014-01-08 01:18:38.000000000 +0100
+@@ -5853,7 +5853,7 @@ func_mode_link ()
        # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
        -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
diff --git a/package/firefox/patches/patch-js_src_configure b/package/firefox/patches/patch-js_src_configure
new file mode 100644
index 000000000..c37f501e4
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_configure
@@ -0,0 +1,31 @@
+--- mozilla-release.orig/js/src/configure	2013-12-05 17:08:46.000000000 +0100
++++ mozilla-release/js/src/configure	2014-01-07 19:30:38.660353287 +0100
+@@ -8652,28 +8652,6 @@ if test -z "$GNU_CC"; then
+     esac
+ fi
+ 
+-if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then
+-            if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then
+-        GOLD=$($CC -print-prog-name=ld.gold)
+-        case "$GOLD" in
+-        /*)
+-            ;;
+-        *)
+-            GOLD=$(which $GOLD)
+-            ;;
+-        esac
+-        if test -n "$GOLD"; then
+-            mkdir -p $_objdir/build/unix/gold
+-            ln -s "$GOLD" $_objdir/build/unix/gold/ld
+-            if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then
+-                LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold"
+-            else
+-                rm -rf $_objdir/build/unix/gold
+-            fi
+-        fi
+-    fi
+-fi
+-
+ if test "$GNU_CC"; then
+     if test -z "$DEVELOPER_OPTIONS"; then
+         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
diff --git a/package/libXt/patches/patch-util_Makefile_am b/package/libXt/patches/patch-util_Makefile_am
new file mode 100644
index 000000000..a97bc50dd
--- /dev/null
+++ b/package/libXt/patches/patch-util_Makefile_am
@@ -0,0 +1,10 @@
+--- libXt-1.1.3.orig/util/Makefile.am	2012-03-16 06:52:08.000000000 +0100
++++ libXt-1.1.3/util/Makefile.am	2014-01-07 13:22:11.833722316 +0100
+@@ -10,7 +10,6 @@ EXTRA_DIST = \
+ 	StrDefs.ht \
+ 	string.list
+ 
+-AM_CFLAGS = $(XT_CFLAGS)
+ makestrs_SOURCES = makestrs.c
+ 
+ 
diff --git a/package/mc/Makefile b/package/mc/Makefile
index 8bfa21955..267553653 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mc
 PKG_VERSION:=		4.7.0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f48b2c8dd140aeb36f59d16a662f0779
 PKG_DESCR:=		norton commander clone
 PKG_SECTION:=		misc
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--enable-charset \
 			--disable-extcharset \
 			--disable-background \