From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- media-gfx/freewrl/Manifest | 7 +-- .../freewrl/files/freewrl-1.22.13-desktop.patch | 11 ----- .../files/freewrl-1.22.13-fontconfig-match.patch | 19 -------- .../freewrl/files/freewrl-1.22.13-java-fix.patch | 54 ---------------------- .../files/freewrl-1.22.13-mozjs187-config.patch | 10 ---- .../freewrl/files/freewrl-2.3.3-ld.gold.patch | 35 -------------- media-gfx/freewrl/metadata.xml | 5 +- 7 files changed, 2 insertions(+), 139 deletions(-) delete mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch delete mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch delete mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch delete mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch delete mode 100644 media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch (limited to 'media-gfx/freewrl') diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest index 986d671a41c6..bcc8e47ad764 100644 --- a/media-gfx/freewrl/Manifest +++ b/media-gfx/freewrl/Manifest @@ -1,9 +1,4 @@ -AUX freewrl-1.22.13-desktop.patch 350 BLAKE2B 196fd1708c7dbc6350381081012c97f2c26e54de3e59850008be4ab59b7e37328f10fab68444ec180996d2f953bf608ceccb431d3160ca51e816f599254f1abc SHA512 3e8a2e2275243ac55a0a62b105aeff1166a39798e34f94878b46e02fdacc038d386768e388529b550d755c737e574f988b2ffacbc64f224ed6e5d6d67de2b4e2 -AUX freewrl-1.22.13-fontconfig-match.patch 666 BLAKE2B 5e4a1e818214c3f4361d3a90c105db254ef34829d28ca15082b49424d649840e0dd3bb0f334b535e40b2f495f505808588e46b6f88e06c523ee796fed05504e4 SHA512 8f92238be4568bea9959ffd9ac81920633340e583d175e6a35add48edbaa41aa937aa9d7494261e2edf83bbdfeadbfe597b5881c3dbf2ef9e9bf2f3ce4a508f5 -AUX freewrl-1.22.13-java-fix.patch 1942 BLAKE2B 2358d7862f179f8c98babfb241fdc281a84eaf0073529f549f435bcbd363f0aad7d44027f221b3ea85109fa06721d7cacb7584d1aaefe4333dc982964b5c940d SHA512 e8224e249e28918e04117542c710b093f90e31666312c7b3f62444d68158832893cf81237c8d9c7677ac4e0b571c0a74457721f0778996a975fbdacffdebb82a -AUX freewrl-1.22.13-mozjs187-config.patch 486 BLAKE2B 4d130a4f8adc59ae97c83dd697d543b3fdd8bdd5c9b9e6253b8c1aa936648a9212e0a1d3c899bf5dd217579142e84714d1d783901e3aa61184122b2530e99fca SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298 -AUX freewrl-2.3.3-ld.gold.patch 1120 BLAKE2B 86f6b8baf403b70b3fd346265b20bd39b76fcdeb9f953b8a653c1999c7f8ea0be1faed609ddb5a74c01f4536f7cfae8484815422a2fdfa21cb9debabc0dd9f3c SHA512 010369ab9ec5f03f3055594b88001deb14a58e3d69cd5f8312a7a25d34ec4bef81940d911a7c13aa8872c82fe66c14284d292a33e1629ab9dfe52cd9a4412e3b DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0 EBUILD freewrl-3.0.0-r1.ebuild 4430 BLAKE2B 7145155adf968a057b3ab817fe496fd8fa7e618e53996a27967d7937ecaa1c0f45e318e83d470d9bfc225aca797675a95f78160e07aa46afbb81e98750fd389b SHA512 0a02299bc0698e022b8eaca0aa6e9151cdb08b16155137d05a4404a467ef66ff04e0d1e0a22b86ad9d557a61210966b7a960f63c6cc478cc889b93e39f775c3a EBUILD freewrl-9999.ebuild 4489 BLAKE2B 8d5f07f5fbb46894e75b62994794738dcf50fa2025eeddc5a0c5c4aada55169e15c2ae5ec90434ed8f96a4a12f1f0b20b1195eee7ffc4a391280f1b9842d56c6 SHA512 9d9dd93cdc9e6dae64d0bdb068b56fa2c6a0f478708be6e48aa771e10526b30c73ae039cc83fe3f62d00bab2571e60bb013ee796c7cd613c8b3c7fa8a7cc60dc -MISC metadata.xml 1381 BLAKE2B 566f615062dd20b88fb1a040961df6e117477544c38d0c53ed7350d1311829b086af1a5c3f763e24d3d63e044a2193c07ac16ed3238826a10fce987d94122db0 SHA512 04a5283d1d9006fcb92806f9eed0033d3f173e7c3d8db54bc5d09f3c26536714f1c090036ae902fbbd9dd801353139a2e896bb462cb28d50d2717fd4d16e7c8d +MISC metadata.xml 1302 BLAKE2B eb8522dbaadd9c9ebc8d3b5e03072fc7b57f6d87046f52104985a5e0e8f40669b53906921286d1d2c79e393853cac4c88f5a351c7bd0c38e3b9905308c0a890e SHA512 f7581007975722b3d16cf349c55ab67b5cf92a47316399adefb38a9413669f544c9fa5cc922f02f5a7473d4570d884d561dc8ef397347eca80494964f2f4faf0 diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch deleted file mode 100644 index 6d620b7ab94b..000000000000 --- a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/freewrl-1.22.13/data/freewrl.desktop 2009-06-08 06:26:21.000000000 -0400 -+++ b/freewrl-1.22.13/data/freewrl.desktop 2013-12-23 10:45:54.916307951 -0500 -@@ -3,7 +3,7 @@ - Name=FreeWRL - Comment=View X3D and VRML files - Exec=/usr/bin/freewrl --Icon=freewrl.png -+Icon=freewrl - Terminal=false - Type=Application - Categories=Graphics;3DGraphics;Viewer; diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch b/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch deleted file mode 100644 index 36b844ea8b62..000000000000 --- a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/lib/scenegraph/Component_Text.c 15 Aug 2012 13:31:45 -0000 1.56 -+++ src/lib/scenegraph/Component_Text.c 29 Aug 2012 14:18:43 -0000 1.57 -@@ -370,6 +370,7 @@ - FcPattern *FW_fp=NULL; - FcPattern *FW_fm=NULL; - FcChar8 *FW_file=NULL; -+ FcResult fcjunkresult; - #else - - if (!p->font_directory) { -@@ -487,7 +488,7 @@ - #ifdef HAVE_FONTCONFIG - FcConfigSubstitute(0,FW_fp,FcMatchPattern); - FcDefaultSubstitute(FW_fp); -- if (!(FW_fm = FcFontMatch(0,FW_fp,0))) { -+ if (!(FW_fm = FcFontMatch(0,FW_fp,&fcjunkresult))) { - /* do whatever is done when no match found */ - printf ("could not find font for id %x\n",num); - } else { diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch b/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch deleted file mode 100644 index 882062cb7e10..000000000000 --- a/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/src/java/Makefile.sources -+++ b/src/java/Makefile.sources -@@ -1,4 +1,4 @@ --dist_noinst_JAVA = \ -+noinst_JAVA = \ - org/web3d/x3d/sai/Browser.java \ - org/web3d/x3d/sai/BrowserEvent.java \ - org/web3d/x3d/sai/BrowserFactoryImpl.java \ -@@ -309,6 +309,7 @@ noinst_JAVA = \ - vrml/InvalidFieldException.java \ - vrml/InvalidRouteException.java \ - vrml/InvalidVRMLSyntaxException.java \ -+ vrml/InvalidX3DSyntaxException.java \ - vrml/MField.java \ - vrml/field/ConstMFColor.java \ - vrml/field/ConstMFFloat.java \ ---- /dev/null -+++ b/src/java/vrml/InvalidX3DSyntaxException.java -@@ -0,0 +1,6 @@ -+package vrml; -+ -+public class InvalidX3DSyntaxException extends Exception { -+ public InvalidX3DSyntaxException() { super(); } -+ public InvalidX3DSyntaxException(String s) { super(s); } -+} ---- a/src/java/Makefile.am 2014-03-10 10:37:09.000000000 -0400 -+++ b/src/java/Makefile.am 2014-03-12 12:29:42.000000000 -0400 -@@ -1,5 +1,10 @@ - # Java Classes for EAI/SAI/etc. - -+# NOTE - automake-1.11.6 changed how class*.stamp is generated, now need -+# to use noinst_JAVA and EXTRA_DIST instead of dist_noinst_JAVA to -+# keep behaviour consistent and compatible with both automake-1.11.6 and -+# older automake -+ - # Get global variables for Makefile defined by toplevel Makefile.globals - include $(top_srcdir)/Makefile.globals - -@@ -9,11 +14,12 @@ - jarfile = vrml.jar - jardir = $(JAVA_DIR) - --$(jarfile): $(dist_noinst_JAVA) classdist_noinst.stamp -- $(JAR) cmf $(JAVAROOT)/manifest.extras $@ -C $(JAVAROOT) $$(echo $(dist_noinst_JAVA:.java=.class)) -+$(jarfile): $(noinst_JAVA) manifest.extras classnoinst.stamp -+ $(JAR) cmf $(JAVAROOT)/manifest.extras $@ -C $(JAVAROOT) $$(echo $(noinst_JAVA:.java=.class)) - - jar_DATA = $(jarfile) - --CLEANFILES = $(jarfile) $$(echo $(dist_noinst_JAVA:.java=.class)) -+CLEANFILES = $(jarfile) $$(echo $(noinst_JAVA:.java=.class)) -+EXTRA_DIST = $(noinst_JAVA) java.policy manifest.extras - - include Makefile.sources diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch deleted file mode 100644 index 645a2315c161..000000000000 --- a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac 2012-06-13 13:17:43.000000000 -0400 -+++ b/configure.ac 2012-06-18 15:34:59.000000000 -0400 -@@ -192,6 +192,7 @@ - AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[spidermonkey],[>=],[1.7.0]) - ;; - *) -+ AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs187]) - AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs185]) - AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozilla-js],[>=],[1.9]) - AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[xulrunner-js],[>=],[1.8]) diff --git a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch b/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch deleted file mode 100644 index 6660f175b502..000000000000 --- a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 57d2d3b900c7d57e167fb7c90b36ca8c9c80b8bd -Author: Ian Stakenvicius -Date: Mon Apr 28 10:53:57 2014 -0400 - - autotools: fixed underlinking issue with libm - - Signed-off-by: Ian Stakenvicius - -diff --git a/freex3d/configure.ac b/freex3d/configure.ac -index 49db07c..48b09c8 100644 ---- a/freex3d/configure.ac -+++ b/freex3d/configure.ac -@@ -73,6 +73,8 @@ AC_PROG_GCC_TRADITIONAL - dnl AC_FUNC_MALLOC - AC_CHECK_FUNCS([strchr strrchr strdup strndup strerror getopt getopt_long getopt_long_only malloc calloc realloc usleep gettimeofday]) - -+# Check for math -+AC_CHECK_LIBM - - # ==================================================== - # FreeWRL specific configuration: target system -diff --git a/freex3d/src/lib/Makefile.am b/freex3d/src/lib/Makefile.am -index ae7fb05..1b1af8a 100644 ---- a/freex3d/src/lib/Makefile.am -+++ b/freex3d/src/lib/Makefile.am -@@ -40,7 +40,8 @@ EXTERNAL_LIBS = \ - $(PNG_LIBS) \ - $(LIBCURL_LIBS) \ - $(IMLIB2_LIBS) \ -- $(LIBLO_LIBS) -+ $(LIBLO_LIBS) \ -+ $(LIBM) - - - # X11 flags specific to x11 target (default on Linux -- optional on Mac) diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml index 51d17f440b62..46c0887e1b14 100644 --- a/media-gfx/freewrl/metadata.xml +++ b/media-gfx/freewrl/metadata.xml @@ -1,10 +1,7 @@ - - axs@gentoo.org - Ian Stakenvicius - + FreeWRL is a VRML97 (VRML-2.0) and X3D interactive viewer, providing both a traditional Xorg application and a nsbrowser plugin for use with many available web browsers. The package depends heavily on OpenGL -- cgit v1.2.3