summaryrefslogtreecommitdiffstats
path: root/audio/murmur
diff options
context:
space:
mode:
Diffstat (limited to 'audio/murmur')
-rw-r--r--audio/murmur/files/patch-compiler.pri6
-rw-r--r--audio/murmur/files/patch-initialize-SSL8
2 files changed, 7 insertions, 7 deletions
diff --git a/audio/murmur/files/patch-compiler.pri b/audio/murmur/files/patch-compiler.pri
index d76d9c4..d98fd8a 100644
--- a/audio/murmur/files/patch-compiler.pri
+++ b/audio/murmur/files/patch-compiler.pri
@@ -1,6 +1,6 @@
---- compiler.pri.orig 2009-12-11 03:05:44.000000000 +0900
-+++ compiler.pri 2009-12-22 02:29:38.000000000 +0900
-@@ -93,7 +93,7 @@
+--- compiler.pri.orig 2015-07-09 13:23:46 UTC
++++ compiler.pri
+@@ -111,7 +111,7 @@ unix:!macx {
CONFIG(debug, debug|release) {
QMAKE_CFLAGS *= -fstack-protector -fPIE -pie
QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie
diff --git a/audio/murmur/files/patch-initialize-SSL b/audio/murmur/files/patch-initialize-SSL
index 5513176..aa959f4 100644
--- a/audio/murmur/files/patch-initialize-SSL
+++ b/audio/murmur/files/patch-initialize-SSL
@@ -8,9 +8,9 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363
Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876
Last-Updated: 2015-11-10
---- src/mumble/main.cpp
+--- src/mumble/main.cpp.orig 2015-07-09 13:23:46 UTC
+++ src/mumble/main.cpp
-@@ -170,6 +170,9 @@
+@@ -170,6 +170,9 @@ int main(int argc, char **argv) {
os_init();
#endif
@@ -20,9 +20,9 @@ Last-Updated: 2015-11-10
bool bAllowMultiple = false;
QUrl url;
if (a.arguments().count() > 1) {
---- src/murmur/main.cpp
+--- src/murmur/main.cpp.orig 2015-07-09 13:23:46 UTC
+++ src/murmur/main.cpp
-@@ -203,6 +203,9 @@
+@@ -203,6 +203,9 @@ int main(int argc, char **argv) {
qsrand(QDateTime::currentDateTime().toTime_t());
qInstallMsgHandler(murmurMessageOutput);
OpenPOWER on IntegriCloud