summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conrad@kostecki.com>2019-02-26 14:05:14 +0100
committerAndrey Utkin <andrey_utkin@gentoo.org>2019-02-26 20:28:47 +0000
commiteaf4188b0ddaf58777e96293aa4c5cf3866f328e (patch)
treeacd706ed2cbb028d71143a3892fab8cbb279b947 /net-im/spectrum2/files
parentnet-im/spectrum2: boost must be with nls (diff)
downloadgentoo-eaf4188b0ddaf58777e96293aa4c5cf3866f328e.tar.gz
gentoo-eaf4188b0ddaf58777e96293aa4c5cf3866f328e.tar.bz2
gentoo-eaf4188b0ddaf58777e96293aa4c5cf3866f328e.zip
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Conrad Kostecki <conrad@kostecki.com> Signed-off-by: Andrey Utkin <andrey_utkin@gentoo.org>
Diffstat (limited to 'net-im/spectrum2/files')
-rw-r--r--net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
deleted file mode 100644
index 27e23db44848..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200
-+++ b/CMakeLists.txt 2018-09-20 20:57:35.000000000 +0200
-@@ -182,8 +182,7 @@
- if(ENABLE_IRC)
- find_package(Communi)
-
-- INCLUDE(FindQt4)
-- FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
-+ FIND_PACKAGE(Qt5 COMPONENTS Core Network)
- # ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
- ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
- # ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
-@@ -321,7 +320,6 @@
- message("IRC plugin : yes")
- include_directories(${QT_QTNETWORK_INCLUDE_DIR})
- include_directories(${IRC_INCLUDE_DIR})
-- include(${QT_USE_FILE})
- else()
- if(ENABLE_IRC)
- message("IRC plugin : no (install libCommuni and libprotobuf-dev)")
---- a/backends/libcommuni/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200
-+++ b/backends/libcommuni/CMakeLists.txt 2018-09-20 20:59:31.000000000 +0200
-@@ -1,14 +1,14 @@
- cmake_minimum_required(VERSION 2.6)
- FILE(GLOB SRC *.cpp)
- FILE(GLOB HEADERS *.h)
--QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
--add_definitions(-DQT_NO_KEYWORDS)
-+QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
-+include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
-
- if (NOT WIN32)
-- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport pthread)
-+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport pthread)
- else ()
-- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport)
-+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport)
- endif()
- INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)
-
---- a/cmake_modules/FindCommuni.cmake 2018-09-17 09:46:40.000000000 +0200
-+++ b/cmake_modules/FindCommuni.cmake 2018-09-20 21:00:04.000000000 +0200
-@@ -1,8 +1,7 @@
--find_package(Qt4)
--include( ${QT_USE_FILE} )
-+find_package(Qt5Network)
-
- FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR})
--FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi)
-+FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}"/.." PATH_SUFFIXES Communi)
-
- # message( STATUS ${IRC_LIBRARY})
- if( IRC_LIBRARY AND IRC_INCLUDE_DIR )