| 1 |
commit: 34706315a36de754450ca83eda6d40346f388766 |
| 2 |
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> |
| 3 |
AuthorDate: Tue Sep 28 13:43:10 2021 +0000 |
| 4 |
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> |
| 5 |
CommitDate: Tue Sep 28 13:43:10 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 |
| 7 |
|
| 8 |
net-im/abaddon: Remove vendored dependencies |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de> |
| 12 |
|
| 13 |
net-im/abaddon/Manifest | 1 - |
| 14 |
net-im/abaddon/abaddon-0.1.0.ebuild | 12 +++------ |
| 15 |
...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++++++++++++++++++++++ |
| 16 |
3 files changed, 33 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest |
| 19 |
index b9936a57a..a9031ec07 100644 |
| 20 |
--- a/net-im/abaddon/Manifest |
| 21 |
+++ b/net-im/abaddon/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 |
| 24 |
-DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 |
| 25 |
|
| 26 |
diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild |
| 27 |
index f987740f9..5e1dfdca0 100644 |
| 28 |
--- a/net-im/abaddon/abaddon-0.1.0.ebuild |
| 29 |
+++ b/net-im/abaddon/abaddon-0.1.0.ebuild |
| 30 |
@@ -5,13 +5,10 @@ EAPI=7 |
| 31 |
|
| 32 |
inherit cmake desktop |
| 33 |
|
| 34 |
-SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" |
| 35 |
- |
| 36 |
DESCRIPTION="Alternative Discord client using GTK instead of Electron" |
| 37 |
HOMEPAGE="https://github.com/uowuo/abaddon" |
| 38 |
SRC_URI=" |
| 39 |
https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
| 40 |
- https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz |
| 41 |
" |
| 42 |
|
| 43 |
LICENSE="GPL-3" |
| 44 |
@@ -19,6 +16,7 @@ SLOT="0" |
| 45 |
KEYWORDS="~amd64 ~x86" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
+ >=dev-cpp/simpleini-4.17_p20210831 |
| 49 |
dev-cpp/gtkmm:3.0= |
| 50 |
dev-db/sqlite:3 |
| 51 |
net-misc/curl |
| 52 |
@@ -31,11 +29,9 @@ DEPEND=" |
| 53 |
" |
| 54 |
BDEPEND="" |
| 55 |
|
| 56 |
-src_unpack() { |
| 57 |
- default |
| 58 |
- rm -r "${S}/thirdparty/simpleini" || die |
| 59 |
- ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die |
| 60 |
-} |
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}/${P}-remove-vendored-dependencies.patch" |
| 63 |
+) |
| 64 |
|
| 65 |
src_install() { |
| 66 |
dodoc README.md |
| 67 |
|
| 68 |
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 |
| 69 |
new file mode 100644 |
| 70 |
index 000000000..b1993cd1d |
| 71 |
--- /dev/null |
| 72 |
+++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch |
| 73 |
@@ -0,0 +1,29 @@ |
| 74 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 75 |
+index 82d405f..5a2f75b 100644 |
| 76 |
+--- a/CMakeLists.txt |
| 77 |
++++ b/CMakeLists.txt |
| 78 |
+@@ -15,13 +15,7 @@ find_package(CURL) |
| 79 |
+ find_package(ZLIB REQUIRED) |
| 80 |
+ find_package(SQLite3 REQUIRED) |
| 81 |
+ find_package(gtkmm REQUIRED) |
| 82 |
+- |
| 83 |
+-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) |
| 84 |
+-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) |
| 85 |
+-if (NOT IXWEBSOCKET_LIBRARY) |
| 86 |
+- add_subdirectory(thirdparty/IXWebSocket) |
| 87 |
+- include_directories(IXWEBSOCKET_INCLUDE_DIRS) |
| 88 |
+-endif() |
| 89 |
++find_package(ixwebsocket REQUIRED) |
| 90 |
+ |
| 91 |
+ include_directories(thirdparty/simpleini) |
| 92 |
+ |
| 93 |
+@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) |
| 94 |
+ target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) |
| 95 |
+ target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) |
| 96 |
+ target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) |
| 97 |
++target_include_directories(abaddon PUBLIC /usr/include/simpleini) |
| 98 |
++ |
| 99 |
++target_link_libraries(abaddon simpleini) |
| 100 |
+ |
| 101 |
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR |
| 102 |
+ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND |
Archives