Update for 2011.02

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,3 +1,19 @@
+2011.02, Released February 28th, 2011:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: alsamixergui, avahi, ffmpeg, icu, mpd,
+	nuttcp, qt, slang, squashfs, sylpheed, synergy, xerces
+
+	Deprecated packages: devmem2, webif
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#2911: Qt: Disable qt3support-option, if gui-module isn't selected
+	#3259: Unable to build webkit (on arm)
+	#3295: slang fails to build on mipsel
+	#3325: ffmpeg fails to build
+
 2011.02-rc2, Released February 24th, 2011:
 
 	Fixes all over the tree.

Makefile

@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.02-rc2
+export BR2_VERSION:=2011.02
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:

docs/about.html

@@ -50,7 +50,7 @@ cross-compilation process.</p>
   toolchain</li>
 
   <li>Has a <b>simple structure</b> that makes it easy to understand
-  and extend. It relies only on the well-know Makefile language.</li>
+  and extend. It relies only on the well-known Makefile language.</li>
 
 </ul>
 

docs/download.html

@@ -6,14 +6,14 @@
 
 <p>
 
-The latest stable release is <b>2010.11</b>, which can be downloaded
+The latest stable release is <b>2011.02</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2010.11.tar.gz">buildroot-2010.11.tar.gz</a>
+<a href="/downloads/buildroot-2011.02.tar.gz">buildroot-2011.02.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.11.tar.bz2">buildroot-2010.11.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.02.tar.bz2">buildroot-2011.02.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2011.02-rc2</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +21,7 @@ downloaded here:<p>
 or
 <a href="/downloads/buildroot-2011.02-rc2.tar.bz2">buildroot-2011.02-rc2.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

docs/news.html

@@ -5,6 +5,15 @@
 <p>
 
 <ul>
+  <li><b>28 February 2011 -- 2011.02 released</b>
+
+    <p>The stable 2011.02 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.02">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.02.tar.bz2">2011.02 release</a>.</p>
+
   <li><b>24 February 2011 -- 2011.02-rc2 released</b>
 
     <p>RC2 is out with more cleanups and bugfixes, see the <a

linux/Config.in

@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_37
 
 config BR2_LINUX_KERNEL_2_6_37
-	bool "2.6.37"
+	bool "2.6.37.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.37"
+	default "2.6.37.2"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"

package/alsamixergui/Config.in

@@ -3,6 +3,8 @@ config BR2_PACKAGE_ALSAMIXERGUI
 	depends on BR2_PACKAGE_ALSA_LIB
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_FLTK
+	select BR2_PACKAGE_ALSA_LIB_PCM
+	select BR2_PACKAGE_ALSA_LIB_MIXER
 	bool "alsamixergui"
 	help
 	  A nice GUI mixer for Alsa using fltk

package/avahi/avahi.mk

