* [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/libgdiplus/files/, dev-dotnet/libgdiplus/
@ 2015-08-18 9:27 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-08-18 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 530f6e7150e1294c662583316d56bc9ac435f4be
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 09:27:20 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 09:27:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530f6e71
dev-dotnet/libgdiplus: Fix for ld.gold; enhance various QA problems
* underlinking fix: https://github.com/mono/libgdiplus/pull/33
* drop removed configure option --with-cairo
* call default() functions as often as possible
Gentoo-Bug: https://bugs.gentoo.org/367345
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../files/libgdiplus-3.12-underlinking.patch | 17 ++++++++++
dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild | 39 +++++++++++-----------
2 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch
new file mode 100644
index 0000000..164f994
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch
@@ -0,0 +1,17 @@
+ tests/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index fb7aa7e..4d752e1 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -13,7 +13,8 @@ DEPS = \
+
+
+ LDADDS = \
+- $(top_builddir)/src/libgdiplus.la
++ $(top_builddir)/src/libgdiplus.la \
++ -lm
+
+ noinst_PROGRAMS = \
+ testgdi testbits testclip testreversepath
diff --git a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild
index 5959db3..96eb910 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild
@@ -3,7 +3,8 @@
# $Id$
EAPI=5
-inherit base eutils dotnet flag-o-matic
+
+inherit autotools eutils dotnet flag-o-matic
DESCRIPTION="Library for using System.Drawing with mono"
HOMEPAGE="http://www.mono-project.com"
@@ -30,38 +31,36 @@ RDEPEND=">=dev-libs/glib-2.2.3:2
!cairo? ( >=x11-libs/pango-1.20 )"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${P}-giflib-quantizebuffer.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-giflib-quantizebuffer.patch"
+ "${FILESDIR}/${P}-underlinking.patch"
+ )
RESTRICT="test"
src_prepare() {
- base_src_prepare
- sed -i -e 's:ungif:gif:g' configure || die
-}
-
-src_configure() {
+ epatch "${PATCHES[@]}"
+ sed -i -e 's:ungif:gif:g' configure.ac || die
append-flags -fno-strict-aliasing
- econf --disable-dependency-tracking \
- --disable-static \
- --with-cairo=system \
- $(use !cairo && printf %s --with-pango)
+ eautoreconf
}
-src_compile() {
- emake "$@"
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(usex cairo "" "--with-pango")
}
src_install () {
- emake -j1 DESTDIR="${D}" "$@" install #nowarn
+ MAKEOPTS+=" -j1"
+ default
+
dotnet_multilib_comply
local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"
- do
+ for docfile in "${commondoc[@]}"; do
[[ -e "${docfile}" ]] && dodoc "${docfile}"
done
- if [[ "${DOCS[@]}" ]]
- then
- dodoc "${DOCS[@]}"
- fi
+ [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
prune_libtool_files
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/libgdiplus/files/, dev-dotnet/libgdiplus/
@ 2016-08-25 19:09 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-08-25 19:09 UTC (permalink / raw
To: gentoo-commits
commit: dd3f2b42cf2984911cadb9ab2a99c2b47f23b99a
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 19:05:20 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 19:09:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3f2b42
dev-dotnet/libgdiplus: Drop old
Package-Manager: portage-2.3.0
dev-dotnet/libgdiplus/Manifest | 1 -
.../libgdiplus-3.12-giflib-quantizebuffer.patch | 298 ---------------------
.../files/libgdiplus-3.12-underlinking.patch | 17 --
dev-dotnet/libgdiplus/libgdiplus-2.10.9.ebuild | 48 ----
dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild | 66 -----
dev-dotnet/libgdiplus/libgdiplus-4.2-r1.ebuild | 51 ----
6 files changed, 481 deletions(-)
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index eac96a4..b0ac70f 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,3 +1,2 @@
DIST libgdiplus-2.10.9.tar.bz2 2074317 SHA256 6ddeb6c327bada7cb6e06d1a20714f526a0c69520dfd42c12ddd032c3c5d964e SHA512 7f1944795c7ede5fd92a6d7e8d7d6cf2ef3c154e656b83e769b417f8f7195dd975084afe3c3cd1dda1ecb2c1167f76c0b5714cd16d549ff056add09763c6b26c WHIRLPOOL 0930cb2ad191c34b7ebd073f687536663bcfe9a44ed3296cf81bc9d43cfc7ee39d8f60f9b9f83f89847164b7366e514ee945737be50b82257209507c3b6e9c5d
-DIST libgdiplus-3.12.tar.gz 688120 SHA256 e61c4dc1bc2ba993e4f79029472efcf5760eb9e60eb20d9cd31f0ebe9113bfc9 SHA512 12c58e7ad99e5aa7caf19f64f47bddd399648292f3c2b9ade64e9051b0495bb8772af8ca9cdb6cb664d20c845d7136f028e10e659548bffd35e7604548bb8743 WHIRLPOOL 288ea9f2b8f5599278f039be1af32f54d0496da6ce70c3e937485d0a3a40494680a7c0fc55430602c256c487df1d57c0b6d8f6220a52b8ac0d7a48e6211d6ead
DIST libgdiplus-4.2.tar.gz 687398 SHA256 f332b9b8b44fd1c50b8d8d01a7296360b806c790b8297614739b3de1edbadfeb SHA512 102d1e07a106fa32640a20c4843bf82b3f628c5b7a3813d39c7712f2cd09d80dc5adb337a8d5bdbae065f876a0c433a5d8fcb7d761dff5ee08c48cac2cd2344e WHIRLPOOL a2580f026ec7d767ca038fa4e41c94a5613b69581c836b144c29b5cf1d97895d9c1c17b077caef760ceae65d35e809a7ef9b6c9089c43c0ec5be1d2bcc453ee0
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-3.12-giflib-quantizebuffer.patch b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-giflib-quantizebuffer.patch
deleted file mode 100644
index 5d0b9c2..00000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-3.12-giflib-quantizebuffer.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-diff --git a/src/gifcodec.c b/src/gifcodec.c
-index e1a0697..e645c6e 100644
---- a/src/gifcodec.c
-+++ b/src/gifcodec.c
-@@ -39,6 +39,293 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0
-
- #include "gifcodec.h"
-
-+#define COLOR_ARRAY_SIZE 32768
-+#define BITS_PER_PRIM_COLOR 5
-+#define MAX_PRIM_COLOR 0x1f
-+
-+static int SortRGBAxis;
-+
-+typedef struct QuantizedColorType {
-+ GifByteType RGB[3];
-+ GifByteType NewColorIndex;
-+ long Count;
-+ struct QuantizedColorType *Pnext;
-+} QuantizedColorType;
-+
-+typedef struct NewColorMapType {
-+ GifByteType RGBMin[3], RGBWidth[3];
-+ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
-+ unsigned long Count; /* Total number of pixels in all the entries */
-+ QuantizedColorType *QuantizedColors;
-+} NewColorMapType;
-+
-+
-+/****************************************************************************
-+ * Routine called by qsort to compare two entries.
-+ ****************************************************************************/
-+static int
-+SortCmpRtn(const void *Entry1,
-+ const void *Entry2) {
-+
-+ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
-+ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
-+}
-+
-+/******************************************************************************
-+ * Routine to subdivide the RGB space recursively using median cut in each
-+ * axes alternatingly until ColorMapSize different cubes exists.
-+ * The biggest cube in one dimension is subdivide unless it has only one entry.
-+ * Returns GIF_ERROR if failed, otherwise GIF_OK.
-+ ******************************************************************************/
-+static int
-+SubdivColorMap(NewColorMapType * NewColorSubdiv,
-+ unsigned int ColorMapSize,
-+ unsigned int *NewColorMapSize) {
-+
-+ int MaxSize;
-+ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
-+ long Sum, Count;
-+ QuantizedColorType *QuantizedColor, **SortArray;
-+
-+ while (ColorMapSize > *NewColorMapSize) {
-+ /* Find candidate for subdivision: */
-+ MaxSize = -1;
-+ for (i = 0; i < *NewColorMapSize; i++) {
-+ for (j = 0; j < 3; j++) {
-+ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
-+ (NewColorSubdiv[i].NumEntries > 1)) {
-+ MaxSize = NewColorSubdiv[i].RGBWidth[j];
-+ Index = i;
-+ SortRGBAxis = j;
-+ }
-+ }
-+ }
-+
-+ if (MaxSize == -1)
-+ return GIF_OK;
-+
-+ /* Split the entry Index into two along the axis SortRGBAxis: */
-+
-+ /* Sort all elements in that entry along the given axis and split at
-+ * the median. */
-+ SortArray = (QuantizedColorType **)malloc(
-+ sizeof(QuantizedColorType *) *
-+ NewColorSubdiv[Index].NumEntries);
-+ if (SortArray == NULL)
-+ return GIF_ERROR;
-+ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
-+ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
-+ j++, QuantizedColor = QuantizedColor->Pnext)
-+ SortArray[j] = QuantizedColor;
-+
-+ qsort(SortArray, NewColorSubdiv[Index].NumEntries,
-+ sizeof(QuantizedColorType *), SortCmpRtn);
-+
-+ /* Relink the sorted list into one: */
-+ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
-+ SortArray[j]->Pnext = SortArray[j + 1];
-+ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
-+ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
-+ free((char *)SortArray);
-+
-+ /* Now simply add the Counts until we have half of the Count: */
-+ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
-+ NumEntries = 1;
-+ Count = QuantizedColor->Count;
-+ while (QuantizedColor->Pnext != NULL &&
-+ (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
-+ QuantizedColor->Pnext->Pnext != NULL) {
-+ QuantizedColor = QuantizedColor->Pnext;
-+ NumEntries++;
-+ Count += QuantizedColor->Count;
-+ }
-+ /* Save the values of the last color of the first half, and first
-+ * of the second half so we can update the Bounding Boxes later.
-+ * Also as the colors are quantized and the BBoxes are full 0..255,
-+ * they need to be rescaled.
-+ */
-+ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
-+ /* coverity[var_deref_op] */
-+ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
-+ MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
-+ MinColor <<= (8 - BITS_PER_PRIM_COLOR);
-+
-+ /* Partition right here: */
-+ NewColorSubdiv[*NewColorMapSize].QuantizedColors =
-+ QuantizedColor->Pnext;
-+ QuantizedColor->Pnext = NULL;
-+ NewColorSubdiv[*NewColorMapSize].Count = Count;
-+ NewColorSubdiv[Index].Count -= Count;
-+ NewColorSubdiv[*NewColorMapSize].NumEntries =
-+ NewColorSubdiv[Index].NumEntries - NumEntries;
-+ NewColorSubdiv[Index].NumEntries = NumEntries;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
-+ NewColorSubdiv[Index].RGBMin[j];
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
-+ NewColorSubdiv[Index].RGBWidth[j];
-+ }
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
-+
-+ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
-+ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
-+
-+ (*NewColorMapSize)++;
-+ }
-+
-+ return GIF_OK;
-+}
-+
-+/******************************************************************************
-+ * Quantize high resolution image into lower one. Input image consists of a
-+ * 2D array for each of the RGB colors with size Width by Height. There is no
-+ * Color map for the input. Output is a quantized image with 2D array of
-+ * indexes into the output color map.
-+ * Note input image can be 24 bits at the most (8 for red/green/blue) and
-+ * the output has 256 colors at the most (256 entries in the color map.).
-+ * ColorMapSize specifies size of color map up to 256 and will be updated to
-+ * real size before returning.
-+ * Also non of the parameter are allocated by this routine.
-+ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
-+ ******************************************************************************/
-+static int
-+QuantizeBuffer(unsigned int Width,
-+ unsigned int Height,
-+ int *ColorMapSize,
-+ GifByteType * RedInput,
-+ GifByteType * GreenInput,
-+ GifByteType * BlueInput,
-+ GifByteType * OutputBuffer,
-+ GifColorType * OutputColorMap) {
-+
-+ unsigned int Index, NumOfEntries;
-+ int i, j, MaxRGBError[3];
-+ unsigned int NewColorMapSize;
-+ long Red, Green, Blue;
-+ NewColorMapType NewColorSubdiv[256];
-+ QuantizedColorType *ColorArrayEntries, *QuantizedColor;
-+
-+ ColorArrayEntries = (QuantizedColorType *)malloc(
-+ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
-+ if (ColorArrayEntries == NULL) {
-+ return GIF_ERROR;
-+ }
-+
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
-+ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
-+ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
-+ MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].Count = 0;
-+ }
-+
-+ /* Sample the colors and their distribution: */
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ ColorArrayEntries[Index].Count++;
-+ }
-+
-+ /* Put all the colors in the first entry of the color map, and call the
-+ * recursive subdivision process. */
-+ for (i = 0; i < 256; i++) {
-+ NewColorSubdiv[i].QuantizedColors = NULL;
-+ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[i].RGBMin[j] = 0;
-+ NewColorSubdiv[i].RGBWidth[j] = 255;
-+ }
-+ }
-+
-+ /* Find the non empty entries in the color table and chain them: */
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++)
-+ if (ColorArrayEntries[i].Count > 0)
-+ break;
-+ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
-+ NumOfEntries = 1;
-+ while (++i < COLOR_ARRAY_SIZE)
-+ if (ColorArrayEntries[i].Count > 0) {
-+ QuantizedColor->Pnext = &ColorArrayEntries[i];
-+ QuantizedColor = &ColorArrayEntries[i];
-+ NumOfEntries++;
-+ }
-+ QuantizedColor->Pnext = NULL;
-+
-+ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
-+ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
-+ NewColorMapSize = 1;
-+ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
-+ GIF_OK) {
-+ free((char *)ColorArrayEntries);
-+ return GIF_ERROR;
-+ }
-+ if (NewColorMapSize < *ColorMapSize) {
-+ /* And clear rest of color map: */
-+ for (i = NewColorMapSize; i < *ColorMapSize; i++)
-+ OutputColorMap[i].Red = OutputColorMap[i].Green =
-+ OutputColorMap[i].Blue = 0;
-+ }
-+
-+ /* Average the colors in each entry to be the color to be used in the
-+ * output color map, and plug it into the output color map itself. */
-+ for (i = 0; i < NewColorMapSize; i++) {
-+ if ((j = NewColorSubdiv[i].NumEntries) > 0) {
-+ QuantizedColor = NewColorSubdiv[i].QuantizedColors;
-+ Red = Green = Blue = 0;
-+ while (QuantizedColor) {
-+ QuantizedColor->NewColorIndex = i;
-+ Red += QuantizedColor->RGB[0];
-+ Green += QuantizedColor->RGB[1];
-+ Blue += QuantizedColor->RGB[2];
-+ QuantizedColor = QuantizedColor->Pnext;
-+ }
-+ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ } else
-+ fprintf(stderr,
-+ "\n%s: Null entry in quantized color map - that's weird.\n",
-+ "libgdiplus");
-+ }
-+
-+ /* Finally scan the input buffer again and put the mapped index in the
-+ * output buffer. */
-+ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ Index = ColorArrayEntries[Index].NewColorIndex;
-+ OutputBuffer[i] = Index;
-+ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
-+ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
-+ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
-+ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
-+ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
-+ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
-+ }
-+
-+#ifdef DEBUG
-+ fprintf(stderr,
-+ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
-+ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
-+#endif /* DEBUG */
-+
-+ free((char *)ColorArrayEntries);
-+
-+ *ColorMapSize = NewColorMapSize;
-+
-+ return GIF_OK;
-+}
-+
- #ifdef EgifOpen
- /* giflib declares this incorrectly as EgifOpen */
- extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch
deleted file mode 100644
index 164f994..00000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- tests/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index fb7aa7e..4d752e1 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -13,7 +13,8 @@ DEPS = \
-
-
- LDADDS = \
-- $(top_builddir)/src/libgdiplus.la
-+ $(top_builddir)/src/libgdiplus.la \
-+ -lm
-
- noinst_PROGRAMS = \
- testgdi testbits testclip testreversepath
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9.ebuild
deleted file mode 100644
index fe947ef..00000000
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils go-mono mono flag-o-matic
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.16:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-4.1.3
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${P}-gold.patch"
- "${FILESDIR}/${PN}-2.10.1-libpng15.patch" )
-
-src_prepare() {
- go-mono_src_prepare
- sed -i -e 's:ungif:gif:g' configure || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- go-mono_src_configure --with-cairo=system \
- $(use !cairo && printf %s --with-pango) \
- || die "configure failed"
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild
deleted file mode 100644
index 96eb910..00000000
--- a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils dotnet flag-o-matic
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
-
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.2.3:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-4.2.3
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-giflib-quantizebuffer.patch"
- "${FILESDIR}/${P}-underlinking.patch"
- )
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- sed -i -e 's:ungif:gif:g' configure.ac || die
- append-flags -fno-strict-aliasing
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- --disable-static \
- $(usex cairo "" "--with-pango")
-}
-
-src_install () {
- MAKEOPTS+=" -j1"
- default
-
- dotnet_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"; do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
- prune_libtool_files
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-4.2-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-4.2-r1.ebuild
deleted file mode 100644
index 2265860..00000000
--- a/dev-dotnet/libgdiplus/libgdiplus-4.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils dotnet
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
-
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.2.3:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-4.2.3
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- --disable-static \
- $(usex cairo "" "--with-pango")
-}
-
-src_install () {
- default
-
- dotnet_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"; do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/libgdiplus/files/, dev-dotnet/libgdiplus/
@ 2019-06-10 6:56 Mikhail Pukhlikov
0 siblings, 0 replies; 4+ messages in thread
From: Mikhail Pukhlikov @ 2019-06-10 6:56 UTC (permalink / raw
To: gentoo-commits
commit: f82d72173eaa008d17efb3f28c4e958ece8150aa
Author: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 06:56:05 2019 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 06:56:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82d7217
dev-dotnet/libgdiplus: add missing keyword, fix #687596
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>
dev-dotnet/libgdiplus/files/libgdiplus-5.6.1-cofigure.patch | 12 ++++++++++++
.../{libgdiplus-5.6.1.ebuild => libgdiplus-5.6.1-r1.ebuild} | 6 +++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-5.6.1-cofigure.patch b/dev-dotnet/libgdiplus/files/libgdiplus-5.6.1-cofigure.patch
new file mode 100644
index 00000000000..04f73357e1d
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-5.6.1-cofigure.patch
@@ -0,0 +1,12 @@
+diff -Nupr libgdiplus-5.6.1~/configure libgdiplus-5.6.1/configure
+--- libgdiplus-5.6.1~/configure 2019-06-07 21:26:37.207823285 +0200
++++ libgdiplus-5.6.1/configure 2019-06-07 21:27:44.045156234 +0200
+@@ -14133,7 +14133,7 @@ fi
+
+
+ # Add xrender here so that we don't fail to find glib if we won't have xrender.pc
+-if test "x$no_x" != "xyes" && "x$x11_available" = "xyes"; then
++if test "x$no_x" != "xyes" && test "x$x11_available" = "xyes"; then
+ GDIPLUS_LIBS="$GDIPLUS_LIBS `$PKG_CONFIG --libs xrender `"
+ GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS `$PKG_CONFIG --cflags xrender `"
+ fi
diff --git a/dev-dotnet/libgdiplus/libgdiplus-5.6.1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-5.6.1-r1.ebuild
similarity index 89%
rename from dev-dotnet/libgdiplus/libgdiplus-5.6.1.ebuild
rename to dev-dotnet/libgdiplus/libgdiplus-5.6.1-r1.ebuild
index c476e6b6642..213d34f5f07 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-5.6.1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-5.6.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.mono-project.com"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
IUSE="cairo"
@@ -31,6 +31,10 @@ RDEPEND=">=dev-libs/glib-2.2.3:2
!cairo? ( >=x11-libs/pango-1.20 )"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-cofigure.patch"
+)
+
src_configure() {
econf \
--disable-dependency-tracking \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/libgdiplus/files/, dev-dotnet/libgdiplus/
@ 2020-05-16 21:28 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-05-16 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 005b641f259bd1a59e23cbfa86a8f173baa53261
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 21:27:06 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 16 21:27:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005b641f
dev-dotnet/libgdiplus: Remove old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-dotnet/libgdiplus/Manifest | 3 -
.../files/libgdiplus-2.10.1-libpng15.patch | 164 ------------
.../files/libgdiplus-2.10.9-freetype251.patch | 12 -
.../libgdiplus-2.10.9-giflib-quantizebuffer.patch | 296 ---------------------
.../libgdiplus/files/libgdiplus-2.10.9-gold.patch | 16 --
.../files/libgdiplus-5.6.1-cofigure.patch | 12 -
dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild | 69 -----
dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild | 70 -----
dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild | 68 -----
dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild | 49 ----
dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild | 49 ----
dev-dotnet/libgdiplus/libgdiplus-5.6.1-r1.ebuild | 57 ----
12 files changed, 865 deletions(-)
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index b8df1fe8aac..f21e7817d5a 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,4 +1 @@
-DIST libgdiplus-2.10.9.tar.bz2 2074317 BLAKE2B ddbdc22d61734e9141f7d05b45867b1c0ac89903a74d23a3b05d247913aaac5350a603a5d7acb85338b2e9877b077c3c4b43839b33b2f6507b76035124cb43b4 SHA512 7f1944795c7ede5fd92a6d7e8d7d6cf2ef3c154e656b83e769b417f8f7195dd975084afe3c3cd1dda1ecb2c1167f76c0b5714cd16d549ff056add09763c6b26c
-DIST libgdiplus-4.2.tar.gz 687398 BLAKE2B e9b5912cb63de9692861b09ceeb5ad55fa6999960fddbbe55382f957591e68bede91550c2d49ed4bc78d118288ca6b35a2b2ab69f87f9fcc289b7fe2b1853b7a SHA512 102d1e07a106fa32640a20c4843bf82b3f628c5b7a3813d39c7712f2cd09d80dc5adb337a8d5bdbae065f876a0c433a5d8fcb7d761dff5ee08c48cac2cd2344e
-DIST libgdiplus-5.6.1.tar.gz 734255 BLAKE2B db54559b6bb6ea3f3f966de8692f08c4a042d0719b45263d3f546be1c7795a86d26943d699284acded8419a969238f58f2482090186df1b167d650343900729d SHA512 f1e477e4cbdd83f15bd8edc0feb975399c3eca042cafd1795a018f412b88ad5eb82d2cb0852d2009fdaa6f17d1c62c6b81340578f00eccc2e98ac9debe4a748e
DIST libgdiplus-6.0.2.tar.gz 1377140 BLAKE2B 5c639a14371eadee0bfa2ad135284089c65212bde0909d21af8f80fd5bdf7283a8aa688ed88df374a0eac0696a377ba05419b12d9a93b37550c020d2b9961ee0 SHA512 b334846cf9471e6f81a3e0a2d6b68c9a39f52e6b22833432e34d3823ae12e3aa9d481806ea9a078463a77f56f3265633447d6709c5ade86ea117d3690f16472c
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch
deleted file mode 100644
index 31a1c01629d..00000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/pngcodec.c.orig 2010-11-03 16:52:54.000000000 +0000
-+++ src/pngcodec.c
-@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn
- bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);
- bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);
- #elif defined(PNG_pHYs_SUPPORTED)
-- if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {
-- bitmap_data->image_flags |= ImageFlagsHasRealDPI;
-- bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;
-- bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;
-+ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
-+ png_uint_32 res_x, res_y;
-+ int unit_type;
-+ png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type);
-+ if (unit_type == PNG_RESOLUTION_METER) {
-+ bitmap_data->image_flags |= ImageFlagsHasRealDPI;
-+ bitmap_data->dpi_horz = res_x * 0.0254;
-+ bitmap_data->dpi_vert = res_y * 0.0254;
-+ }
- }
- #endif
- /* default to screen resolution (if nothing was provided or available) */
-@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn
- #if defined(PNG_iCCP_SUPPORTED)
- {
- png_charp name;
-- png_charp profile;
-+ png_bytep profile;
- png_uint_32 proflen;
- int compression_type;
-
-@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream
- ImageFlags colourspace_flag;
- int i;
- int j;
-+ png_colorp png_palette;
-+ int png_num_palette;
-+ png_bytep trans_alpha;
-+ int num_trans;
-+ png_color_16p trans_color;
-
- width = png_get_image_width (png_ptr, info_ptr);
- height = png_get_image_height (png_ptr, info_ptr);
-@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream
- }
-
- /* Copy palette. */
-+ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
-+
- num_colours = 1 << bit_depth;
-
- if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
-@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream
- colourspace_flag = ImageFlagsColorSpaceRGB;
-
- palette_entries = num_colours;
-- if (palette_entries > info_ptr->num_palette) {
-- palette_entries = info_ptr->num_palette;
-+ if (palette_entries > png_num_palette) {
-+ palette_entries = png_num_palette;
- }
-
- palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB));
-@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream
-
- for (i=0; i < palette_entries; i++) {
- set_pixel_bgra (&palette->Entries[i], 0,
-- info_ptr->palette[i].blue,
-- info_ptr->palette[i].green,
-- info_ptr->palette[i].red,
-+ png_palette[i].blue,
-+ png_palette[i].green,
-+ png_palette[i].red,
- 0xFF); /* alpha */
- }
- }
-
-+ png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
- /* Make sure transparency is respected. */
-- if (info_ptr->num_trans > 0) {
-+ if (num_trans > 0) {
- palette->Flags |= PaletteFlagsHasAlpha;
- colourspace_flag |= ImageFlagsHasAlpha;
-
-- if (info_ptr->num_trans > info_ptr->num_palette) {
-- info_ptr->num_trans = info_ptr->num_palette;
-+ if (num_trans > png_num_palette) {
-+ num_trans = png_num_palette;
- }
-
-- for (i=0; i < info_ptr->num_trans; i++) {
-+ for (i=0; i < num_trans; i++) {
- set_pixel_bgra(&palette->Entries[i], 0,
-- info_ptr->palette[i].blue,
-- info_ptr->palette[i].green,
-- info_ptr->palette[i].red,
-+ png_palette[i].blue,
-+ png_palette[i].green,
-+ png_palette[i].red,
- #if PNG_LIBPNG_VER > 10399
-- info_ptr->trans_alpha [i]); /* alpha */
-+ trans_alpha [i]); /* alpha */
- #else
- info_ptr->trans[i]); /* alpha */
- #endif
-@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream
- BYTE bit_depth;
- int stride;
- int interlace;
-+ png_colorp png_palette;
-+ int png_num_palette;
- png_bytep *row_pointers;
- BYTE *rawptr;
- int i, j;
-@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream
- png_byte palette = 0;
- png_byte pix = *rowp++;
-
-+ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
- palette = (pix >> 6) & 0x03;
- set_pixel_bgra (rawptr, 0,
-- info_ptr->palette[palette].blue,
-- info_ptr->palette[palette].green,
-- info_ptr->palette[palette].red,
-+ png_palette[palette].blue,
-+ png_palette[palette].green,
-+ png_palette[palette].red,
- 0xFF); /* alpha */
-
- palette = (pix >> 4) & 0x03;
- set_pixel_bgra (rawptr, 4,
-- info_ptr->palette[palette].blue,
-- info_ptr->palette[palette].green,
-- info_ptr->palette[palette].red,
-+ png_palette[palette].blue,
-+ png_palette[palette].green,
-+ png_palette[palette].red,
- 0xFF); /* alpha */
-
- palette = (pix >> 2) & 0x03;
- set_pixel_bgra (rawptr, 8,
-- info_ptr->palette[palette].blue,
-- info_ptr->palette[palette].green,
-- info_ptr->palette[palette].red,
-+ png_palette[palette].blue,
-+ png_palette[palette].green,
-+ png_palette[palette].red,
- 0xFF); /* alpha */
-
- palette = pix & 0x03;
- set_pixel_bgra (rawptr, 12,
-- info_ptr->palette[palette].blue,
-- info_ptr->palette[palette].green,
-- info_ptr->palette[palette].red,
-+ png_palette[palette].blue,
-+ png_palette[palette].green,
-+ png_palette[palette].red,
- 0xFF); /* alpha */
- rawptr += 16;
- }
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch
deleted file mode 100644
index b4faa06d641..00000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgdiplus-2.10.9/src/gdiplus-private.h
-+++ libgdiplus-2.10.9/src/gdiplus-private.h
-@@ -30,7 +30,8 @@
- #include <stdio.h>
- #include <math.h>
- #include <glib.h>
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
- #include <pthread.h>
- #include <unistd.h>
-
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-giflib-quantizebuffer.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-giflib-quantizebuffer.patch
deleted file mode 100644
index f65c349af77..00000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-giflib-quantizebuffer.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-diff -uNr libgdiplus-2.10.9/src/gifcodec.c libgdiplus-2.10.9-funtoo/src/gifcodec.c
---- libgdiplus-2.10.9/src/gifcodec.c 2011-12-02 18:23:12.000000000 +0100
-+++ libgdiplus-2.10.9-funtoo/src/gifcodec.c 2013-10-08 18:06:44.643554570 +0200
-@@ -39,6 +39,293 @@
-
- #include "gifcodec.h"
-
-+#define COLOR_ARRAY_SIZE 32768
-+#define BITS_PER_PRIM_COLOR 5
-+#define MAX_PRIM_COLOR 0x1f
-+
-+static int SortRGBAxis;
-+
-+typedef struct QuantizedColorType {
-+ GifByteType RGB[3];
-+ GifByteType NewColorIndex;
-+ long Count;
-+ struct QuantizedColorType *Pnext;
-+} QuantizedColorType;
-+
-+typedef struct NewColorMapType {
-+ GifByteType RGBMin[3], RGBWidth[3];
-+ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
-+ unsigned long Count; /* Total number of pixels in all the entries */
-+ QuantizedColorType *QuantizedColors;
-+} NewColorMapType;
-+
-+
-+/****************************************************************************
-+ * Routine called by qsort to compare two entries.
-+ ****************************************************************************/
-+static int
-+SortCmpRtn(const void *Entry1,
-+ const void *Entry2) {
-+
-+ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
-+ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
-+}
-+
-+/******************************************************************************
-+ * Routine to subdivide the RGB space recursively using median cut in each
-+ * axes alternatingly until ColorMapSize different cubes exists.
-+ * The biggest cube in one dimension is subdivide unless it has only one entry.
-+ * Returns GIF_ERROR if failed, otherwise GIF_OK.
-+ ******************************************************************************/
-+static int
-+SubdivColorMap(NewColorMapType * NewColorSubdiv,
-+ unsigned int ColorMapSize,
-+ unsigned int *NewColorMapSize) {
-+
-+ int MaxSize;
-+ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
-+ long Sum, Count;
-+ QuantizedColorType *QuantizedColor, **SortArray;
-+
-+ while (ColorMapSize > *NewColorMapSize) {
-+ /* Find candidate for subdivision: */
-+ MaxSize = -1;
-+ for (i = 0; i < *NewColorMapSize; i++) {
-+ for (j = 0; j < 3; j++) {
-+ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
-+ (NewColorSubdiv[i].NumEntries > 1)) {
-+ MaxSize = NewColorSubdiv[i].RGBWidth[j];
-+ Index = i;
-+ SortRGBAxis = j;
-+ }
-+ }
-+ }
-+
-+ if (MaxSize == -1)
-+ return GIF_OK;
-+
-+ /* Split the entry Index into two along the axis SortRGBAxis: */
-+
-+ /* Sort all elements in that entry along the given axis and split at
-+ * the median. */
-+ SortArray = (QuantizedColorType **)malloc(
-+ sizeof(QuantizedColorType *) *
-+ NewColorSubdiv[Index].NumEntries);
-+ if (SortArray == NULL)
-+ return GIF_ERROR;
-+ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
-+ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
-+ j++, QuantizedColor = QuantizedColor->Pnext)
-+ SortArray[j] = QuantizedColor;
-+
-+ qsort(SortArray, NewColorSubdiv[Index].NumEntries,
-+ sizeof(QuantizedColorType *), SortCmpRtn);
-+
-+ /* Relink the sorted list into one: */
-+ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
-+ SortArray[j]->Pnext = SortArray[j + 1];
-+ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
-+ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
-+ free((char *)SortArray);
-+
-+ /* Now simply add the Counts until we have half of the Count: */
-+ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
-+ NumEntries = 1;
-+ Count = QuantizedColor->Count;
-+ while (QuantizedColor->Pnext != NULL &&
-+ (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
-+ QuantizedColor->Pnext->Pnext != NULL) {
-+ QuantizedColor = QuantizedColor->Pnext;
-+ NumEntries++;
-+ Count += QuantizedColor->Count;
-+ }
-+ /* Save the values of the last color of the first half, and first
-+ * of the second half so we can update the Bounding Boxes later.
-+ * Also as the colors are quantized and the BBoxes are full 0..255,
-+ * they need to be rescaled.
-+ */
-+ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
-+ /* coverity[var_deref_op] */
-+ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
-+ MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
-+ MinColor <<= (8 - BITS_PER_PRIM_COLOR);
-+
-+ /* Partition right here: */
-+ NewColorSubdiv[*NewColorMapSize].QuantizedColors =
-+ QuantizedColor->Pnext;
-+ QuantizedColor->Pnext = NULL;
-+ NewColorSubdiv[*NewColorMapSize].Count = Count;
-+ NewColorSubdiv[Index].Count -= Count;
-+ NewColorSubdiv[*NewColorMapSize].NumEntries =
-+ NewColorSubdiv[Index].NumEntries - NumEntries;
-+ NewColorSubdiv[Index].NumEntries = NumEntries;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
-+ NewColorSubdiv[Index].RGBMin[j];
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
-+ NewColorSubdiv[Index].RGBWidth[j];
-+ }
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
-+
-+ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
-+ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
-+
-+ (*NewColorMapSize)++;
-+ }
-+
-+ return GIF_OK;
-+}
-+
-+/******************************************************************************
-+ * Quantize high resolution image into lower one. Input image consists of a
-+ * 2D array for each of the RGB colors with size Width by Height. There is no
-+ * Color map for the input. Output is a quantized image with 2D array of
-+ * indexes into the output color map.
-+ * Note input image can be 24 bits at the most (8 for red/green/blue) and
-+ * the output has 256 colors at the most (256 entries in the color map.).
-+ * ColorMapSize specifies size of color map up to 256 and will be updated to
-+ * real size before returning.
-+ * Also non of the parameter are allocated by this routine.
-+ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
-+ ******************************************************************************/
-+static int
-+QuantizeBuffer(unsigned int Width,
-+ unsigned int Height,
-+ int *ColorMapSize,
-+ GifByteType * RedInput,
-+ GifByteType * GreenInput,
-+ GifByteType * BlueInput,
-+ GifByteType * OutputBuffer,
-+ GifColorType * OutputColorMap) {
-+
-+ unsigned int Index, NumOfEntries;
-+ int i, j, MaxRGBError[3];
-+ unsigned int NewColorMapSize;
-+ long Red, Green, Blue;
-+ NewColorMapType NewColorSubdiv[256];
-+ QuantizedColorType *ColorArrayEntries, *QuantizedColor;
-+
-+ ColorArrayEntries = (QuantizedColorType *)malloc(
-+ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
-+ if (ColorArrayEntries == NULL) {
-+ return GIF_ERROR;
-+ }
-+
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
-+ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
-+ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
-+ MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].Count = 0;
-+ }
-+
-+ /* Sample the colors and their distribution: */
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ ColorArrayEntries[Index].Count++;
-+ }
-+
-+ /* Put all the colors in the first entry of the color map, and call the
-+ * recursive subdivision process. */
-+ for (i = 0; i < 256; i++) {
-+ NewColorSubdiv[i].QuantizedColors = NULL;
-+ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[i].RGBMin[j] = 0;
-+ NewColorSubdiv[i].RGBWidth[j] = 255;
-+ }
-+ }
-+
-+ /* Find the non empty entries in the color table and chain them: */
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++)
-+ if (ColorArrayEntries[i].Count > 0)
-+ break;
-+ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
-+ NumOfEntries = 1;
-+ while (++i < COLOR_ARRAY_SIZE)
-+ if (ColorArrayEntries[i].Count > 0) {
-+ QuantizedColor->Pnext = &ColorArrayEntries[i];
-+ QuantizedColor = &ColorArrayEntries[i];
-+ NumOfEntries++;
-+ }
-+ QuantizedColor->Pnext = NULL;
-+
-+ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
-+ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
-+ NewColorMapSize = 1;
-+ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
-+ GIF_OK) {
-+ free((char *)ColorArrayEntries);
-+ return GIF_ERROR;
-+ }
-+ if (NewColorMapSize < *ColorMapSize) {
-+ /* And clear rest of color map: */
-+ for (i = NewColorMapSize; i < *ColorMapSize; i++)
-+ OutputColorMap[i].Red = OutputColorMap[i].Green =
-+ OutputColorMap[i].Blue = 0;
-+ }
-+
-+ /* Average the colors in each entry to be the color to be used in the
-+ * output color map, and plug it into the output color map itself. */
-+ for (i = 0; i < NewColorMapSize; i++) {
-+ if ((j = NewColorSubdiv[i].NumEntries) > 0) {
-+ QuantizedColor = NewColorSubdiv[i].QuantizedColors;
-+ Red = Green = Blue = 0;
-+ while (QuantizedColor) {
-+ QuantizedColor->NewColorIndex = i;
-+ Red += QuantizedColor->RGB[0];
-+ Green += QuantizedColor->RGB[1];
-+ Blue += QuantizedColor->RGB[2];
-+ QuantizedColor = QuantizedColor->Pnext;
-+ }
-+ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ } else
-+ fprintf(stderr,
-+ "\n%s: Null entry in quantized color map - that's weird.\n",
-+ "libgdiplus");
-+ }
-+
-+ /* Finally scan the input buffer again and put the mapped index in the
-+ * output buffer. */
-+ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ Index = ColorArrayEntries[Index].NewColorIndex;
-+ OutputBuffer[i] = Index;
-+ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
-+ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
-+ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
-+ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
-+ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
-+ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
-+ }
-+
-+#ifdef DEBUG
-+ fprintf(stderr,
-+ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
-+ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
-+#endif /* DEBUG */
-+
-+ free((char *)ColorArrayEntries);
-+
-+ *ColorMapSize = NewColorMapSize;
-+
-+ return GIF_OK;
-+}
-+
- /* giflib declares this incorrectly as EgifOpen */
- extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-gold.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-gold.patch
deleted file mode 100644
index 379ae941ef4..00000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-gold.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- tests/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 97f5f4e..c02ca25 100644
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -228,7 +228,7 @@ DEPS = \
- $(top_builddir)/src/libgdiplus.la
-
- LDADDS = \
-- $(top_builddir)/src/libgdiplus.la
-+ $(top_builddir)/src/libgdiplus.la -lX11 -lglib-2.0
-
- testgdi_DEPENDENCIES = $(TEST_DEPS)
- testgdi_LDADD = $(LDADDS)
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-5.6.1-cofigure.patch b/dev-dotnet/libgdiplus/files/libgdiplus-5.6.1-cofigure.patch
deleted file mode 100644
index 04f73357e1d..00000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-5.6.1-cofigure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nupr libgdiplus-5.6.1~/configure libgdiplus-5.6.1/configure
---- libgdiplus-5.6.1~/configure 2019-06-07 21:26:37.207823285 +0200
-+++ libgdiplus-5.6.1/configure 2019-06-07 21:27:44.045156234 +0200
-@@ -14133,7 +14133,7 @@ fi
-
-
- # Add xrender here so that we don't fail to find glib if we won't have xrender.pc
--if test "x$no_x" != "xyes" && "x$x11_available" = "xyes"; then
-+if test "x$no_x" != "xyes" && test "x$x11_available" = "xyes"; then
- GDIPLUS_LIBS="$GDIPLUS_LIBS `$PKG_CONFIG --libs xrender `"
- GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS `$PKG_CONFIG --cflags xrender `"
- fi
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
deleted file mode 100644
index 32bb72c4078..00000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base eutils mono flag-o-matic ltprune
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
-
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.16:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-4.1.3
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=("${FILESDIR}/${P}-gold.patch"
- "${FILESDIR}/${PN}-2.10.1-libpng15.patch"
- "${FILESDIR}/${PN}-2.10.9-freetype251.patch")
-
-src_prepare() {
- base_src_prepare
- sed -i -e 's:ungif:gif:g' configure || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- econf \
- --disable-static \
- --with-cairo=system \
- $(use !cairo && printf %s --with-pango)
-}
-
-src_compile() {
- emake "$@"
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" "$@" install #nowarn
- mono_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"
- do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- if [[ "${DOCS[@]}" ]]
- then
- dodoc "${DOCS[@]}"
- fi
- prune_libtool_files
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild
deleted file mode 100644
index 90794452cf3..00000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base eutils mono flag-o-matic ltprune
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
-
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.16:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-4.2.3
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=("${FILESDIR}/${P}-gold.patch"
- "${FILESDIR}/${PN}-2.10.1-libpng15.patch"
- "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch"
- "${FILESDIR}/${PN}-2.10.9-freetype251.patch")
-
-src_prepare() {
- base_src_prepare
- sed -i -e 's:ungif:gif:g' configure || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- econf \
- --disable-static \
- --with-cairo=system \
- $(use !cairo && printf %s --with-pango)
-}
-
-src_compile() {
- emake "$@"
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" "$@" install #nowarn
- mono_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"
- do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- if [[ "${DOCS[@]}" ]]
- then
- dodoc "${DOCS[@]}"
- fi
- prune_libtool_files
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild
deleted file mode 100644
index 5e07d0b6600..00000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils dotnet flag-o-matic ltprune
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
-
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.16:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-4.2.3
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=("${FILESDIR}/${P}-gold.patch"
- "${FILESDIR}/${PN}-2.10.1-libpng15.patch"
- "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch")
-
-src_prepare() {
- base_src_prepare
- sed -i -e 's:ungif:gif:g' configure || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- econf \
- --disable-static \
- --with-cairo=system \
- $(use !cairo && printf %s --with-pango)
-}
-
-src_compile() {
- emake "$@"
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" "$@" install #nowarn
- dotnet_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"
- do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- if [[ "${DOCS[@]}" ]]
- then
- dodoc "${DOCS[@]}"
- fi
- prune_libtool_files
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild
deleted file mode 100644
index fae2d76969e..00000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils dotnet ltprune
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
-
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.2.3:2
- >=media-libs/freetype-2.3.7:2
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0=
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-5.1.2:=
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- --disable-static \
- $(usex cairo "" "--with-pango")
-}
-
-src_install() {
- default
-
- dotnet_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"; do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
- prune_libtool_files
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild b/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild
deleted file mode 100644
index 93891c63f74..00000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
-
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.2.3:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-5.1.2
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- --disable-static \
- $(usex cairo "" "--with-pango")
-}
-
-src_install() {
- default
-
- dotnet_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"; do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
- prune_libtool_files
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-5.6.1-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-5.6.1-r1.ebuild
deleted file mode 100644
index 7516ec26028..00000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-5.6.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
-
-IUSE="cairo"
-
-#skip tests due https://bugs.gentoo.org/687784
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/glib-2.2.3:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-5.1.2
- <media-libs/giflib-5.1.9
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-cofigure.patch"
-)
-
-src_configure() {
- econf \
- --disable-static \
- $(usex cairo "" "--with-pango")
-}
-
-src_install() {
- default
-
- dotnet_multilib_comply
- local commondoc=( AUTHORS ChangeLog README TODO )
- for docfile in "${commondoc[@]}"; do
- [[ -e "${docfile}" ]] && dodoc "${docfile}"
- done
- [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-16 21:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-16 21:28 [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/libgdiplus/files/, dev-dotnet/libgdiplus/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2019-06-10 6:56 Mikhail Pukhlikov
2016-08-25 19:09 Pacho Ramos
2015-08-18 9:27 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox