| 1 |
commit: 1663e7bd1045ca2ebc784e6d75ade9849236fa07 |
| 2 |
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> |
| 3 |
AuthorDate: Sun Nov 28 13:50:27 2021 +0000 |
| 4 |
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> |
| 5 |
CommitDate: Sun Nov 28 13:56:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1663e7bd |
| 7 |
|
| 8 |
net-im/abaddon: Bump to 0.1.2 |
| 9 |
|
| 10 |
This also removes dev-cpp/simpleini as a dependency, since upstream no |
| 11 |
longer depends on SimpleIni starting with this release. |
| 12 |
|
| 13 |
The minimum required version for net-libs/ixwebsocket has been lowered |
| 14 |
according roughly to the commit that is currently used in upstream's |
| 15 |
submodule. |
| 16 |
|
| 17 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 18 |
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de> |
| 19 |
|
| 20 |
net-im/abaddon/Manifest | 2 +- |
| 21 |
.../{abaddon-0.1.1.ebuild => abaddon-0.1.2.ebuild} | 9 ++------- |
| 22 |
...baddon-0.1.1-remove-vendored-dependencies.patch | 22 ---------------------- |
| 23 |
3 files changed, 3 insertions(+), 30 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest |
| 26 |
index 951679a1f..9ba75f477 100644 |
| 27 |
--- a/net-im/abaddon/Manifest |
| 28 |
+++ b/net-im/abaddon/Manifest |
| 29 |
@@ -1 +1 @@ |
| 30 |
-DIST abaddon-0.1.1.tar.gz 12805146 BLAKE2B 7457604fc6f5e2b3932533d67ff52797d67ac4d52d832dd4ff9181bcffb886f335345107b3938cf02e9357896bffb18e6ef7f0367b5e0f40f5c6d1656f346ad6 SHA512 d8c65024fe3bbf94e45232320a37ec85df9eae71e16a38ca2ca33ce42464d45dad0058d66eb54869dd1b58514b20bb3438b8ee32a19956b3ae60af81c7774fbb |
| 31 |
+DIST abaddon-0.1.2.tar.gz 12806758 BLAKE2B a9367bd376599d88b0fbee85b14b9836dc40143e32682ab546114cadc7d33d8f82fb903b0199effc732a4e94a947ea5b10366e463381ca977c57a092264af09f SHA512 79a5696fe761d65bbb5bdd5be02abe65a1a14aa33e4ad650a61912d54c3b07a38221e6f801fcde239364bbe34c25fc8e76cdf069c06261435ba477d96b098cbb |
| 32 |
|
| 33 |
diff --git a/net-im/abaddon/abaddon-0.1.1.ebuild b/net-im/abaddon/abaddon-0.1.2.ebuild |
| 34 |
similarity index 81% |
| 35 |
rename from net-im/abaddon/abaddon-0.1.1.ebuild |
| 36 |
rename to net-im/abaddon/abaddon-0.1.2.ebuild |
| 37 |
index 9588b8f1c..86fafd9c5 100644 |
| 38 |
--- a/net-im/abaddon/abaddon-0.1.1.ebuild |
| 39 |
+++ b/net-im/abaddon/abaddon-0.1.2.ebuild |
| 40 |
@@ -16,11 +16,10 @@ SLOT="0" |
| 41 |
KEYWORDS="~amd64 ~x86" |
| 42 |
|
| 43 |
RDEPEND=" |
| 44 |
- >=dev-cpp/simpleini-4.17_p20210901 |
| 45 |
dev-cpp/gtkmm:3.0= |
| 46 |
dev-db/sqlite:3 |
| 47 |
net-misc/curl |
| 48 |
- >=net-libs/ixwebsocket-11.2.8 |
| 49 |
+ >=net-libs/ixwebsocket-11.0.8 |
| 50 |
sys-libs/zlib:= |
| 51 |
" |
| 52 |
DEPEND=" |
| 53 |
@@ -29,17 +28,13 @@ DEPEND=" |
| 54 |
" |
| 55 |
BDEPEND="" |
| 56 |
|
| 57 |
-PATCHES=( |
| 58 |
- "${FILESDIR}/${P}-remove-vendored-dependencies.patch" |
| 59 |
-) |
| 60 |
- |
| 61 |
src_install() { |
| 62 |
dodoc README.md |
| 63 |
|
| 64 |
dobin "${BUILD_DIR}"/abaddon |
| 65 |
|
| 66 |
insinto /usr/share/${PN} |
| 67 |
- doins -r css res |
| 68 |
+ doins -r res/* |
| 69 |
|
| 70 |
make_desktop_entry /usr/bin/${PN} |
| 71 |
} |
| 72 |
|
| 73 |
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 |
| 74 |
deleted file mode 100644 |
| 75 |
index b5a29f97e..000000000 |
| 76 |
--- a/net-im/abaddon/files/abaddon-0.1.1-remove-vendored-dependencies.patch |
| 77 |
+++ /dev/null |
| 78 |
@@ -1,22 +0,0 @@ |
| 79 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 80 |
-index 638be3e..ea76f4e 100644 |
| 81 |
---- a/CMakeLists.txt |
| 82 |
-+++ b/CMakeLists.txt |
| 83 |
-@@ -23,11 +23,7 @@ if (NOT IXWebSocket_FOUND) |
| 84 |
- endif() |
| 85 |
- |
| 86 |
- add_compile_definitions(SI_NO_CONVERSION) # only CSimpleIniA is used |
| 87 |
--find_package(simpleini QUIET) |
| 88 |
--if (NOT simpleini_FOUND) |
| 89 |
-- message("simpleini was not found and will be included as a submodule") |
| 90 |
-- include_directories(thirdparty/simpleini) |
| 91 |
--endif() |
| 92 |
-+include_directories(/usr/include/simpleini) |
| 93 |
- |
| 94 |
- if(MINGW OR WIN32) |
| 95 |
- link_libraries(ws2_32) |
| 96 |
-@@ -103,3 +99,4 @@ target_link_libraries(abaddon ${GTKMM_LIBRARIES}) |
| 97 |
- target_link_libraries(abaddon ${CURL_LIBRARIES}) |
| 98 |
- target_link_libraries(abaddon ${ZLIB_LIBRARY}) |
| 99 |
- target_link_libraries(abaddon ${NLOHMANN_JSON_LIBRARIES}) |
| 100 |
-+target_link_libraries(abaddon simpleini) |
Archives