Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imv/, media-gfx/imv/files/
Date: Mon, 30 Jan 2023 19:11:29
Message-Id: 1675105869.4b15699494f9fda24b9c06f9319995e6af8a48e7.ionen@gentoo
1 commit: 4b15699494f9fda24b9c06f9319995e6af8a48e7
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 30 18:56:16 2023 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 30 19:11:09 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b156994
7
8 media-gfx/imv: drop 4.3.1_p20211221-r3
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 media-gfx/imv/Manifest | 1 -
13 .../files/imv-4.3.1_p20211221-libgrapheme2.patch | 13 ----
14 media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild | 89 ----------------------
15 3 files changed, 103 deletions(-)
16
17 diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
18 index b3bb76e4d202..e0446825429c 100644
19 --- a/media-gfx/imv/Manifest
20 +++ b/media-gfx/imv/Manifest
21 @@ -1,2 +1 @@
22 -DIST imv-4.3.1_p20211221.tar.gz 80082 BLAKE2B 2b4f3cdb0b7123b978cdbc588cf686c38d65053e3fadb6532da45be3e24b35a297639ca8ddb7d05945f92763cc014a232eb0ca0af0da059b2dac48d2b3c9939d SHA512 7579930a406d2ba1dca7f043d635ea89301606d06ca5ebe5779fffd1410789bb07ef8228beb2ef08af2783e64deda8b67aa991fc56333c0e60051f7666fbb19f
23 DIST imv-4.4.0.tar.gz 80360 BLAKE2B c598bb270ed57562f1c1b9a56f42676a7c8390c976ed74405228da572b000a85bf69e51f1bbfa6d554a481debc092995fe5222ba1e8b0b029b72395a8b8f329b SHA512 ddc0740022183a5467a0815ca623d2204b26449fee14b00c3468d06dbba3b5c3314b04a582bbac6075205f8d58cc24f157e283ce1ce3d34ecf0a9bdc497ab7f1
24
25 diff --git a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
26 deleted file mode 100644
27 index d71067130c27..000000000000
28 --- a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
29 +++ /dev/null
30 @@ -1,13 +0,0 @@
31 -https://lists.sr.ht/~exec64/imv-devel/patches/35908
32 ---- a/src/console.c
33 -+++ b/src/console.c
34 -@@ -54,3 +54,3 @@
35 - if (buffer[position] != 0) {
36 -- return position + grapheme_next_character_break(buffer + position, SIZE_MAX);
37 -+ return position + grapheme_next_character_break_utf8(buffer + position, SIZE_MAX);
38 - } else {
39 -@@ -87,3 +87,3 @@
40 - do {
41 -- step = grapheme_next_character_break(buffer + result, SIZE_MAX);
42 -+ step = grapheme_next_character_break_utf8(buffer + result, SIZE_MAX);
43 - if (result + step >= position)
44
45 diff --git a/media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild b/media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild
46 deleted file mode 100644
47 index 48d367ef221a..000000000000
48 --- a/media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild
49 +++ /dev/null
50 @@ -1,89 +0,0 @@
51 -# Copyright 1999-2022 Gentoo Authors
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI=8
55 -
56 -inherit meson xdg
57 -
58 -if [[ ${PV} == 9999 ]]; then
59 - inherit git-r3
60 - EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
61 -else
62 - IMV_HASH=4448fb6104d67e3dfff3e71babe257992fce556
63 - SRC_URI="https://git.sr.ht/~exec64/imv/archive/${IMV_HASH}.tar.gz -> ${P}.tar.gz"
64 - S="${WORKDIR}/${PN}-${IMV_HASH}"
65 - KEYWORDS="amd64 x86"
66 -fi
67 -
68 -DESCRIPTION="Minimal image viewer designed for tiling window manager users"
69 -HOMEPAGE="https://sr.ht/~exec64/imv/"
70 -
71 -LICENSE="MIT-with-advertising"
72 -SLOT="0"
73 -IUSE="+X +freeimage gif heif icu jpeg png svg test tiff wayland"
74 -REQUIRED_USE="|| ( X wayland )"
75 -RESTRICT="!test? ( test )"
76 -
77 -RDEPEND="
78 - dev-libs/glib:2
79 - dev-libs/inih
80 - media-libs/libglvnd[X?]
81 - x11-libs/cairo
82 - x11-libs/libxkbcommon[X?]
83 - x11-libs/pango
84 - X? (
85 - x11-libs/libX11
86 - x11-libs/libxcb:=
87 - )
88 - freeimage? ( media-libs/freeimage )
89 - gif? ( media-libs/libnsgif )
90 - heif? ( media-libs/libheif:= )
91 - icu? ( dev-libs/icu:= )
92 - !icu? ( >=dev-libs/libgrapheme-2:= )
93 - jpeg? ( media-libs/libjpeg-turbo:= )
94 - png? ( media-libs/libpng:= )
95 - svg? ( >=gnome-base/librsvg-2.44:2 )
96 - tiff? ( media-libs/tiff:= )
97 - wayland? ( dev-libs/wayland )
98 - !sys-apps/renameutils"
99 -DEPEND="
100 - ${RDEPEND}
101 - X? ( x11-base/xorg-proto )
102 - test? ( dev-util/cmocka )"
103 -BDEPEND="
104 - app-text/asciidoc
105 - wayland? ( dev-util/wayland-scanner )"
106 -
107 -PATCHES=(
108 - "${FILESDIR}"/${P}-animated-gif.patch
109 - "${FILESDIR}"/${P}-libgrapheme2.patch
110 -)
111 -
112 -src_prepare() {
113 - default
114 -
115 - # if wayland-only, don't automagic on libGL and force libOpenGL
116 - if ! use X; then
117 - sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die
118 - fi
119 -
120 - # glu isn't used by anything
121 - sed -i "/dependency('glu')/d" meson.build || die
122 -}
123 -
124 -src_configure() {
125 - local emesonargs=(
126 - $(meson_feature freeimage)
127 - $(meson_feature gif libnsgif)
128 - $(meson_feature heif libheif)
129 - $(meson_feature jpeg libjpeg)
130 - $(meson_feature png libpng)
131 - $(meson_feature svg librsvg)
132 - $(meson_feature test)
133 - $(meson_feature tiff libtiff)
134 - -Dunicode=$(usex icu{,} grapheme)
135 - -Dwindows=$(usex X $(usex wayland all x11) wayland)
136 - )
137 -
138 - meson_src_configure
139 -}