|
[-]
[+]
|
Changed |
wengophone.spec
|
|
|
|
[-]
[+]
|
Added |
owautoconf.diff
^
|
| @@ -0,0 +1,32 @@
+------------------------------------------------------------------------
+r12195 | gladiac | 2007-08-03 16:26:59 +0200 (Fri, 03 Aug 2007) | 2 lines
+
+* (feature) support configure options
+
+------------------------------------------------------------------------
+Index: owbuild/owbuild/OWAutoconf.cmake
+===================================================================
+--- owbuild/owbuild/OWAutoconf.cmake (revision 12194)
++++ owbuild/owbuild/OWAutoconf.cmake (revision 12195)
+@@ -13,18 +13,18 @@
+ # For details see the accompanying COPYING file.
+
+
+-macro (ow_autoconf configureCommand makeCommand)
++macro (ow_autoconf _configureCommand _configureOptions _makeCommand)
+
+ execute_process(
+ COMMAND
+- ${configureCommand}
++ ${_configureCommand} ${_configureOptions}
+ WORKING_DIRECTORY
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+
+ execute_process(
+ COMMAND
+- ${makeCommand}
++ ${_makeCommand}
+ WORKING_DIRECTORY
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
|
|
[-]
[+]
|
Added |
owffmpeg-internal.diff
^
|
| @@ -0,0 +1,26 @@
+------------------------------------------------------------------------
+r12196 | gladiac | 2007-08-03 16:27:30 +0200 (Fri, 03 Aug 2007) | 2 lines
+
+* (bugfix) fix compilation on x86_64 and add options
+
+Index: libs/3rdparty/ffmpeg/CMakeLists-internal-unix.txt
+===================================================================
+--- libs/3rdparty/ffmpeg/CMakeLists-internal-unix.txt.orig
++++ libs/3rdparty/ffmpeg/CMakeLists-internal-unix.txt
+@@ -10,12 +10,14 @@ ow_add_public_include_dirs(
+ )
+
+ set(configure "./configure")
++set(configureOptions "--extra-cflags=")
+
+ if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ow_check_cxx_compiler_flag("-fPIC" WITH_FPIC)
+ if (WITH_FPIC)
+- set(configure "./configure -fPIC")
++ set(configure "./configure")
++ set(configureOptions "--extra-cflags=-fPIC")
+ endif (WITH_FPIC)
+ endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+
+-ow_autoconf(${configure} "make")
++ow_autoconf(${configure} ${configureOptions} "make")
|
|
[-]
[+]
|
Added |
wengophone_qt4_crashes.patch
^
|
| @@ -0,0 +1,20 @@
+Index: /wengophone-ng/branches/wengophone-2.1/libs/qtutil/src/QObjectThreadSafe.cpp
+===================================================================
+--- /wengophone-ng/branches/wengophone-2.1/libs/qtutil/src/QObjectThreadSafe.cpp (revision 7175)
++++ /wengophone-ng/branches/wengophone-2.1/libs/qtutil/src/QObjectThreadSafe.cpp (revision 11804)
+@@ -21,8 +21,14 @@
+
+ #include <QtCore/QCoreApplication>
++#include <QtCore/QThread>
+
+ QObjectThreadSafe::QObjectThreadSafe(QObject * parent)
+ : QObject(parent) {
+-
++ // If an object has a parent, its thread must be the current one. See
++ // http://doc.trolltech.com/4.3/qobject.html#moveToThread for more info.
++ assert(!parent || parent->thread() == QThread::currentThread());
++ if(!parent) {
++ moveToThread(QCoreApplication::instance()->thread());
++ }
+ _blockEvents = false;
+ }
|
|
|
Added |
wengophone-2.1.1.tar.bz2
^
|
