net-im/abaddon: Bump to 0.1.2

This also removes dev-cpp/simpleini as a dependency, since upstream no
longer depends on SimpleIni starting with this release.

The minimum required version for net-libs/ixwebsocket has been lowered
according roughly to the commit that is currently used in upstream's
submodule.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Adrian Schollmeyer <nex+b-g-o@nexadn.de>
This commit is contained in:
Adrian Schollmeyer
2021-11-28 14:50:27 +01:00
parent 881c1489c5
commit 1663e7bd10
3 changed files with 3 additions and 30 deletions

View File

@@ -1 +1 @@
DIST abaddon-0.1.1.tar.gz 12805146 BLAKE2B 7457604fc6f5e2b3932533d67ff52797d67ac4d52d832dd4ff9181bcffb886f335345107b3938cf02e9357896bffb18e6ef7f0367b5e0f40f5c6d1656f346ad6 SHA512 d8c65024fe3bbf94e45232320a37ec85df9eae71e16a38ca2ca33ce42464d45dad0058d66eb54869dd1b58514b20bb3438b8ee32a19956b3ae60af81c7774fbb
DIST abaddon-0.1.2.tar.gz 12806758 BLAKE2B a9367bd376599d88b0fbee85b14b9836dc40143e32682ab546114cadc7d33d8f82fb903b0199effc732a4e94a947ea5b10366e463381ca977c57a092264af09f SHA512 79a5696fe761d65bbb5bdd5be02abe65a1a14aa33e4ad650a61912d54c3b07a38221e6f801fcde239364bbe34c25fc8e76cdf069c06261435ba477d96b098cbb

View File

@@ -16,11 +16,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-cpp/simpleini-4.17_p20210901
dev-cpp/gtkmm:3.0=
dev-db/sqlite:3
net-misc/curl
>=net-libs/ixwebsocket-11.2.8
>=net-libs/ixwebsocket-11.0.8
sys-libs/zlib:=
"
DEPEND="
@@ -29,17 +28,13 @@ DEPEND="
"
BDEPEND=""
PATCHES=(
"${FILESDIR}/${P}-remove-vendored-dependencies.patch"
)
src_install() {
dodoc README.md
dobin "${BUILD_DIR}"/abaddon
insinto /usr/share/${PN}
doins -r css res
doins -r res/*
make_desktop_entry /usr/bin/${PN}
}

View File

@@ -1,22 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 638be3e..ea76f4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,11 +23,7 @@ if (NOT IXWebSocket_FOUND)
endif()
add_compile_definitions(SI_NO_CONVERSION) # only CSimpleIniA is used
-find_package(simpleini QUIET)
-if (NOT simpleini_FOUND)
- message("simpleini was not found and will be included as a submodule")
- include_directories(thirdparty/simpleini)
-endif()
+include_directories(/usr/include/simpleini)
if(MINGW OR WIN32)
link_libraries(ws2_32)
@@ -103,3 +99,4 @@ target_link_libraries(abaddon ${GTKMM_LIBRARIES})
target_link_libraries(abaddon ${CURL_LIBRARIES})
target_link_libraries(abaddon ${ZLIB_LIBRARY})
target_link_libraries(abaddon ${NLOHMANN_JSON_LIBRARIES})
+target_link_libraries(abaddon simpleini)