Gentoo Archives: gentoo-commits

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