Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/
Date: Wed, 08 Sep 2021 06:38:04
Message-Id: 1631083070.b137e9f96d9e5e93632e029ca8901a49408a6a3c.sam@gentoo
1 commit: b137e9f96d9e5e93632e029ca8901a49408a6a3c
2 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
3 AuthorDate: Wed Sep 8 06:04:01 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 8 06:37:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b137e9f9
7
8 media-gfx/gimp: 2.10.26 version bump
9
10 Closes: https://bugs.gentoo.org/753635
11
12 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
13 Closes: https://github.com/gentoo/gentoo/pull/22242
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 media-gfx/gimp/Manifest | 1 +
17 media-gfx/gimp/gimp-2.10.26.ebuild | 212 +++++++++++++++++++++++++++++++++++++
18 2 files changed, 213 insertions(+)
19
20 diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
21 index bb813ef7acf..6d36bca0fa4 100644
22 --- a/media-gfx/gimp/Manifest
23 +++ b/media-gfx/gimp/Manifest
24 @@ -1,3 +1,4 @@
25 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
26 DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
27 +DIST gimp-2.10.26.tar.bz2 31665981 BLAKE2B 150ae935a84aadea98d58d61e8c5ed3ec3d0083202085c8b75cfcd6de34f3b30bc402baa49111c208af2144e3006f162072cd2fd8027404e64c23d54d84d5daa SHA512 d99f4f3ff23faa9bd7e6a40123d22af7620e51dc7d01c4605b8fbd44fe9069f0753e69adceb0bdb24d93537e2fbdf83f9cac46aa9afe1d234a6cb679335ef966
28 DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
29
30 diff --git a/media-gfx/gimp/gimp-2.10.26.ebuild b/media-gfx/gimp/gimp-2.10.26.ebuild
31 new file mode 100644
32 index 00000000000..09172d13d44
33 --- /dev/null
34 +++ b/media-gfx/gimp/gimp-2.10.26.ebuild
35 @@ -0,0 +1,212 @@
36 +# Copyright 1999-2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +GNOME2_EAUTORECONF=yes
41 +WANT_AUTOMAKE=
42 +
43 +inherit autotools gnome2 toolchain-funcs virtualx
44 +
45 +DESCRIPTION="GNU Image Manipulation Program"
46 +HOMEPAGE="https://www.gimp.org/"
47 +SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
48 +LICENSE="GPL-3 LGPL-3"
49 +SLOT="0/2"
50 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
51 +
52 +IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
53 +
54 +RESTRICT="!test? ( test )"
55 +
56 +COMMON_DEPEND="
57 + >=app-text/poppler-0.50[cairo]
58 + >=app-text/poppler-data-0.4.7
59 + >=dev-libs/atk-2.2.0
60 + >=dev-libs/glib-2.56.2:2
61 + >=dev-libs/json-glib-1.2.6
62 + dev-libs/libxml2:2
63 + dev-libs/libxslt
64 + >=gnome-base/librsvg-2.40.6:2
65 + >=media-gfx/mypaint-brushes-2.0.2:=
66 + >=media-libs/babl-0.1.88
67 + >=media-libs/fontconfig-2.12.4
68 + >=media-libs/freetype-2.1.7
69 + >=media-libs/gegl-0.4.32:0.4[cairo]
70 + >=media-libs/gexiv2-0.10.6
71 + >=media-libs/harfbuzz-0.9.19
72 + >=media-libs/lcms-2.8:2
73 + >=media-libs/libmypaint-1.6.1:=
74 + >=media-libs/libpng-1.6.25:0=
75 + >=media-libs/tiff-3.5.7:0
76 + net-libs/glib-networking[ssl]
77 + sys-libs/zlib
78 + virtual/jpeg
79 + >=x11-libs/cairo-1.12.2
80 + >=x11-libs/gdk-pixbuf-2.31:2
81 + >=x11-libs/gtk+-2.24.32:2
82 + x11-libs/libXcursor
83 + >=x11-libs/pango-1.29.4
84 + aalib? ( media-libs/aalib )
85 + alsa? ( >=media-libs/alsa-lib-1.0.0 )
86 + aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
87 + heif? ( >=media-libs/libheif-1.9.1:= )
88 + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
89 + mng? ( media-libs/libmng:= )
90 + openexr? ( >=media-libs/openexr-1.6.1:= )
91 + postscript? ( app-text/ghostscript-gpl )
92 + udev? ( dev-libs/libgudev:= )
93 + unwind? ( >=sys-libs/libunwind-1.1.0:= )
94 + webp? ( >=media-libs/libwebp-0.6.0:= )
95 + wmf? ( >=media-libs/libwmf-0.2.8 )
96 + xpm? ( x11-libs/libXpm )
97 +"
98 +
99 +RDEPEND="
100 + ${COMMON_DEPEND}
101 + x11-themes/hicolor-icon-theme
102 + gnome? ( gnome-base/gvfs )
103 +"
104 +
105 +DEPEND="
106 + ${COMMON_DEPEND}
107 + >=dev-lang/perl-5.10.0
108 + dev-libs/appstream-glib
109 + dev-util/gtk-update-icon-cache
110 + >=dev-util/intltool-0.40.1
111 + sys-apps/findutils
112 + >=sys-devel/gettext-0.19
113 + >=sys-devel/libtool-2.2
114 + virtual/pkgconfig
115 +"
116 +
117 +DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
118 +
119 +# Bugs 685210 (and duplicate 691070)
120 +PATCHES=(
121 + "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
122 +)
123 +
124 +src_prepare() {
125 + sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
126 +
127 + sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
128 + sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
129 +
130 + gnome2_src_prepare # calls eautoreconf
131 +
132 + sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
133 + fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
134 +
135 + export CC_FOR_BUILD="$(tc-getBUILD_CC)"
136 +}
137 +
138 +_adjust_sandbox() {
139 + # Bugs #569738 and #591214
140 + local nv
141 + for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
142 + # We do not check for existence as they may show up later
143 + # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
144 + addwrite "${nv}"
145 + done
146 +
147 + addwrite /dev/dri/ # bugs #574038 and #684886
148 + addwrite /dev/ati/ # bug #589198
149 + addwrite /proc/mtrr # bug #589198
150 +}
151 +
152 +src_configure() {
153 + _adjust_sandbox
154 +
155 + local myconf=(
156 + GEGL="${EPREFIX}"/usr/bin/gegl-0.4
157 + GDBUS_CODEGEN="${EPREFIX}"/bin/false
158 +
159 + --enable-default-binary
160 +
161 + --disable-check-update
162 + --disable-python
163 + --enable-mp
164 + --with-appdata-test
165 + --with-bug-report-url=https://bugs.gentoo.org/
166 + --with-xmc
167 + --without-libbacktrace
168 + --without-webkit
169 + --without-xvfb-run
170 + $(use_enable cpu_flags_ppc_altivec altivec)
171 + $(use_enable cpu_flags_x86_mmx mmx)
172 + $(use_enable cpu_flags_x86_sse sse)
173 + $(use_enable debug)
174 + $(use_enable vector-icons)
175 + $(use_with aalib aa)
176 + $(use_with alsa)
177 + $(use_with !aqua x)
178 + $(use_with heif libheif)
179 + $(use_with jpeg2k jpeg2000)
180 + $(use_with mng libmng)
181 + $(use_with openexr)
182 + $(use_with postscript gs)
183 + $(use_with udev gudev)
184 + $(use_with unwind libunwind)
185 + $(use_with webp)
186 + $(use_with wmf)
187 + $(use_with xpm libxpm)
188 + )
189 +
190 + gnome2_src_configure "${myconf[@]}"
191 +}
192 +
193 +src_compile() {
194 + export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
195 + gnome2_src_compile
196 +}
197 +
198 +# for https://bugs.gentoo.org/664938
199 +_rename_plugins() {
200 + einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
201 + local prepend=gimp-org-
202 + (
203 + cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
204 + for plugin_slash in $(ls -d1 */); do
205 + plugin=${plugin_slash%/}
206 + if [[ -f ${plugin}/${plugin} ]]; then
207 + # NOTE: Folder and file name need to match for Gimp to load that plug-in
208 + # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
209 + mv ${plugin}/{,${prepend}}${plugin} || die
210 + mv {,${prepend}}${plugin} || die
211 + fi
212 + done
213 + )
214 +}
215 +
216 +src_test() {
217 + virtx emake check
218 +}
219 +
220 +src_install() {
221 + gnome2_src_install
222 +
223 + # Workaround for bug #321111 to give GIMP the least
224 + # precedence on PDF documents by default
225 + mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
226 +
227 + find "${D}" -name '*.la' -type f -delete || die
228 +
229 + # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
230 + local gimp_app_version=$(ver_cut 1-2)
231 + mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
232 +
233 + # Remove gimp devel-docs html files if user doesn't need it
234 + if ! use doc; then
235 + rm -r "${ED}"/usr/share/gtk-doc || die
236 + fi
237 +
238 + _rename_plugins || die
239 +}
240 +
241 +pkg_postinst() {
242 + gnome2_pkg_postinst
243 +}
244 +
245 +pkg_postrm() {
246 + gnome2_pkg_postrm
247 +}