@@ -160,8 +160,19 @@ define AVAHI_INSTALL_DAEMON_INITSCRIPT
 	$(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
 endef
 
+# avahi build sys erroneously only installs dbus service if systemd is enabled
+define AVAHI_INSTALL_DAEMON_DBUS_SERVICE
+	$(INSTALL) -m 0644 -D $(@D)/avahi-daemon/org.freedesktop.Avahi.service \
+		$(TARGET_DIR)/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
+endef
+
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
 AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_DBUS_SERVICE
+endif
+
 endif
 
 $(eval $(call AUTOTARGETS,package,avahi))

package/devmem2/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DEVMEM2
 	bool "devmem2"
+	depends on BR2_DEPRECATED
 	help
 	  Simple program to read/write from/to any location in memory.
 

package/icu/icu.mk

@@ -16,7 +16,9 @@ ICU_SUBDIR = source
 HOST_ICU_SUBDIR = source
 
 define ICU_PREFIX_FIXUP
-	$(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/icu-config
+	$(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/icu-config
 endef
 
 ICU_POST_INSTALL_TARGET_HOOKS += ICU_PREFIX_FIXUP

package/multimedia/ffmpeg/ffmpeg.mk

@@ -124,6 +124,11 @@ else
 FFMPEG_CONF_OPT += --disable-zlib
 endif
 
+# MMX on is default for x86, disable it for lowly x86-type processors
+ifeq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
+FFMPEG_CONF_OPT += --disable-mmx
+endif
+
 FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
 
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others

package/multimedia/mpd/Config.in

@@ -4,6 +4,7 @@ menuconfig BR2_PACKAGE_MPD
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
 	help
 	  MPD is a flexible, powerful, server-side application
 	  for playing music. Through plugins and libraries
@@ -18,6 +19,8 @@ config BR2_PACKAGE_MPD_ALSA
 	bool "alsa"
 	default y
 	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_PCM
+	select BR2_PACKAGE_ALSA_LIB_MIXER
 	help
 	  Enable alsa output support.
 
@@ -53,6 +56,17 @@ config BR2_PACKAGE_MPD_FLAC
 	  Enable flac input/streaming support.
 	  Select this if you want to play back FLAC files.
 
+config BR2_PACKAGE_MPD_FFMPEG
+	bool "ffmpeg"
+	select BR2_PACKAGE_FFMPEG
+	depends on BR2_LARGEFILE
+	help
+	  Enable ffmpeg input support.
+	  Select this if you want to play back files supported by ffmpeg.
+
+comment "ffmpeg support requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
+
 config BR2_PACKAGE_MPD_LAME
 	bool "lame"
 	select BR2_PACKAGE_LAME
@@ -144,17 +158,6 @@ config BR2_PACKAGE_MPD_WAVPACK
 	  Enable wavpack input support.
 	  Select this if you want to play back WV files.
 
-config BR2_PACKAGE_MPD_FFMPEG
-	bool "ffmpeg"
-	select BR2_PACKAGE_FFMPEG
-	depends on BR2_LARGEFILE
-	help
-	  Enable ffmpeg input support.
-	  Select this if you want to play back files supported by ffmpeg.
-
-comment "ffmpeg support requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
-
 endif
 
 comment "mpd requires a toolchain with C++ and WCHAR support"

package/multimedia/mpd/mpd.mk

@@ -35,7 +35,7 @@ endif
 ifeq ($(BR2_PACKAGE_MPD_FLAC),y)
 MPD_DEPENDENCIES += flac
 else
-MPD_CONF_OPT += --without-flac
+MPD_CONF_OPT += --without-flac --disable-oggflac
 endif
 
 ifeq ($(BR2_PACKAGE_MPD_CURL),y)

package/nuttcp/nuttcp-6.1.2-susv3-legacy.patch

@@ -0,0 +1,264 @@
+[PATCH] Replace susv3 legacy function with modern equivalents
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ nuttcp-6.1.2.c |   90 ++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 45 insertions(+), 45 deletions(-)
+
+Index: nuttcp-6.1.2/nuttcp-6.1.2.c
+===================================================================
+--- nuttcp-6.1.2.orig/nuttcp-6.1.2.c
++++ nuttcp-6.1.2/nuttcp-6.1.2.c
+@@ -1925,11 +1925,11 @@
+ 	if (udp && !haverateopt)
+ 		rate = DEFAULT_UDP_RATE;
+ 
+-	bzero((char *)&frominet, sizeof(frominet));
+-	bzero((char *)&clientaddr, sizeof(clientaddr));
++	memset((char *)&frominet, 0, sizeof(frominet));
++	memset((char *)&clientaddr, 0, sizeof(clientaddr));
+ 
+ #ifdef AF_INET6
+-	bzero((char *)&clientaddr6, sizeof(clientaddr6));
++	memset((char *)&clientaddr6, 0, sizeof(clientaddr6));
+ 	clientscope6 = 0;
+ #endif
+ 
+@@ -1985,7 +1985,7 @@
+ 		}
+ 
+ 		while (stream_idx <= nstream) {
+-			bzero(&hints, sizeof(hints));
++			memset(&hints, 0, sizeof(hints));
+ 			res[stream_idx] = NULL;
+ 			if (explicitaf) hints.ai_family = af;
+ 			if ((cp2 = strchr(cp1, '/'))) {
+@@ -3013,12 +3013,12 @@
+ 		if ((stream_idx > 0) && skip_data)
+ 			break;
+ 
+-		bzero((char *)&sinme[stream_idx], sizeof(sinme[stream_idx]));
+-		bzero((char *)&sinhim[stream_idx], sizeof(sinhim[stream_idx]));
++		memset((char *)&sinme[stream_idx], 0, sizeof(sinme[stream_idx]));
++		memset((char *)&sinhim[stream_idx], 0, sizeof(sinhim[stream_idx]));
+ 
+ #ifdef AF_INET6
+-		bzero((char *)&sinme6[stream_idx], sizeof(sinme6[stream_idx]));
+-		bzero((char *)&sinhim6[stream_idx], sizeof(sinhim6[stream_idx]));
++		memset((char *)&sinme6[stream_idx], 0, sizeof(sinme6[stream_idx]));
++		memset((char *)&sinhim6[stream_idx], 0, sizeof(sinhim6[stream_idx]));
+ #endif
+ 
+ 		if (((trans && !reverse) && (stream_idx > 0)) ||
+@@ -3028,15 +3028,15 @@
+ 			if (client) {
+ 				if (af == AF_INET) {
+ 				    sinhim[stream_idx].sin_family = af;
+-				    bcopy((char *)&(((struct sockaddr_in *)res[stream_idx]->ai_addr)->sin_addr),
+-					  (char *)&sinhim[stream_idx].sin_addr.s_addr,
++				    memcpy((char *)&sinhim[stream_idx].sin_addr.s_addr,
++					  (char *)&(((struct sockaddr_in *)res[stream_idx]->ai_addr)->sin_addr),
+ 					  sizeof(sinhim[stream_idx].sin_addr.s_addr));
+ 				}
+ #ifdef AF_INET6
+ 				else if (af == AF_INET6) {
+ 				    sinhim6[stream_idx].sin6_family = af;
+-				    bcopy((char *)&(((struct sockaddr_in6 *)res[stream_idx]->ai_addr)->sin6_addr),
+-					  (char *)&sinhim6[stream_idx].sin6_addr.s6_addr,
++				    memcpy((char *)&sinhim6[stream_idx].sin6_addr.s6_addr,
++					  (char *)&(((struct sockaddr_in6 *)res[stream_idx]->ai_addr)->sin6_addr),
+ 					  sizeof(sinhim6[stream_idx].sin6_addr.s6_addr));
+ 				    sinhim6[stream_idx].sin6_scope_id = ((struct sockaddr_in6 *)res[stream_idx]->ai_addr)->sin6_scope_id;
+ 				}
+@@ -3113,8 +3113,8 @@
+ 				 * to the multicast group
+ 				 */
+ 				if (af == AF_INET) {
+-				    bcopy((char *)&sinhim[1].sin_addr.s_addr,
+-					(char *)&save_sinhim.sin_addr.s_addr,
++				    memcpy((char *)&save_sinhim.sin_addr.s_addr,
++					(char *)&sinhim[1].sin_addr.s_addr,
+ 					sizeof(struct in_addr));
+ 				    if (!client && (irvers >= 50505)) {
+ 					struct sockaddr_in peer;
+@@ -3124,8 +3124,8 @@
+ 						      &peerlen) < 0) {
+ 						err("getpeername");
+ 					}
+-					bcopy((char *)&peer.sin_addr.s_addr,
+-					    (char *)&sinhim[1].sin_addr.s_addr,
++					memcpy((char *)&sinhim[1].sin_addr.s_addr,
++					    (char *)&peer.sin_addr.s_addr,
+ 					    sizeof(struct in_addr));
+ 				    }
+ 				    else {
+@@ -3136,8 +3136,8 @@
+ 							&melen) < 0) {
+ 						err("getsockname");
+ 					}
+-					bcopy((char *)&me.sin_addr.s_addr,
+-					    (char *)&sinhim[1].sin_addr.s_addr,
++					memcpy((char *)&sinhim[1].sin_addr.s_addr,
++					    (char *)&me.sin_addr.s_addr,
+ 					    sizeof(struct in_addr));
+ 				    }
+ 				    sinhim[1].sin_addr.s_addr &=
+@@ -4197,13 +4197,13 @@
+ 						&melen) < 0) {
+ 					err("getsockname");
+ 				}
+-				bcopy((char *)&me.sin_addr.s_addr,
+-				      (char *)&mc_group.imr_multiaddr.s_addr,
++				memcpy((char *)&mc_group.imr_multiaddr.s_addr,
++				      (char *)&me.sin_addr.s_addr,
+ 				      sizeof(struct in_addr));
+ 			}
+ 			else {
+-				bcopy((char *)&peer.sin_addr.s_addr,
+-				      (char *)&mc_group.imr_multiaddr.s_addr,
++				memcpy((char *)&mc_group.imr_multiaddr.s_addr,
++				      (char *)&peer.sin_addr.s_addr,
+ 				      sizeof(struct in_addr));
+ 			}
+ 			mc_group.imr_multiaddr.s_addr &= htonl(0xFFFFFF);
+@@ -4330,12 +4330,12 @@
+ 			if(udp) {
+ 				strcpy(buf, "BOD0");
+ 				if (multicast) {
+-				    bcopy((char *)&sinhim[1].sin_addr.s_addr,
+-					  (char *)&save_mc.sin_addr.s_addr,
+-					  sizeof(struct in_addr));
+-				    bcopy((char *)&save_sinhim.sin_addr.s_addr,
++				    memcpy((char *)&save_mc.sin_addr.s_addr,
+ 					  (char *)&sinhim[1].sin_addr.s_addr,
+ 					  sizeof(struct in_addr));
++				    memcpy((char *)&sinhim[1].sin_addr.s_addr,
++					  (char *)&save_sinhim.sin_addr.s_addr,
++					  sizeof(struct in_addr));
+ 				}
+ 				(void)Nwrite( fd[stream_idx + 1], buf, 4 ); /* rcvr start */
+ 				if (two_bod) {
+@@ -4344,8 +4344,8 @@
+ 					(void)Nwrite( fd[stream_idx + 1], buf, 4 ); /* rcvr start */
+ 				}
+ 				if (multicast) {
+-				    bcopy((char *)&save_mc.sin_addr.s_addr,
+-					  (char *)&sinhim[1].sin_addr.s_addr,
++				    memcpy((char *)&sinhim[1].sin_addr.s_addr,
++					  (char *)&save_mc.sin_addr.s_addr,
+ 					  sizeof(struct in_addr));
+ 				}
+ 				if (timeout)
+@@ -4361,7 +4361,7 @@
+ 				fflush(stdout);
+ 			}
+ 			if (udplossinfo)
+-				bcopy(&nbytes, buf + 24, 8);
++				memcpy(buf + 24, &nbytes, 8);
+ 			if (!udp && interval && !(format & NORETRANS) &&
+ 			    ((retransinfo == 1) ||
+ 			     ((retransinfo >= 2) &&
+@@ -4372,13 +4372,13 @@
+ 					tmp = 0x5254524Eu;	/* "RTRN" */
+ 				else
+ 					tmp = 0x48525452u;	/* "HRTR" */
+-				bcopy(&nretrans, buf + 24, 4);
+-				bcopy(&tmp, buf + 28, 4);
++				memcpy(buf + 24, &nretrans, 4);
++				memcpy(buf + 28, &tmp, 4);
+ 			}
+ 			else {
+ 				send_retrans = 0;
+ 				if (!udp)
+-					bzero(buf + 24, 8);
++					memset(buf + 24, 0, 8);
+ 			}
+ 			if (nbuf == INT_MAX)
+ 				nbuf = ULLONG_MAX;
+@@ -4423,12 +4423,12 @@
+ 				nbytes += buflen;
+ 				cnt = 0;
+ 				if (udplossinfo)
+-					bcopy(&nbytes, buf + 24, 8);
++					memcpy(buf + 24, &nbytes, 8);
+ 				if (send_retrans) {
+ 					nretrans = get_retrans(
+ 							fd[stream_idx + 1]);
+ 					nretrans -= iretrans;
+-					bcopy(&nretrans, buf + 24, 4);
++					memcpy(buf + 24, &nretrans, 4);
+ 				}
+ 				stream_idx++;
+ 				stream_idx = stream_idx % nstream;
+@@ -4523,8 +4523,8 @@
+ 				nbytes += cnt;
+ 			if(udp) {
+ 				if (multicast)
+-				    bcopy((char *)&save_sinhim.sin_addr.s_addr,
+-					  (char *)&sinhim[1].sin_addr.s_addr,
++				    memcpy((char *)&sinhim[1].sin_addr.s_addr,
++					  (char *)&save_sinhim.sin_addr.s_addr,
+ 					  sizeof(struct in_addr));
+ 				strcpy(buf, "EOD0");
+ 				(void)Nwrite( fd[stream_idx + 1], buf, 4 ); /* rcvr end */
+@@ -4532,7 +4532,7 @@
+ 		} else {
+ 			first_read = 1;
+ 			need_swap = 0;
+-			bzero(buf + 24, 8);
++			memset(buf + 24, 0, 8);
+ 			if (udp) {
+ 			    ntbytesc = 0;
+ 			    got_eod0 = 0;
+@@ -4584,7 +4584,7 @@
+ 				     * goes off right here */
+ 				    if (udplossinfo) {
+ 					    if (first_read) {
+-						    bcopy(buf + 24, &ntbytesc,
++						    memcpy(&ntbytesc, buf + 24,
+ 								8);
+ 						    first_read = 0;
+ 						    if (ntbytesc > 0x100000000ull)
+@@ -4598,7 +4598,7 @@
+ 						    }
+ 					    }
+ 					    if (!need_swap)
+-						    bcopy(buf + 24, &ntbytesc,
++						    memcpy(&ntbytesc, buf + 24,
+ 								8);
+ 					    else {
+ 						    cp1 = (char *)&ntbytesc;
+@@ -4627,8 +4627,8 @@
+ 					    uint32_t tmp;
+ 
+ 					    first_read = 0;
+-					    bcopy(buf + 24, &nretrans, 4);
+-					    bcopy(buf + 28, &tmp, 4);
++					    memcpy(&nretrans, buf + 24, 4);
++					    memcpy(&tmp, buf + 28, 4);
+ 					    if (tmp == 0x5254524Eu) {
+ 						    /* "RTRN" */
+ 						    retransinfo = 1;
+@@ -4661,7 +4661,7 @@
+ 				    }
+ 				    if (read_retrans) {
+ 					    if (!need_swap)
+-						    bcopy(buf + 24, &nretrans,
++						    memcpy(&nretrans, buf + 24,
+ 								4);
+ 					    else {
+ 						    cp1 = (char *)&nretrans;
+@@ -5327,10 +5327,10 @@
+ 		itimer.it_interval.tv_usec = 0;
+ 		setitimer(ITIMER_REAL, &itimer, 0);
+ 		signal(SIGALRM, SIG_DFL);
+-		bzero((char *)&frominet, sizeof(frominet));
+-		bzero((char *)&clientaddr, sizeof(clientaddr));
++		memset((char *)&frominet, 0, sizeof(frominet));
++		memset((char *)&clientaddr, 0, sizeof(clientaddr));
+ #ifdef AF_INET6
+-		bzero((char *)&clientaddr6, sizeof(clientaddr));
++		memset((char *)&clientaddr6, 0, sizeof(clientaddr));
+ 		clientscope6 = 0;
+ #endif
+ 		cput = 0.000001;

package/qt/Config.in

@@ -57,6 +57,7 @@ config BR2_PACKAGE_QT_LICENSE_APPROVED
 
 config BR2_PACKAGE_QT_QT3SUPPORT
 	bool "Compatibility with Qt3"
+	depends on BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  Turns on support for older Qt3. This will create an additional
 	  library with proxy code and increase the space required on target.

package/qt/Config.mouse.in

@@ -15,4 +15,11 @@ config BR2_PACKAGE_QT_MOUSE_TSLIB
 config BR2_PACKAGE_QT_MOUSE_QVFB
 	bool "qvfb"
 
+comment "Mouse Options"
+
+config BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR
+	bool "Hide the mouse cursor"
+	help
+	  Do not show the mouse cursor in QWS.
+
 endmenu

package/qt/qt.mk

@@ -154,6 +154,9 @@ QT_CONFIGURE += -qt-mouse-qvfb
 else
 QT_CONFIGURE += -no-mouse-qvfb
 endif
+ifeq ($(BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR),y)
+QT_CONFIGURE+= -D QT_NO_QWS_CURSOR
+endif
 
 ### Keyboard drivers
 ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)

package/slang/slang.mk

@@ -8,8 +8,10 @@ SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
 SLANG_SITE = http://www.uclibc.org/
 SLANG_INSTALL_STAGING = YES
 
+# We need to add -fPIC since we're busting original CFLAGS
+# that have it, see bug #3295
 define SLANG_BUILD_CMDS
-	$(MAKE1) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+	$(MAKE1) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -fPIC" \
 	LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
 endef
 

package/squashfs/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SQUASHFS
 	bool "squashfs"
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
 	help
 	  Tools to generate SquashFS filesystems.
 

package/squashfs/squashfs.mk

@@ -5,11 +5,6 @@ SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/sq
 # no libattr/xz in BR
 SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
 
-# we need atleast one compresser, so use gzip if none are enabled
-ifeq ($(BR2_PACKAGE_SQUASHFS_GZIP)$(BR2_PACKAGE_SQUASHFS_LZO)$(BR2_PACKAGE_SQUASHFS_LZMA),)
-BR2_PACKAGE_SQUASHFS_GZIP=y
-endif
-
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
 SQUASHFS_DEPENDENCIES += xz
 SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=lzma

package/sylpheed/sylpheed-2.4.8-makefile.patch

@@ -1,23 +0,0 @@
---- a/libsylph/Makefile.in	2007-12-20 23:48:26.000000000 -0500
-+++ b/libsylph/Makefile.in	2008-02-14 16:34:17.000000000 -0500
-@@ -143,7 +143,7 @@ manualdir = @manualdir@
- AM_CPPFLAGS =  	-DG_LOG_DOMAIN=\"LibSylph\" 	-DSYSCONFDIR=\""$(sysconfdir)"\"
- 
- 
--INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)
-+INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) 
- 
- #lib_LTLIBRARIES = libsylph.la
- noinst_LTLIBRARIES = libsylph.la
-
---- a/src/Makefile.in	2007-12-20 23:48:26.000000000 -0500
-+++ b/src/Makefile.in	2008-02-14 16:47:46.000000000 -0500
-@@ -153,7 +153,7 @@ BUILT_SOURCES =  	quote_fmt_lex.c 	quote
- EXTRA_DIST =  	quote_fmt_parse.h 	sylpheed-marshal.list 	version.h.in 	sylpheed.rc.in
- 
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"Sylpheed\" 	$(GTK_CFLAGS) 	$(GDK_PIXBUF_CFLAGS) 	$(GPGME_CFLAGS) 	-I$(includedir) 	-I$(top_srcdir)/libsylph
-+INCLUDES =  	-DG_LOG_DOMAIN=\"Sylpheed\" 	$(GTK_CFLAGS) 	$(GDK_PIXBUF_CFLAGS) 	$(GPGME_CFLAGS) 	-I$(top_srcdir)/libsylph
- 
- @HAVE_WINDRES_TRUE@SYLPHEED_RES = sylpheed.res
- @HAVE_WINDRES_FALSE@SYLPHEED_RES = 

package/sylpheed/sylpheed.mk

@@ -3,16 +3,22 @@
 # sylpheed
 #
 #############################################################
-SYLPHEED_VERSION = 2.4.8
+SYLPHEED_VERSION_MAJOR = 3.1
+SYLPHEED_VERSION_MINOR = 0
+SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
-SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v2.4
-SYLPHEED_AUTORECONF = NO
-SYLPHEED_INSTALL_STAGING = NO
-SYLPHEED_INSTALL_TARGET = YES
+SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
-SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix=""
+SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix="" \
+                    --includedir=$(STAGING_DIR)/usr/include
 
 SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2
 
-$(eval $(call AUTOTARGETS,package,sylpheed))
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+SYLPHEED_DEPENDENCIES += openssl
+SYLPHEED_CONF_OPT += --enable-ssl
+else
+SYLPHEED_CONF_OPT += --disable-ssl
+endif
 
+$(eval $(call AUTOTARGETS,package,sylpheed))

package/synergy/synergy-1.3.1-exit.patch

@@ -1,21 +0,0 @@
-[PATCH] fix build issue in CArchDaemonUnix
-
-exit() needs #include <stdlib.h> for the prototype.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- lib/arch/CArchDaemonUnix.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp
-+++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
-@@ -19,6 +19,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <stdlib.h>
- 
- //
- // CArchDaemonUnix

package/synergy/synergy-1.3.1-includes.patch

@@ -0,0 +1,167 @@
+[PATCH] fix build with modern toolchains
+
+Several files are missing the correct includes for exit/getenvmemcpy/strlen/..
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ lib/arch/CArchDaemonUnix.cpp        |    1 +
+ lib/arch/CMultibyte.cpp             |    1 +
+ lib/base/CStringUtil.cpp            |    1 +
+ lib/client/CClient.cpp              |    3 ++-
+ lib/client/CServerProxy.cpp         |    1 +
+ lib/net/CTCPSocket.cpp              |    2 +-
+ lib/platform/CXWindowsScreen.cpp    |    1 +
+ lib/server/CClientProxy1_3.cpp      |    1 +
+ lib/server/CServer.cpp              |    1 +
+ lib/synergy/CPacketStreamFilter.cpp |    1 +
+ lib/synergy/IKeyState.cpp           |    1 +
+ lib/synergy/IPrimaryScreen.cpp      |    1 +
+ 12 files changed, 13 insertions(+), 2 deletions(-)
+
+Index: synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp
++++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
+@@ -19,6 +19,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ //
+ // CArchDaemonUnix
+Index: synergy-1.3.1/lib/arch/CMultibyte.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp
++++ synergy-1.3.1/lib/arch/CMultibyte.cpp
+@@ -19,6 +19,7 @@
+ #include "CArch.h"
+ #include <limits.h>
+ #include <string.h>
++#include <stdlib.h>
+ #if HAVE_LOCALE_H
+ #	include <locale.h>
+ #endif
+Index: synergy-1.3.1/lib/base/CStringUtil.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/base/CStringUtil.cpp
++++ synergy-1.3.1/lib/base/CStringUtil.cpp
+@@ -19,6 +19,7 @@
+ #include <cctype>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstring>
+ #include <algorithm>
+ 
+ //
+Index: synergy-1.3.1/lib/client/CClient.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/client/CClient.cpp
++++ synergy-1.3.1/lib/client/CClient.cpp
+@@ -26,7 +26,8 @@
+ #include "CLog.h"
+ #include "IEventQueue.h"
+ #include "TMethodEventJob.h"
+-
++#include <string.h>
++#include <stdlib.h>
+ //
+ // CClient
+ //
+Index: synergy-1.3.1/lib/client/CServerProxy.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/client/CServerProxy.cpp
++++ synergy-1.3.1/lib/client/CServerProxy.cpp
+@@ -24,6 +24,7 @@
+ #include "TMethodEventJob.h"
+ #include "XBase.h"
+ #include <memory>
++#include <string.h>
+ 
+ //
+ // CServerProxy
+Index: synergy-1.3.1/lib/net/CTCPSocket.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp
++++ synergy-1.3.1/lib/net/CTCPSocket.cpp
+@@ -24,7 +24,7 @@
+ #include "CArch.h"
+ #include "XArch.h"
+ #include <string.h>
+-
++#include <stdlib.h>
+ //
+ // CTCPSocket
+ //
+Index: synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp
++++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
+@@ -27,6 +27,7 @@
+ #include "IEventQueue.h"
+ #include "TMethodEventJob.h"
+ #include <cstring>
++#include <stdlib.h>
+ #if X_DISPLAY_MISSING
+ #	error X11 is required to build synergy
+ #else
+Index: synergy-1.3.1/lib/server/CClientProxy1_3.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp
++++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp
+@@ -17,6 +17,7 @@
+ #include "CLog.h"
+ #include "IEventQueue.h"
+ #include "TMethodEventJob.h"
++#include <string.h>
+ 
+ //
+ // CClientProxy1_3
+Index: synergy-1.3.1/lib/server/CServer.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/server/CServer.cpp
++++ synergy-1.3.1/lib/server/CServer.cpp
+@@ -29,6 +29,7 @@
+ #include "TMethodEventJob.h"
+ #include "CArch.h"
+ #include <string.h>
++#include <stdlib.h>
+ 
+ //
+ // CServer
+Index: synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp
++++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
+@@ -16,6 +16,7 @@
+ #include "IEventQueue.h"
+ #include "CLock.h"
+ #include "TMethodEventJob.h"
++#include <string.h>
+ 
+ //
+ // CPacketStreamFilter
+Index: synergy-1.3.1/lib/synergy/IKeyState.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp
++++ synergy-1.3.1/lib/synergy/IKeyState.cpp
+@@ -14,6 +14,7 @@
+ 
+ #include "IKeyState.h"
+ #include <string.h>
++#include <stdlib.h>
+ 
+ //
+ // IKeyState
+Index: synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
+===================================================================
+--- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp
++++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include "IPrimaryScreen.h"
++#include <stdlib.h>
+ 
+ //
+ // IPrimaryScreen

package/webif/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_WEBIF
 	bool "webif - Status Console"
 	depends on BR2_PACKAGE_BUSYBOX # httpd
+	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_HASERL
 	help
 	  A web interface for showing different network status. This package

package/xerces/Config.in

@@ -1,11 +1,11 @@
 config BR2_PACKAGE_XERCES
 	bool "xerces-c++"
-	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Xerces-C++ is a validating XML parser written in portable C++.
 
 	  http://xml.apache.org/xerces-c/
 
-comment "xerces-c++ requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "xerces-c++ requires a toolchain with C++ and WCHAR support enabled"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)

package/xerces/xerces.mk

@@ -78,7 +78,7 @@ $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
 	touch $@
 
 $(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY): $(XERCES_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(XERCES_MAKE_OPT) -C $(XERCES_DIR)
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) $(XERCES_MAKE_OPT) -C $(XERCES_DIR)
 
 $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY): $(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY)
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \

toolchain/gdb/gdb.mk

@@ -183,6 +183,7 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked
 	(cd $(GDB_HOST_DIR); \
 		gdb_cv_func_sigsetjmp=yes \
 		bash_cv_have_mbstate_t=yes \
+		$(HOST_CONFIGURE_OPTS) \
 		$(GDB_DIR)/configure $(QUIET) \
 		--cache-file=/dev/null \
 		--prefix=$(STAGING_DIR) \
@@ -207,7 +208,7 @@ $(TARGET_CROSS)gdb: $(GDB_HOST_DIR)/gdb/gdb
 	ln -snf $(REAL_GNU_TARGET_NAME)-gdb \
 		$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gdb
 
-gdbhost: $(TARGET_CROSS)gdb
+gdbhost: host-expat $(TARGET_CROSS)gdb
 
 gdbhost-source: $(DL_DIR)/$(GDB_SOURCE)
 

toolchain/kernel-headers/Config.in

@@ -47,6 +47,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.34.8"	if BR2_KERNEL_HEADERS_2_6_34
 	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
-	default "2.6.37.1"	if BR2_KERNEL_HEADERS_2_6_37
+	default "2.6.37.2"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

toolchain/toolchain-crosstool-ng/crosstool-ng.mk

@@ -395,7 +395,8 @@ $(CTNG_DIR)/.patched: $(CTNG_DIR)/.unpacked
 # considered always remade. But we do not want
 # to reconfigure and rebuild ct-ng every time
 # we need to run it...
-$(CTNG_DIR)/.configured: | host-gawk        \
+$(CTNG_DIR)/.configured: | $(if $(BR2_CCACHE),host-ccache) \
+                           host-gawk        \
                            host-automake
 
 $(CTNG_DIR)/.configured: $(CTNG_DIR)/.patched

toolchain/uClibc/uclibc.mk

@@ -395,6 +395,13 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
 		oldconfig
 	touch $@
 
+ifeq ($(BR2_CCACHE),y)
+# we'll need ccache for the host built before make oldconfig
+# if configured, otherwise uclibc-menuconfig will fail.
+# Use order-only dependency as host-ccache is a virtual target
+$(UCLIBC_DIR)/.config: | host-ccache
+endif
+
 $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.config
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \