jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt: bump version

Browse Source 
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2012-04-04 20:53:26 +02:00
parent 2e59d1d7ed
commit 738b0b0555
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/qt/qt-configure.patch
View File

@ -17,11 +17,15 @@ in the $(STAGING_DIR) and on the target remains the same.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: qt-4.7.2/configure ---
configure | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Index: qt-everywhere-opensource-src-4.8.1/configure
=================================================================== ===================================================================
--- qt-4.7.2.orig/configure 2011-03-31 22:28:16.530647168 +0200 --- qt-everywhere-opensource-src-4.8.1.orig/configure
+++ qt-4.7.2/configure 2011-03-31 22:29:38.908081695 +0200 +++ qt-everywhere-opensource-src-4.8.1/configure
@@ -4456,15 +4456,15 @@ @@ -4661,15 +4661,15 @@
if [ ! -z "$QT_HOST_PREFIX" ]; then if [ ! -z "$QT_HOST_PREFIX" ]; then

24
package/qt/qt-pthread_getattr_np.patch
View File

@ -3,9 +3,15 @@ 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 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 <sagaert.johan@skynet.be> Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
--- 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 src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 61 ++++++++++
@@ -75,6 +75,23 @@ 1 file changed, 61 insertions(+)
Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
===================================================================
--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
@@ -70,6 +70,23 @@
#endif #endif
#include <unistd.h> #include <unistd.h>
@ -29,7 +35,7 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
#if OS(SOLARIS) #if OS(SOLARIS)
#include <thread.h> #include <thread.h>
#else #else
@@ -667,18 +683,61 @@ static inline void* currentThreadStackBa @@ -648,6 +665,37 @@
get_thread_info(find_thread(NULL), &threadInfo); get_thread_info(find_thread(NULL), &threadInfo);
return threadInfo.stack_end; return threadInfo.stack_end;
#elif OS(UNIX) #elif OS(UNIX)
@ -67,7 +73,7 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
MutexLocker locker(mutex); MutexLocker locker(mutex);
static void* stackBase = 0; static void* stackBase = 0;
static size_t stackSize = 0; @@ -655,11 +703,23 @@
static pthread_t stackThread; static pthread_t stackThread;
pthread_t thread = pthread_self(); pthread_t thread = pthread_self();
if (stackBase == 0 || thread != stackThread) { if (stackBase == 0 || thread != stackThread) {
@ -91,11 +97,11 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
#else #else
// FIXME: this function is non-portable; other POSIX systems may have different np alternatives // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
pthread_getattr_np(thread, &sattr); pthread_getattr_np(thread, &sattr);
@@ -690,6 +749,7 @@ static inline void* currentThreadStackBa @@ -671,6 +731,7 @@
stackThread = thread; stackThread = thread;
} }
return static_cast<char*>(stackBase) + stackSize; return static_cast<char*>(stackBase) + stackSize;
+#endif +#endif
#elif OS(WINCE) #else
AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); #error Need a way to get the stack base on this platform
MutexLocker locker(mutex); #endif

2
package/qt/qt.mk
View File

@ -12,7 +12,7 @@
# #
###################################################################### ######################################################################
QT_VERSION = 4.8.0 QT_VERSION = 4.8.1
QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
QT_SITE = http://get.qt.nokia.com/qt/source QT_SITE = http://get.qt.nokia.com/qt/source
QT_DEPENDENCIES = host-pkg-config QT_DEPENDENCIES = host-pkg-config