Package: sweethome3d / 6.1.2+dfsg-2

build.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From: Markus Koschany <apo@debian.org>
Date: Sun, 14 Oct 2018 14:36:46 +0200
Subject: build

---
 build.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index b4f77ec..776abbd 100644
--- a/build.xml
+++ b/build.xml
@@ -51,7 +51,8 @@
            debug="false" debuglevel="lines,vars,source">
       <!-- Use lib as an extension directory to override default Java 3D libraries -->
       <extdirs>
-        <pathelement location="lib"/>
+          <pathelement location="/usr/share/java"/>
+          <pathelement location="/usr/share/icedtea-web"/>
       </extdirs>
       <classpath>
         <pathelement location="libtest/AppleJavaExtensions.jar"/>
@@ -59,6 +60,7 @@
       </classpath>
       <exclude name="com/eteks/sweethome3d/swing/VideoPanel.java"/>
       <exclude name="com/eteks/sweethome3d/viewcontroller/VideoController.java"/>
+      <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
     </javac>
 
     <!-- Copy resources excepted furniture, textures and help files -->
@@ -474,7 +476,7 @@
     <echo message="deploy dir ready for ftp"/>
   </target>
 
-  <target name="jarExecutable" depends="application,furniture,textures,examples,help,jogl-java3d"
+  <target name="jarExecutable" depends="application,furniture,textures,examples,help"
           description="Builds install/SweetHome3D-version.jar executable Jar">
     <!-- Create SweetHome3D-version.jar containing Sweet Home 3D classes and resources,
          and other DLLs and jars -->