* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freewrl/files/
@ 2020-12-12 16:35 David Seifert
0 siblings, 0 replies; only message in thread
From: David Seifert @ 2020-12-12 16:35 UTC (permalink / raw
To: gentoo-commits
commit: fb7c45a8ed009805d92e5690a4a90a8e5705f756
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 12 16:35:02 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 16:35:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7c45a8
media-gfx/freewrl: remove unused patch(es)
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../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 --------------
5 files changed, 129 deletions(-)
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 6d620b7ab94..00000000000
--- 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 36b844ea8b6..00000000000
--- 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 882062cb7e1..00000000000
--- 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 645a2315c16..00000000000
--- 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 6660f175b50..00000000000
--- a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 57d2d3b900c7d57e167fb7c90b36ca8c9c80b8bd
-Author: Ian Stakenvicius <axs@gentoo.org>
-Date: Mon Apr 28 10:53:57 2014 -0400
-
- autotools: fixed underlinking issue with libm
-
- Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
-
-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)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-12 16:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-12 16:35 [gentoo-commits] repo/gentoo:master commit in: media-gfx/freewrl/files/ David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox