diff options
| author | thierry <thierry@FreeBSD.org> | 2015-06-19 03:50:53 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2015-06-19 03:50:53 +0800 |
| commit | f35f4e5852fb8f3eb3ac2501b2a090d44a6b1737 (patch) | |
| tree | 1ea41ce69c245bbeb027bd2e25efae45e11fa3d9 /net-im/qTox/files | |
| parent | 589c6fbd4e1be9cdc61ee35756fb6a7b1d4c4df6 (diff) | |
| download | freebsd-ports-gnome-f35f4e5852fb8f3eb3ac2501b2a090d44a6b1737.tar.gz freebsd-ports-gnome-f35f4e5852fb8f3eb3ac2501b2a090d44a6b1737.tar.zst freebsd-ports-gnome-f35f4e5852fb8f3eb3ac2501b2a090d44a6b1737.zip | |
Upgrade Tox, libfilteraudio, toxic, qTox and uTox to a recent snapshot.
PR: ports/200865
Submitted by: yuri (at) rawbw.com (qTox maintainer) + patches from other maintainers
Approved by: maintainers
Diffstat (limited to 'net-im/qTox/files')
| -rw-r--r-- | net-im/qTox/files/patch-qtox.pro | 10 | ||||
| -rw-r--r-- | net-im/qTox/files/patch-src_main.cpp | 13 | ||||
| -rw-r--r-- | net-im/qTox/files/patch-src_platform_camera_v4l2.cpp | 10 | ||||
| -rw-r--r-- | net-im/qTox/files/patch-src_platform_camera_v4l2.h | 11 |
4 files changed, 39 insertions, 5 deletions
diff --git a/net-im/qTox/files/patch-qtox.pro b/net-im/qTox/files/patch-qtox.pro index 984ef8c9ce6f..c3322ca2f839 100644 --- a/net-im/qTox/files/patch-qtox.pro +++ b/net-im/qTox/files/patch-qtox.pro @@ -1,8 +1,8 @@ ---- qtox.pro.orig 2015-04-27 03:03:27 UTC +--- qtox.pro.orig 2015-06-12 10:53:59 UTC +++ qtox.pro -@@ -433,6 +433,18 @@ SOURCES += \ - src/profilelocker.cpp \ - src/avatarbroadcaster.cpp +@@ -483,6 +483,18 @@ SOURCES += \ + src/widget/translator.cpp \ + src/persistence/settingsserializer.cpp +unix { + target.path = $$PREFIX/bin @@ -17,5 +17,5 @@ +} + HEADERS += \ - src/audio.h \ + src/audio/audio.h \ src/core/core.h \ diff --git a/net-im/qTox/files/patch-src_main.cpp b/net-im/qTox/files/patch-src_main.cpp new file mode 100644 index 000000000000..fce8ccc494eb --- /dev/null +++ b/net-im/qTox/files/patch-src_main.cpp @@ -0,0 +1,13 @@ +--- src/main.cpp.orig 2015-06-12 10:53:59 UTC ++++ src/main.cpp +@@ -280,3 +280,10 @@ int main(int argc, char *argv[]) + qDebug() << "Clean exit with status"<<errorcode; + return errorcode; + } ++ ++// Missing in libxccrt.so function __cxa_deleted_virtual, see FreeBSD Bug#200863 ++extern "C" void __cxa_deleted_virtual() ++{ ++ abort(); ++} ++ diff --git a/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp b/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp new file mode 100644 index 000000000000..8d94e9c04ff4 --- /dev/null +++ b/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp @@ -0,0 +1,10 @@ +--- src/platform/camera/v4l2.cpp.orig 2015-06-15 03:25:21 UTC ++++ src/platform/camera/v4l2.cpp +@@ -26,6 +26,7 @@ + #include <fcntl.h> + #include <sys/ioctl.h> + #include <linux/videodev2.h> ++#include <errno.h> + + /** + * Most of this file is adapted from libavdevice's v4l2.c, diff --git a/net-im/qTox/files/patch-src_platform_camera_v4l2.h b/net-im/qTox/files/patch-src_platform_camera_v4l2.h new file mode 100644 index 000000000000..f8ba4ab59af3 --- /dev/null +++ b/net-im/qTox/files/patch-src_platform_camera_v4l2.h @@ -0,0 +1,11 @@ +--- src/platform/camera/v4l2.h.orig 2015-06-12 10:53:59 UTC ++++ src/platform/camera/v4l2.h +@@ -24,7 +24,7 @@ + #include <QPair> + #include "src/video/videomode.h" + +-#ifndef Q_OS_LINUX ++#ifndef Q_OS_UNIX + #error "This file is only meant to be compiled for Linux targets" + #endif + |