From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../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 insertions(+) create mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch create mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch create mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch create mode 100644 media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch create mode 100644 media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch (limited to 'media-gfx/freewrl/files') diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch new file mode 100644 index 000000000000..6d620b7ab94b --- /dev/null +++ b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..36b844ea8b62 --- /dev/null +++ b/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..882062cb7e10 --- /dev/null +++ b/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch @@ -0,0 +1,54 @@ +--- 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 new file mode 100644 index 000000000000..645a2315c161 --- /dev/null +++ b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..6660f175b502 --- /dev/null +++ b/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch @@ -0,0 +1,35 @@ +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) -- cgit v1.2.3