From 7b462167eefb25138669c9ed632cd9ed16d5550f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2012 11:25:18 +0100 Subject: zlib: bump version Patch is now upstream. Signed-off-by: Peter Korsgaard --- package/zlib/zlib-1.2.5-fix-static-install.patch | 24 ------------------------ package/zlib/zlib.mk | 9 +++++---- 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 package/zlib/zlib-1.2.5-fix-static-install.patch (limited to 'package') diff --git a/package/zlib/zlib-1.2.5-fix-static-install.patch b/package/zlib/zlib-1.2.5-fix-static-install.patch deleted file mode 100644 index 0a885f742..000000000 --- a/package/zlib/zlib-1.2.5-fix-static-install.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] fix make install for static builds - -Only try to install shared lib if we've built one. - -Signed-off-by: Peter Korsgaard ---- - Makefile.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -Index: zlib-1.2.5/Makefile.in -=================================================================== ---- zlib-1.2.5.orig/Makefile.in -+++ zlib-1.2.5/Makefile.in -@@ -168,7 +168,9 @@ install-libs: $(LIBS) - -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi - -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi - cp $(STATICLIB) $(DESTDIR)$(libdir) -- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) -+ if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ -+ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ -+ fi - cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) - -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index fbe923e69..eca98b876 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -3,10 +3,11 @@ # zlib # ############################################################# -ZLIB_VERSION:=1.2.5 -ZLIB_SOURCE:=zlib-$(ZLIB_VERSION).tar.bz2 -ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng -ZLIB_INSTALL_STAGING=YES + +ZLIB_VERSION = 1.2.6 +ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2 +ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng +ZLIB_INSTALL_STAGING = YES ifeq ($(BR2_PREFER_STATIC_LIB),y) ZLIB_PIC := -- cgit v1.2.3 From cf2486bf317e4bbf88c801fb96183ba62be78cc8 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 14 Feb 2012 10:56:52 +0100 Subject: DOWNLOAD_WGET: use -O instead of -P to set output file Some URLs use url-encoded arguments to specify the file to download. Wget will then use an output file name which includes all the ampersands and such. However, this is not what we see from buildroot. E.g.: FOO_SITE="http://git.foo.com/?p=foo.git;a=blob;f=" FOO_SOURCE="foo.tgz" wget will download this into $(DL_DIR)/index.html?p=foo.git;a=blob;f=foo.tgz buildroot thinks it's in $(DL_DIR)/foo.tgz To make sure the view of wget and buildroot are consistent, specify the output file explicitly. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/Makefile.package.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 33461b4dc..ea44c6cef 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -238,7 +238,7 @@ endef define DOWNLOAD_WGET test -e $(DL_DIR)/$(2) || \ - $(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2) + $(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2) endef define SOURCE_CHECK_WGET -- cgit v1.2.3 From 68f651954705e3f90ede5b3fb647ccdb6c9226bf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 15 Feb 2012 08:41:05 +0100 Subject: avahi: bump version Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 739c5f281..339261480 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -10,7 +10,7 @@ # either version 2.1 of the License, or (at your option) any # later version. -AVAHI_VERSION = 0.6.30 +AVAHI_VERSION = 0.6.31 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz AVAHI_SITE = http://www.avahi.org/download/ AVAHI_INSTALL_STAGING = YES -- cgit v1.2.3 From 25d88d92814aae41c97a95e5c6be1373125b4f7e Mon Sep 17 00:00:00 2001 From: Alexandre Pereira da Silva Date: Thu, 16 Feb 2012 00:38:00 -0200 Subject: linux-firmware: add support for the atheros ar9271 firmware Signed-off-by: Alexandre Pereira da Silva Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/linux-firmware/Config.in | 9 +++++++++ package/linux-firmware/linux-firmware.mk | 4 ++++ 2 files changed, 13 insertions(+) (limited to 'package') diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 9ce1a75d8..b15896ca5 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -8,6 +8,15 @@ config BR2_PACKAGE_LINUX_FIRMWARE if BR2_PACKAGE_LINUX_FIRMWARE +menu "Atheros" + +config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271 + bool "Atheros 9271" + help + Firmware files for the Atheros 9271 module + +endmenu + menu "Ralink" config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index d5987ab6c..eedef2f78 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -21,6 +21,10 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \ rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin \ LICENCE.ralink-firmware.txt +# ar9271 +LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271) += \ + LICENCE.atheros_firmware ar9271.fw + # wl127x LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \ ti-connectivity/wl1271-fw-2.bin \ -- cgit v1.2.3 From 3175e72e054a9b088903cf625a66ccfe9fd4404e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 17 Feb 2012 10:39:03 -0300 Subject: Avoid the warnings about the redefinition of LUA_USE_DLOPEN, when BR2_PACKAGE_LUA_INTERPRETER_READLINE is set See src/luaconf.h lines 36-40 Signed-off-by: Francois Perrad Acked-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/lua/lua.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 1dabedf46..30e95b457 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -9,7 +9,7 @@ LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y) - LUA_MYCFLAGS += -fPIC -DLUA_USE_DLOPEN + LUA_MYCFLAGS += -fPIC LUA_MYLIBS += -ldl endif @@ -18,7 +18,7 @@ ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y) LUA_MYLIBS += -lreadline -lhistory -lncurses LUA_MYCFLAGS += -DLUA_USE_LINUX else - LUA_MYCFLAGS += -DLUA_USE_POSIX + LUA_MYCFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN endif HOST_LUA_DEPENDENCIES = -- cgit v1.2.3 From 457d9c592f1f5c605041e81ced6848b68bf05406 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 23 Feb 2012 23:19:53 +0100 Subject: libarchive: bump version Signed-off-by: Peter Korsgaard --- package/libarchive/libarchive.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 53b367641..c9e5d07bb 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -3,7 +3,7 @@ # libarchive (reusable C library for archive formats) # ############################################################# -LIBARCHIVE_VERSION = 2.8.4 +LIBARCHIVE_VERSION = 2.8.5 LIBARCHIVE_SITE = http://libarchive.googlecode.com/files/ LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz LIBARCHIVE_INSTALL_STAGING = YES -- cgit v1.2.3 From bf6a6e441a8a924ba25298cbff6d20665403c0c3 Mon Sep 17 00:00:00 2001 From: Julien Boibessot Date: Wed, 22 Feb 2012 14:47:57 +0100 Subject: sdl_net: bump version, fix tarball name Bump version & cleanup variables setting while we are at it. Signed-off-by: Julien Boibessot Signed-off-by: Peter Korsgaard --- package/sdl_net/sdl_net.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk index bc99f6ce5..4992b8c50 100644 --- a/package/sdl_net/sdl_net.mk +++ b/package/sdl_net/sdl_net.mk @@ -3,8 +3,9 @@ # SDL_net: network addon for SDL # ############################################################# -SDL_NET_VERSION:=1.2.7 -SDL_NET_SITE:=http://www.libsdl.org/projects/SDL_net/release +SDL_NET_VERSION = 1.2.8 +SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release +SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz SDL_NET_CONF_OPT = --localstatedir=/var \ --with-sdl-prefix=$(STAGING_DIR)/usr \ -- cgit v1.2.3 From 24bc2ff8c1d55b13b11faa110dabfb45f73083da Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 25 Feb 2012 22:52:02 +0100 Subject: qt: bump version Webkit support runs pkg-config at build time, so we need to ensure our version gets picked up. Signed-off-by: Peter Korsgaard --- package/qt/qt-4.7.4-configure.patch | 48 ---------- package/qt/qt-4.7.4-pthread_getattr_np.patch | 101 --------------------- .../qt/qt-4.7.4-pthread_getattr_np_webkit.patch | 68 -------------- package/qt/qt-4.7.4-script-qtdbus-no-gui.patch | 22 ----- package/qt/qt-configure.patch | 48 ++++++++++ package/qt/qt-pthread_getattr_np.patch | 101 +++++++++++++++++++++ package/qt/qt-script-qtdbus-no-gui.patch | 22 +++++ package/qt/qt.mk | 14 ++- 8 files changed, 177 insertions(+), 247 deletions(-) delete mode 100644 package/qt/qt-4.7.4-configure.patch delete mode 100644 package/qt/qt-4.7.4-pthread_getattr_np.patch delete mode 100644 package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch delete mode 100644 package/qt/qt-4.7.4-script-qtdbus-no-gui.patch create mode 100644 package/qt/qt-configure.patch create mode 100644 package/qt/qt-pthread_getattr_np.patch create mode 100644 package/qt/qt-script-qtdbus-no-gui.patch (limited to 'package') diff --git a/package/qt/qt-4.7.4-configure.patch b/package/qt/qt-4.7.4-configure.patch deleted file mode 100644 index cef53e3fa..000000000 --- a/package/qt/qt-4.7.4-configure.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix -hostprefix behaviour - -When -hostprefix ./configure option is used, Qt installs all its -headers, libraries and binaries inside the given host prefix, instead -of the prefix. This is used by Buildroot to make sure that all Qt -libraries and headers are installed in $(STAGING_DIR). - -Qt ./configure script also allows to tune the installation location of -various elements, for examples the plugins through the -plugindir -option. Unfortunately, this option only impact the installation path -on the target, but not on the host when -hostprefix is used. - -This patch modifies Qt ./configure script so that HOST_*PATH_STR -variables are composed of the host prefix concatenated with the path -of installation on the target. This way, the plugin installation local -in the $(STAGING_DIR) and on the target remains the same. - -Signed-off-by: Thomas Petazzoni - -Index: qt-4.7.2/configure -=================================================================== ---- qt-4.7.2.orig/configure 2011-03-31 22:28:16.530647168 +0200 -+++ qt-4.7.2/configure 2011-03-31 22:29:38.908081695 +0200 -@@ -4456,15 +4456,15 @@ - - - if [ ! -z "$QT_HOST_PREFIX" ]; then -- HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"` -- HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"` -- HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"` -- HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"` -- HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"` -- HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"` -- HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"` -- HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"` -- HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"` -+ HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX/$QT_INSTALL_PREFIX"` -+ HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/$QT_INSTALL_DOCS"` -+ HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/$QT_INSTALL_HEADERS"` -+ HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/$QT_INSTALL_LIBS"` -+ HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/$QT_INSTALL_BINS"` -+ HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/$QT_INSTALL_PLUGINS"` -+ HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/$QT_INSTALL_IMPORTS"` -+ HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX/$QT_INSTALL_DATA"` -+ HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/$QT_INSTALL_TRANSLATIONS"` - HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"` - HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` - HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` diff --git a/package/qt/qt-4.7.4-pthread_getattr_np.patch b/package/qt/qt-4.7.4-pthread_getattr_np.patch deleted file mode 100644 index 4b20bb232..000000000 --- a/package/qt/qt-4.7.4-pthread_getattr_np.patch +++ /dev/null @@ -1,101 +0,0 @@ -Add pthred_getattr_np / phread_attr_getstrack alternatives for uClibc - -Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webkit-for-uclibc.patch?rev=20371 - -Signed-off-by: Johan Sagaert ---- qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp 2010-02-11 16:55:20.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp 2010-05-23 10:49:29.000000000 +0200 -@@ -75,6 +75,23 @@ - #endif - #include - -+#if defined(QT_LINUXBASE) -+#include -+#endif -+ -+#if defined(__UCLIBC__) -+// versions of uClibc 0.9.32 and below with linuxthreads.old do not have -+// pthread_getattr_np or pthread_attr_getstack. -+#if __UCLIBC_MAJOR__ == 0 && \ -+ (__UCLIBC_MINOR__ < 9 || \ -+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \ -+ defined(__LINUXTHREADS_OLD__) -+#define UCLIBC_USE_PROC_SELF_MAPS 1 -+#include -+extern int *__libc_stack_end; -+#endif -+#endif -+ - #if OS(SOLARIS) - #include - #else -@@ -667,18 +683,61 @@ static inline void* currentThreadStackBa - get_thread_info(find_thread(NULL), &threadInfo); - return threadInfo.stack_end; - #elif OS(UNIX) -+#ifdef UCLIBC_USE_PROC_SELF_MAPS -+ // Read /proc/self/maps and locate the line whose address -+ // range contains __libc_stack_end. -+ FILE *file = fopen("/proc/self/maps", "r"); -+ if (!file) -+ return 0; -+ __fsetlocking(file, FSETLOCKING_BYCALLER); -+ char *line = NULL; -+ size_t lineLen = 0; -+ while (!feof_unlocked(file)) { -+ if (getdelim(&line, &lineLen, '\n', file) <= 0) -+ break; -+ -+ long from; -+ long to; -+ if (sscanf (line, "%lx-%lx", &from, &to) != 2) -+ continue; -+ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) { -+ fclose(file); -+ free(line); -+#ifdef _STACK_GROWS_UP -+ return (void *)from; -+#else -+ return (void *)to; -+#endif -+ } -+ } -+ fclose(file); -+ free(line); -+ return 0; -+#else - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); - static void* stackBase = 0; - static size_t stackSize = 0; - static pthread_t stackThread; - pthread_t thread = pthread_self(); - if (stackBase == 0 || thread != stackThread) { -+ -+#if defined(QT_LINUXBASE) -+ // LinuxBase is missing pthread_getattr_np - resolve it once at runtime instead -+ // see http://bugs.linuxbase.org/show_bug.cgi?id=2364 -+ typedef int (*GetAttrPtr)(pthread_t, pthread_attr_t *); -+ static int (*pthread_getattr_np_ptr)(pthread_t, pthread_attr_t *) = 0; -+ if (!pthread_getattr_np_ptr) -+ *(void **)&pthread_getattr_np_ptr = dlsym(RTLD_DEFAULT, "pthread_getattr_np"); -+#endif - pthread_attr_t sattr; - pthread_attr_init(&sattr); - #if HAVE(PTHREAD_NP_H) || OS(NETBSD) - // e.g. on FreeBSD 5.4, neundorf@kde.org - pthread_attr_get_np(thread, &sattr); -+#elif defined(QT_LINUXBASE) -+ if (pthread_getattr_np_ptr) -+ pthread_getattr_np_ptr(thread, &sattr); - #else - // FIXME: this function is non-portable; other POSIX systems may have different np alternatives - pthread_getattr_np(thread, &sattr); -@@ -690,6 +749,7 @@ static inline void* currentThreadStackBa - stackThread = thread; - } - return static_cast(stackBase) + stackSize; -+#endif - #elif OS(WINCE) - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); diff --git a/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch deleted file mode 100644 index 934c332f4..000000000 --- a/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp 2010-09-10 11:05:22.000000000 +0200 -+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp 2010-11-15 16:39:53.000000000 +0100 -@@ -70,6 +70,19 @@ - #endif - #include - -+#if defined(__UCLIBC__) -+// versions of uClibc 0.9.32 with linuxthreads.old and below do not have -+// pthread_getattr_np or pthread_attr_getstack. -+#if __UCLIBC_MAJOR__ == 0 && \ -+ (__UCLIBC_MINOR__ < 9 || \ -+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \ -+ defined(__LINUXTHREADS_OLD__) -+#define UCLIBC_USE_PROC_SELF_MAPS 1 -+#include -+extern int* __libc_stack_end; -+#endif -+#endif -+ - #if OS(SOLARIS) - #include - #else -@@ -580,6 +592,37 @@ - get_thread_info(find_thread(NULL), &threadInfo); - return threadInfo.stack_end; - #elif OS(UNIX) -+#ifdef UCLIBC_USE_PROC_SELF_MAPS -+ // Read /proc/self/maps and locate the line whose address -+ // range contains __libc_stack_end. -+ FILE* file = fopen("/proc/self/maps", "r"); -+ if (!file) -+ return 0; -+ __fsetlocking(file, FSETLOCKING_BYCALLER); -+ char* line = 0; -+ size_t lineLen = 0; -+ while (!feof_unlocked(file)) { -+ if (getdelim(&line, &lineLen, '\n', file) <= 0) -+ break; -+ -+ long from; -+ long to; -+ if (sscanf (line, "%lx-%lx", &from, &to) != 2) -+ continue; -+ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) { -+ fclose(file); -+ free(line); -+#ifdef _STACK_GROWS_UP -+ return (void *)from; -+#else -+ return (void *)to; -+#endif -+ } -+ } -+ fclose(file); -+ free(line); -+ return 0; -+#else - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); - static void* stackBase = 0; -@@ -603,6 +646,7 @@ - stackThread = thread; - } - return static_cast(stackBase) + stackSize; -+#endif - #elif OS(WINCE) - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); diff --git a/package/qt/qt-4.7.4-script-qtdbus-no-gui.patch b/package/qt/qt-4.7.4-script-qtdbus-no-gui.patch deleted file mode 100644 index e29e9e4a1..000000000 --- a/package/qt/qt-4.7.4-script-qtdbus-no-gui.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] fix build with script+dbus enabled, but no gui - -The script/qtdbus plugin doesn't need gui support, so don't try to -link it against libQtGui. - -Signed-off-by: Peter Korsgaard ---- - src/plugins/script/qtdbus/qtdbus.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro -=================================================================== ---- qt-4.7.3.orig/src/plugins/script/qtdbus/qtdbus.pro -+++ qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro -@@ -1,6 +1,6 @@ - TARGET = qtscriptdbus - include(../../qpluginbase.pri) --QT = core gui script -+QT = core script - CONFIG += qdbus - - SOURCES += main.cpp diff --git a/package/qt/qt-configure.patch b/package/qt/qt-configure.patch new file mode 100644 index 000000000..cef53e3fa --- /dev/null +++ b/package/qt/qt-configure.patch @@ -0,0 +1,48 @@ +Fix -hostprefix behaviour + +When -hostprefix ./configure option is used, Qt installs all its +headers, libraries and binaries inside the given host prefix, instead +of the prefix. This is used by Buildroot to make sure that all Qt +libraries and headers are installed in $(STAGING_DIR). + +Qt ./configure script also allows to tune the installation location of +various elements, for examples the plugins through the -plugindir +option. Unfortunately, this option only impact the installation path +on the target, but not on the host when -hostprefix is used. + +This patch modifies Qt ./configure script so that HOST_*PATH_STR +variables are composed of the host prefix concatenated with the path +of installation on the target. This way, the plugin installation local +in the $(STAGING_DIR) and on the target remains the same. + +Signed-off-by: Thomas Petazzoni + +Index: qt-4.7.2/configure +=================================================================== +--- qt-4.7.2.orig/configure 2011-03-31 22:28:16.530647168 +0200 ++++ qt-4.7.2/configure 2011-03-31 22:29:38.908081695 +0200 +@@ -4456,15 +4456,15 @@ + + + if [ ! -z "$QT_HOST_PREFIX" ]; then +- HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"` +- HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"` +- HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"` +- HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"` +- HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"` +- HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"` +- HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"` +- HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"` +- HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"` ++ HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX/$QT_INSTALL_PREFIX"` ++ HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/$QT_INSTALL_DOCS"` ++ HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/$QT_INSTALL_HEADERS"` ++ HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/$QT_INSTALL_LIBS"` ++ HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/$QT_INSTALL_BINS"` ++ HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/$QT_INSTALL_PLUGINS"` ++ HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/$QT_INSTALL_IMPORTS"` ++ HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX/$QT_INSTALL_DATA"` ++ HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/$QT_INSTALL_TRANSLATIONS"` + HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"` + HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` + HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` diff --git a/package/qt/qt-pthread_getattr_np.patch b/package/qt/qt-pthread_getattr_np.patch new file mode 100644 index 000000000..4b20bb232 --- /dev/null +++ b/package/qt/qt-pthread_getattr_np.patch @@ -0,0 +1,101 @@ +Add pthred_getattr_np / phread_attr_getstrack alternatives for uClibc + +Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webkit-for-uclibc.patch?rev=20371 + +Signed-off-by: Johan Sagaert +--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp 2010-02-11 16:55:20.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp 2010-05-23 10:49:29.000000000 +0200 +@@ -75,6 +75,23 @@ + #endif + #include + ++#if defined(QT_LINUXBASE) ++#include ++#endif ++ ++#if defined(__UCLIBC__) ++// versions of uClibc 0.9.32 and below with linuxthreads.old do not have ++// pthread_getattr_np or pthread_attr_getstack. ++#if __UCLIBC_MAJOR__ == 0 && \ ++ (__UCLIBC_MINOR__ < 9 || \ ++ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \ ++ defined(__LINUXTHREADS_OLD__) ++#define UCLIBC_USE_PROC_SELF_MAPS 1 ++#include ++extern int *__libc_stack_end; ++#endif ++#endif ++ + #if OS(SOLARIS) + #include + #else +@@ -667,18 +683,61 @@ static inline void* currentThreadStackBa + get_thread_info(find_thread(NULL), &threadInfo); + return threadInfo.stack_end; + #elif OS(UNIX) ++#ifdef UCLIBC_USE_PROC_SELF_MAPS ++ // Read /proc/self/maps and locate the line whose address ++ // range contains __libc_stack_end. ++ FILE *file = fopen("/proc/self/maps", "r"); ++ if (!file) ++ return 0; ++ __fsetlocking(file, FSETLOCKING_BYCALLER); ++ char *line = NULL; ++ size_t lineLen = 0; ++ while (!feof_unlocked(file)) { ++ if (getdelim(&line, &lineLen, '\n', file) <= 0) ++ break; ++ ++ long from; ++ long to; ++ if (sscanf (line, "%lx-%lx", &from, &to) != 2) ++ continue; ++ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) { ++ fclose(file); ++ free(line); ++#ifdef _STACK_GROWS_UP ++ return (void *)from; ++#else ++ return (void *)to; ++#endif ++ } ++ } ++ fclose(file); ++ free(line); ++ return 0; ++#else + AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); + MutexLocker locker(mutex); + static void* stackBase = 0; + static size_t stackSize = 0; + static pthread_t stackThread; + pthread_t thread = pthread_self(); + if (stackBase == 0 || thread != stackThread) { ++ ++#if defined(QT_LINUXBASE) ++ // LinuxBase is missing pthread_getattr_np - resolve it once at runtime instead ++ // see http://bugs.linuxbase.org/show_bug.cgi?id=2364 ++ typedef int (*GetAttrPtr)(pthread_t, pthread_attr_t *); ++ static int (*pthread_getattr_np_ptr)(pthread_t, pthread_attr_t *) = 0; ++ if (!pthread_getattr_np_ptr) ++ *(void **)&pthread_getattr_np_ptr = dlsym(RTLD_DEFAULT, "pthread_getattr_np"); ++#endif + pthread_attr_t sattr; + pthread_attr_init(&sattr); + #if HAVE(PTHREAD_NP_H) || OS(NETBSD) + // e.g. on FreeBSD 5.4, neundorf@kde.org + pthread_attr_get_np(thread, &sattr); ++#elif defined(QT_LINUXBASE) ++ if (pthread_getattr_np_ptr) ++ pthread_getattr_np_ptr(thread, &sattr); + #else + // FIXME: this function is non-portable; other POSIX systems may have different np alternatives + pthread_getattr_np(thread, &sattr); +@@ -690,6 +749,7 @@ static inline void* currentThreadStackBa + stackThread = thread; + } + return static_cast(stackBase) + stackSize; ++#endif + #elif OS(WINCE) + AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); + MutexLocker locker(mutex); diff --git a/package/qt/qt-script-qtdbus-no-gui.patch b/package/qt/qt-script-qtdbus-no-gui.patch new file mode 100644 index 000000000..e29e9e4a1 --- /dev/null +++ b/package/qt/qt-script-qtdbus-no-gui.patch @@ -0,0 +1,22 @@ +[PATCH] fix build with script+dbus enabled, but no gui + +The script/qtdbus plugin doesn't need gui support, so don't try to +link it against libQtGui. + +Signed-off-by: Peter Korsgaard +--- + src/plugins/script/qtdbus/qtdbus.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro +=================================================================== +--- qt-4.7.3.orig/src/plugins/script/qtdbus/qtdbus.pro ++++ qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro +@@ -1,6 +1,6 @@ + TARGET = qtscriptdbus + include(../../qpluginbase.pri) +-QT = core gui script ++QT = core script + CONFIG += qdbus + + SOURCES += main.cpp diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 34f05f925..fe85daebf 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -12,7 +12,7 @@ # ###################################################################### -QT_VERSION = 4.7.4 +QT_VERSION = 4.8.0 QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz QT_SITE = http://get.qt.nokia.com/qt/source QT_DEPENDENCIES = host-pkg-config @@ -59,7 +59,10 @@ endif # ensure glib is built first if enabled for Qt's glib support ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +QT_CONFIGURE_OPTS += -glib QT_DEPENDENCIES += libglib2 +else +QT_CONFIGURE_OPTS += -no-glib endif @@ -222,9 +225,7 @@ ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y) QT_CONFIGURE_OPTS += -no-gui endif -ifeq ($(BR2_PACKAGE_QT_GIF),y) -QT_CONFIGURE_OPTS += -qt-gif -else +ifneq ($(BR2_PACKAGE_QT_GIF),y) QT_CONFIGURE_OPTS += -no-gif endif @@ -490,9 +491,6 @@ define QT_CONFIGURE_CMDS $(if $(VERBOSE),-verbose,-silent) \ -force-pkg-config \ $(QT_CONFIGURE_OPTS) \ - -no-gfx-qnx \ - -no-kbd-qnx \ - -no-mouse-qnx \ -no-xinerama \ -no-cups \ -no-nis \ @@ -507,7 +505,7 @@ define QT_CONFIGURE_CMDS endef define QT_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef -- cgit v1.2.3 From ed7791e2e8cdade564a5f484cdfe62ffe16cb981 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 25 Feb 2012 23:18:03 +0100 Subject: Makefile: move cmake toolchain file to $HOST_DIR/usr/share/buildroot To make it part of the SDK installation. Signed-off-by: Peter Korsgaard --- Makefile | 5 +++-- package/Makefile.cmake.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/Makefile b/Makefile index d5cd8f03d..9a07f9f79 100644 --- a/Makefile +++ b/Makefile @@ -368,7 +368,7 @@ $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) % dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) -$(BASE_TARGETS): dirs $(O)/toolchainfile.cmake +$(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake $(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config $(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig @@ -377,7 +377,8 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL) -$(O)/toolchainfile.cmake: +$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: + mkdir -p $(@D) @echo -en "\ set(CMAKE_SYSTEM_NAME Linux)\n\ set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\ diff --git a/package/Makefile.cmake.in b/package/Makefile.cmake.in index 38e459b80..aea118519 100644 --- a/package/Makefile.cmake.in +++ b/package/Makefile.cmake.in @@ -72,7 +72,7 @@ define $(2)_CONFIGURE_CMDS (cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ - -DCMAKE_TOOLCHAIN_FILE="$$(BASE_DIR)/toolchainfile.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ $$($$(PKG)_CONF_OPT) \ ) -- cgit v1.2.3 From fbfda06cb9d9aa1708915ec4148d08a0ca36cbc2 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Sun, 26 Feb 2012 10:13:06 -0200 Subject: qt: simplify arch handling Signed-off-by: Peter Korsgaard --- package/qt/qt.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'package') diff --git a/package/qt/qt.mk b/package/qt/qt.mk index fe85daebf..68f93483c 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -199,9 +199,7 @@ else QT_CONFIGURE_OPTS += -big-endian endif -ifeq ($(BR2_arm),y) -QT_EMB_PLATFORM = arm -else ifeq ($(BR2_armeb),y) +ifeq ($(BR2_arm)$(BR2_armeb),y) QT_EMB_PLATFORM = arm else ifeq ($(BR2_avr32),y) QT_EMB_PLATFORM = avr32 @@ -209,9 +207,7 @@ else ifeq ($(BR2_i386),y) QT_EMB_PLATFORM = x86 else ifeq ($(BR2_x86_64),y) QT_EMB_PLATFORM = x86_64 -else ifeq ($(BR2_mips),y) -QT_EMB_PLATFORM = mips -else ifeq ($(BR2_mipsel),y) +else ifeq ($(BR2_mips)$(BR2_mipsel),y) QT_EMB_PLATFORM = mips else ifeq ($(BR2_powerpc),y) QT_EMB_PLATFORM = powerpc -- cgit v1.2.3 From 974a0da6e1bf73c5091d21f1e89e08974b078432 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 26 Feb 2012 22:23:45 +0100 Subject: qt: fix build with gcc 4.6.x on arm As noted by Ismael Luceno. For details, see: http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02245.html Signed-off-by: Peter Korsgaard --- package/qt/qt.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'package') diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 68f93483c..776eb63af 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -201,6 +201,11 @@ endif ifeq ($(BR2_arm)$(BR2_armeb),y) QT_EMB_PLATFORM = arm +ifeq ($(BR2_GCC_VERSION_4_6_X),y) +# workaround for gcc issue +# http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02245.html +QT_CXXFLAGS += -fno-strict-volatile-bitfields +endif else ifeq ($(BR2_avr32),y) QT_EMB_PLATFORM = avr32 else ifeq ($(BR2_i386),y) -- cgit v1.2.3 From 7e4936dfa4c3d2c3192c6c69e9b51f1d4a646fa8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 27 Feb 2012 16:32:28 +0100 Subject: vala: bump version Signed-off-by: Peter Korsgaard --- package/vala/vala.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 52a85102c..a3ad03776 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ############################################################# VALA_VERSION_MAJOR = 0.15 -VALA_VERSION_MINOR = 1 +VALA_VERSION_MINOR = 2 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR) VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz -- cgit v1.2.3 From 328fc5747279ff00fcc619d1eda81bf139f3221c Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 27 Feb 2012 13:38:54 +0100 Subject: gamin: fix compilation with glib 2.30 G_CONST_RETURN is deprecated in glib 2.30 so remove occurences to avoid build failures. Patch taken from http://patches.openembedded.org/patch/13079/ Signed-off-by: Sven Neumann Cc: Richard Purdie Signed-off-by: Peter Korsgaard --- package/gamin/gamin-0.1.10-no-const-return.patch | 57 ++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/gamin/gamin-0.1.10-no-const-return.patch (limited to 'package') diff --git a/package/gamin/gamin-0.1.10-no-const-return.patch b/package/gamin/gamin-0.1.10-no-const-return.patch new file mode 100644 index 000000000..3e6e90521 --- /dev/null +++ b/package/gamin/gamin-0.1.10-no-const-return.patch @@ -0,0 +1,57 @@ +G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid +build failures. + +Upstream-Status: Pending + +Index: gamin-0.1.10/server/gam_node.c +=================================================================== +--- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100 ++++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100 +@@ -122,7 +122,7 @@ + * it has finished with the string. If it must keep it longer, it + * should makes its own copy. The returned string must not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_node_get_path(GamNode * node) + { + g_assert(node); +Index: gamin-0.1.10/server/gam_node.h +=================================================================== +--- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100 ++++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100 +@@ -58,7 +58,7 @@ + void gam_node_set_is_dir (GamNode *node, + gboolean is_dir); + +-G_CONST_RETURN char *gam_node_get_path (GamNode *node); ++const char *gam_node_get_path (GamNode *node); + + GList *gam_node_get_subscriptions (GamNode *node); + +Index: gamin-0.1.10/server/gam_subscription.c +=================================================================== +--- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100 ++++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100 +@@ -141,7 +141,7 @@ + * @param sub the GamSubscription + * @returns The path being monitored. It should not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_subscription_get_path(GamSubscription * sub) + { + if (sub == NULL) +Index: gamin-0.1.10/server/gam_subscription.h +=================================================================== +--- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100 ++++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100 +@@ -21,7 +21,7 @@ + + int gam_subscription_get_reqno (GamSubscription *sub); + +-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); ++const char *gam_subscription_get_path (GamSubscription *sub); + + GamListener *gam_subscription_get_listener (GamSubscription *sub); + -- cgit v1.2.3 From 4fd8bdc7da9e69d7c7515f1577de3e5c427dde89 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 27 Feb 2012 13:38:55 +0100 Subject: libglib2: update to version 2.30.2 Update to latest stable release and add a dependency on libffi which is needed by GObject. [Peter: fixup build on uClibc] Signed-off-by: Sven Neumann Signed-off-by: Peter Korsgaard --- package/libglib2/Config.in | 1 + ...b2-fix-compilation-with-no-builtin-atomic.patch | 25 ---------------------- package/libglib2/libglib2.mk | 16 +++++++------- 3 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch (limited to 'package') diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 3d4243073..d1d7231b0 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext help diff --git a/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch b/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch deleted file mode 100644 index 39c051078..000000000 --- a/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin -Date: Sat, 6 Nov 2010 14:56:15 +0100 -Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers - -Signed-off-by: Lionel Landwerlin ---- - glib/gatomic.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/glib/gatomic.c b/glib/gatomic.c -index 845c866..01468ce 100644 ---- a/glib/gatomic.c -+++ b/glib/gatomic.c -@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi - #endif /* DEFINE_WITH_WIN32_INTERLOCKED */ - - #ifdef DEFINE_WITH_MUTEXES -+# include "gthread.h" - /* We have to use the slow, but safe locking method */ - static GMutex *g_atomic_mutex; - --- -1.7.2.3 - diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 0832ac335..d0d9c5c2e 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -3,8 +3,8 @@ # libglib2 # ############################################################# -LIBGLIB2_VERSION_MAJOR = 2.28 -LIBGLIB2_VERSION_MINOR = 8 +LIBGLIB2_VERSION_MAJOR = 2.30 +LIBGLIB2_VERSION_MINOR = 2 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) @@ -13,7 +13,7 @@ LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_INSTALL_TARGET = YES LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install -LIBGLIB2_CONF_ENV = \ +LIBGLIB2_CONF_ENV = \ ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ glib_cv_uscore=no ac_cv_func_strtod=yes \ ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \ @@ -41,24 +41,24 @@ LIBGLIB2_CONF_ENV = \ ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \ ac_use_included_regex=no gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \ - ac_cv_func_posix_getgrgid_r=no \ + ac_cv_func_posix_getgrgid_r=no glib_cv_have_qsort_r=yes \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) HOST_LIBGLIB2_CONF_OPT = \ --disable-gtk-doc \ --enable-debug=no \ -LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl) +LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl) -HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib +HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib ifneq ($(BR2_ENABLE_LOCALE),y) -LIBGLIB2_DEPENDENCIES+=libiconv +LIBGLIB2_DEPENDENCIES += libiconv endif ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBGLIB2_CONF_OPT += --with-libiconv=gnu -LIBGLIB2_DEPENDENCIES+=libiconv +LIBGLIB2_DEPENDENCIES += libiconv endif define LIBGLIB2_REMOVE_DEV_FILES -- cgit v1.2.3 From 01ffa2e8684d2a3114469cc423e6ee992fd71599 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 27 Feb 2012 13:38:56 +0100 Subject: glib-networking: new package glib-networking provides network-related GIO modules for glib. It is used by newer versions of libsoup to implement SSL/TLS support. Signed-off-by: Sven Neumann Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/glib-networking/Config.in | 11 +++++++++++ package/glib-networking/glib-networking.mk | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 package/glib-networking/Config.in create mode 100644 package/glib-networking/glib-networking.mk (limited to 'package') diff --git a/package/Config.in b/package/Config.in index 8a7c9c4a5..41cbb8c1a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -344,6 +344,7 @@ source "package/jsmin/Config.in" endmenu menu "Networking" +source "package/glib-networking/Config.in" source "package/libcgi/Config.in" source "package/libcgicc/Config.in" source "package/libcurl/Config.in" diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in new file mode 100644 index 000000000..16f0d4a22 --- /dev/null +++ b/package/glib-networking/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_GLIB_NETWORKING + bool "glib-networking" + depends on BR2_USE_WCHAR # glib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + help + Network-related GIO modules for glib. + +comment "glib-networking requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk new file mode 100644 index 000000000..b1ad62110 --- /dev/null +++ b/package/glib-networking/glib-networking.mk @@ -0,0 +1,22 @@ +############################################################# +# +# glib-networking +# +############################################################# + +GLIB_NETWORKING_MAJOR_VERSION = 2.30 +GLIB_NETWORLING_MINOR_VERSION = 2 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORLING_MINOR_VERSION) +GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION) +GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz + +GLIB_NETWORKING_INSTALL_STAGING = YES + +GLIB_NETWORKING_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +GLIB_NETWORKING_DEPENDENCIES += gnutls +GLIB_NETWORKING_CONF_OPT = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +endif + +$(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From 8d485749e136ed43b5f1129dee08b7e4200182fa Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 27 Feb 2012 13:38:57 +0100 Subject: libsoup: update to version 2.36.1 Update to latest stable release. SSL support now depends on glib-networking with gnutls support instead of using gnutls directly. Remove libsoup-CVE-2011-2054.patch, this is fixed upstream. Signed-off-by: Sven Neumann Signed-off-by: Peter Korsgaard --- package/libsoup/Config.in | 1 + package/libsoup/libsoup-CVE-2011-2054.patch | 32 ----------------------------- package/libsoup/libsoup.mk | 19 ++++++++--------- 3 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 package/libsoup/libsoup-CVE-2011-2054.patch (limited to 'package') diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 347687cfe..eee6adecc 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBSOUP config BR2_PACKAGE_LIBSOUP_SSL bool "https support" + select BR2_PACKAGE_GLIB_NETWORKING select BR2_PACKAGE_GNUTLS depends on BR2_PACKAGE_LIBSOUP help diff --git a/package/libsoup/libsoup-CVE-2011-2054.patch b/package/libsoup/libsoup-CVE-2011-2054.patch deleted file mode 100644 index 0dc5eccf9..000000000 --- a/package/libsoup/libsoup-CVE-2011-2054.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4617b6ef6dd21931a0153070c5b5ff7ef21b46f8 Mon Sep 17 00:00:00 2001 -From: Dan Winship -Date: Wed, 29 Jun 2011 10:04:06 -0400 -Subject: [PATCH] SoupServer: fix to not allow smuggling ".." into path - -When SoupServer:raw-paths was set (the default), it was possible to -sneak ".." segments into the path passed to the SoupServerHandler, -which could then end up tricking some handlers into retrieving -arbitrary files from the filesystem. Fix that. - -https://bugzilla.gnome.org/show_bug.cgi?id=653258 - -diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c -index d56efd1..7225337 100644 ---- a/libsoup/soup-server.c -+++ b/libsoup/soup-server.c -@@ -779,6 +779,15 @@ got_headers (SoupMessage *req, SoupClientContext *client) - - uri = soup_message_get_uri (req); - decoded_path = soup_uri_decode (uri->path); -+ -+ if (strstr (decoded_path, "/../") || -+ g_str_has_suffix (decoded_path, "/..")) { -+ /* Introducing new ".." segments is not allowed */ -+ g_free (decoded_path); -+ soup_message_set_status (req, SOUP_STATUS_BAD_REQUEST); -+ return; -+ } -+ - soup_uri_set_path (uri, decoded_path); - g_free (decoded_path); - } diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 147b220a2..657258506 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,10 +4,11 @@ # ############################################################# -LIBSOUP_MAJOR_VERSION:=2.32 -LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2 -LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2 -LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION) +LIBSOUP_MAJOR_VERSION = 2.36 +LIBSOUP_MINOR_VERSION = 1 +LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION) +LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2 +LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION) LIBSOUP_INSTALL_STAGING = YES LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) @@ -16,18 +17,14 @@ ifneq ($(BR2_INET_IPV6),y) LIBSOUP_CONF_ENV += soup_cv_ipv6=no endif -LIBSOUP_CONF_OPT = \ - --disable-explicit-deps \ - --disable-glibtest \ - --without-gnome +LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y) -LIBSOUP_DEPENDENCIES += gnutls -LIBSOUP_CONF_OPT += --enable-ssl --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBSOUP_DEPENDENCIES += glib-networking else -LIBSOUP_CONF_OPT += --disable-ssl +LIBSOUP_CONF_OPT += --disable-tls-check endif $(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From e8255618956eb8e4ed259d98aa3865510288b182 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 28 Feb 2012 12:22:33 +0100 Subject: e2fsprogs: disable build of e4defrag unless explicitly enabled The e2fsprogs configure script enables the build of the e4defrag utility by default. Disable it unless BR2_PACKAGE_E2FSPROGS_E4DEFRAG is selected. Also the --disable-blkid option is not recognized by the configure script. Use --disable-libblkid instead. Signed-off-by: Sven Neumann Signed-off-by: Peter Korsgaard --- package/e2fsprogs/e2fsprogs.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 912deab6c..f3d44f6fa 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -12,9 +12,10 @@ E2FSPROGS_CONF_OPT = \ --enable-elf-shlibs \ $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \ $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \ + $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \ $(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \ --disable-uuidd \ - --disable-blkid \ + --disable-libblkid \ --disable-libuuid \ --enable-fsck \ --disable-e2initrd-helper \ -- cgit v1.2.3 From 97165f123bd67b8d1a9a0a3bb41f2c4b8475156d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 28 Feb 2012 21:52:03 +0100 Subject: libglib2: fix build with legacy uClibc versions qsort_r was only added in uClibc 0.9.33, so only enable it when we're sure it's available. For external/ctng toolchains we cannot easily know, so simply disable it there. Signed-off-by: Peter Korsgaard --- package/libglib2/libglib2.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d0d9c5c2e..d2445a148 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -41,9 +41,16 @@ LIBGLIB2_CONF_ENV = \ ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \ ac_use_included_regex=no gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \ - ac_cv_func_posix_getgrgid_r=no glib_cv_have_qsort_r=yes \ + ac_cv_func_posix_getgrgid_r=no \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) +# old uClibc versions don't provide qsort_r +ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no +else +LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes +endif + HOST_LIBGLIB2_CONF_OPT = \ --disable-gtk-doc \ --enable-debug=no \ -- cgit v1.2.3