diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
| commit | f78108598211053d41752a83e0345441bb9014ae (patch) | |
| tree | dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /dev-tcltk/tkimg | |
| parent | dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff) | |
gentoo resync : 11.02.2018
Diffstat (limited to 'dev-tcltk/tkimg')
| -rw-r--r-- | dev-tcltk/tkimg/Manifest | 3 | ||||
| -rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch | 18 | ||||
| -rw-r--r-- | dev-tcltk/tkimg/tkimg-1.4-r9.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index 67546bc145b2..a4912066dee0 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,5 +1,6 @@ +AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9 AUX tkimg-1.4-png2.patch 1044 BLAKE2B 236e5fa637b4b1cc6c74dd85d4fe73520941af360873b0455ab146c443d844470d6afb67071976cd1850a79e0906b7374947d2c802c8ba85f83682c6ae0f77a5 SHA512 fbf982af5446fc54212745eee8338d5dc4b169f79045963be23a84c7a0ef9e68f54d895156b4f040f6585499f1ead9967ac0ce57106e3ca3615fbaa9adcd1fb7 DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69 DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1 -EBUILD tkimg-1.4-r9.ebuild 1806 BLAKE2B 562d662637a24bf1091cc1efd4b46707e1339b9b4e4a5dcab0c258e8b37bda2e1b881c2ba20e4bcdceaa53b4caf73e3222fc084503b959d57f9df2b87c0155f1 SHA512 1dbbd2a6c0f924efd4351fdbdf1791d61adaa720b81892367ab5efd9b3c33a83f0891013751914cf0a8d8690ef958ee2bae9e3be375dd35c4cb82c700be2e710 +EBUILD tkimg-1.4-r9.ebuild 1842 BLAKE2B 470dcd82e9d64a0e809c39679ce8fa602f14d085eba6a665fbb112f0810a216378688a5fdec79e8bd16a6a06f4fa0a6efdac8e6742aa90449e2d674c38debc9d SHA512 35c3e79accf91eb48d577eb019c65125ca4ced5add2c2130599b3d92a8f4970ad1238df0dcf6cc22dadadb51d624338515933a522918b0b3cd1cd39e1f8d1e89 MISC metadata.xml 436 BLAKE2B 264c09c99797be5f1a242a1146d8552ab4cf632ad404d950829d102b2f3f8a40c5542ff04e9770a4870153843e462298af802e6caaff9e5bbb37abdb32697155 SHA512 d0401ca91110d4ffb90190d7135d3a5e6ef1aa0d3106cd7a84e72e64f3f565ee2ef30ac19aa2f119838a50d9c926132b93f2723a763d25b819db42fc57c16adf diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch new file mode 100644 index 000000000000..23000ac7922c --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch @@ -0,0 +1,18 @@ +Fix build with jpeg-9, bug #520886 + +--- a/jpeg/jpeg.c 2010-06-17 15:40:24.000000000 +0200 ++++ b/jpeg/jpeg.c 2018-02-07 23:26:38.050073397 +0100 +@@ -53,6 +53,13 @@ + */ + + #include "tkimg.h" ++#ifndef FALSE ++#define FALSE 0 ++#endif ++#ifndef TRUE ++#define TRUE 1 ++#endif ++#define HAVE_BOOLEAN + #include "jpegtcl.h" + + static int SetupJPegLibrary(Tcl_Interp *interp); diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild index 9b621a465ef7..155c4483e327 100644 --- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild +++ b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -40,6 +40,7 @@ S="${WORKDIR}/${MYP}" src_prepare() { epatch \ "${WORKDIR}"/${P}-jpeg.patch \ + "${FILESDIR}"/${P}-jpeg-9.patch \ "${WORKDIR}"/${P}-tiff.patch \ "${WORKDIR}"/${P}-png.patch \ "${FILESDIR}"/${P}-png2.patch \ |