* [gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
@ 2021-09-28 13:43 Adrian Schollmeyer
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Schollmeyer @ 2021-09-28 13:43 UTC (permalink / raw
To: gentoo-commits
commit: 34706315a36de754450ca83eda6d40346f388766
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Tue Sep 28 13:43:10 2021 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Tue Sep 28 13:43:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315
net-im/abaddon: Remove vendored dependencies
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-im/abaddon/Manifest | 1 -
net-im/abaddon/abaddon-0.1.0.ebuild | 12 +++------
...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest
index b9936a57a..a9031ec07 100644
--- a/net-im/abaddon/Manifest
+++ b/net-im/abaddon/Manifest
@@ -1,2 +1 @@
DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734
-DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4
diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild
index f987740f9..5e1dfdca0 100644
--- a/net-im/abaddon/abaddon-0.1.0.ebuild
+++ b/net-im/abaddon/abaddon-0.1.0.ebuild
@@ -5,13 +5,10 @@ EAPI=7
inherit cmake desktop
-SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a"
-
DESCRIPTION="Alternative Discord client using GTK instead of Electron"
HOMEPAGE="https://github.com/uowuo/abaddon"
SRC_URI="
https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz
"
LICENSE="GPL-3"
@@ -19,6 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
+ >=dev-cpp/simpleini-4.17_p20210831
dev-cpp/gtkmm:3.0=
dev-db/sqlite:3
net-misc/curl
@@ -31,11 +29,9 @@ DEPEND="
"
BDEPEND=""
-src_unpack() {
- default
- rm -r "${S}/thirdparty/simpleini" || die
- ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die
-}
+PATCHES=(
+ "${FILESDIR}/${P}-remove-vendored-dependencies.patch"
+)
src_install() {
dodoc README.md
diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch
new file mode 100644
index 000000000..b1993cd1d
--- /dev/null
+++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 82d405f..5a2f75b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,13 +15,7 @@ find_package(CURL)
+ find_package(ZLIB REQUIRED)
+ find_package(SQLite3 REQUIRED)
+ find_package(gtkmm REQUIRED)
+-
+-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h)
+-find_library(IXWEBSOCKET_LIBRARY ixwebsocket)
+-if (NOT IXWEBSOCKET_LIBRARY)
+- add_subdirectory(thirdparty/IXWebSocket)
+- include_directories(IXWEBSOCKET_INCLUDE_DIRS)
+-endif()
++find_package(ixwebsocket REQUIRED)
+
+ include_directories(thirdparty/simpleini)
+
+@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS})
+ target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS})
+ target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS})
+ target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS})
++target_include_directories(abaddon PUBLIC /usr/include/simpleini)
++
++target_link_libraries(abaddon simpleini)
+
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
+ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
@ 2021-11-28 13:57 Adrian Schollmeyer
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Schollmeyer @ 2021-11-28 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 1663e7bd1045ca2ebc784e6d75ade9849236fa07
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Sun Nov 28 13:50:27 2021 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Sun Nov 28 13:56:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1663e7bd
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 <AT> nexadn.de>
net-im/abaddon/Manifest | 2 +-
.../{abaddon-0.1.1.ebuild => abaddon-0.1.2.ebuild} | 9 ++-------
...baddon-0.1.1-remove-vendored-dependencies.patch | 22 ----------------------
3 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest
index 951679a1f..9ba75f477 100644
--- a/net-im/abaddon/Manifest
+++ b/net-im/abaddon/Manifest
@@ -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
diff --git a/net-im/abaddon/abaddon-0.1.1.ebuild b/net-im/abaddon/abaddon-0.1.2.ebuild
similarity index 81%
rename from net-im/abaddon/abaddon-0.1.1.ebuild
rename to net-im/abaddon/abaddon-0.1.2.ebuild
index 9588b8f1c..86fafd9c5 100644
--- a/net-im/abaddon/abaddon-0.1.1.ebuild
+++ b/net-im/abaddon/abaddon-0.1.2.ebuild
@@ -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}
}
diff --git a/net-im/abaddon/files/abaddon-0.1.1-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.1-remove-vendored-dependencies.patch
deleted file mode 100644
index b5a29f97e..000000000
--- a/net-im/abaddon/files/abaddon-0.1.1-remove-vendored-dependencies.patch
+++ /dev/null
@@ -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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
@ 2024-06-15 3:52 Takuya Wakazono
0 siblings, 0 replies; 3+ messages in thread
From: Takuya Wakazono @ 2024-06-15 3:52 UTC (permalink / raw
To: gentoo-commits
commit: 7b256a87bba322a32d193d59ca84cd5d99c98783
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Jun 15 03:49:13 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Jun 15 03:52:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7b256a87
net-im/abaddon: add missing includes
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
net-im/abaddon/abaddon-0.2.1.ebuild | 7 ++++++-
.../abaddon/files/abaddon-0.2.1-missing-include.patch | 18 ++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/net-im/abaddon/abaddon-0.2.1.ebuild b/net-im/abaddon/abaddon-0.2.1.ebuild
index f3cda4227..a51c94aa9 100644
--- a/net-im/abaddon/abaddon-0.2.1.ebuild
+++ b/net-im/abaddon/abaddon-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -41,6 +41,11 @@ DEPEND="
dev-cpp/nlohmann_json
"
+PATCHES=(
+ # Add missing includes
+ "${FILESDIR}/${P}-missing-include.patch"
+)
+
src_configure() {
# Disable keychain because there's currently
# no package for it in ::guru or ::gentoo
diff --git a/net-im/abaddon/files/abaddon-0.2.1-missing-include.patch b/net-im/abaddon/files/abaddon-0.2.1-missing-include.patch
new file mode 100644
index 000000000..d99694e3c
--- /dev/null
+++ b/net-im/abaddon/files/abaddon-0.2.1-missing-include.patch
@@ -0,0 +1,18 @@
+Add missing includes.
+https://github.com/uowuo/abaddon/commit/7ed65a89ae71c3c5d2ba99797bd2b1d93ce172ca
+https://github.com/uowuo/abaddon/pull/312
+--- a/src/platform.cpp
++++ b/src/platform.cpp
+@@ -1,9 +1,12 @@
+ #include "platform.hpp"
++#include "util.hpp"
+ #include <config.h>
+ #include <filesystem>
+ #include <fstream>
+ #include <string>
+
++#include <spdlog/spdlog.h>
++
+ using namespace std::literals::string_literals;
+
+ #if defined(_WIN32)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-15 3:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-28 13:57 [gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/ Adrian Schollmeyer
-- strict thread matches above, loose matches on Subject: below --
2024-06-15 3:52 Takuya Wakazono
2021-09-28 13:43 Adrian Schollmeyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox