* [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/
@ 2016-03-14 18:20 Ian Delaney
0 siblings, 0 replies; 6+ messages in thread
From: Ian Delaney @ 2016-03-14 18:20 UTC (permalink / raw
To: gentoo-commits
commit: ad93e8df59ad944022b2012c62b37785a0d76fd1
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Mon Mar 14 17:46:21 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 18:19:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad93e8df
net-p2p/airdcpp-webclient: bump to 1.0.0, add init script, add USE flags
Package-Manager: portage-2.2.27
Closes: https://github.com/gentoo/gentoo/pull/1047
net-p2p/airdcpp-webclient/Manifest | 1 +
.../airdcpp-webclient-1.0.0.ebuild | 62 ++++++++++++++++++++++
net-p2p/airdcpp-webclient/files/airdcppd.confd | 8 +++
net-p2p/airdcpp-webclient/files/airdcppd.initd | 21 ++++++++
net-p2p/airdcpp-webclient/metadata.xml | 2 +
5 files changed, 94 insertions(+)
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index cbd055e..6733eb9 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1 +1,2 @@
DIST airdcpp-webclient-0.16.5.tar.gz 702187 SHA256 d153621ce390ee5d434a63d8af5d46b4b54638984de35ee8340ca63f27f61e16 SHA512 decc359aa569de8d3ae117a7f9ce38d9234564401072a776271ce7dff1e24022ad8d01fbf9cf4cc5238778c3c0cb7031b33e2e8d6a1014034ef507a8c29a6f7b WHIRLPOOL 3c71a391dd3e7a5defa5ec8a3abf580b5850abade28b763ad2548f0cc6df5345002c3a07e7e9db33abdedbd60740b62fc27fb0f8af5022353ac35cb826437e18
+DIST airdcpp-webclient-1.0.0.tar.gz 705277 SHA256 46c19884e220f39924a59c98d09743f2e9017a11bc81f7f95f5419798627813b SHA512 5a8523f15f6ee598d9b5dde502a80831ab8bb7c36c2fa60abb88232619c1e0f64ee3a2d08f1f90ec1a8af6ee0571733f353514522975614fc036d9f6655610ac WHIRLPOOL ef9aad1bc02fdcf66355ceea9302bacb79a69561b507963cec59bfb9f423d17316edcbccb1edba596e0acd93971eaf6f45661f5f90b3d16b007ed42b39e67535
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-1.0.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.0.0.ebuild
new file mode 100644
index 0000000..9c38324
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils user
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://github.com/airdcpp-web/airdcpp-webclient"
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nat-pmp +tbb +webui"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-cpp/websocketpp
+ dev-libs/boost
+ dev-libs/geoip
+ dev-libs/leveldb
+ dev-libs/openssl:0=
+ net-libs/miniupnpc
+ sys-libs/zlib
+ virtual/libiconv
+ nat-pmp? ( net-libs/libnatpmp )
+ tbb? ( dev-cpp/tbb )
+"
+DEPEND="
+ dev-lang/python:*
+ ${RDEPEND}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_WEB_UI=OFF
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+ newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+ keepdir /var/lib/airdcppd
+ fowners airdcppd:airdcppd /var/lib/airdcppd
+ cmake-utils_src_install
+}
+
+pkg_setup() {
+ enewgroup airdcppd
+ enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Run 'airdcppd --configure' to set up ports and authentication"
+ fi
+}
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.confd b/net-p2p/airdcpp-webclient/files/airdcppd.confd
new file mode 100644
index 0000000..af140cb
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcppd.confd
@@ -0,0 +1,8 @@
+# /etc/conf.d/airdcppd: config file for /etc/init.d/airdcppd
+
+# User and group as which to run
+#AIRDCPPD_USER="airdcppd"
+#AIRDCPPD_GROUP="airdcppd"
+
+# umask used to create files
+#AIRDCPPD_UMASK=007
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.initd b/net-p2p/airdcpp-webclient/files/airdcppd.initd
new file mode 100644
index 0000000..53e6145
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcppd.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+AIRDCPPD_USER="${AIRDCPPD_USER:-${RC_SVCNAME}}"
+AIRDCPPD_GROUP="${AIRDCPPD_GROUP:-${RC_SVCNAME}}"
+AIRDCPPD_UMASK="${SYNCTHING_UMASK:-007}"
+AIRDCPPD_HOME="$(getent passwd "${AIRDCPPD_USER}" | cut -d: -f6)"
+
+command="/usr/bin/airdcppd"
+pidfile="${AIRDCPPD_HOME}/.airdc++/${RC_SVCNAME}.pid"
+command_args="-d"
+start_stop_daemon_args="\
+ --user ${AIRDCPPD_USER} \
+ --group ${AIRDCPPD_GROUP} \
+ --umask ${AIRDCPPD_UMASK} \
+"
+
+depend() {
+ need localmount net
+}
diff --git a/net-p2p/airdcpp-webclient/metadata.xml b/net-p2p/airdcpp-webclient/metadata.xml
index 36c434f..c8f06e0 100644
--- a/net-p2p/airdcpp-webclient/metadata.xml
+++ b/net-p2p/airdcpp-webclient/metadata.xml
@@ -18,6 +18,8 @@
AirDC++ Web Client is a cross-platform peer-to-peer file sharing client which allows sharing files with groups of people.
</longdescription>
<use>
+ <flag name="nat-pmp">Enable support for the NAT-PMP protocol</flag>
+ <flag name="tbb">Enable support of the TBB library to improve performance</flag>
<flag name="webui">Enable the Web UI</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/
@ 2017-01-26 22:40 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-01-26 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 32d49f7d930a0112b5281ebb75e4fdb5c2cd9275
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Wed Jan 25 20:38:05 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 22:38:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d49f7d
net-p2p/airdcpp-webclient: fix an issue with zlib >= 1.2.10
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3651
.../airdcpp-webclient-1.4.1-r1.ebuild | 70 ++++++++++++++++++++++
.../airdcpp-webclient-1.4.1-fix-zlib-errors.patch | 23 +++++++
2 files changed, 93 insertions(+)
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild
new file mode 100644
index 00000000..8d68bde
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+
+inherit cmake-utils user python-any-r1
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://airdcpp-web.github.io/"
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="nat-pmp +tbb +webui"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-cpp/websocketpp
+ dev-libs/boost:=
+ dev-libs/geoip
+ dev-libs/leveldb
+ dev-libs/openssl:0=[-bindist]
+ net-libs/miniupnpc:=
+ sys-libs/zlib
+ virtual/libiconv
+ nat-pmp? ( net-libs/libnatpmp )
+ tbb? ( dev-cpp/tbb )
+"
+DEPEND="
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+# Fix errors with zlib >= 1.2.10
+# https://bugs.launchpad.net/dcplusplus/+bug/1656050
+# https://github.com/airdcpp/airdcpp-core/commit/5b48aa785a2d6248971423fd5b7e07af32a6c289
+# https://github.com/airdcpp/airdcpp-core/commit/e80e3d2f6492b5c4f56489338bc2825583526831
+PATCHES=( "${FILESDIR}/${P}-fix-zlib-errors.patch" )
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ enewgroup airdcppd
+ enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_WEB_UI=OFF
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+ newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+ keepdir /var/lib/airdcppd
+ fowners airdcppd:airdcppd /var/lib/airdcppd
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Run 'airdcppd --configure' to set up ports and authentication"
+ fi
+}
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-1.4.1-fix-zlib-errors.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-1.4.1-fix-zlib-errors.patch
new file mode 100644
index 00000000..ad5a379
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-1.4.1-fix-zlib-errors.patch
@@ -0,0 +1,23 @@
+diff --git a/airdcpp-core/airdcpp/ZUtils.cpp b/airdcpp-core/airdcpp/ZUtils.cpp
+index 73217f71..8dbbf293 100644
+--- a/airdcpp-core/airdcpp/ZUtils.cpp
++++ b/airdcpp-core/airdcpp/ZUtils.cpp
+@@ -33,7 +33,7 @@ const double ZFilter::MIN_COMPRESSION_LEVEL = 0.9;
+ ZFilter::ZFilter() : totalIn(0), totalOut(0), compressing(true) {
+ memset(&zs, 0, sizeof(zs));
+
+- if(deflateInit(&zs, 3) != Z_OK) {
++ if(deflateInit(&zs, SETTING(MAX_COMPRESSION)) != Z_OK) {
+ throw Exception(STRING(COMPRESSION_ERROR));
+ }
+ }
+@@ -54,7 +54,8 @@ bool ZFilter::operator()(const void* in, size_t& insize, void* out, size_t& outs
+ if(compressing && insize > 0 && outsize > 16 && (totalIn > (64*1024)) && ((static_cast<double>(totalOut) / totalIn) > 0.95)) {
+ zs.avail_in = 0;
+ zs.avail_out = outsize;
+- if(deflateParams(&zs, 0, Z_DEFAULT_STRATEGY) != Z_OK) {
++ auto err = ::deflateParams(&zs, 0, Z_DEFAULT_STRATEGY);
++ if (err == Z_STREAM_ERROR) {
+ throw Exception(STRING(COMPRESSION_ERROR));
+ }
+ zs.avail_in = insize;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/
@ 2020-08-24 12:20 Louis Sautier
0 siblings, 0 replies; 6+ messages in thread
From: Louis Sautier @ 2020-08-24 12:20 UTC (permalink / raw
To: gentoo-commits
commit: b53e06123dc49a0cdb965fee76a9533038a56a88
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 10:04:53 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 12:20:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53e0612
net-p2p/airdcpp-webclient: v2.8.1, migrate to acct-user, misc. fixes
* Migrate to cmake.eclass
* Add a systemd unit
* Add Python 3.8 and 3.9 support
* Add a debug USE flag
* Move some dependencies to BDEPEND
Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-p2p/airdcpp-webclient/Manifest | 1 +
.../airdcpp-webclient-2.8.1.ebuild | 60 ++++++++++++++++++++++
net-p2p/airdcpp-webclient/files/airdcppd.service | 15 ++++++
3 files changed, 76 insertions(+)
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 838597c5643..a8a782337d9 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,2 +1,3 @@
DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
+DIST airdcpp-webclient-2.8.1.tar.gz 945274 BLAKE2B e98ea603d52f041fed1a60a2c6dd4bff141c230bd554ccc6e7f013a28bd2ef8f2001e5343d3233d09b7cc9ef7e1af8b45a18757f59d29cdfb592763375c01e0c SHA512 c75b20591deb62a62dfb26df1536c521073643d3d7893d2ac85f2206c52a1786349a980994084abf840d1610000128247e6ae94aecf31b1d5266224086257ca7
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.8.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.8.1.ebuild
new file mode 100644
index 00000000000..acb5cd4995b
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.8.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit cmake python-any-r1 systemd
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://airdcpp-web.github.io/"
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug nat-pmp +tbb +webui"
+
+RDEPEND="
+ acct-user/airdcppd
+ acct-group/airdcppd
+ app-arch/bzip2
+ dev-cpp/websocketpp
+ dev-libs/boost:=
+ dev-libs/leveldb:=
+ dev-libs/libmaxminddb:=
+ dev-libs/openssl:0=[-bindist]
+ net-libs/miniupnpc:=
+ sys-libs/zlib
+ virtual/libiconv
+ nat-pmp? ( net-libs/libnatpmp:= )
+ tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_NATPMP=$(usex nat-pmp)
+ -DENABLE_TBB=$(usex tbb)
+ -DINSTALL_WEB_UI=OFF
+ )
+ CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+ newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+ systemd_dounit "${FILESDIR}/airdcppd.service"
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Run 'airdcppd --configure' to set up ports and authentication"
+ fi
+}
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.service b/net-p2p/airdcpp-webclient/files/airdcppd.service
new file mode 100644
index 00000000000..00d4ea07186
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcppd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Cross-platform Direct Connect client
+After=network-online.target
+
+[Service]
+Type=forking
+User=airdcppd
+Group=airdcppd
+# Grant write access to group members
+UMask=007
+PIDFile=/var/lib/airdcppd/.airdc++/airdcppd.pid
+ExecStart=/usr/bin/airdcppd -d
+
+[Install]
+WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/
@ 2022-11-05 19:36 Louis Sautier
0 siblings, 0 replies; 6+ messages in thread
From: Louis Sautier @ 2022-11-05 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 3c87eae224d451e0433cd4338773f945fb879277
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 5 19:12:03 2022 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 19:35:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c87eae2
net-p2p/airdcpp-webclient: fix build with strict flags, add Py3.11
Closes: https://bugs.gentoo.org/861839
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
.../airdcpp-webclient-2.11.2.ebuild | 6 +++++-
.../files/airdcpp-webclient-2.11.2-fix-odr.patch | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
index 8b834ebeb9f1..76af45cb877b 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit cmake python-any-r1 systemd
@@ -38,6 +38,10 @@ BDEPEND="
"
PDEPEND="webui? ( www-apps/airdcpp-webui )"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-odr.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DENABLE_NATPMP=$(usex nat-pmp)
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch
new file mode 100644
index 000000000000..e44365ca1bd2
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch
@@ -0,0 +1,22 @@
+From 5f12f803c2fc0450111152e2ea5f649ed92f4b7f Mon Sep 17 00:00:00 2001
+From: maksis <maksis@adrenaline-network.com>
+Date: Thu, 13 Oct 2022 22:05:35 +0300
+Subject: [PATCH] Build: define the HAVE_POSIX_FADVISE flag correctly
+
+Fixes https://github.com/airdcpp-web/airdcpp-webclient/issues/425
+---
+ airdcpp-core/CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/airdcpp-core/CMakeLists.txt
++++ b/airdcpp-core/CMakeLists.txt
+@@ -75,8 +75,7 @@ if (HAVE_MNTENT_H)
+ endif (HAVE_MNTENT_H)
+
+ if (HAVE_POSIX_FADVISE)
+- set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.cpp PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND)
+- set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.h PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND)
++ add_definitions (-DHAVE_POSIX_FADVISE)
+ endif (HAVE_POSIX_FADVISE)
+
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/
@ 2024-06-16 19:37 Louis Sautier
0 siblings, 0 replies; 6+ messages in thread
From: Louis Sautier @ 2024-06-16 19:37 UTC (permalink / raw
To: gentoo-commits
commit: ed5629df8381f940de93a0e6c0b193d0e5260d04
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 19:29:03 2024 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 19:36:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5629df
net-p2p/airdcpp-webclient: fix build with miniupnpc 2.2.8, #934055
Also:
* fix ebuild variable order.
* enable Python 3.13.
Closes: https://bugs.gentoo.org/934055
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
.../airdcpp-webclient-2.12.1.ebuild | 8 ++++++--
.../airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch | 22 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
index 848b7f674f46..e6d1af1f4eed 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
inherit cmake python-any-r1 systemd
@@ -11,9 +11,9 @@ DESCRIPTION="Cross-platform Direct Connect client"
HOMEPAGE="https://airdcpp-web.github.io/"
SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~riscv x86"
LICENSE="GPL-2+"
SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
IUSE="debug nat-pmp +tbb +webui"
RDEPEND="
@@ -38,6 +38,10 @@ BDEPEND="
"
PDEPEND="webui? ( www-apps/airdcpp-webui )"
+PATCHES=(
+ "${FILESDIR}/${P}-miniupnpc-2.2.8.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DENABLE_NATPMP=$(usex nat-pmp)
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch
new file mode 100644
index 000000000000..64dcce950d48
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch
@@ -0,0 +1,22 @@
+https://github.com/airdcpp/airdcpp-windows/commit/2b1cd3d05774ce8134186bb9977a45cf00aaaef5
+
+From 2b1cd3d05774ce8134186bb9977a45cf00aaaef5 Mon Sep 17 00:00:00 2001
+From: maksis <maksis@adrenaline-network.com>
+Date: Thu, 13 Jun 2024 20:05:17 +0300
+Subject: [PATCH] Add support for miniupnpc 2.2.8
+
+--- a/airdcpp-core/airdcpp/Mapper_MiniUPnPc.cpp
++++ b/airdcpp-core/airdcpp/Mapper_MiniUPnPc.cpp
+@@ -108,7 +108,12 @@ bool Mapper_MiniUPnPc::init() {
+ UPNPUrls urls;
+ IGDdatas data;
+
++#if (MINIUPNPC_API_VERSION >= 18)
++ auto ret = UPNP_GetValidIGD(devices, &urls, &data, 0, 0, nullptr, 0);
++#else
+ auto ret = UPNP_GetValidIGD(devices, &urls, &data, 0, 0);
++#endif
++
+
+ bool ok = ret == 1;
+ if(ok) {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/
@ 2024-06-16 19:37 Louis Sautier
0 siblings, 0 replies; 6+ messages in thread
From: Louis Sautier @ 2024-06-16 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 6de68fcf554d79307451eab42455047bc77efcf8
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 19:34:14 2024 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 19:36:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de68fcf
net-p2p/airdcpp-webclient: drop 2.11.2
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-p2p/airdcpp-webclient/Manifest | 1 -
.../airdcpp-webclient-2.11.2.ebuild | 65 ----------------------
.../files/airdcpp-webclient-2.11.2-fix-odr.patch | 22 --------
3 files changed, 88 deletions(-)
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 8e2ce6bb90c8..69c843fdfa1f 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,3 +1,2 @@
-DIST airdcpp-webclient-2.11.2.tar.gz 978294 BLAKE2B cb15e02dc5381cc5f0ecb1b4d65cdd1c4a3d007f3ea1e78a159b8a62af03831318b8f6d8c0692c5a9145dda616627ea97f4bd3eeb1270a7452c7d78bf01d147f SHA512 281d4a9da88f23a4c02eef7f09c4fc2c91c44ac93d932ea4bfe097029b45dbd12a8d04d4ef8b493d261f5dade15b62ed4d564197fbfb2d9d98b9dfcc9a9e6379
DIST airdcpp-webclient-2.11.4.tar.gz 958611 BLAKE2B f0ff3a39c8615edbc541a952460b831eefd37f1825da4881da147c54a00612479382a9d69d4399f55fbdd77c77ab6716097594c8d10c6a3839db5ae14d11cc87 SHA512 0ab8fbdc6d1b815546724bfdcd436aa2e07ffdb499b91a3506db18c2f494f76bc1203d0d9d3cfd3ae6ad9d0f2fb4038df46aada0515747e2477c7f6595a05436
DIST airdcpp-webclient-2.12.1.tar.gz 961603 BLAKE2B bc17fb3b3643b1d699f7c0ef958616759d87cd96467318a592c1460e355d512a3efc0e793a3098f8074f02d5af47b1ef33b65fbe7a6c9a955bbdc472d323f637 SHA512 0f662311d208b937c946b41a617c82a0e72442fb7c2bef09d56ec71931bde35bd1024ce53cb3bf7deda3eaaac31ecbe8fa2c66c337c0833db655f80f5e5156be
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
deleted file mode 100644
index 9b5fdb2338b8..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug nat-pmp +tbb +webui"
-
-RDEPEND="
- acct-user/airdcppd
- acct-group/airdcppd
- app-arch/bzip2
- dev-cpp/websocketpp
- dev-libs/boost:=
- dev-libs/leveldb:=
- dev-libs/libmaxminddb:=
- dev-libs/openssl:0=[-bindist(-)]
- net-libs/miniupnpc:=
- sys-libs/zlib
- virtual/libiconv
- nat-pmp? ( net-libs/libnatpmp:= )
- tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- ${PYTHON_DEPS}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-odr.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_NATPMP=$(usex nat-pmp)
- -DENABLE_TBB=$(usex tbb)
- -DINSTALL_WEB_UI=OFF
- )
- CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- newconfd "${FILESDIR}/airdcppd.confd" airdcppd
- newinitd "${FILESDIR}/airdcppd.initd" airdcppd
- systemd_dounit "${FILESDIR}/airdcppd.service"
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Run 'airdcppd --configure' to set up ports and authentication"
- fi
-}
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch
deleted file mode 100644
index e44365ca1bd2..000000000000
--- a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5f12f803c2fc0450111152e2ea5f649ed92f4b7f Mon Sep 17 00:00:00 2001
-From: maksis <maksis@adrenaline-network.com>
-Date: Thu, 13 Oct 2022 22:05:35 +0300
-Subject: [PATCH] Build: define the HAVE_POSIX_FADVISE flag correctly
-
-Fixes https://github.com/airdcpp-web/airdcpp-webclient/issues/425
----
- airdcpp-core/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/airdcpp-core/CMakeLists.txt
-+++ b/airdcpp-core/CMakeLists.txt
-@@ -75,8 +75,7 @@ if (HAVE_MNTENT_H)
- endif (HAVE_MNTENT_H)
-
- if (HAVE_POSIX_FADVISE)
-- set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.cpp PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND)
-- set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.h PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND)
-+ add_definitions (-DHAVE_POSIX_FADVISE)
- endif (HAVE_POSIX_FADVISE)
-
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-16 19:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-16 19:37 [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/ Louis Sautier
-- strict thread matches above, loose matches on Subject: below --
2024-06-16 19:37 Louis Sautier
2022-11-05 19:36 Louis Sautier
2020-08-24 12:20 Louis Sautier
2017-01-26 22:40 David Seifert
2016-03-14 18:20 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox