From e8aa09f74c8ba0c9e1c5ae3ab49f93b6a0820330 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Sep 2024 12:32:28 +0100 Subject: gentoo auto-resync : 14:09:2024 - 12:32:27 --- media-libs/libwmf/Manifest | 11 +- ...ibwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch | 118 --------------------- .../files/libwmf-0.2.8.4-CVE-2015-4695.patch | 56 ---------- .../files/libwmf-0.2.8.4-CVE-2015-4696.patch | 23 ---- .../libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch | 25 ----- .../libwmf/files/libwmf-0.2.8.4-intoverflow.patch | 27 ----- .../libwmf-0.2.8.4-use-freetype2-pkg-config.patch | 67 ------------ .../files/libwmf-0.2.8.4-use-system-fonts.patch | 39 ------- media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 5 +- media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild | 101 ------------------ 10 files changed, 5 insertions(+), 467 deletions(-) delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch delete mode 100644 media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild (limited to 'media-libs/libwmf') diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest index 1e22e20b343d..5549b95b9c18 100644 --- a/media-libs/libwmf/Manifest +++ b/media-libs/libwmf/Manifest @@ -1,15 +1,6 @@ -AUX libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch 3240 BLAKE2B e890a9ce2bf98f550b1586d9edcae461822cc3ad1ced3a114730c417048f9bd06724234b61826ca471ba5eb3be6086b7882fd6bc2012e0dca4cbc9fa323f60e8 SHA512 49216f9d0f499ce8923fafc8da8fa9ac1d1ce284ba36fa8131be48b23f0885c3f20ec358f0e9a47b6856239aeff2dbe9311df6594a7e797bfef92e092365821f -AUX libwmf-0.2.8.4-CVE-2015-4695.patch 1813 BLAKE2B fba497022327c65d7f00848b1494489bc92e2824ffc30ab7a6df2e5d94f83a5a8ba1baa1beaac7b9b86d90bc9d3d9b43af2057acbbeb462fc9e85e2d40b50cb0 SHA512 43c3b73df7317eec2d0ef5ce818949977d7f634487279afc692a79b78f6418bf6d9c854765fdd85a2647061ae647d2291ac9504dfbf1e6c5c5caf58712e6446e -AUX libwmf-0.2.8.4-CVE-2015-4696.patch 483 BLAKE2B 4cb2ea28fd5a895395492b566b7599d234e7786d72cbddf2be4e2e78a5b4adac6e36b7eeb7d6d885a5d2fbbc08bcb1aea69eafa0d48295b1cce52309a879d552 SHA512 8f89d01822bfe598c410a22385207f5782164974d796c3839c27562531017452ac1f3da3111e8580168963d45fd797b1fbb9487d8593286ff8bbd446cb383dd2 AUX libwmf-0.2.8.4-build.patch 1340 BLAKE2B 166ea2f767a52e96127a1dbfcd91a4e6e95b744c53303db9f093d56b0ac9aed4b2bd75aa1503e02a4e2d5fe599a09274c57e36179d588f71407f5e2bdd729c9d SHA512 de48cf695e0c1a3d9b97e2dbd4db9ccc2c633269de88be8799e5cf37dbd6a5bb70cae36b203ed2bc22f22a38970faa4feeb0b7aa11aa290f68dadd2b3a5dd2f6 -AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 BLAKE2B 5dfb05fd737d18cd3a355c2b8ba19c74ea7f41284a64893c0f4412b6d6a51d43c61356baa236901f2318cccab28aa100ceeb2b026ca8b70e36848e50eb549037 SHA512 2a03dffdcf2f8e6181f4468b69dc6dce4b01d9258f7596ffce83a555bed14e429e60848ba26fe7bece309430f9c2a90eec84802221d136f15058207b183382a0 -AUX libwmf-0.2.8.4-intoverflow.patch 971 BLAKE2B f10b1b268144d790e8be24c94ece3a1d02961ed8436be22e26d742812ac3d1b4ff207bc978e2b6aba72e92aea8191f65b91dc8cfae5c5ca405b78f5b41c8b43e SHA512 939b729d2ca9c1204e623d50151d2a736904455e716ce917da83e454dc99165b77c2039413174bd9e219dc7453ef3c92348cc7bf1e3a1ade1d5040a81eb7cdee AUX libwmf-0.2.8.4-libpng-1.5.patch 478 BLAKE2B 355d3cd673a6ce5c09a13aac3b0badb7f1dfff112c4526b6be9b8a76cb1db4a0702bdcccbb5df20aa04976a4c54bfeba0fe11f66f2154c64f3ff2c3409491672 SHA512 acfa95c22d3d352b270d41cd814c1c876536da9a08a19eb40acb9770913fbd824654c90223413507d714248321cd6be9190187d3b00a75ed4a0a001a0800617c AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae2e4bd96eccb7bf12f8ba138a00cb5fb36725dad2a00ba4be71c8a61649f1e723204f59741e86da4517f802ce2743 SHA512 02170d7ec2cd0e987567becd995416c52b85d3f55d6e0e236ea8eeacdb3218edc1a1647d96f24b3dbe904ea3bcc6cacef1a6d82a0fbfa9d808dc061e11a154f7 -AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058 -AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c DIST libwmf-0.2.13.tar.gz 3044235 BLAKE2B 0cfbc94d6e7d52c5ecf09b277cf536f56ec54d3b53845e80afdfe4aa3b397562bffd198fb51726d210f21e3e9e16650f85e9188f4e5303b5c4c8b917ef882040 SHA512 f45a936c9bc98fc1a5f2b0808b497119e4dcd3c132615fdddb7583e5719c7d1d7f85c16ebf313cad453e5b7ae3508bf6b80c4ed2b42322b7dec295d8f4eb86ce -DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5 -EBUILD libwmf-0.2.13-r1.ebuild 2081 BLAKE2B 191d2c1e057590d4bc7e04afa00fcbab29831942db49299b02767e1aa866fee907701a163ee3d4b61bfbc6ecf392762f66fc5689d319f3c63d11449b2c844fcc SHA512 4d932aac098da631e50ad6be984d3272e02e175ccce84170adb40d954005915ec01105d36b4339153988735f954870cf75e45f3e06af4595581405d8652d7345 -EBUILD libwmf-0.2.8.4-r9.ebuild 2572 BLAKE2B d2246a5329e907c7bf23a2ef8350ad4f55f46e80b3839b12d44fa68cdcf8cd56debf4b88bfa6708b064ae333653bebaa383052435fca223eef81cb5001df6341 SHA512 63bbbcdd2b63544bb57d7cbe98fbb84ffa9673df1bf2c906929985c14d5b780936fd0f19207d6d3f8999747f6df459e9bee3a0fe0bbc1876ac6ad0d371280019 +EBUILD libwmf-0.2.13-r1.ebuild 2086 BLAKE2B f35f6816975b25042c4d55833da145de35e596ae406750ccd954411e07099273556e02e0edb8e92784120c329b9c462fa8944ed81d4a4b41820be8a90c38d3ff SHA512 b1197e31e36dda6dc63c20583ec04cee2a1b592159c9c26bbc6000d7067af88e9155bd95ff0dfab8a984b4a8f8ed2c64fb7383785b04df8ebfa81df6d9f6ff3b MISC metadata.xml 358 BLAKE2B 2ea3f9baafa3e335d52668945db020bfef6188bd6fd4daf19dd99714de595f57ae98b1e9c88fe25dbf0647d241a5c24ec84c7e334b36cb17d37a8e545f824b9b SHA512 b4a8da2bb4723d4b3470dfb2c5dc3b745bd44032d627188198979400ec639e8ea01b199f844ce80b99e581e1ab93aac8301b7a05b0ea35ea81e3ff8ab1948706 diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch deleted file mode 100644 index e8ba8db1e843..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2015-06-08 14:46:24.591876404 +0100 -+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2015-06-08 14:46:35.345993247 +0100 -@@ -859,7 +859,7 @@ - % - % - */ --static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) -+static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) - { int byte; - int count; - int i; -@@ -870,12 +870,14 @@ - U32 u; - - unsigned char* q; -+ unsigned char* end; - - for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0; - - byte = 0; - x = 0; - q = pixels; -+ end = pixels + bmp->width * bmp->height; - - for (y = 0; y < bmp->height; ) - { count = ReadBlobByte (src); -@@ -884,7 +886,10 @@ - { /* Encoded mode. */ - byte = ReadBlobByte (src); - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = (unsigned char) byte; - } - else -@@ -896,13 +901,15 @@ - else - { /* Escape mode. */ - count = ReadBlobByte (src); -- if (count == 0x01) return; -+ if (count == 0x01) return 1; - switch (count) - { - case 0x00: - { /* End of line. */ - x = 0; - y++; -+ if (y >= bmp->height) -+ return 0; - q = pixels + y * bmp->width; - break; - } -@@ -910,13 +917,20 @@ - { /* Delta mode. */ - x += ReadBlobByte (src); - y += ReadBlobByte (src); -+ if (y >= bmp->height) -+ return 0; -+ if (x >= bmp->width) -+ return 0; - q = pixels + y * bmp->width + x; - break; - } - default: - { /* Absolute mode. */ - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = ReadBlobByte (src); - } - else -@@ -943,7 +957,7 @@ - byte = ReadBlobByte (src); /* end of line */ - byte = ReadBlobByte (src); - -- return; -+ return 1; - } - - /* -@@ -1143,8 +1157,18 @@ - } - } - else -- { /* Convert run-length encoded raster pixels. */ -- DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image); -+ { -+ if (bmp_info.bits_per_pixel == 8) /* Convert run-length encoded raster pixels. */ -+ { -+ if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image)) -+ { WMF_ERROR (API,"corrupt bmp"); -+ API->err = wmf_E_BadFormat; -+ } -+ } -+ else -+ { WMF_ERROR (API,"Unexpected pixel depth"); -+ API->err = wmf_E_BadFormat; -+ } - } - - if (ERR (API)) ---- libwmf-0.2.8.4/src/ipa/ipa.h 2015-06-08 14:46:24.590876393 +0100 -+++ libwmf-0.2.8.4/src/ipa/ipa.h 2015-06-08 14:46:35.345993247 +0100 -@@ -48,7 +48,7 @@ - static unsigned short ReadBlobLSBShort (BMPSource*); - static unsigned long ReadBlobLSBLong (BMPSource*); - static long TellBlob (BMPSource*); --static void DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); -+static int DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); - static void ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*); - static int ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int); - static void SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch deleted file mode 100644 index b6d499da98e1..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libwmf-0.2.8.4/src/player/meta.h -+++ libwmf-0.2.8.4/src/player/meta.h -@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI* - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch deleted file mode 100644 index 3312841258b0..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- libwmf-0.2.8.4/src/player/meta.h -+++ libwmf-0.2.8.4/src/player/meta.h -@@ -2585,6 +2585,8 @@ - polyrect.BR[i] = clip->rects[i].BR; - } - -+ if (FR->region_clip) FR->region_clip (API,&polyrect); -+ - wmf_free (API,polyrect.TL); - wmf_free (API,polyrect.BR); - } -@@ -2593,9 +2595,10 @@ - polyrect.BR = 0; - - polyrect.count = 0; -+ -+ if (FR->region_clip) FR->region_clip (API,&polyrect); - } - -- if (FR->region_clip) FR->region_clip (API,&polyrect); - - return (changed); - } diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch deleted file mode 100644 index 83a9ce7f3635..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN libwmf-0.2.8.4.old/configure.ac libwmf-0.2.8.4/configure.ac ---- libwmf-0.2.8.4.old/configure.ac 2011-07-01 22:37:57.000000000 +0200 -+++ libwmf-0.2.8.4/configure.ac 2011-07-01 22:41:38.000000000 +0200 -@@ -744,8 +744,7 @@ - - if test $LIBWMF_BUILDSTYLE != lite; then - PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ -- GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` -- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" -+ GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0` - wmf_gdk_pixbuf=yes - ],[ wmf_gdk_pixbuf=no - ]) -diff -urN libwmf-0.2.8.4.old/src/Makefile.am libwmf-0.2.8.4/src/Makefile.am ---- libwmf-0.2.8.4.old/src/Makefile.am 2011-07-01 22:37:57.000000000 +0200 -+++ libwmf-0.2.8.4/src/Makefile.am 2011-07-01 22:40:41.000000000 +0200 -@@ -63,7 +63,7 @@ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -export-dynamic - --loaderdir = $(libdir)/$(GDK_PIXBUF_DIR) -+loaderdir = $(GDK_PIXBUF_DIR) - - loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN) - diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch deleted file mode 100644 index 507fe66223ce..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/player.c 2002-12-10 19:30:26.000000000 +0000 -+++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100 -@@ -42,6 +42,7 @@ - #include "player/defaults.h" /* Provides: default settings */ - #include "player/record.h" /* Provides: parameter mechanism */ - #include "player/meta.h" /* Provides: record interpreters */ -+#include - - /** - * @internal -@@ -132,8 +134,14 @@ - } - } - --/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); -- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); -+ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) -+ { -+ API->err = wmf_E_InsMem; -+ WMF_DEBUG (API,"bailing..."); -+ return (API->err); -+ } -+ -+ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); - - if (ERR (API)) - { WMF_DEBUG (API,"bailing..."); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch deleted file mode 100644 index 0f133e2e75e2..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 6 Aug 2014 14:53:03 +0200 -Subject: [PATCH] configure: use pkg-config for freetype - -Upstream-status: Pending -Signed-off-by: Koen Kooi ---- - configure.ac | 37 ++++++++----------------------------- - 1 file changed, 8 insertions(+), 29 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3cfe974..0055a8c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use freetype2 in DIR],[ - fi - ]) - --if [ test -n "$FREETYPE_DIR" ]; then -- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH]) --else -- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config) --fi -- --if [ test -n "$FREETYPE_CONFIG" ]; then -- if [ test -n "$FREETYPE_DIR" ]; then -- freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include" -- freetype_libs=`$FREETYPE_CONFIG --libs` -- else -- freetype_cflags=`$FREETYPE_CONFIG --cflags` -- freetype_libs=`$FREETYPE_CONFIG --libs` -- fi --else -- if [ test -n "$FREETYPE_DIR" ]; then -- freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include" -- freetype_libs="-L$FREETYPE_DIR/lib -lfreetype" -- else -- freetype_cflags="" -- freetype_libs="-lfreetype" -- fi --fi -- --CPPFLAGS="$freetype_cflags $CPPFLAGS" --LDFLAGS="$LDFLAGS $freetype_libs" -+PKG_CHECK_MODULES(FREETYPE2, freetype2, -+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" -+ LDFLAGS="$LDFLAGS $FREETYPE2_LIBS", -+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) -+) - - AC_CHECK_LIB(freetype,FT_Init_FreeType,[ -- WMF_FT_LDFLAGS="$freetype_libs" -+ WMF_FT_LDFLAGS="$FREETYPE2_LIBS" - ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) - ]) - AC_CHECK_HEADER(ft2build.h,[ -- WMF_FT_CFLAGS="$freetype_cflags" -- WMF_FT_CONFIG_CFLAGS="$freetype_cflags" -+ WMF_FT_CFLAGS="$FREETYPE2_CFLAGS" -+ WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS" - ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) - ]) - --- -1.9.0 - diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch deleted file mode 100644 index 2f7465c33cd0..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN libwmf-0.2.8.4.old/fonts/Makefile.am libwmf-0.2.8.4/fonts/Makefile.am ---- libwmf-0.2.8.4.old/fonts/Makefile.am 2011-07-01 22:37:57.000000000 +0200 -+++ libwmf-0.2.8.4/fonts/Makefile.am 2011-07-01 22:38:37.000000000 +0200 -@@ -1,35 +1,3 @@ - fontdir = @WMF_FONTDIR@ - - bin_SCRIPTS = libwmf-fontmap -- --FONTS = \ -- n019003l.afm \ -- n019003l.pfb \ -- n019004l.afm \ -- n019004l.pfb \ -- n019023l.afm \ -- n019023l.pfb \ -- n019024l.afm \ -- n019024l.pfb \ -- n021003l.afm \ -- n021003l.pfb \ -- n021004l.afm \ -- n021004l.pfb \ -- n021023l.afm \ -- n021023l.pfb \ -- n021024l.afm \ -- n021024l.pfb \ -- n022003l.afm \ -- n022003l.pfb \ -- n022004l.afm \ -- n022004l.pfb \ -- n022023l.afm \ -- n022023l.pfb \ -- n022024l.afm \ -- n022024l.pfb \ -- s050000l.afm \ -- s050000l.pfb -- --font_DATA = $(FONTS) fontmap -- --EXTRA_DIST = libwmf-fontmap.in LICENSE $(FONTS) diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild index 34d9e1951968..5962fe96d395 100644 --- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild +++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild @@ -6,7 +6,10 @@ EAPI=8 inherit autotools gnome2-utils DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" -HOMEPAGE="https://github.com/caolanm/libwmf http://wvware.sourceforge.net/" +HOMEPAGE=" + https://github.com/caolanm/libwmf + https://wvware.sourceforge.net/ +" SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2" diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild deleted file mode 100644 index 6d328c94189e..000000000000 --- a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools gnome2-utils - -DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" -HOMEPAGE="http://wvware.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/project/wvware/${PN}/${PV}/${P}.tar.gz" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc expat X" - -RDEPEND="app-text/ghostscript-gpl - media-fonts/urw-fonts - media-libs/freetype:2= - media-libs/libpng:0= - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2 - virtual/jpeg:0= - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2:2= ) - X? ( x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" ) - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch - "${FILESDIR}"/${P}-CVE-2015-4695.patch - "${FILESDIR}"/${P}-CVE-2015-4696.patch - "${FILESDIR}"/${P}-gdk-pixbuf.patch - "${FILESDIR}"/${P}-intoverflow.patch - "${FILESDIR}"/${P}-libpng-1.5.patch - "${FILESDIR}"/${P}-pngfix.patch - "${FILESDIR}"/${P}-use-freetype2-pkg-config.patch - "${FILESDIR}"/${P}-use-system-fonts.patch - ) - -src_prepare() { - default - - # Fixes QA warning "This package has a configure.in file which has long been deprecated" - # Since there is already a configure.ac, we don't need the deprecated configure.in - rm configure.in || die - - if ! use doc ; then - sed -i -e 's:doc::' Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - # Support for GD is disabled, since it's never linked, even, when enabled - # See https://bugs.gentoo.org/268161 - local myeconfargs=( - --disable-gd - --disable-static - $(use_enable debug) - $(use_with expat) - $(use_with !expat libxml2) - $(use_with X x) - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} - --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-freetype - --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap - --with-jpeg - --with-layers - --with-png - --with-sys-gd - --with-zlib - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # address parallel build issue, bug 677566 - MAKEOPTS=-j1 - - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - gnome2_gdk_pixbuf_update -} -- cgit v1.2.3