mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-02-20 18:15:49 +01:00
Removed old/not working ebuilds
This commit is contained in:
root
@@ -1,194 +0,0 @@
|
||||
# ChangeLog for media-libs/gdk-pixbuf
|
||||
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/ChangeLog,v 1.44 2006/10/16 23:23:31 blubb Exp $
|
||||
|
||||
16 Oct 2006; Simon Stelling <blubb@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r5.ebuild:
|
||||
don't let the build system decide whether we use mmx or not
|
||||
|
||||
20 Nov 2005; Hardave Riar <hardave@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r5.ebuild:
|
||||
Stable on mips, bug #112608.
|
||||
|
||||
*gdk-pixbuf-0.22.0-r5 (15 Nov 2005)
|
||||
|
||||
15 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
|
||||
files/gdk-pixbuf-0.22.0-loaders.patch, +gdk-pixbuf-0.22.0-r5.ebuild:
|
||||
Modified patch to fix a few more probems with the XPM loader (bug #112608).
|
||||
Revision bump to propagate the changes, and marked stable on all arches that
|
||||
reported back successful testing.
|
||||
|
||||
29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
|
||||
Change encoding to UTF-8 for GLEP 31 compliance
|
||||
|
||||
17 Oct 2004; Hardave Riar <hardave@gentoo.org> gdk-pixbuf-0.22.0-r3.ebuild:
|
||||
Stable on mips, bug #64230.
|
||||
|
||||
09 Oct 2004; Tom Gall <tgall@gentoo.org> gdk-pixbuf-0.22.0-r3.ebuild:
|
||||
stable on ppc64, bug #64230
|
||||
|
||||
06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r3.ebuild:
|
||||
get_libdir fixes.
|
||||
|
||||
20 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r3.ebuild:
|
||||
Stable on alpha, bug 64240.
|
||||
|
||||
20 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r3.ebuild:
|
||||
Stable on sparc wrt #64230
|
||||
|
||||
*gdk-pixbuf-0.22.0-r3 (20 Sep 2004)
|
||||
|
||||
20 Sep 2004; foser <foser@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
|
||||
Add security fixes (#64230)
|
||||
|
||||
18 Aug 2004; Aron Griffis <agriffis@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
|
||||
stable on alpha
|
||||
|
||||
29 Jul 2004; Tom Gall <tgall@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
|
||||
stable on ppc64, bug #55676
|
||||
|
||||
14 Apr 2004; Stephen P. Becker <geoman@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r2.ebuild:
|
||||
Marked stable on mips.
|
||||
|
||||
23 Mar 2004; Jon Portnoy <avenj@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r2.ebuild :
|
||||
Fix amd64/!amd64 DEPEND construct.
|
||||
|
||||
13 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r2.ebuild:
|
||||
Added gnuconfig_update for mipslinux systems, and added ~mips keyword.
|
||||
|
||||
04 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
|
||||
gdk-pixbuf-0.22.0-r2.ebuild:
|
||||
stable on sparc
|
||||
|
||||
09 Jan 2004; <agriffis@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
|
||||
stable on ia64
|
||||
|
||||
*gdk-pixbuf-0.22.0-r1 (15 Sep 2003)
|
||||
|
||||
15 Sep 2003; Mike Gardiner <obz@gentoo.org> gdk-pixbuf-0.18.0-r1.ebuild,
|
||||
gdk-pixbuf-0.22.0-r1.ebuild:
|
||||
Removed older versions, but keeping keywords consistency
|
||||
|
||||
15 Sep 2003; Mike Gardiner <obz@gentoo.org> gdk-pixbuf-0.22.0.ebuild,
|
||||
metadata.xml:
|
||||
Marked stable on x86, and added metadata.xml
|
||||
|
||||
*gdk-pixbuf-0.22.0-r2 (18 Aug 2003)
|
||||
|
||||
18 Aug 2003; <spider@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
|
||||
support for USE="mmx" flag (thanks to Serge Matveev <serge@matveev.spb.ru>)
|
||||
|
||||
13 Aug 2003; <spider@gentoo.org> :
|
||||
added a db-1 dependency (copied from gnome-libs) to get specifics.
|
||||
|
||||
04 Feb 2003; Aron Griffis <agriffis@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
|
||||
Mark stable on alpha
|
||||
|
||||
*gdk-pixbuf-0.22.0 (22 Dec 2002)
|
||||
|
||||
04 Jul 2003; Guy Martin <gmsoft@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
|
||||
Added hppa to KEYWORDS.
|
||||
|
||||
22 Dec 2002; foser <foser@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
|
||||
New version, removed obsolete unpack hack
|
||||
|
||||
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
|
||||
|
||||
*gdk-pixbuf-0.21.0 (07 Nov 2002)
|
||||
|
||||
08 Apr 2003; Todd Sunderlin <todd@gentoo.org> gdk-pixbuf-0.21.0.ebuild:
|
||||
Marked stable for sparc.
|
||||
|
||||
07 Nov 2002; foser <foser@gentoo.org> gdk-pixbuf-0.21.0.ebuild :
|
||||
New version, fixed some deps added doc USE
|
||||
|
||||
*gdk-pixbuf-0.20.0 (01 Oct 2002)
|
||||
|
||||
01 Oct 2002; Spider <spider@gentoo.org> gdk-pixbuf-0.20.0.ebuild : uodated
|
||||
to the latest version, added fixes for the -config script. hopefully
|
||||
this solves the bugs with missing include dirs.
|
||||
|
||||
*gdk-pixbuf-0.18.0-r1 (24 Jun 2002)
|
||||
|
||||
25 Jul 2002; Spider <spider@gentoo.org> :
|
||||
seems this needs db-1.85 or it will fail to build.
|
||||
added dependency. per bug #5382
|
||||
|
||||
24 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
|
||||
|
||||
Convert to use libtool.eclass.
|
||||
|
||||
*gdk-pixbuf-0.18.0 (19 Jun 2002)
|
||||
|
||||
19 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> gdk-pixbuf-0.18.0.ebuild:
|
||||
|
||||
Version bump.
|
||||
|
||||
*gdk-pixbuf-0.17.0 (05 Jun 2002)
|
||||
|
||||
05 Jun 2002; Olivier R. <doctomoe@gentoo.org> gdk-pixbuf-0.17.0.ebuild:
|
||||
|
||||
Added media-libs/imlib as dependency, as it is needed to compile properly.
|
||||
|
||||
*gdk-pixbuf-0.17.0 (20 Apr 2002)
|
||||
|
||||
*gdk-pixbuf-0.16.0-r9 (12 Apr 2002)
|
||||
|
||||
12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gdk-pixbuf-0.16.0-r9.ebuild:
|
||||
|
||||
Updated to depend on the new libpng (which requires that this be recompiled
|
||||
against that).
|
||||
|
||||
*gdk-pixbuf-0.16.0-r8 (8 Apr 2002)
|
||||
|
||||
8 Apr 2002; M.Schlemmer <azarah@gentoo.org> gdk-pixbuf-0.16.0-r8.ebuild :
|
||||
|
||||
Change to use the "virtualx" eclass. Some cleanups.
|
||||
|
||||
3 Apr 2002; M.Schlemmer <azarah@gentoo.org> gdk-pixbuf-0.16.0-r7.ebuild :
|
||||
|
||||
Remove unneeded auto* stuff.
|
||||
|
||||
*gdk-pixbuf-0.16.0-r7 (2 Apr 2002)
|
||||
|
||||
2 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gdk-pixbuf-0.16.0-r7.ebuild :
|
||||
|
||||
For the record: blocke is a sheer genius. His idea was to look at an RPM, so
|
||||
I had a look at Mandrake's src.rpm, and lo! David BAUDENS
|
||||
<baudens@mandrakesoft.com> had a fix for compiling without the display.
|
||||
|
||||
*gdk-pixbuf-0.16.0-r6 (31 Mar 2002)
|
||||
|
||||
31 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gdk-pixbuf-0.16.0-r6.ebuild:
|
||||
|
||||
GNOME support is no longer an option -- it is built-in automatically, because
|
||||
downstream applications tend to expect it in this package.
|
||||
|
||||
*gdk-pixbuf-0.16.0-r5 (16 Mar 2002)
|
||||
|
||||
16 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
|
||||
|
||||
Libtoolize to fix "rebuild" bug.
|
||||
|
||||
17 Feb 2002; M.Schlemmer <azarah@gentoo.org> gdk-pixbuf-0.16.0-r4.ebuild :
|
||||
|
||||
Fix the build to do the libraries in /usr/lib/gdk-pixbuf/loaders/ properly the
|
||||
first time. This is hackish at the moment, but seems to be a upstream
|
||||
problem. This should resolve the need to remerge gdk-pixbuf twice to get
|
||||
mentioned libraries.
|
||||
|
||||
*gdk-pixbuf-0.16.0-r1 (1 Feb 2002)
|
||||
|
||||
1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
|
||||
|
||||
Added initial ChangeLog which should be updated whenever the package is
|
||||
updated in any way. This changelog is targetted to users. This means that the
|
||||
comments should well explained and written in clean English. The details about
|
||||
writing correct changelogs are explained in the skel.ChangeLog file which you
|
||||
can find in the root directory of the portage repository.
|
||||
@@ -1,32 +0,0 @@
|
||||
AUX gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157 RMD160 cbae52afefb9cebfb0fe262c7b1dd1300794a358 SHA1 a4ef059db072707c261275ff2e86ca9a3f30d8ab SHA256 d3196c1666f560997bc5cd5be4787156c64f92dc0fd8dada8ad3c16793b90970
|
||||
MD5 d1fb93f1ae994875158a7e0c108c36f8 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
|
||||
RMD160 cbae52afefb9cebfb0fe262c7b1dd1300794a358 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
|
||||
SHA256 d3196c1666f560997bc5cd5be4787156c64f92dc0fd8dada8ad3c16793b90970 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
|
||||
AUX gdk-pixbuf-0.22.0-bmp_secure.patch 557 RMD160 49e26cd7d4d190a4692bce88d65d8def2a4a6fff SHA1 7b8ceaaf9158af0cefe98a6cc509a1a0ced7d85d SHA256 1bb9330c75e8ceb927620f03717d442185b84602b9ec67bb6940518aabdff5f8
|
||||
MD5 5f59d5772b1482d885a180dbc581cf84 files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
|
||||
RMD160 49e26cd7d4d190a4692bce88d65d8def2a4a6fff files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
|
||||
SHA256 1bb9330c75e8ceb927620f03717d442185b84602b9ec67bb6940518aabdff5f8 files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
|
||||
AUX gdk-pixbuf-0.22.0-loaders.patch 3589 RMD160 8aa0bd1f88ce8f50d1ec2a396e4f88fc3a42e4e4 SHA1 79ad22e48da40652aa9d06cb3350beffa4f20094 SHA256 310824874429c26b277c985b218e133ded4e94c51de389979875de38ddb57400
|
||||
MD5 3cf31ae0509747f72ac27a9fd96109c2 files/gdk-pixbuf-0.22.0-loaders.patch 3589
|
||||
RMD160 8aa0bd1f88ce8f50d1ec2a396e4f88fc3a42e4e4 files/gdk-pixbuf-0.22.0-loaders.patch 3589
|
||||
SHA256 310824874429c26b277c985b218e133ded4e94c51de389979875de38ddb57400 files/gdk-pixbuf-0.22.0-loaders.patch 3589
|
||||
AUX gdk-pixbuf-0.22.0-m4.patch 276 RMD160 35bf793c8eb8f3555505c7abf42822bc165da06f SHA1 3082b4fefdd4b2deadc3f77e85e7bcd95f0b83e5 SHA256 4a62476624319a09c000d01d45689167ea5cf1665e4c7e988032ffff11920132
|
||||
MD5 3edfa9fe9382fd8206d6238ec121a5af files/gdk-pixbuf-0.22.0-m4.patch 276
|
||||
RMD160 35bf793c8eb8f3555505c7abf42822bc165da06f files/gdk-pixbuf-0.22.0-m4.patch 276
|
||||
SHA256 4a62476624319a09c000d01d45689167ea5cf1665e4c7e988032ffff11920132 files/gdk-pixbuf-0.22.0-m4.patch 276
|
||||
DIST gdk-pixbuf-0.22.0.tar.bz2 398208 RMD160 0e56a0f883fd8e3fb4d49b9a38f984b95cd96ece SHA1 495324afb5abebc14567ffd5a6cd72333bcc7f5b SHA256 411f2a1c27c3afadc5d034f2213d9f6c3a37f564eb5989cf6e8a53729280ae22
|
||||
EBUILD gdk-pixbuf-0.22.0-r5.ebuild 1655 RMD160 49dbc10d6a405ac6aa33a28054459377f5763c85 SHA1 9f7562caf696ad9c4fba10d31334bef95c788829 SHA256 369645a93ad50f35bfa47463bfa2a8c357ad327cb3d4754b006bf9deb7c27368
|
||||
MD5 83c0e1e114933c83fec0959ef9f62a0c gdk-pixbuf-0.22.0-r5.ebuild 1655
|
||||
RMD160 49dbc10d6a405ac6aa33a28054459377f5763c85 gdk-pixbuf-0.22.0-r5.ebuild 1655
|
||||
SHA256 369645a93ad50f35bfa47463bfa2a8c357ad327cb3d4754b006bf9deb7c27368 gdk-pixbuf-0.22.0-r5.ebuild 1655
|
||||
MISC ChangeLog 6553 RMD160 2a328c79f3f09d3ed0f1cee4d4fcba2942ff3d6c SHA1 a29c8f4ea808d5c9f4dbd7cee92a7551182767e6 SHA256 97ec6d49d7c42ead77648767ec6e384eeeaa68259c336624b9dc4d0e0ea1d74a
|
||||
MD5 edce664ec9f193c0e8dac16dac0cd0de ChangeLog 6553
|
||||
RMD160 2a328c79f3f09d3ed0f1cee4d4fcba2942ff3d6c ChangeLog 6553
|
||||
SHA256 97ec6d49d7c42ead77648767ec6e384eeeaa68259c336624b9dc4d0e0ea1d74a ChangeLog 6553
|
||||
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
|
||||
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
|
||||
RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
|
||||
SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
|
||||
MD5 79304c539cdf535d0d9d22f692be926d files/digest-gdk-pixbuf-0.22.0-r5 256
|
||||
RMD160 e47e65fca37659885f77eeac116c0bdc113aacab files/digest-gdk-pixbuf-0.22.0-r5 256
|
||||
SHA256 e0d89abd734807451c72124bb2435f6dbf9517fd37714e49b6bd88691ee53a2a files/digest-gdk-pixbuf-0.22.0-r5 256
|
||||
@@ -1,3 +0,0 @@
|
||||
MD5 05fcb68ceaa338614ab650c775efc2f2 gdk-pixbuf-0.22.0.tar.bz2 398208
|
||||
RMD160 0e56a0f883fd8e3fb4d49b9a38f984b95cd96ece gdk-pixbuf-0.22.0.tar.bz2 398208
|
||||
SHA256 411f2a1c27c3afadc5d034f2213d9f6c3a37f564eb5989cf6e8a53729280ae22 gdk-pixbuf-0.22.0.tar.bz2 398208
|
||||
@@ -1,48 +0,0 @@
|
||||
--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c 2002-09-27 23:12:40.000000000 +0200
|
||||
+++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c 2005-03-30 01:33:06.000000000 +0200
|
||||
@@ -31,8 +31,6 @@
|
||||
#include "gdk-pixbuf-private.h"
|
||||
#include "gdk-pixbuf-io.h"
|
||||
|
||||
-
|
||||
-
|
||||
#if 0
|
||||
/* If these structures were unpacked, they would define the two headers of the
|
||||
* BMP file. After them comes the palette, and then the image data.
|
||||
@@ -206,7 +204,7 @@
|
||||
|
||||
if (State == NULL)
|
||||
return NULL;
|
||||
-
|
||||
+
|
||||
while (feof(f) == 0) {
|
||||
length = fread(membuf, 1, sizeof (membuf), f);
|
||||
if (length > 0)
|
||||
@@ -245,11 +243,26 @@
|
||||
static gboolean
|
||||
grow_buffer (struct bmp_progressive_state *State)
|
||||
{
|
||||
- guchar *tmp = realloc (State->buff, State->BufferSize);
|
||||
+ guchar *tmp;
|
||||
+
|
||||
+ if (State->BufferSize == 0) {
|
||||
+#if 0
|
||||
+ g_set_error (error,
|
||||
+ GDK_PIXBUF_ERROR,
|
||||
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
||||
+ _("BMP image has bogus header data"));
|
||||
+#endif
|
||||
+ State->read_state = READ_STATE_ERROR;
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ tmp = realloc (State->buff, State->BufferSize);
|
||||
+
|
||||
if (!tmp) {
|
||||
State->read_state = READ_STATE_ERROR;
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
State->buff = tmp;
|
||||
return TRUE;
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
Index: io-bmp.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v
|
||||
retrieving revision 1.41
|
||||
diff -u -p -r1.41 io-bmp.c
|
||||
--- gdk-pixbuf/io-bmp.c 13 Aug 2004 02:26:57 -0000 1.41
|
||||
+++ gdk-pixbuf/io-bmp.c 20 Aug 2004 00:18:14 -0000
|
||||
@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat
|
||||
guchar c;
|
||||
gint idx;
|
||||
|
||||
- if (context->compr.y >= context->Header.height)
|
||||
+ if (context->compr.y >= context->Header.height) {
|
||||
+ context->BufferDone = 0;
|
||||
return TRUE;
|
||||
+ }
|
||||
|
||||
y = context->compr.y;
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c
|
||||
--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c 2002-09-27 17:19:15.000000000 -0500
|
||||
+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c 2005-10-27 11:28:23.000000000 -0500
|
||||
@@ -330,6 +330,9 @@
|
||||
|
||||
State->HeaderSize+=I;
|
||||
|
||||
+ if (State->HeaderSize < 0)
|
||||
+ return FALSE;
|
||||
+
|
||||
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
||||
guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize);
|
||||
if (!tmp)
|
||||
diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c
|
||||
--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c 2001-03-01 15:16:28.000000000 -0500
|
||||
+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c 2005-10-27 11:29:14.000000000 -0500
|
||||
@@ -243,8 +243,8 @@
|
||||
break;
|
||||
else {
|
||||
if (numnames > 0) {
|
||||
- space -= 1;
|
||||
- strcat (color, " ");
|
||||
+ strncat (color, " ", space);
|
||||
+ space -= MIN (space, 1);
|
||||
}
|
||||
|
||||
strncat (color, temp, space);
|
||||
@@ -281,7 +281,8 @@
|
||||
/* Fall through to the xpm_read_string. */
|
||||
|
||||
case op_body:
|
||||
- xpm_read_string (h->infile, &h->buffer, &h->buffer_size);
|
||||
+ if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size))
|
||||
+ return NULL;
|
||||
return h->buffer;
|
||||
|
||||
default:
|
||||
@@ -317,13 +318,6 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-/* Destroy notification function for the pixbuf */
|
||||
-static void
|
||||
-free_buffer (guchar *pixels, gpointer data)
|
||||
-{
|
||||
- free (pixels);
|
||||
-}
|
||||
-
|
||||
static gboolean
|
||||
xpm_color_parse (const char *spec, XColor *color)
|
||||
{
|
||||
@@ -342,7 +336,8 @@
|
||||
gchar pixel_str[32];
|
||||
GHashTable *color_hash;
|
||||
_XPMColor *colors, *color, *fallbackcolor;
|
||||
- guchar *pixels, *pixtmp;
|
||||
+ guchar *pixtmp;
|
||||
+ GdkPixbuf* pixbuf;
|
||||
|
||||
fallbackcolor = NULL;
|
||||
|
||||
@@ -352,16 +347,33 @@
|
||||
return NULL;
|
||||
}
|
||||
sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
|
||||
- if (cpp >= 32) {
|
||||
- g_warning ("XPM has more than 31 chars per pixel.");
|
||||
+ if (cpp <= 0 || cpp >= 32) {
|
||||
+ g_warning ("XPM has invalid number of chars per pixel.");
|
||||
return NULL;
|
||||
}
|
||||
+ if (n_col <= 0 ||
|
||||
+ n_col >= G_MAXINT / (cpp + 1) ||
|
||||
+ n_col >= G_MAXINT / sizeof (_XPMColor)) {
|
||||
+ g_warning ("XPM file has invalid number of colors");
|
||||
+ return NULL;
|
||||
+ }
|
||||
|
||||
/* The hash is used for fast lookups of color from chars */
|
||||
color_hash = g_hash_table_new (g_str_hash, g_str_equal);
|
||||
|
||||
- name_buf = g_new (gchar, n_col * (cpp + 1));
|
||||
- colors = g_new (_XPMColor, n_col);
|
||||
+ name_buf = g_new (gchar, n_col * (cpp + 1));
|
||||
+ if (!name_buf) {
|
||||
+ g_warning ("Cannot allocate memory for loading XPM image");
|
||||
+ g_hash_table_destroy (color_hash);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ colors = g_new (_XPMColor, n_col);
|
||||
+ if (!colors) {
|
||||
+ g_warning ("Cannot allocate memory for loading XPM image");
|
||||
+ g_hash_table_destroy (color_hash);
|
||||
+ g_free (name_buf);
|
||||
+ return NULL;
|
||||
+ }
|
||||
|
||||
for (cnt = 0; cnt < n_col; cnt++) {
|
||||
gchar *color_name;
|
||||
@@ -397,12 +409,8 @@
|
||||
fallbackcolor = color;
|
||||
}
|
||||
|
||||
- if (is_trans)
|
||||
- pixels = malloc (w * h * 4);
|
||||
- else
|
||||
- pixels = malloc (w * h * 3);
|
||||
-
|
||||
- if (!pixels) {
|
||||
+ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h);
|
||||
+ if (!pixbuf) {
|
||||
g_hash_table_destroy (color_hash);
|
||||
g_free (colors);
|
||||
g_free (name_buf);
|
||||
@@ -410,7 +418,7 @@
|
||||
}
|
||||
|
||||
wbytes = w * cpp;
|
||||
- pixtmp = pixels;
|
||||
+ pixtmp = pixbuf->pixels;
|
||||
|
||||
for (ycnt = 0; ycnt < h; ycnt++) {
|
||||
buffer = (*get_buf) (op_body, handle);
|
||||
@@ -443,9 +451,7 @@
|
||||
g_free (colors);
|
||||
g_free (name_buf);
|
||||
|
||||
- return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8,
|
||||
- w, h, is_trans ? (w * 4) : (w * 3),
|
||||
- free_buffer, NULL);
|
||||
+ return pixbuf;
|
||||
}
|
||||
|
||||
/* Shared library entry point for file loading */
|
||||
@@ -1,9 +0,0 @@
|
||||
Fix aclocal warning:
|
||||
/usr/share/aclocal/gdk-pixbuf.m4:12: warning: underquoted definition of AM_PATH_GDK_PIXBUF
|
||||
--- gdk-pixbuf-0.22.0/gdk-pixbuf.m4
|
||||
+++ gdk-pixbuf-0.22.0/gdk-pixbuf.m4
|
||||
@@ -11,3 +11,3 @@
|
||||
dnl
|
||||
-AC_DEFUN(AM_PATH_GDK_PIXBUF,
|
||||
+AC_DEFUN([AM_PATH_GDK_PIXBUF],
|
||||
[dnl
|
||||
@@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2006 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild,v 1.5 2006/10/16 23:23:31 blubb Exp $
|
||||
|
||||
inherit virtualx libtool gnome.org eutils
|
||||
|
||||
DESCRIPTION="GNOME Image Library"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
|
||||
IUSE="doc mmx"
|
||||
|
||||
RDEPEND="media-libs/jpeg
|
||||
media-libs/tiff
|
||||
=x11-libs/gtk+-1.2*
|
||||
>=media-libs/libpng-1.2.1
|
||||
amd64? ( sys-libs/db )
|
||||
!amd64? ( <sys-libs/db-2 )
|
||||
>=gnome-base/gnome-libs-1.4.1.2-r1"
|
||||
# We need gnome-libs here, else gnome support do not get compiled into
|
||||
# gdk-pixbuf (the GnomeCanvasPixbuf library )
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( dev-util/gtk-doc )"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
epatch "${FILESDIR}"/${P}-m4.patch
|
||||
# security fix (#64230)
|
||||
epatch "${FILESDIR}"/${P}-bmp_secure.patch
|
||||
epatch "${FILESDIR}"/${P}-loaders.patch
|
||||
# reject corrupt bmps (#64230)
|
||||
epatch "${FILESDIR}"/${P}-bmp_reject_corrupt.patch
|
||||
|
||||
# update libtool, else we get the "relink bug"
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf \
|
||||
--sysconfdir=/etc/X11/gdk-pixbuf \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable mmx) \
|
||||
|| die
|
||||
|
||||
# build needs to be able to
|
||||
# connect to an X display.
|
||||
Xemake || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
einstall \
|
||||
sysconfdir="${D}"/etc/X11/gdk-pixbuf || die
|
||||
|
||||
dosed -e "s:${D}::g" /usr/bin/gdk-pixbuf-config
|
||||
# fix permissions on the loaders
|
||||
chmod a+rx "${D}"/usr/$(get_libdir)/gdk-pixbuf/loaders
|
||||
chmod a+r "${D}"/usr/$(get_libdir)/gdk-pixbuf/loaders/*
|
||||
|
||||
dodoc AUTHORS ChangeLog INSTALL README NEWS TODO
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>gnome</herd>
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user