From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- media-libs/coin/files/coin-3.1.0-javascript.patch | 38 ---------------------- media-libs/coin/files/coin-3.1.3-freetype251.patch | 28 ---------------- media-libs/coin/files/coin-3.1.3-gcc-4.7.patch | 10 ------ media-libs/coin/files/coin-3.1.3-gcc-7.patch | 21 ------------ .../coin-3.1.3-memhandler-initialization.patch | 23 ------------- .../coin/files/coin-3.1.3-pkgconfig-partial.patch | 13 -------- 6 files changed, 133 deletions(-) delete mode 100644 media-libs/coin/files/coin-3.1.0-javascript.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-freetype251.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-gcc-4.7.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-gcc-7.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch (limited to 'media-libs/coin/files') diff --git a/media-libs/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch deleted file mode 100644 index f45d9cd78cf6..000000000000 --- a/media-libs/coin/files/coin-3.1.0-javascript.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: src/vrml97/JS_VRMLClasses.h -=================================================================== ---- src/vrml97/JS_VRMLClasses.h (revision 13505) -+++ src/vrml97/JS_VRMLClasses.h (revision 13506) -@@ -28,6 +28,7 @@ - #error this is a private header file - #endif /* ! COIN_INTERNAL */ - -+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT) - /* ********************************************************************** */ - - class SoJavaScriptEngine; -@@ -37,5 +38,6 @@ - void JS_addVRMLclasses(SoJavaScriptEngine * engine); - - /* ********************************************************************** */ -+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT - - #endif /* !COIN_JS_VRMLCLASSES_H */ -Index: src/vrml97/JS_VRMLClasses.cpp -=================================================================== ---- src/vrml97/JS_VRMLClasses.cpp (revision 13505) -+++ src/vrml97/JS_VRMLClasses.cpp (revision 13506) -@@ -2,7 +2,7 @@ - #include "config.h" - #endif // HAVE_CONFIG_H - --#ifdef HAVE_VRML97 -+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT) - - /**************************************************************************\ - * -@@ -2097,4 +2097,4 @@ - MFVec3dHandler::jsval2field); - } - --#endif // HAVE_VRML97 -+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT diff --git a/media-libs/coin/files/coin-3.1.3-freetype251.patch b/media-libs/coin/files/coin-3.1.3-freetype251.patch deleted file mode 100644 index 44e8eefb1f63..000000000000 --- a/media-libs/coin/files/coin-3.1.3-freetype251.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Coin-3.1.3/src/glue/freetype.cpp -+++ Coin-3.1.3/src/glue/freetype.cpp -@@ -52,9 +52,9 @@ - #ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */ - #define FREETYPEGLUE_ASSUME_FREETYPE 1 - #include --#include --#include --#include -+#include FT_FREETYPE_H -+#include FT_GLYPH_H -+#include FT_OUTLINE_H - #endif /* FREETYPEGLUE_ASSUME_FREETYPE */ - - #include ---- Coin-3.1.3/src/glue/freetype.h -+++ Coin-3.1.3/src/glue/freetype.h -@@ -87,8 +87,8 @@ - - #ifdef HAVE_FREETYPE - #include --#include --#include -+#include FT_FREETYPE_H -+#include FT_GLYPH_H - #else /* HAVE_FREETYPE */ - - #include diff --git a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch deleted file mode 100644 index fd2430903802..000000000000 --- a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- coin3-3.1.3.orig/include/Inventor/SbBasic.h -+++ coin3-3.1.3/include/Inventor/SbBasic.h -@@ -24,6 +24,7 @@ - * - \**************************************************************************/ - -+#include - #include - - /* ********************************************************************** */ diff --git a/media-libs/coin/files/coin-3.1.3-gcc-7.patch b/media-libs/coin/files/coin-3.1.3-gcc-7.patch deleted file mode 100644 index c1f1f560d851..000000000000 --- a/media-libs/coin/files/coin-3.1.3-gcc-7.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN Coin-3.1.3.orig/src/3ds/SoStream.cpp Coin-3.1.3/src/3ds/SoStream.cpp ---- Coin-3.1.3.orig/src/3ds/SoStream.cpp 2010-03-02 16:20:09.000000000 +0300 -+++ Coin-3.1.3/src/3ds/SoStream.cpp 2017-07-23 15:04:43.808204691 +0300 -@@ -176,7 +176,7 @@ - if (!gotNum) { setBadBit(); return FALSE; } \ - \ - char *ce; \ -- s = '\0'; \ -+ s = NULL; \ - _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \ - \ - if (ce != s) \ -@@ -273,7 +273,7 @@ - gotAll: \ - \ - char *ce; \ -- s = '\0'; \ -+ s = NULL; \ - double tempVal = _convertFunc_(buf, &ce); \ - \ - if (ce != s) \ diff --git a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch deleted file mode 100644 index 892882b6a3db..000000000000 --- a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch +++ /dev/null @@ -1,23 +0,0 @@ -Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378 -Patch http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/tree/0012-memhandler-initialization.patch?id=ca89ec7227943bdec800ee51b920f578fab87b05 - ---- a/src/misc/SbHash.h -+++ b/src/misc/SbHash.h -@@ -89,6 +89,8 @@ - cc_memalloc_deallocate(entry->memhandler, ptr); - } - SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {} -+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler) -+ : key(key), obj(obj), memhandler(memhandler) {} - - Key key; - Type obj; -@@ -218,7 +220,7 @@ - /* Key not already in the hash table; insert a new - * entry as the first element in the bucket - */ -- entry = new (this->memhandler) SbHashEntry(key, obj); -+ entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); - entry->next = this->buckets[i]; - this->buckets[i] = entry; - diff --git a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch deleted file mode 100644 index 3fd3bca726d4..000000000000 --- a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru ../Coin-3.1.3/Coin.pc.in ./Coin.pc.in ---- Coin.pc.in 2010-03-02 14:20:09.000000000 +0100 -+++ Coin.pc.in 2010-06-28 19:27:59.634534460 +0200 -@@ -10,7 +10,8 @@ - Version: @COIN_VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} @COIN_EXTRA_LDFLAGS@ @COIN_EXTRA_LIBS@ -+Libs: -L${libdir} -lCoin -+Libs.private: -L${libdir} @COIN_EXTRA_LIBS@ - Cflags: -I${includedir} @COIN_EXTRA_CFLAGS@ @COIN_EXTRA_CPPFLAGS@ - - coin_host=@host@ -- cgit v1.2.3