[net-im/spectrum] update from PR
parent
6923078445
commit
2d4abfe2b7
@ -0,0 +1,13 @@
|
||||
--- a/CMakeLists.txt 2018-04-27 12:27:02.000000000 +0200
|
||||
+++ b/CMakeLists.txt 2018-04-29 18:17:42.157170288 +0200
|
||||
@@ -399,10 +399,6 @@
|
||||
endif()
|
||||
|
||||
if(CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
- if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
- ADD_DEFINITIONS(-O0)
|
||||
- ADD_DEFINITIONS(-ggdb)
|
||||
- endif()
|
||||
ADD_DEFINITIONS(-DDEBUG)
|
||||
message("Debug : yes")
|
||||
else(CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
@ -1,24 +1,35 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
LOGFILE=/var/log/spectrum2/std.log
|
||||
SPECTRUM2_GROUP="spectrum"
|
||||
SPECTRUM2_MANAGER="/usr/bin/spectrum2_manager"
|
||||
SPECTRUM2_USER="spectrum"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
start() {
|
||||
[ -d /var/run/spectrum2 ] || mkdir /var/run/spectrum2 && chown jabber:jabber /var/run/spectrum2 && chmod 750 /var/run/spectrum2
|
||||
ebegin "Starting ${PROTOCOL} Spectrum Transport"
|
||||
start-stop-daemon --start --user jabber --group jabber \
|
||||
--exec /usr/bin/spectrum2_manager start &> $LOGFILE
|
||||
ebegin "Starting Spectrum2 Transport"
|
||||
start-stop-daemon --start --group ${SPECTRUM2_GROUP} --user ${SPECTRUM2_USER} \
|
||||
--exec ${SPECTRUM2_MANAGER} start
|
||||
eend $?
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkpath -d -o ${SPECTRUM2_USER}:${SPECTRUM2_GROUP} -q /run/spectrum2
|
||||
}
|
||||
|
||||
status() {
|
||||
ebegin "Status Spectrum2 Transport"
|
||||
${SPECTRUM2_MANAGER} status
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${PROTOCOL} Spectrum Transport"
|
||||
start-stop-daemon --user jabber --group jabber \
|
||||
--exec /usr/bin/spectrum2_manager stop 1>>$LOGFILE 2>&1
|
||||
ebegin "Stopping Spectrum2 Transport"
|
||||
start-stop-daemon --start --group ${SPECTRUM2_GROUP} --user ${SPECTRUM2_USER} \
|
||||
--exec ${SPECTRUM2_MANAGER} stop
|
||||
eend $?
|
||||
}
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
# systemd tmpfile settings for spectrum2
|
||||
# See tmpfiles.d(5) for details
|
||||
|
||||
d /var/run/spectrum2 0750 jabber jabber -
|
||||
@ -0,0 +1,55 @@
|
||||
--- a/CMakeLists.txt 2018-02-07 11:57:43.000000000 +0100
|
||||
+++ b/CMakeLists.txt 2018-04-04 22:12:33.000000000 +0200
|
||||
@@ -200,8 +200,7 @@
|
||||
set(Communi_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
|
||||
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)
|
||||
@@ -341,7 +340,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-02-07 11:57:43.000000000 +0100
|
||||
+++ b/backends/libcommuni/CMakeLists.txt 2018-04-04 22:20:11.000000000 +0200
|
||||
@@ -1,14 +1,15 @@
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
+find_package(Qt5Network REQUIRED)
|
||||
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/CommuniConfig.cmake 2018-02-07 11:57:43.000000000 +0100
|
||||
+++ b/cmake_modules/CommuniConfig.cmake 2018-04-04 22:14:07.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 )
|
||||
Loading…
Reference in New Issue