[gentoo-commits] repo/gentoo:master commit in: net-libs/libnice/files/, net-libs/libnice/
commit: ebcc47b19f21ecfc1e0f4e276b288000ffc540aa
Author: Alfred Wingate protonmail com>
AuthorDate: Tue Aug 1 21:30:25 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 7 04:45:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebcc47b1
net-libs/libnice: remove graphviz requirement
* Patched out target wouldn't do anything either way as the generated
file is shipped with the tarball.
Closes: https://bugs.gentoo.org/877451
Closes: https://bugs.gentoo.org/889820
Signed-off-by: Alfred Wingate protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32134
Signed-off-by: Sam James gentoo.org>
...libnice-0.1.19-remove-graphviz-dependency.patch | 30 ++
net-libs/libnice/libnice-0.1.19-r1.ebuild | 5
net-libs/libnice/libnice-0.1.21.ebuild | 5
3 files changed, 40 insertions(+)
diff --git
a/net-libs/libnice/files/libnice-0.1.19-remove-graphviz-dependency.patch
b/net-libs/libnice/files/libnice-0.1.19-remove-graphviz-dependency.patch
new file mode 100644
index ..29cd023761e4
--- /dev/null
+++ b/net-libs/libnice/files/libnice-0.1.19-remove-graphviz-dependency.patch
@@ -0,0 +1,30 @@
+From 42b2ca76d0b3b044ca3ada05f5200becc61aeedd Mon Sep 17 00:00:00 2001
+From: Alfred Wingate
+Date: Wed, 2 Aug 2023 00:16:29 +0300
+Subject: [PATCH] Remove unnecessary target with unecessary dependency
+
+* The generated file is included in the repository and the source files
+ hasn't been modified since it was added.
+
+https://bugs.gentoo.org/877451
+https://bugs.gentoo.org/889820
+--- a/docs/reference/libnice/meson.build
b/docs/reference/libnice/meson.build
+@@ -63,14 +63,3 @@ gnome.gtkdoc('libnice',
+ ],
+ install: true,
+ check: true)
+-
+-# If we ever need to regenerate this diagram.
+-# Since it’s not expected to change much, let’s not depend on GraphViz to
+-# build the docs (that's also why we don't use find_program('dot') here)
+-run_target('update-states.png',
+- command: ['dot',
+-'-Tpng',
+-'-o', join_paths(meson.current_source_dir(), 'states.png'),
+-'-Gsize=9.6,2.9!',
+-'-Gdpi=200',
+-files('states.gv')])
+--
+2.41.0
+
diff --git a/net-libs/libnice/libnice-0.1.19-r1.ebuild
b/net-libs/libnice/libnice-0.1.19-r1.ebuild
index 9c5c64599217..69ede6628795 100644
--- a/net-libs/libnice/libnice-0.1.19-r1.ebuild
+++ b/net-libs/libnice/libnice-0.1.19-r1.ebuild
@@ -30,6 +30,11 @@ BDEPEND="
app-text/docbook-xml-dtd:4.1.2 )
"
+PATCHES=(
+ # bugs 877451, 889820
+ "${FILESDIR}/libnice-0.1.19-remove-graphviz-dependency.patch"
+)
+
src_prepare() {
default
diff --git a/net-libs/libnice/libnice-0.1.21.ebuild
b/net-libs/libnice/libnice-0.1.21.ebuild
index 0417eadc8e07..0dca1a3694ee 100644
--- a/net-libs/libnice/libnice-0.1.21.ebuild
+++ b/net-libs/libnice/libnice-0.1.21.ebuild
@@ -30,6 +30,11 @@ BDEPEND="
app-text/docbook-xml-dtd:4.1.2 )
"
+PATCHES=(
+ # bugs 877451, 889820
+ "${FILESDIR}/libnice-0.1.19-remove-graphviz-dependency.patch"
+)
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnice/files/, net-libs/libnice/
commit: de1435427c3bb5e14f97aeb22ac6723763d5557d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 18 10:29:17 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 18 12:00:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de143542
net-libs/libnice: Drop 0.1.13, EAPI5--
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-libs/libnice/Manifest | 1 -
.../libnice/files/libnice-0.1.13-gstreamer.patch | 40 ---
net-libs/libnice/libnice-0.1.13.ebuild | 57 --
3 files changed, 98 deletions(-)
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 35bfe6c5ad0..dc6cbc3cb4d 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,2 +1 @@
-DIST libnice-0.1.13.tar.gz 912374 BLAKE2B
ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d
SHA512
c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B
81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1
SHA512
60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
diff --git a/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch
b/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch
deleted file mode 100644
index 136d85456c4..000
--- a/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 76ff4aee9fe963842dd17748d14c68552c5dcda3 Mon Sep 17 00:00:00 2001
-From: Timo Gurr
-Date: Mon, 1 Jun 2015 16:10:16 +0200
-Subject: [PATCH] configure: Fix configure failure when building without
- gstreamer support
-
-Error introduced in 20ea22e0a11a9bdfe4d8125b68083249b694338a, resulting in a
-configure/build error when building without gstreamer:
-
-configure: error: conditional "HAVE_GST_CHECK" was never defined.
-Usually this means the macro was only invoked conditionally.
- configure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6031cec..64a571f 100644
a/configure.ac
-+++ b/configure.ac
-@@ -231,9 +231,6 @@ AS_IF([test "$with_gstreamer" != no], [
- [
- have_gst_check=no
- ])
--
-- AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
--
- ])
-
- AS_IF([test "$with_gstreamer010" != no], [
-@@ -260,6 +257,7 @@ AC_SUBST(gstplugindir)
- AC_SUBST(gstplugin010dir)
-
- AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes)
-+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
- AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes)
-
- GUPNP_IGD_REQUIRED=0.2.4
---
-2.4.1
-
diff --git a/net-libs/libnice/libnice-0.1.13.ebuild
b/net-libs/libnice/libnice-0.1.13.ebuild
deleted file mode 100644
index 7b19bb53cab..000
--- a/net-libs/libnice/libnice-0.1.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils epatch ltprune multilib-minimal xdg-utils
-
-DESCRIPTION="An implementation of the Interactice Connectivity Establishment
standard (ICE)"
-HOMEPAGE="https://nice.freedesktop.org/wiki/;
-SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz;
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux
~x86-linux ~ppc-macos"
-IUSE="+introspection +upnp"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
- upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- virtual/pkgconfig
-"
-
-# Many tests fail from time to time, for example:
-# https://bugs.freedesktop.org/show_bug.cgi?id=81691
-RESTRICT="test"
-
-src_prepare() {
- xdg_environment_reset
-
- # https://bugs.freedesktop.org/show_bug.cgi?id=90801
- epatch "${FILESDIR}"/${P}-gstreamer.patch
- eautoreconf
-}
-
-multilib_src_configure() {
- # gstreamer plugin split off into media-plugins/gst-plugins-libnice
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-static-plugins \
- --without-gstreamer \
- --without-gstreamer-0.10 \
- $(multilib_native_use_enable introspection) \
- $(use_enable upnp gupnp)
-
- if multilib_is_native_abi; then
- ln -s {"${S}"/,}docs/reference/libnice/html || die
- fi
-}
-
-multilib_src_install_all() {
-
