* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2019-02-26 20:29 Andrey Utkin
0 siblings, 0 replies; 9+ messages in thread
From: Andrey Utkin @ 2019-02-26 20:29 UTC (permalink / raw
To: gentoo-commits
commit: eaf4188b0ddaf58777e96293aa4c5cf3866f328e
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Tue Feb 26 13:05:14 2019 +0000
Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 20:28:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf4188b
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: Andrey Utkin <andrey_utkin <AT> gentoo.org>
net-im/spectrum2/Manifest | 1 -
.../files/spectrum2-2.0.9-use_qt5_libcommuni.patch | 54 ---------
net-im/spectrum2/spectrum2-2.0.9.ebuild | 125 ---------------------
3 files changed, 180 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index d19142bc269..3503d086f65 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
-DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982
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 27e23db4484..00000000000
--- 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 )
diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild b/net-im/spectrum2/spectrum2-2.0.9.ebuild
deleted file mode 100644
index 5533572a03c..00000000000
--- a/net-im/spectrum2/spectrum2-2.0.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 systemd user
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im"
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- net-im/swift:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${PYTHON_DEPS}
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- dev-python/sleekxmpp[${PYTHON_USEDEP}]
- dev-util/cppunit
- net-irc/ngircd
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-remove_debug_cflags.patch"
- "${FILESDIR}/${P}-use_qt5_libcommuni.patch"
-)
-
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup spectrum
- enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
-
- use test && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
-
- # Respect users CFLAGS, when compiling for debug mode
- # Since Spectrum2 searches for a qt4 compiled libcommuni,
- # it must be patched, to find the qt5 compiled libcommuni,
- # See: https://github.com/SpectrumIM/spectrum2/pull/253
- cmake-utils_src_prepare
-}
-
-src_configure() {
- use debug && CMAKE_BUILD_TYPE="Debug"
-
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd tests/libtransport && "${EPYTHON}" ../start.py || die
-}
-
-src_install() {
- cmake-utils_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2019-03-10 2:19 Andrey Utkin
0 siblings, 0 replies; 9+ messages in thread
From: Andrey Utkin @ 2019-03-10 2:19 UTC (permalink / raw
To: gentoo-commits
commit: d1ffc1ff3349eabd0f7ee13a6fe77407cb284cc1
Author: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 19:21:14 2019 +0000
Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 02:18:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ffc1ff
net-im/spectrum2: drop broken 'debug' USE flag
Switching to Debug CMake configuration leads to an odd effect.
Users can just supply extra CFLAGS for better debugging info, which is
exactly what Debug CMake configuration does.
No revbump since this is a build failure issue.
Successful installations don't need a rebuild.
Bug: https://bugs.gentoo.org/674498
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andrey Utkin <andrey_utkin <AT> gentoo.org>
.../files/spectrum2-2.0.9-remove_debug_cflags.patch | 13 -------------
net-im/spectrum2/spectrum2-2.0.10.ebuild | 10 +---------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
deleted file mode 100644
index 19e3b83d230..00000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200
-+++ b/CMakeLists.txt 2018-09-20 21:04:29.000000000 +0200
-@@ -384,10 +384,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)
diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild
index ddc335eca68..317a25b2ab5 100644
--- a/net-im/spectrum2/spectrum2-2.0.10.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
REQUIRED_USE="|| ( mysql postgres sqlite )"
RDEPEND="
@@ -59,8 +59,6 @@ DEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-2.0.9-remove_debug_cflags.patch" )
-
# Tests are currently restricted, as they do completly fail
RESTRICT="test"
@@ -75,16 +73,10 @@ src_prepare() {
# Respect users LDFLAGS
sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
- # Respect users CFLAGS, when compiling for debug mode
- # Since Spectrum2 searches for a qt4 compiled libcommuni,
- # it must be patched, to find the qt5 compiled libcommuni,
- # See: https://github.com/SpectrumIM/spectrum2/pull/253
cmake-utils_src_prepare
}
src_configure() {
- use debug && CMAKE_BUILD_TYPE="Debug"
-
local mycmakeargs=(
-DENABLE_DOCS="$(usex doc)"
-DENABLE_FROTZ="$(usex frotz)"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2019-03-26 16:45 Patrice Clement
0 siblings, 0 replies; 9+ messages in thread
From: Patrice Clement @ 2019-03-26 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 48242c09c959b315f30bcaacdcbcdffdd464005f
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Mar 24 13:11:09 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 16:45:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48242c09
net-im/spectrum2: fix wrong user in systemd tmpfiles.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11479
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
net-im/spectrum2/files/spectrum2.tmpfiles-r1 | 1 +
net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild | 114 ++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/net-im/spectrum2/files/spectrum2.tmpfiles-r1 b/net-im/spectrum2/files/spectrum2.tmpfiles-r1
new file mode 100644
index 00000000000..90c020f13d9
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2.tmpfiles-r1
@@ -0,0 +1 @@
+d /run/spectrum2 0700 spectrum spectrum - -
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild b/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
new file mode 100644
index 00000000000..d528d246079
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 systemd user
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ dev-python/sleekxmpp[${PYTHON_USEDEP}]
+ dev-util/cppunit
+ net-irc/ngircd
+ )
+"
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup spectrum
+ enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+ use test && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2020-05-14 9:01 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2020-05-14 9:01 UTC (permalink / raw
To: gentoo-commits
commit: 023e1a434092beb0b6083f299a9530998f3253f4
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 08:55:23 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu May 14 08:57:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023e1a43
net-im/spectrum2: add fix for boost-1.73 and gcc-10
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../spectrum2-2.0.12-boost-173-compatibility.patch | 21 +++++++++
.../spectrum2-2.0.12-gcc-10-compatibility.patch | 54 ++++++++++++++++++++++
net-im/spectrum2/spectrum2-2.0.12-r2.ebuild | 5 ++
3 files changed, 80 insertions(+)
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
new file mode 100644
index 00000000000..b9a8adeee5a
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
@@ -0,0 +1,21 @@
+From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Thu, 14 May 2020 10:34:43 +0200
+Subject: [PATCH] Fix compilation with boost-1.73
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ include/transport/ThreadPool.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
+index 5902f965..ffd07c8e 100644
+--- a/include/transport/ThreadPool.h
++++ b/include/transport/ThreadPool.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <boost/bind.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ #include <queue>
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
new file mode 100644
index 00000000000..ad13208b3e1
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
@@ -0,0 +1,54 @@
+From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Wed, 13 May 2020 14:22:27 +0200
+Subject: [PATCH] Fix dfrotz compilation with GCC >= 10
+
+Since GCC enables by default -fno-common,
+the compilation of dfrotz due multiple definitions will fail.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ backends/frotz/dfrotz/dumb/dumb_init.c | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_input.c | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_output.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c
+index 4b9c6704..35295b74 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_init.c
++++ b/backends/frotz/dfrotz/dumb/dumb_init.c
+@@ -7,7 +7,7 @@
+
+ #include "dumb_frotz.h"
+
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+
+ #define INFORMATION "\
+ An interpreter for all Infocom and other Z-Machine games.\n\
+diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c
+index 4149b2b0..88fc8ae5 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_input.c
++++ b/backends/frotz/dfrotz/dumb/dumb_input.c
+@@ -5,7 +5,7 @@
+ */
+
+ #include "dumb_frotz.h"
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+
+ static char runtime_usage[] =
+ "DUMB-FROTZ runtime help:\n"
+diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c
+index 9e505167..6dc7db82 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_output.c
++++ b/backends/frotz/dfrotz/dumb/dumb_output.c
+@@ -7,7 +7,7 @@
+
+ #include "dumb_frotz.h"
+
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+
+ static bool show_line_numbers = FALSE;
+ static bool show_line_types = -1;
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
index 0bc829465f9..e2a557eb711 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -64,6 +64,11 @@ DEPEND="
# Tests are currently restricted, as they do completly fail
RESTRICT="test"
+PATCHES="
+ "${FILESDIR}/${P}-boost-173-compatibility.patch"
+ "${FILESDIR}/${P}-gcc-10-compatibility.patch"
+"
+
python_check_deps() {
has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2020-08-27 17:28 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2020-08-27 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 73b5c4466f2c421fb3bdbe13b3f7b27be76fc968
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 17:27:46 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 17:28:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b5c446
net-im/spectrum2: fix compilation with musl
Closes: https://bugs.gentoo.org/717410
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../spectrum2-2.0.13-musl-compatibility.patch | 95 ++++++++++++++++++++++
net-im/spectrum2/spectrum2-2.0.12-r4.ebuild | 1 +
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild | 5 +-
3 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch
new file mode 100644
index 00000000000..07bde50b832
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch
@@ -0,0 +1,95 @@
+From 19b10896fa3426b2bd9e4e75a63ca52322373d33 Mon Sep 17 00:00:00 2001
+From: Vitaly Takmazov <vitalyster@gmail.com>
+Date: Fri, 24 Jul 2020 15:09:28 +0300
+Subject: [PATCH] musl compatibility
+
+---
+ backends/libpurple/main.cpp | 6 +++---
+ backends/swiften/main.cpp | 2 ++
+ libtransport/UserManager.cpp | 2 ++
+ spectrum/src/main.cpp | 2 ++
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
+index 54c618e0..4555edbc 100644
+--- a/backends/libpurple/main.cpp
++++ b/backends/libpurple/main.cpp
+@@ -528,7 +528,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
+
+ purple_accounts_delete_wrapped(account);
+ #ifndef WIN32
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
+ malloc_trim(0);
+ #endif
+ #endif
+@@ -2287,7 +2287,7 @@ static void signed_on(PurpleConnection *gc, gpointer unused) {
+ PurpleAccount *account = purple_connection_get_account_wrapped(gc);
+ np->handleConnected(np->m_accounts[account]);
+ #ifndef WIN32
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
+ // force returning of memory chunks allocated by libxml2 to kernel
+ malloc_trim(0);
+ #endif
+@@ -2516,7 +2516,7 @@ int main(int argc, char **argv) {
+ boost::locale::generator gen;
+ std::locale::global(gen(""));
+ #ifndef WIN32
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
+ mallopt(M_CHECK_ACTION, 2);
+ mallopt(M_PERTURB, 0xb);
+ #endif
+diff --git a/backends/swiften/main.cpp b/backends/swiften/main.cpp
+index f0acdb6d..6c111464 100644
+--- a/backends/swiften/main.cpp
++++ b/backends/swiften/main.cpp
+@@ -227,10 +227,12 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient {
+ #ifndef WIN32
+ #ifndef __FreeBSD__
+ #ifndef __MACH__
++#if defined (__GLIBC__)
+ // force returning of memory chunks allocated by libxml2 to kernel
+ malloc_trim(0);
+ #endif
+ #endif
++#endif
+ #endif
+ }
+
+diff --git a/libtransport/UserManager.cpp b/libtransport/UserManager.cpp
+index 73fcdae9..a622754f 100644
+--- a/libtransport/UserManager.cpp
++++ b/libtransport/UserManager.cpp
+@@ -125,10 +125,12 @@ void UserManager::removeUser(User *user, bool onUserBehalf) {
+ #ifndef WIN32
+ #ifndef __FreeBSD__
+ #ifndef __MACH__
++#if defined (__GLIBC__)
+ malloc_trim(0);
+ #endif
+ #endif
+ #endif
++#endif
+ // VALGRIND_DO_LEAK_CHECK;
+ }
+
+diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
+index 0f5985a2..89e5b9a1 100644
+--- a/spectrum/src/main.cpp
++++ b/spectrum/src/main.cpp
+@@ -320,11 +320,13 @@ int main(int argc, char **argv)
+ #ifndef WIN32
+ #ifndef __FreeBSD__
+ #ifndef __MACH__
++#if defined (__GLIBC__)
+ mallopt(M_CHECK_ACTION, 2);
+ mallopt(M_PERTURB, 0xb);
+ #endif
+ #endif
+ #endif
++#endif
+
+ #ifndef WIN32
+ if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) {
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
index 4f12c3c285e..3bbf840a522 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${P}-boost-173-compatibility.patch"
"${FILESDIR}/${P}-gcc-10-compatibility.patch"
"${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch"
+ "${FILESDIR}/${PN}-2.0.13-musl-compatibility.patch"
)
src_prepare() {
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index 1c7985cbc6c..d94c327ca2c 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -58,7 +58,10 @@ DEPEND="
test? ( dev-util/cppunit )
"
-PATCHES=( "${FILESDIR}/${P}-libpqxx-7-compatibility.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-libpqxx-7-compatibility.patch"
+ "${FILESDIR}/${P}-musl-compatibility.patch"
+)
src_prepare() {
# Respect users LDFLAGS
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2020-09-02 12:39 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2020-09-02 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 4b0cc208da074b6d03babb1a8aaeef873bfbd72d
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 11:39:47 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 12:31:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0cc208
net-im/spectrum2: drop old version
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-im/spectrum2/Manifest | 1 -
.../spectrum2-2.0.12-boost-173-compatibility.patch | 21 ----
.../spectrum2-2.0.12-gcc-10-compatibility.patch | 54 ----------
net-im/spectrum2/spectrum2-2.0.12-r4.ebuild | 112 ---------------------
4 files changed, 188 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 5122ae14a1d..bdab4cc72da 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
deleted file mode 100644
index b9a8adeee5a..00000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <kostecki@his.de>
-Date: Thu, 14 May 2020 10:34:43 +0200
-Subject: [PATCH] Fix compilation with boost-1.73
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- include/transport/ThreadPool.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
-index 5902f965..ffd07c8e 100644
---- a/include/transport/ThreadPool.h
-+++ b/include/transport/ThreadPool.h
-@@ -1,5 +1,6 @@
- #pragma once
-
-+#include <boost/bind.hpp>
- #include <boost/thread.hpp>
- #include <boost/thread/mutex.hpp>
- #include <queue>
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
deleted file mode 100644
index ad13208b3e1..00000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <kostecki@his.de>
-Date: Wed, 13 May 2020 14:22:27 +0200
-Subject: [PATCH] Fix dfrotz compilation with GCC >= 10
-
-Since GCC enables by default -fno-common,
-the compilation of dfrotz due multiple definitions will fail.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- backends/frotz/dfrotz/dumb/dumb_init.c | 2 +-
- backends/frotz/dfrotz/dumb/dumb_input.c | 2 +-
- backends/frotz/dfrotz/dumb/dumb_output.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c
-index 4b9c6704..35295b74 100644
---- a/backends/frotz/dfrotz/dumb/dumb_init.c
-+++ b/backends/frotz/dfrotz/dumb/dumb_init.c
-@@ -7,7 +7,7 @@
-
- #include "dumb_frotz.h"
-
--f_setup_t f_setup;
-+extern f_setup_t f_setup;
-
- #define INFORMATION "\
- An interpreter for all Infocom and other Z-Machine games.\n\
-diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c
-index 4149b2b0..88fc8ae5 100644
---- a/backends/frotz/dfrotz/dumb/dumb_input.c
-+++ b/backends/frotz/dfrotz/dumb/dumb_input.c
-@@ -5,7 +5,7 @@
- */
-
- #include "dumb_frotz.h"
--f_setup_t f_setup;
-+extern f_setup_t f_setup;
-
- static char runtime_usage[] =
- "DUMB-FROTZ runtime help:\n"
-diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c
-index 9e505167..6dc7db82 100644
---- a/backends/frotz/dfrotz/dumb/dumb_output.c
-+++ b/backends/frotz/dfrotz/dumb/dumb_output.c
-@@ -7,7 +7,7 @@
-
- #include "dumb_frotz.h"
-
--f_setup_t f_setup;
-+extern f_setup_t f_setup;
-
- static bool show_line_numbers = FALSE;
- static bool show_line_types = -1;
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
deleted file mode 100644
index 3bbf840a522..00000000000
--- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im"
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="
- || ( mysql postgres sqlite )
- test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- >=net-im/swift-4.0.2-r2:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-boost-173-compatibility.patch"
- "${FILESDIR}/${P}-gcc-10-compatibility.patch"
- "${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch"
- "${FILESDIR}/${PN}-2.0.13-musl-compatibility.patch"
-)
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2021-11-16 22:18 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2021-11-16 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 01975b3fd47620a48b4d15eeb05fda7204e8c4ca
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 22:14:04 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 22:14:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01975b3f
net-im/spectrum2: drop old version
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-im/spectrum2/Manifest | 1 -
.../spectrum2-2.0.13-libpqxx-7-compatibility.patch | 79 --------------
.../spectrum2-2.0.13-musl-compatibility.patch | 95 -----------------
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild | 114 ---------------------
4 files changed, 289 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 811f573d638f..de10b87706e8 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B 3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45 SHA512 53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
deleted file mode 100644
index 48a1f0a333a0..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/cmake_modules/Findpqxx.cmake b/cmake_modules/Findpqxx.cmake
-index 9c53550..691ec0e 100644
---- a/cmake_modules/Findpqxx.cmake
-+++ b/cmake_modules/Findpqxx.cmake
-@@ -1,16 +1,33 @@
--FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
--MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
-+if (NOT WIN32)
-+ find_package(PkgConfig)
-+ if (PKG_CONFIG_FOUND)
-+ pkg_check_modules(PQXX libpqxx)
-+ if (PQXX_FOUND)
-+ if (PQXX_VERSION STRGREATER "7")
-+ message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17")
-+ set (CMAKE_CXX_STANDARD 17)
-+ endif()
-+ endif()
-+ endif()
-+else()
-
--FIND_LIBRARY(PQXX_LIBRARY pqxx )
--MARK_AS_ADVANCED(PQXX_LIBRARY)
-+ FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
-+ MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
-
--FIND_LIBRARY(PQ_LIBRARY pq )
--MARK_AS_ADVANCED(PQ_LIBRARY)
-+ FIND_LIBRARY(PQXX_LIBRARIES pqxx )
-+ MARK_AS_ADVANCED(PQXX_LIBRARIES)
-
--if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
-- set( PQXX_FOUND 1 )
-- message( STATUS "Found pqxx: ${PQXX_LIBRARY}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}")
--else()
-- message(STATUS "Could NOT find pqxx and pq library")
--endif()
-+ FIND_LIBRARY(PQ_LIBRARY pq )
-+ MARK_AS_ADVANCED(PQ_LIBRARY)
-
-+ if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
-+ set( PQXX_FOUND 1 )
-+ message( STATUS "Found pqxx: ${PQXX_LIBRARIES}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}")
-+ if (PQXX_VERSION STRGREATER "7")
-+ message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17")
-+ set (CMAKE_CXX_STANDARD 17)
-+ endif()
-+ else()
-+ message(STATUS "Could NOT find pqxx and pq library")
-+ endif()
-+endif()
-diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt
-index 8892241..2b5a0f9 100644
---- a/libtransport/CMakeLists.txt
-+++ b/libtransport/CMakeLists.txt
-@@ -48,9 +48,9 @@ find_package(CURL)
-
- if(WIN32)
- include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
-- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
-+ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
- else()
-- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
-+ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
- endif()
-
- set_target_properties(transport PROPERTIES
-diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
-index 31cce95..f5305aa 100644
---- a/libtransport/NetworkPluginServer.cpp
-+++ b/libtransport/NetworkPluginServer.cpp
-@@ -1904,7 +1904,7 @@ NetworkPluginServer::wrapIncomingMedia(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swif
- //Doesn't handle: unquoted src, escaped "'>s, quotes in quotes ("quote: 'text' end quote")
- static boost::regex image_expr("<img\\s+[^>]*src\\s*=\\s*[\"']([^\"']+)[\"'][^>]*>");
-
-- bool matchCount = 0;
-+ int matchCount = 0;
- std::string firstUrl;
-
- std::string::const_iterator xhtml_pos = xhtml.begin();
diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch
deleted file mode 100644
index 07bde50b832d..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 19b10896fa3426b2bd9e4e75a63ca52322373d33 Mon Sep 17 00:00:00 2001
-From: Vitaly Takmazov <vitalyster@gmail.com>
-Date: Fri, 24 Jul 2020 15:09:28 +0300
-Subject: [PATCH] musl compatibility
-
----
- backends/libpurple/main.cpp | 6 +++---
- backends/swiften/main.cpp | 2 ++
- libtransport/UserManager.cpp | 2 ++
- spectrum/src/main.cpp | 2 ++
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
-index 54c618e0..4555edbc 100644
---- a/backends/libpurple/main.cpp
-+++ b/backends/libpurple/main.cpp
-@@ -528,7 +528,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
-
- purple_accounts_delete_wrapped(account);
- #ifndef WIN32
--#if !defined(__FreeBSD__) && !defined(__APPLE__)
-+#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
- malloc_trim(0);
- #endif
- #endif
-@@ -2287,7 +2287,7 @@ static void signed_on(PurpleConnection *gc, gpointer unused) {
- PurpleAccount *account = purple_connection_get_account_wrapped(gc);
- np->handleConnected(np->m_accounts[account]);
- #ifndef WIN32
--#if !defined(__FreeBSD__) && !defined(__APPLE__)
-+#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
- // force returning of memory chunks allocated by libxml2 to kernel
- malloc_trim(0);
- #endif
-@@ -2516,7 +2516,7 @@ int main(int argc, char **argv) {
- boost::locale::generator gen;
- std::locale::global(gen(""));
- #ifndef WIN32
--#if !defined(__FreeBSD__) && !defined(__APPLE__)
-+#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
- mallopt(M_CHECK_ACTION, 2);
- mallopt(M_PERTURB, 0xb);
- #endif
-diff --git a/backends/swiften/main.cpp b/backends/swiften/main.cpp
-index f0acdb6d..6c111464 100644
---- a/backends/swiften/main.cpp
-+++ b/backends/swiften/main.cpp
-@@ -227,10 +227,12 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient {
- #ifndef WIN32
- #ifndef __FreeBSD__
- #ifndef __MACH__
-+#if defined (__GLIBC__)
- // force returning of memory chunks allocated by libxml2 to kernel
- malloc_trim(0);
- #endif
- #endif
-+#endif
- #endif
- }
-
-diff --git a/libtransport/UserManager.cpp b/libtransport/UserManager.cpp
-index 73fcdae9..a622754f 100644
---- a/libtransport/UserManager.cpp
-+++ b/libtransport/UserManager.cpp
-@@ -125,10 +125,12 @@ void UserManager::removeUser(User *user, bool onUserBehalf) {
- #ifndef WIN32
- #ifndef __FreeBSD__
- #ifndef __MACH__
-+#if defined (__GLIBC__)
- malloc_trim(0);
- #endif
- #endif
- #endif
-+#endif
- // VALGRIND_DO_LEAK_CHECK;
- }
-
-diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
-index 0f5985a2..89e5b9a1 100644
---- a/spectrum/src/main.cpp
-+++ b/spectrum/src/main.cpp
-@@ -320,11 +320,13 @@ int main(int argc, char **argv)
- #ifndef WIN32
- #ifndef __FreeBSD__
- #ifndef __MACH__
-+#if defined (__GLIBC__)
- mallopt(M_CHECK_ACTION, 2);
- mallopt(M_PERTURB, 0xb);
- #endif
- #endif
- #endif
-+#endif
-
- #ifndef WIN32
- if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) {
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
deleted file mode 100644
index e270aa2de67e..000000000000
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd tmpfiles
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im"
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="
- || ( mysql postgres sqlite )
- test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- >=net-im/swift-4.0.2-r2:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-libpqxx-7-compatibility.patch"
- "${FILESDIR}/${P}-musl-compatibility.patch"
-)
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
-
-pkg_postinst() {
- tmpfiles_process spectrum2.conf
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2023-02-28 20:47 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2023-02-28 20:47 UTC (permalink / raw
To: gentoo-commits
commit: f2af202efb0844fb1dd3b5a00d2865d51ffdeff3
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 20:45:43 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 20:46:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2af202e
net-im/spectrum2: add log4cxx-1.0.0 support
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/spectrum2-2.1.3-log4cxx-1.0.0.patch | 63 ++++++++++++
net-im/spectrum2/spectrum2-2.1.3-r2.ebuild | 111 +++++++++++++++++++++
2 files changed, 174 insertions(+)
diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
new file mode 100644
index 000000000000..852f4ad78027
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
@@ -0,0 +1,63 @@
+Description: (newer) Debian log4cxx needs C++17 and used smart pointers.
+ This patch just enables C++17 for the build and using smart pointers
+ where needed.
+Author: Tobias Frost <tobi@debian.org>
+Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that will enable properly gating the new code.
+Last-Update: 2022-11-21 <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+
+ project(libtransport)
+
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ if(WIN32)
+ set(CMAKE_CXX_STANDARD 17)
+ endif(WIN32)
+--- a/plugin/cpp/Logging.cpp
++++ b/plugin/cpp/Logging.cpp
+@@ -26,6 +26,7 @@
+ #include <iterator>
+ #include <algorithm>
+
++#include <memory>
+
+ #include <boost/filesystem.hpp>
+ #include <boost/algorithm/string.hpp>
+@@ -100,15 +101,17 @@
+ #ifdef _MSC_VER
+ root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
+ #else
+- root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
++ auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
++ auto consoleappender = std::make_shared<ConsoleAppender>(patternlayout);
++ root->addAppender(consoleappender);
+ #endif
+ }
+ else {
+ log4cxx::helpers::Properties p;
+
+- log4cxx::helpers::FileInputStream *istream = NULL;
++ log4cxx::helpers::InputStreamPtr istream;
+ try {
+- istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
++ istream.reset(new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)));
+ }
+ catch(log4cxx::helpers::IOException &ex) {
+ std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n";
+--- a/tests/libtransport/main.cpp
++++ b/tests/libtransport/main.cpp
+@@ -23,7 +23,9 @@
+ #ifdef WITH_LOG4CXX
+ LoggerPtr root = Logger::getRootLogger();
+ #ifndef _MSC_VER
+- root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false));
++ auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
++ auto fileappender = std::make_shared<FileAppender>(patternlayout, "libtransport_test.log", false);
++ root->addAppender(fileappender);
+ #else
+ root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false));
+ #endif
diff --git a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..6913f31eba94
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ >=dev-libs/log4cxx-1.0.0:=
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.3-log4cxx-1.0.0.patch" )
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
@ 2024-07-16 7:44 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-07-16 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 05128d7166f549276048bfbe43eca8e7ef683588
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 07:35:30 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 07:35:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05128d71
net-im/spectrum2: fix build w/ boost-1.85
Closes: https://bugs.gentoo.org/933691
Thanks-to: Bill Prendergast <dek.devel <AT> baisenvar.info>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/spectrum2-2.2.1-boost-1.85.patch | 103 +++++++++++++++++++++
.../files/spectrum2-2.2.1-use-c++14.patch | 13 +++
net-im/spectrum2/spectrum2-2.2.1.ebuild | 5 +
3 files changed, 121 insertions(+)
diff --git a/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch b/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch
new file mode 100644
index 000000000000..30e6a4cdeb81
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch
@@ -0,0 +1,103 @@
+Bug: https://bugs.gentoo.org/933691
+
+From: Bill Prendergast <dek.devel@baisenvar.info>
+
+Fix build with boost-1.85 (filesystem api v4 removed Deprecated Features)
+see https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
+
+--- a/plugin/cpp/Util.cpp
++++ b/plugin/cpp/Util.cpp
+@@ -53,7 +53,7 @@ void createDirectories(Transport::Config *config, const boost::filesystem::path&
+ }
+
+ // First create branch, by calling ourself recursively
+- createDirectories(config, ph.branch_path());
++ createDirectories(config, ph.parent_path());
+
+ // Now that parent's path exists, create the directory
+ create_directory(ph);
+@@ -89,7 +89,7 @@ void removeEverythingOlderThan(const std::vector<std::string> &dirs, time_t t) {
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+ if (last_write_time(itr->path()) < t) {
+ try {
+- if (is_regular(itr->path())) {
++ if (is_regular_file(itr->path())) {
+ remove(itr->path());
+ }
+ else if (is_directory(itr->path())) {
+--- a/spectrum/src/main.cpp
++++ b/spectrum/src/main.cpp
+@@ -147,7 +147,7 @@ static void _createDirectories(Transport::Config *config, boost::filesystem::pat
+ }
+
+ // First create branch, by calling ourself recursively
+- _createDirectories(config, ph.branch_path());
++ _createDirectories(config, ph.parent_path());
+
+ // Now that parent's path exists, create the directory
+ boost::filesystem::create_directory(ph);
+--- a/spectrum_manager/src/methods.cpp
++++ b/spectrum_manager/src/methods.cpp
+@@ -168,7 +168,7 @@ int start_instances(ManagerConfig *config, const std::string &_jid) {
+
+ directory_iterator end_itr;
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ Config cfg;
+ if (cfg.load(itr->path().string()) == false) {
+ std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -232,7 +232,7 @@ void stop_instances(ManagerConfig *config, const std::string &_jid) {
+
+ directory_iterator end_itr;
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ Config cfg;
+ if (cfg.load(itr->path().string()) == false) {
+ std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -315,7 +315,7 @@ int restart_instances(ManagerConfig *config, const std::string &_jid) {
+
+ directory_iterator end_itr;
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ Config cfg;
+ if (cfg.load(itr->path().string()) == false) {
+ std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -401,7 +401,7 @@ int show_status(ManagerConfig *config) {
+
+ directory_iterator end_itr;
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ Config cfg;
+ if (cfg.load(itr->path().string()) == false) {
+ std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -531,7 +531,7 @@ std::string get_config(ManagerConfig *config, const std::string &jid, const std:
+
+ directory_iterator end_itr;
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ Config cfg;
+ if (cfg.load(itr->path().string()) == false) {
+ std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -572,7 +572,7 @@ void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &netwo
+ bool found = false;
+ directory_iterator end_itr;
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ Config cfg;
+ if (cfg.load(itr->path().string()) == false) {
+ std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -619,7 +619,7 @@ std::vector<std::string> show_list(ManagerConfig *config, bool show) {
+
+ directory_iterator end_itr;
+ for (directory_iterator itr(p); itr != end_itr; ++itr) {
+- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ Config cfg;
+ if (cfg.load(itr->path().string()) == false) {
+ std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
diff --git a/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch b/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch
new file mode 100644
index 000000000000..009f7cb4a3a8
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch
@@ -0,0 +1,13 @@
+Don't focre c11
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@
+
+ project(libtransport)
+
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 14)
+ if(WIN32)
+ set(CMAKE_CXX_STANDARD 17)
+ endif(WIN32)
diff --git a/net-im/spectrum2/spectrum2-2.2.1.ebuild b/net-im/spectrum2/spectrum2-2.2.1.ebuild
index 659d8085be5d..bfeccf1de360 100644
--- a/net-im/spectrum2/spectrum2-2.2.1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild
@@ -58,6 +58,11 @@ DEPEND="
test? ( dev-util/cppunit )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.1-boost-1.85.patch
+ "${FILESDIR}"/${PN}-2.2.1-use-c++14.patch
+)
+
src_prepare() {
# Respect users LDFLAGS
sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-07-16 7:44 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-02 12:39 [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-07-16 7:44 Sam James
2023-02-28 20:47 Conrad Kostecki
2021-11-16 22:18 Conrad Kostecki
2020-08-27 17:28 Conrad Kostecki
2020-05-14 9:01 Conrad Kostecki
2019-03-26 16:45 Patrice Clement
2019-03-10 2:19 Andrey Utkin
2019-02-26 20:29 Andrey Utkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox