| 1 |
commit: bfa2ea1e5cda2965eb51f61ab0070a6508e50d74 |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 5 01:35:28 2015 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 5 01:42:16 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa2ea1e |
| 7 |
|
| 8 |
media-gfx/gimp: 2.9.2 (bug #567366) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
media-gfx/gimp/Manifest | 1 + |
| 13 |
.../gimp/files/gimp-2.9.2-no-deprecation.patch | 50 +++++++ |
| 14 |
media-gfx/gimp/files/gimp-2.9.2-version.patch | 28 ++++ |
| 15 |
media-gfx/gimp/gimp-2.9.2.ebuild | 166 +++++++++++++++++++++ |
| 16 |
4 files changed, 245 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest |
| 19 |
index 66dc29e..3fe6b5b 100644 |
| 20 |
--- a/media-gfx/gimp/Manifest |
| 21 |
+++ b/media-gfx/gimp/Manifest |
| 22 |
@@ -1,3 +1,4 @@ |
| 23 |
DIST gimp-2.8.10.tar.bz2 20343461 SHA256 e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 SHA512 21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 WHIRLPOOL 16b0a7e8a4197db41da29832977bee917e65d5cbbf308dde1ba73c150742c70c52cd60d449d0fd0269b0ed5db0378461d3277a2350898c3a5e07b1f3cf8bdf47 |
| 24 |
DIST gimp-2.8.14.tar.bz2 20440077 SHA256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d SHA512 533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba WHIRLPOOL 8fd7b0fd5f8627b2df83481f7956727acd42eafcdc9c9116713d60faf8578005c2fb1e1d729f3b2c836a90e9bab063e477f9da5285e5c43a79f2dbe441a0565b |
| 25 |
DIST gimp-2.8.16.tar.bz2 20847212 SHA256 95e3857bd0b5162cf8d1eda8c78b741eef968c3e3ac6c1195aaac2a4e2574fb7 SHA512 480b49a7fc7775aa924bf2e7a5a5165b94df1318fc8439faf2e4263dd26efbca9d1d8ccc5b9b52114c33d2363e087d5a364fab86077c27bc19e58383880b13fd WHIRLPOOL 26e8e26cea15a4689a2efbecbaf1425f0bb645b9cf4f380ad2047e52606bb8d5f64261cd12b40d603a86f0d5e253dffcac18990a461c601294931a3a87e1d334 |
| 26 |
+DIST gimp-2.9.2.tar.bz2 21370301 SHA256 85bed436b868b2e45ffab48d1bf5743006932770e8cca3322e345aefc000e29e SHA512 5c870a36d62de5fde0c7799dd28b78daca2d349bb7fdbc7b940db89ab00fc025256408b581ba6b4d795d6db9bc25672cf6a45552b22c3eae053ce94a2201fa37 WHIRLPOOL cfa5300659f97c75b7b4f4fbc6f3ad3d03a7c0e97153749d224859b8b618d041f8cbe9232578d720803589d8a48bc7ea9a785294991b626ba7b458512a3d4b2e |
| 27 |
|
| 28 |
diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch |
| 29 |
new file mode 100644 |
| 30 |
index 0000000..441298a |
| 31 |
--- /dev/null |
| 32 |
+++ b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch |
| 33 |
@@ -0,0 +1,50 @@ |
| 34 |
+From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001 |
| 35 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 36 |
+Date: Sat, 5 Dec 2015 01:14:37 +0100 |
| 37 |
+Subject: [PATCH] Do not disable deprecated APIs |
| 38 |
+ |
| 39 |
+--- |
| 40 |
+ configure.ac | 27 --------------------------- |
| 41 |
+ 1 file changed, 27 deletions(-) |
| 42 |
+ |
| 43 |
+diff --git a/configure.ac b/configure.ac |
| 44 |
+index 4de6e53..8528e87 100644 |
| 45 |
+--- a/configure.ac |
| 46 |
++++ b/configure.ac |
| 47 |
+@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;" |
| 48 |
+ AC_SUBST(MIME_TYPES) |
| 49 |
+ |
| 50 |
+ |
| 51 |
+-######################### |
| 52 |
+-# Disable deprecated APIs |
| 53 |
+-######################### |
| 54 |
+- |
| 55 |
+-CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE" |
| 56 |
+- |
| 57 |
+-# Make sure not to disable deprecated APIs for unreleased versions. |
| 58 |
+-# We must build without problems with future releases of libraries |
| 59 |
+-# and disabling deprecated API risks breaking the build |
| 60 |
+- |
| 61 |
+-if test "x$have_glib_2_43" != "xyes"; then |
| 62 |
+- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED" |
| 63 |
+-fi |
| 64 |
+- |
| 65 |
+-if test "x$have_gtk_2_26" != "xyes"; then |
| 66 |
+- CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" |
| 67 |
+-fi |
| 68 |
+- |
| 69 |
+-if test "x$have_gdk_pixbuf_2_31" != "xyes"; then |
| 70 |
+- CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED" |
| 71 |
+-fi |
| 72 |
+- |
| 73 |
+-if test "x$have_pango_1_32" != "xyes"; then |
| 74 |
+- CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED" |
| 75 |
+-fi |
| 76 |
+- |
| 77 |
+- |
| 78 |
+ ############################ |
| 79 |
+ # Require multihead safe API |
| 80 |
+ ############################ |
| 81 |
+-- |
| 82 |
+2.6.3 |
| 83 |
+ |
| 84 |
|
| 85 |
diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch |
| 86 |
new file mode 100644 |
| 87 |
index 0000000..e486144 |
| 88 |
--- /dev/null |
| 89 |
+++ b/media-gfx/gimp/files/gimp-2.9.2-version.patch |
| 90 |
@@ -0,0 +1,28 @@ |
| 91 |
+From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001 |
| 92 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 93 |
+Date: Sat, 5 Dec 2015 01:15:22 +0100 |
| 94 |
+Subject: [PATCH] Sync version string |
| 95 |
+ |
| 96 |
+.. with |
| 97 |
+m4_define([gimp_micro_version], [2]) |
| 98 |
+above |
| 99 |
+--- |
| 100 |
+ configure.ac | 2 +- |
| 101 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 102 |
+ |
| 103 |
+diff --git a/configure.ac b/configure.ac |
| 104 |
+index 8528e87..21d86a3 100644 |
| 105 |
+--- a/configure.ac |
| 106 |
++++ b/configure.ac |
| 107 |
+@@ -20,7 +20,7 @@ m4_define([gimp_binary_age], |
| 108 |
+ [m4_eval(100 * gimp_minor_version + gimp_micro_version)]) |
| 109 |
+ |
| 110 |
+ # For overriding the version string. Comment out if not needed. |
| 111 |
+-# m4_define([gimp_version], [2.9.1]) |
| 112 |
++# m4_define([gimp_version], [2.9.2]) |
| 113 |
+ |
| 114 |
+ # This is the X.Y used in -lgimp-X.Y |
| 115 |
+ m4_define([gimp_api_version], [2.0]) |
| 116 |
+-- |
| 117 |
+2.6.3 |
| 118 |
+ |
| 119 |
|
| 120 |
diff --git a/media-gfx/gimp/gimp-2.9.2.ebuild b/media-gfx/gimp/gimp-2.9.2.ebuild |
| 121 |
new file mode 100644 |
| 122 |
index 0000000..f04722f |
| 123 |
--- /dev/null |
| 124 |
+++ b/media-gfx/gimp/gimp-2.9.2.ebuild |
| 125 |
@@ -0,0 +1,166 @@ |
| 126 |
+# Copyright 1999-2015 Gentoo Foundation |
| 127 |
+# Distributed under the terms of the GNU General Public License v2 |
| 128 |
+# $Id$ |
| 129 |
+ |
| 130 |
+EAPI=5 |
| 131 |
+PYTHON_COMPAT=( python2_7 ) |
| 132 |
+ |
| 133 |
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 |
| 134 |
+ |
| 135 |
+DESCRIPTION="GNU Image Manipulation Program" |
| 136 |
+HOMEPAGE="http://www.gimp.org/" |
| 137 |
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" |
| 138 |
+LICENSE="GPL-3 LGPL-3" |
| 139 |
+SLOT="2" |
| 140 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 141 |
+ |
| 142 |
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" |
| 143 |
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm" |
| 144 |
+ |
| 145 |
+for lang in ${LANGS}; do |
| 146 |
+ IUSE+=" linguas_${lang}" |
| 147 |
+done |
| 148 |
+ |
| 149 |
+RDEPEND=">=dev-libs/glib-2.30.2:2 |
| 150 |
+ >=dev-libs/atk-2.2.0 |
| 151 |
+ >=x11-libs/gtk+-2.24.10:2 |
| 152 |
+ dev-util/gtk-update-icon-cache |
| 153 |
+ >=x11-libs/gdk-pixbuf-2.31:2 |
| 154 |
+ >=x11-libs/cairo-1.12.2 |
| 155 |
+ >=x11-libs/pango-1.29.4 |
| 156 |
+ xpm? ( x11-libs/libXpm ) |
| 157 |
+ >=media-libs/freetype-2.1.7 |
| 158 |
+ >=media-libs/harfbuzz-0.9.19 |
| 159 |
+ >=media-libs/gexiv2-0.6.1 |
| 160 |
+ >=media-libs/fontconfig-2.2.0 |
| 161 |
+ sys-libs/zlib |
| 162 |
+ dev-libs/libxml2 |
| 163 |
+ dev-libs/libxslt |
| 164 |
+ x11-themes/hicolor-icon-theme |
| 165 |
+ >=media-libs/babl-0.1.14 |
| 166 |
+ >=media-libs/gegl-0.3.4:0.3 |
| 167 |
+ >=dev-libs/glib-2.43 |
| 168 |
+ aalib? ( media-libs/aalib ) |
| 169 |
+ alsa? ( media-libs/alsa-lib ) |
| 170 |
+ aqua? ( x11-libs/gtk-mac-integration ) |
| 171 |
+ dev-util/gdbus-codegen |
| 172 |
+ gnome? ( gnome-base/gvfs ) |
| 173 |
+ webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) |
| 174 |
+ virtual/jpeg:0 |
| 175 |
+ jpeg2k? ( media-libs/jasper ) |
| 176 |
+ >=media-libs/lcms-2.2:2 |
| 177 |
+ mng? ( media-libs/libmng ) |
| 178 |
+ openexr? ( >=media-libs/openexr-1.6.1 ) |
| 179 |
+ pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 ) |
| 180 |
+ >=media-libs/libpng-1.2.37:0 |
| 181 |
+ python? ( |
| 182 |
+ ${PYTHON_DEPS} |
| 183 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 184 |
+ ) |
| 185 |
+ tiff? ( >=media-libs/tiff-3.5.7:0 ) |
| 186 |
+ svg? ( >=gnome-base/librsvg-2.36.0:2 ) |
| 187 |
+ wmf? ( >=media-libs/libwmf-0.2.8 ) |
| 188 |
+ x11-libs/libXcursor |
| 189 |
+ sys-libs/zlib |
| 190 |
+ app-arch/bzip2 |
| 191 |
+ >=app-arch/xz-utils-5.0.0 |
| 192 |
+ postscript? ( app-text/ghostscript-gpl ) |
| 193 |
+ udev? ( virtual/libgudev:= )" |
| 194 |
+DEPEND="${RDEPEND} |
| 195 |
+ sys-apps/findutils |
| 196 |
+ virtual/pkgconfig |
| 197 |
+ >=dev-util/intltool-0.40.1 |
| 198 |
+ >=sys-devel/gettext-0.19 |
| 199 |
+ doc? ( >=dev-util/gtk-doc-1 ) |
| 200 |
+ >=sys-devel/libtool-2.2 |
| 201 |
+ >=sys-devel/automake-1.11 |
| 202 |
+ dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) |
| 203 |
+ |
| 204 |
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*" |
| 205 |
+ |
| 206 |
+S="${WORKDIR}"/${P} |
| 207 |
+ |
| 208 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 209 |
+ |
| 210 |
+pkg_setup() { |
| 211 |
+ G2CONF="--enable-default-binary \ |
| 212 |
+ --disable-silent-rules \ |
| 213 |
+ $(use_with !aqua x) \ |
| 214 |
+ --without-libmypaint \ |
| 215 |
+ $(use_with aalib aa) \ |
| 216 |
+ $(use_with alsa) \ |
| 217 |
+ $(use_enable altivec) \ |
| 218 |
+ $(use_with webkit) \ |
| 219 |
+ $(use_with jpeg2k libjasper) \ |
| 220 |
+ $(use_with postscript gs) \ |
| 221 |
+ $(use_enable cpu_flags_x86_mmx mmx) \ |
| 222 |
+ $(use_with mng libmng) \ |
| 223 |
+ $(use_with openexr) \ |
| 224 |
+ $(use_with pdf poppler) \ |
| 225 |
+ $(use_enable python) \ |
| 226 |
+ $(use_enable smp mp) \ |
| 227 |
+ $(use_enable cpu_flags_x86_sse sse) \ |
| 228 |
+ $(use_with svg librsvg) \ |
| 229 |
+ $(use_with tiff libtiff) \ |
| 230 |
+ $(use_with udev gudev) \ |
| 231 |
+ $(use_with wmf) \ |
| 232 |
+ --with-xmc \ |
| 233 |
+ $(use_with xpm libxpm) \ |
| 234 |
+ --without-xvfb-run" |
| 235 |
+ |
| 236 |
+ if use python; then |
| 237 |
+ python-single-r1_pkg_setup |
| 238 |
+ fi |
| 239 |
+} |
| 240 |
+ |
| 241 |
+src_prepare() { |
| 242 |
+ epatch "${FILESDIR}"/${PN}-2.9.2-version.patch |
| 243 |
+ epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch # bug 395695, comment 9 and 16 |
| 244 |
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 |
| 245 |
+ eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too |
| 246 |
+ |
| 247 |
+ gnome2_src_prepare |
| 248 |
+} |
| 249 |
+ |
| 250 |
+_clean_up_locales() { |
| 251 |
+ einfo "Cleaning up locales..." |
| 252 |
+ for lang in ${LANGS}; do |
| 253 |
+ use "linguas_${lang}" && { |
| 254 |
+ einfo "- keeping ${lang}" |
| 255 |
+ continue |
| 256 |
+ } |
| 257 |
+ rm -Rf "${ED}"/usr/share/locale/"${lang}" || die |
| 258 |
+ done |
| 259 |
+} |
| 260 |
+ |
| 261 |
+src_test() { |
| 262 |
+ Xemake check |
| 263 |
+} |
| 264 |
+ |
| 265 |
+src_install() { |
| 266 |
+ gnome2_src_install |
| 267 |
+ |
| 268 |
+ if use python; then |
| 269 |
+ python_optimize |
| 270 |
+ fi |
| 271 |
+ |
| 272 |
+ # Workaround for bug #321111 to give GIMP the least |
| 273 |
+ # precedence on PDF documents by default |
| 274 |
+ mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die |
| 275 |
+ |
| 276 |
+ prune_libtool_files --all |
| 277 |
+ |
| 278 |
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) |
| 279 |
+ local gimp_app_version=$(get_version_component_range 1-2) |
| 280 |
+ mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die |
| 281 |
+ |
| 282 |
+ _clean_up_locales |
| 283 |
+} |
| 284 |
+ |
| 285 |
+pkg_postinst() { |
| 286 |
+ gnome2_pkg_postinst |
| 287 |
+} |
| 288 |
+ |
| 289 |
+pkg_postrm() { |
| 290 |
+ gnome2_pkg_postrm |
| 291 |
+} |
Archives