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

6 files changed, 64 insertions, 23 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index f1764e14f..229b09dea 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
 PKG_VERSION:=		26.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		91ce51cc6474f1269484e5327643a59c
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
new file mode 100644
index 000000000..884cea4dd
--- /dev/null
+++ b/package/firefox/patches/patch-configure
@@ -0,0 +1,30 @@
+--- mozilla-release.orig/configure	2013-12-05 17:08:46.000000000 +0100
++++ mozilla-release/configure	2014-01-06 18:17:43.008094174 +0100
+@@ -9787,27 +9787,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
diff --git a/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp b/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp
new file mode 100644
index 000000000..0a96d2259
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp
@@ -0,0 +1,10 @@
+--- mozilla-release.orig/gfx/layers/BufferUnrotate.cpp	2013-12-05 17:07:31.000000000 +0100
++++ mozilla-release/gfx/layers/BufferUnrotate.cpp	2014-01-06 21:27:39.000000000 +0100
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
+                     int aByteStride, int aXBoundary, int aYBoundary)
diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in
deleted file mode 100644
index b20260a8e..000000000
--- a/package/libXt/patches/patch-util_Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- libXt-1.1.3.orig/util/Makefile.in	2012-03-16 06:52:18.000000000 +0100
-+++ libXt-1.1.3/util/Makefile.in	2013-04-30 13:38:32.000000000 +0200
-@@ -106,7 +106,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- CHANGELOG_CMD = @CHANGELOG_CMD@
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS_FOR_BUILD@
- CWARNFLAGS = @CWARNFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
-@@ -246,7 +246,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
--AM_CFLAGS = $(XT_CFLAGS)
-+AM_CFLAGS = 
- makestrs_SOURCES = makestrs.c
- 
- # Man page
diff --git a/package/python3/patches/patch-Modules_posixmodule_c b/package/python3/patches/patch-Modules_posixmodule_c
new file mode 100644
index 000000000..537958513
--- /dev/null
+++ b/package/python3/patches/patch-Modules_posixmodule_c
@@ -0,0 +1,20 @@
+--- Python-3.3.2.orig/Modules/posixmodule.c	2013-05-15 18:32:59.000000000 +0200
++++ Python-3.3.2/Modules/posixmodule.c	2014-01-06 18:59:54.000000000 +0100
+@@ -7679,7 +7679,7 @@ PyDoc_STRVAR(posix_close__doc__,
+ Close a file descriptor (for low level IO).");
+ 
+ static PyObject *
+-posix_close(PyObject *self, PyObject *args)
++posix_pyclose(PyObject *self, PyObject *args)
+ {
+     int fd, res;
+     if (!PyArg_ParseTuple(args, "i:close", &fd))
+@@ -11082,7 +11082,7 @@ static PyMethodDef posix_methods[] = {
+     {"open",            (PyCFunction)posix_open,\
+                         METH_VARARGS | METH_KEYWORDS,
+                         posix_open__doc__},
+-    {"close",           posix_close, METH_VARARGS, posix_close__doc__},
++    {"close",           posix_pyclose, METH_VARARGS, posix_close__doc__},
+     {"closerange",      posix_closerange, METH_VARARGS, posix_closerange__doc__},
+     {"device_encoding", device_encoding, METH_VARARGS, device_encoding__doc__},
+     {"dup",             posix_dup, METH_VARARGS, posix_dup__doc__},
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index 2e60ec055..3af13570f 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		trafshow
 PKG_VERSION:=		5.2.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0b2f0bb23b7832138b7d841437b9e182
 PKG_DESCR:=		traffic analyzing tool
 PKG_SECTION:=		net
@@ -20,7 +20,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CPPFLAGS+=	-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
+TARGET_CPPFLAGS+=	-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS -D_GNU_SOURCE
+TARGET_LDFLAGS+=	-ltinfo
 
 trafshow-install:
 	${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin