[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/
commit: 6aeb488eeb991c598145185cfeff409554509dc3
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Mar 5 19:17:57 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Mar 5 19:18:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aeb488e
dev-tcltk/tkimg: drop 1.4.14-r2
Closes: https://bugs.gentoo.org/920481
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tkimg/Manifest | 1 -
dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 74 ---
dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild | 119 -
3 files changed, 194 deletions(-)
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 7391afe1f2f9..5f8bd763509d 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,4 +1,3 @@
-DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B
f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d
SHA512
41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a082bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B
b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e
SHA512
f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978
DIST Img-1.4.16-Source.tar.gz 12129708 BLAKE2B
5da76a42a1643d759d765ade01a8a9e9782cba21d30f5ec95693364d80aca32fa54f610081833d44bf5723e6901d7577e93bd4d4285880e855e835ae6a901f4b
SHA512
622549749d41c7c026053cf82b4c434602ff541b9ee7f6f15c2450fcf3cfb34eb8277432267c78adc3dcc60e53fa2d84b7cf98c5fd5a6c3cfbcf0f60746cd227
DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B
8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6
SHA512
8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
deleted file mode 100644
index 9b889315efb3..
--- a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
+++ /dev/null
@@ -1,74 +0,0 @@
a/libtiff/tifftclDecls.h 2023-03-14 18:53:43.978820056 +0100
-+++ b/libtiff/tifftclDecls.h 2023-03-14 18:54:32.583047764 +0100
-@@ -169,10 +169,10 @@
- TIFFTCLAPI intTIFFReadRGBATile(TIFF *tiffptr, uint32_t a,
- uint32_t b, uint32_t *c);
- /* 57 */
--TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char *a);
-+TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char a[1024]);
- /* 58 */
- TIFFTCLAPI intTIFFRGBAImageBegin(TIFFRGBAImage *a, TIFF
*tiffptr,
-- int b, char *c);
-+ int b, char c[1024]);
- /* 59 */
- TIFFTCLAPI intTIFFRGBAImageGet(TIFFRGBAImage *d, uint32_t *c,
- uint32_t b, uint32_t a);
a/tiff/tiffZip.c 2023-03-14 19:04:42.869354563 +0100
-+++ b/tiff/tiffZip.c 2023-03-14 19:05:14.768849607 +0100
-@@ -22,6 +22,7 @@
- * OF THIS SOFTWARE.
- */
-
-+#include
- #include "tiffInt.h"
-
- /*
-@@ -233,7 +234,7 @@
- we need to simplify this code to reflect a ZLib that is likely
updated
- to deal with 8byte memory sizes, though this code will respond
- appropriately even before we simplify it */
-- sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
-+ sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
- return (deflateReset(>stream) == Z_OK);
- }
-
a/tiff/tiffPixar.c 2023-03-14 20:52:33.865532115 +0100
-+++ b/tiff/tiffPixar.c 2023-03-14 20:54:14.606973646 +0100
-@@ -592,8 +592,8 @@
- #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
- #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
-
--static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
--static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
-+static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
-+static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
-
- #define PIXARLOGDATAFMT_UNKNOWN -1
-
-@@ -747,7 +747,7 @@
- }
-
- static int
--PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
-+PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
- {
- static const char module[] = "PixarLogDecode";
- TIFFDirectory *td = >tif_dir;
-@@ -,7 +,7 @@
- * Encode a chunk of pixels.
- */
- static int
--PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
-+PixarLogEncode(TIFF* tif, uint8_t *bp,
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/
commit: 2f0b759b1aa4bcea8226682f257cf77625db2667
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Mar 16 07:45:09 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Mar 16 07:45:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0b759b
dev-tcltk/tkimg: fix line endings
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 98 +-
dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild | 2 +
2 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
index 6f9e575db2ac..9b889315efb3 100644
--- a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
@@ -16,59 +16,59 @@
--- a/tiff/tiffZip.c 2023-03-14 19:04:42.869354563 +0100
+++ b/tiff/tiffZip.c 2023-03-14 19:05:14.768849607 +0100
@@ -22,6 +22,7 @@
- * OF THIS SOFTWARE.
- */
-
-+#include
- #include "tiffInt.h"
-
- /*
+ * OF THIS SOFTWARE.
+ */
+
++#include
+ #include "tiffInt.h"
+
+ /*
@@ -233,7 +234,7 @@
- we need to simplify this code to reflect a ZLib that is likely
updated
- to deal with 8byte memory sizes, though this code will respond
- appropriately even before we simplify it */
-- sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
-+ sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
- return (deflateReset(>stream) == Z_OK);
- }
-
+ we need to simplify this code to reflect a ZLib that is likely
updated
+ to deal with 8byte memory sizes, though this code will respond
+ appropriately even before we simplify it */
+- sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
++ sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
+ return (deflateReset(>stream) == Z_OK);
+ }
+
--- a/tiff/tiffPixar.c 2023-03-14 20:52:33.865532115 +0100
+++ b/tiff/tiffPixar.c 2023-03-14 20:54:14.606973646 +0100
@@ -592,8 +592,8 @@
- #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
- #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
-
--static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
--static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
-+static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
-+static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
-
- #define PIXARLOGDATAFMT_UNKNOWN -1
-
+ #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
+ #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
+
+-static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
+-static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
++static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
++static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
+
+ #define PIXARLOGDATAFMT_UNKNOWN -1
+
@@ -747,7 +747,7 @@
- }
-
- static int
--PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
-+PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
- {
- static const char module[] = "PixarLogDecode";
- TIFFDirectory *td = >tif_dir;
+ }
+
+ static int
+-PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
++PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
+ {
+ static const char module[] = "PixarLogDecode";
+ TIFFDirectory *td = >tif_dir;
@@ -,7 +,7 @@
- * Encode a chunk of pixels.
- */
- static int
--PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
-+PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)
- {
- static const char module[] = "PixarLogEncode";
- TIFFDirectory *td = >tif_dir;
+ * Encode a chunk of pixels.
+ */
+ static int
+-PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
++PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)
+ {
+ static const char module[] = "PixarLogEncode";
+ TIFFDirectory *td = >tif_dir;
@@ -1411,7 +1411,7 @@
- /*
-* Allocate state block so tag methods have storage to record values.
-*/
-- tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));
-+ tif->tif_data = (uint8_t *) TkimgTIFFmalloc(sizeof (PixarLogState));
- if (tif->tif_data == NULL)
- goto bad;
- sp = (PixarLogState*) tif->tif_data;
+ /*
+* Allocate state block so tag methods have storage to record values.
+*/
+- tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));
++ tif->tif_data =
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/
commit: 38f7fe2ccd1202077ddc49cb4de13f77a42f80f1
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Mar 14 20:29:02 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Mar 14 20:29:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f7fe2c
dev-tcltk/tkimg: fix gcc13 compilation
Closes: https://bugs.gentoo.org/895822
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 74 ++
...img-1.4.14-r1.ebuild => tkimg-1.4.14-r2.ebuild} | 17 -
2 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
new file mode 100644
index ..6f9e575db2ac
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
@@ -0,0 +1,74 @@
+--- a/libtiff/tifftclDecls.h 2023-03-14 18:53:43.978820056 +0100
b/libtiff/tifftclDecls.h 2023-03-14 18:54:32.583047764 +0100
+@@ -169,10 +169,10 @@
+ TIFFTCLAPI intTIFFReadRGBATile(TIFF *tiffptr, uint32_t a,
+ uint32_t b, uint32_t *c);
+ /* 57 */
+-TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char *a);
++TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char a[1024]);
+ /* 58 */
+ TIFFTCLAPI intTIFFRGBAImageBegin(TIFFRGBAImage *a, TIFF
*tiffptr,
+- int b, char *c);
++ int b, char c[1024]);
+ /* 59 */
+ TIFFTCLAPI intTIFFRGBAImageGet(TIFFRGBAImage *d, uint32_t *c,
+ uint32_t b, uint32_t a);
+--- a/tiff/tiffZip.c 2023-03-14 19:04:42.869354563 +0100
b/tiff/tiffZip.c 2023-03-14 19:05:14.768849607 +0100
+@@ -22,6 +22,7 @@
+ * OF THIS SOFTWARE.
+ */
+
++#include
+ #include "tiffInt.h"
+
+ /*
+@@ -233,7 +234,7 @@
+ we need to simplify this code to reflect a ZLib that is likely
updated
+ to deal with 8byte memory sizes, though this code will respond
+ appropriately even before we simplify it */
+- sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
++ sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ?
(uInt)tif->tif_rawdatasize : 0xU;
+ return (deflateReset(>stream) == Z_OK);
+ }
+
+--- a/tiff/tiffPixar.c 2023-03-14 20:52:33.865532115 +0100
b/tiff/tiffPixar.c 2023-03-14 20:54:14.606973646 +0100
+@@ -592,8 +592,8 @@
+ #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
+ #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
+
+-static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
+-static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
++static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
++static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
+
+ #define PIXARLOGDATAFMT_UNKNOWN -1
+
+@@ -747,7 +747,7 @@
+ }
+
+ static int
+-PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
++PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
+ {
+ static const char module[] = "PixarLogDecode";
+ TIFFDirectory *td = >tif_dir;
+@@ -,7 +,7 @@
+ * Encode a chunk of pixels.
+ */
+ static int
+-PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
++PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)
+ {
+ static const char module[] = "PixarLogEncode";
+ TIFFDirectory *td = >tif_dir;
+@@ -1411,7 +1411,7 @@
+ /*
+* Allocate state block so tag methods have storage to record values.
+*/
+- tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));
++ tif->tif_data = (uint8_t *) TkimgTIFFmalloc(sizeof (PixarLogState));
+ if (tif->tif_data == NULL)
+ goto bad;
+ sp = (PixarLogState*) tif->tif_data;
diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
similarity index 89%
rename from dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
rename to dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
index c92ed64bf558..904cc6621894 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
@@ -35,7 +35,10 @@ RESTRICT="!test? ( test )"
S="${WORKDIR}/${MYP}"
-PATCHES=( "${WORKDIR}"/patchset-1 )
+PATCHES=(
+ "${WORKDIR}"/patchset-1
+ "${FILESDIR}"/${P}-gcc11.patch
+)
QA_CONFIG_IMPL_DECL_SKIP=(
stat64 # used to test for Large File Support
@@ -50,6 +53,9 @@ src_prepare() {
libpng/pngtclDecls.h \
libtiff/tifftclDecls.h
+ # libtiff unbundle is problematic
+ rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
+
default
echo "unknown" > manifest.uuid || die
@@ -69,6 +75,15 @@ src_prepare() {
tc-export AR
}
+src_configure() {
+
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/
commit: 4204f6e8cd2485fa224b25bd2be8182f578608b9
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Feb 17 19:38:52 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Feb 17 19:38:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4204f6e8
dev-tcltk/tkimg: fix test when not installed
Closes: https://bugs.gentoo.org/804106
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch | 11 +++
dev-tcltk/tkimg/tkimg-1.4.13.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
new file mode 100644
index ..840e013b6915
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in 2022-02-17 20:34:02.134144390 +0100
b/Makefile.in 2022-02-17 20:32:31.957625786 +0100
+@@ -109,7 +109,7 @@
+ do \
+ here=`pwd` && \
+ cd $$sub && \
+- $(MAKE) top_builddir=$$here test || exit $$? && \
++ $(MAKE) top_builddir=$$here libdir=.. test || exit $$? && \
+ cd $$here ; \
+ done
+
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
index feba8d5b635d..1c8ec49d4031 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,6 +37,7 @@ S="${WORKDIR}/Img-${PV}"
PATCHES=(
"${WORKDIR}"/patchset-1
+ "${FILESDIR}"/${P}-test.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/
commit: 5f4b367799f0fc945ff6399b985755088abe02b4
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Apr 13 18:23:49 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Apr 13 18:23:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4b3677
dev-tcltk/tkimg: build with fno-common
Closes: https://bugs.gentoo.org/706838
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch | 11 +++
dev-tcltk/tkimg/tkimg-1.4.9.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
new file mode 100644
index 000..307dfe31437
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/libpng/pngtclDecls.h 2020-04-13 20:16:18.542559383 +0200
b/libpng/pngtclDecls.h 2020-04-13 20:16:33.921314336 +0200
+@@ -1369,6 +1369,8 @@
+
+ #ifdef __cplusplus
+ extern "C" {
++#else
++extern
+ #endif
+ PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
+ #ifdef __cplusplus
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index d2c7d256208..e5bccdee84c 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,6 +42,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-1.4.7-png.patch
"${WORKDIR}"/${PN}-1.4.7-tiff.patch
"${FILESDIR}"/${PN}-1.4-jpeg-9.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/
commit: d44b99f7d815de683b403b10707917fcb4799dc7
Author: Tupone Alfredo gentoo org>
AuthorDate: Sun Dec 15 21:33:01 2019 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Dec 15 21:33:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44b99f7
dev-tcltk/tkimg: remove old versions
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tkimg/Manifest | 2 -
dev-tcltk/tkimg/files/tkimg-1.4-png2.patch | 36
dev-tcltk/tkimg/tkimg-1.4-r9.ebuild| 90 --
3 files changed, 128 deletions(-)
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index e5443095dbe..83f12e9da11 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,5 +1,3 @@
DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
SHA512
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B
48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595
SHA512
6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
-DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B
f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3
SHA512
bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
SHA512
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-DIST tkimg1.4.tar.bz2 4912894 BLAKE2B
630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a
SHA512
b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
b/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
deleted file mode 100644
index 195e9be43fa..000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
png/png.c.orig 2010-06-17 06:40:24.0 -0700
-+++ png/png.c 2013-04-23 20:57:32.0 -0700
-@@ -332,6 +332,16 @@
- png_set_expand(png_ptr);
- }
-
-+if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, )) {
-+ png_set_sRGB(png_ptr, info_ptr, intent);
-+} else if (png_get_gAMA) {
-+ double gamma;
-+ if (!png_get_gAMA(png_ptr, info_ptr, )) {
-+ gamma = 0.45455;
-+ }
-+ png_set_gamma(png_ptr, 1.0, gamma);
-+}
-+
- png_read_update_info(png_ptr,info_ptr);
- block.pixelSize = png_get_channels(png_ptr, info_ptr);
- block.pitch = png_get_rowbytes(png_ptr, info_ptr);
-@@ -353,16 +363,6 @@
- block.offset[3] = 0;
- }
-
--if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, )) {
-- png_set_sRGB(png_ptr, info_ptr, intent);
--} else if (png_get_gAMA) {
-- double gamma;
-- if (!png_get_gAMA(png_ptr, info_ptr, )) {
-- gamma = 0.45455;
-- }
-- png_set_gamma(png_ptr, 1.0, gamma);
--}
--
- png_data= (char **) ckalloc(sizeof(char *) * info_height +
- info_height * block.pitch);
-
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
deleted file mode 100644
index 155c4483e32..000
--- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib prefix toolchain-funcs virtualx
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/;
-SRC_URI="
- https://dev.gentoo.org/~jlec/distfiles/${P}-patchset-1.tar.xz
- mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test static-libs"
-
-RDEPEND="
- dev-lang/tk:=
- >=dev-tcltk/tcllib-1.11
- media-libs/tiff:0=
- >=media-libs/libpng-1.6:0=
- >=sys-libs/zlib-1.2.7:=
- x11-libs/libX11
- virtual/jpeg:="
-DEPEND="${RDEPEND}
- test? (
- x11-apps/xhost
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )"
-
-# Fails with jpeg-turbo silently, #386253
-#RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/
commit: 380691910358a36cb69a08221b55caa89a1bffc5 Author: Tupone Alfredo gentoo org> AuthorDate: Tue Oct 2 17:02:30 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Oct 2 17:02:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38069191 dev-tcltk/tkimg: Version bump to 1.4.7 Closes: https://bugs.gentoo.org/504968 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-tcltk/tkimg/Manifest | 1 + dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch| 18 + dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch | 63 ++ dev-tcltk/tkimg/files/tkimg-1.4.7-png.patch | 80 +++ dev-tcltk/tkimg/files/tkimg-1.4.7-tclconfig.patch | 39 ++ dev-tcltk/tkimg/files/tkimg-1.4.7-tiff.patch | 806 ++ dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch | 90 +++ dev-tcltk/tkimg/tkimg-1.4.7.ebuild| 88 +++ 8 files changed, 1185 insertions(+) diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index a1285ebbc33..1e2e1025891 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,2 +1,3 @@ +DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69 DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1 diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch new file mode 100644 index 000..23000ac7922 --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch @@ -0,0 +1,18 @@ +Fix build with jpeg-9, bug #520886 + +--- a/jpeg/jpeg.c 2010-06-17 15:40:24.0 +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/files/tkimg-1.4.7-jpeg.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch new file mode 100644 index 000..969b953a19a --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch @@ -0,0 +1,63 @@ + libjpeg/Makefile.in| 2 +- + libjpeg/configure.in | 19 --- + libjpeg/jpegtclDecls.h | 4 ++-- + 4 files changed, 4 insertions(+), 39 deletions(-) + +diff --git a/libjpeg/Makefile.in b/libjpeg/Makefile.in +index cf2aca8..2d937b1 100644 +--- a/libjpeg/Makefile.in b/libjpeg/Makefile.in +@@ -107,7 +107,7 @@ RANLIB = @RANLIB@ + RANLIB_STUB = @RANLIB_STUB@ + SHLIB_CFLAGS = @SHLIB_CFLAGS@ + SHLIB_LD = @SHLIB_LD@ +-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ ++SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ljpeg + STLIB_LD = @STLIB_LD@ + TCL_DEFS = @TCL_DEFS@ + TCL_BIN_DIR = @TCL_BIN_DIR@ +diff --git a/libjpeg/configure.in b/libjpeg/configure.in +index 378806d..327e2bd 100644 +--- a/libjpeg/configure.in b/libjpeg/configure.in +@@ -54,25 +54,6 @@ JPEG_CC=$CC + + TEA_ADD_SOURCES([jpegtcl.c jpegtclStubInit.c]) + +-TEA_ADD_SOURCES([ +- ../compat/libjpeg/jcapimin.c../compat/libjpeg/jcapistd.c ../compat/libjpeg/jccoefct.c +- ../compat/libjpeg/jccolor.c ../compat/libjpeg/jcdctmgr.c ../compat/libjpeg/jchuff.c +- ../compat/libjpeg/jcinit.c ../compat/libjpeg/jcmainct.c ../compat/libjpeg/jcmarker.c +- ../compat/libjpeg/jcmaster.c../compat/libjpeg/jcomapi.c ../compat/libjpeg/jcparam.c +- ../compat/libjpeg/jcarith.c ../compat/libjpeg/jcprepct.c ../compat/libjpeg/jcsample.c +- ../compat/libjpeg/jctrans.c ../compat/libjpeg/jdapimin.c ../compat/libjpeg/jdapistd.c +- ../compat/libjpeg/jdatadst.c../compat/libjpeg/jdatasrc.c ../compat/libjpeg/jdcoefct.c +- ../compat/libjpeg/jdcolor.c ../compat/libjpeg/jddctmgr.c ../compat/libjpeg/jdhuff.c +- ../compat/libjpeg/jdinput.c ../compat/libjpeg/jdmainct.c ../compat/libjpeg/jdmarker.c +- ../compat/libjpeg/jdmaster.c../compat/libjpeg/jdmerge.c ../compat/libjpeg/jdarith.c +- ../compat/libjpeg/jdpostct.c../compat/libjpeg/jdsample.c ../compat/libjpeg/jdtrans.c +-
