diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-22 21:48:45 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-22 21:48:45 +0000 |
commit | 5c29daf3485a433d8d383d815978ac34b0916bc7 (patch) | |
tree | 20588fb22766b27b57f6d5aab9e067e72b7b5d34 /irc/kvirc/files | |
parent | databases/mysqlwsrep57-server: Upgrade from 5.7.23 to 5.7.24 (diff) |
irc/kvirc: update to 5.0.0-beta1
- KDE4 will be removed by the end of the year
- Give maintainership to kde@
- Remove irc/kvirc-qt4
Notes
Notes:
svn path=/head/; revision=488136
Diffstat (limited to 'irc/kvirc/files')
-rw-r--r-- | irc/kvirc/files/patch-debian_git-5d45ef | 30 | ||||
-rw-r--r-- | irc/kvirc/files/patch-src__kvirc__CMakeLists.txt | 11 | ||||
-rw-r--r-- | irc/kvirc/files/patch-src_modules_rijndael_libkvirijndael.cpp | 20 |
3 files changed, 0 insertions, 61 deletions
diff --git a/irc/kvirc/files/patch-debian_git-5d45ef b/irc/kvirc/files/patch-debian_git-5d45ef deleted file mode 100644 index 1d1413904a9f..000000000000 --- a/irc/kvirc/files/patch-debian_git-5d45ef +++ /dev/null @@ -1,30 +0,0 @@ -Description: Fixes FTBFS with gcc 6. - Fixes invalid conversion errors. Also fixes two wrong flag operations, already - fixed upstream (in 0d14434b and 934fa2e1). -Author: Andrey Rahmatullin <wrar@debian.org> -Bug-Debian: https://bugs.debian.org/811908 -Last-Update: 2016-11-04 - -diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp -index f925ca7..1266b46 100644 ---- src/kvirc/kernel/KviIrcConnection.cpp -+++ src/kvirc/kernel/KviIrcConnection.cpp -@@ -669,7 +669,8 @@ void KviIrcConnection::closeAllChannels() - while(m_pChannelList->first()) - { - m_pChannelList->first()->close(); -- QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents); -+ QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents); -+ QApplication::processEvents(f); - } - } - -@@ -678,7 +679,8 @@ void KviIrcConnection::closeAllQueries() - while(m_pQueryList->first()) - { - m_pQueryList->first()->close(); -- QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents); -+ QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents); -+ QApplication::processEvents(f); - } - } diff --git a/irc/kvirc/files/patch-src__kvirc__CMakeLists.txt b/irc/kvirc/files/patch-src__kvirc__CMakeLists.txt deleted file mode 100644 index 9595caba58ec..000000000000 --- a/irc/kvirc/files/patch-src__kvirc__CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/kvirc/CMakeLists.txt.orig 2012-05-07 08:17:17.000000000 +0000 -+++ ./src/kvirc/CMakeLists.txt 2013-11-21 18:21:55.137647449 +0000 -@@ -357,7 +357,7 @@ - SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") - - IF(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") -- SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS -export-dynamic) -+ SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS -Wl,-export-dynamic) - MESSAGE(STATUS "Patching for FreeBSD...") - ENDIF() - diff --git a/irc/kvirc/files/patch-src_modules_rijndael_libkvirijndael.cpp b/irc/kvirc/files/patch-src_modules_rijndael_libkvirijndael.cpp deleted file mode 100644 index 4fd7ce6a12e0..000000000000 --- a/irc/kvirc/files/patch-src_modules_rijndael_libkvirijndael.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/modules/rijndael/libkvirijndael.cpp.orig 2011-07-23 15:15:56 UTC -+++ src/modules/rijndael/libkvirijndael.cpp -@@ -328,7 +328,7 @@ - setLastError(__tr2qs("The message is not a hexadecimal string: this is not my stuff")); - return false; - } else { -- if(len > 0) -+ if(*len > 0) - { - *outBuffer = (char *)KviMemory::allocate(*len); - KviMemory::move(*outBuffer,tmpBuf,*len); -@@ -354,7 +354,7 @@ - setLastError(__tr2qs("The message is not a base64 string: this is not my stuff")); - return false; - } else { -- if(len > 0) -+ if(*len > 0) - { - *outBuffer = (char *)KviMemory::allocate(*len); - KviMemory::move(*outBuffer,tmpBuf,*len); |