Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10993423
D9276.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D9276.diff
View Options
Index: Makefile
===================================================================
--- /dev/null
+++ Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
Index: abi_used_libs
===================================================================
--- /dev/null
+++ abi_used_libs
@@ -0,0 +1,11 @@
+libGL.so.1
+libX11.so.6
+libXext.so.6
+libXrender.so.1
+libXxf86vm.so.1
+libc.so.6
+libdl.so.2
+libjawt.so
+libjvm.so
+libm.so.6
+libnsl.so.1
Index: files/build_with_source_1.8.patch
===================================================================
--- /dev/null
+++ files/build_with_source_1.8.patch
@@ -0,0 +1,31 @@
+diff -Naur SweetHome3D-6.0-src.orig/build.xml SweetHome3D-6.0-src/build.xml
+--- SweetHome3D-6.0-src.orig/build.xml 2018-10-11 23:29:50.000000000 +0200
++++ SweetHome3D-6.0-src/build.xml 2019-01-13 01:00:29.624778239 +0100
+@@ -43,11 +43,11 @@
+ during applet launch (otherwise Java 1.1 to 1.4 plug-ins refuse to load Applet class) -->
+ <javac srcdir="src" destdir="build/classes"
+ includes="com/eteks/sweethome3d/applet/SweetHome3D*.java"
+- encoding="ISO-8859-1" target="1.1" source="1.2"
++ encoding="ISO-8859-1" target="1.8" source="1.8"
+ debug="false" debuglevel="lines,vars,source"/>
+ <!-- Compile other classes -->
+ <javac srcdir="src" destdir="build/classes"
+- encoding="ISO-8859-1" target="1.5" source="1.5"
++ encoding="ISO-8859-1" target="1.8" source="1.8"
+ debug="false" debuglevel="lines,vars,source">
+ <!-- Use lib as an extension directory to override default Java 3D libraries -->
+ <extdirs>
+@@ -403,11 +403,11 @@
+ during applet launch (otherwise Java 1.1 to 1.4 plug-ins refuse to load Applet class) -->
+ <javac srcdir="src" destdir="build/classes"
+ includes="com/eteks/sweethome3d/applet/SweetHome3DViewer.java"
+- encoding="ISO-8859-1" target="1.1" source="1.2"
++ encoding="ISO-8859-1" target="1.8" source="1.8"
+ debug="false" debuglevel="lines,vars,source"/>
+ <!-- Compile only classes depending on ViewerHelper to reduce Jar size -->
+ <javac srcdir="src" destdir="build/classes"
+- encoding="ISO-8859-1" target="1.5"
++ encoding="ISO-8859-1" target="1.8"
+ debug="false" debuglevel="lines,vars,source">
+ <include name="com/eteks/sweethome3d/applet/ViewerHelper.java"/>
+ <include name="com/eteks/sweethome3d/io/DefaultPatternTexture.java"/>
Index: files/disable-checkForUpdates.patch
===================================================================
--- /dev/null
+++ files/disable-checkForUpdates.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo@debian.org>
+Date: Sun, 14 Oct 2018 14:29:36 +0200
+Subject: disable-checkForUpdates
+
+---
+ src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties b/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties
+index 2e6e4e1..848fe71 100644
+--- a/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties
++++ b/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties
+@@ -86,7 +86,7 @@ newHomeWallHeight=250
+ newWallBaseboardlThickness=1
+ newWallBaseboardlHeight=7
+ newFloorThickness=12
+-checkUpdatesEnabled=true
++checkUpdatesEnabled=false
+ autoSaveDelayForRecovery=600000
+ valueAddedTaxEnabled=false
+ defaultValueAddedTaxPercentage=0.2
Index: files/series
===================================================================
--- /dev/null
+++ files/series
@@ -0,0 +1,2 @@
+disable-checkForUpdates.patch
+build_with_source_1.8.patch
Index: files/sweethome3d.desktop
===================================================================
--- /dev/null
+++ files/sweethome3d.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Sweet Home 3D
+Comment=An interior design application
+TryExec=sweethome3d
+Exec=sweethome3d %f
+Icon=sweethome3d
+Categories=Office;Java;
+StartupWMClass=com-eteks-sweethome3d-SweetHome3D
+MimeType=application/x-sweethome3d
Index: files/sweethome3d.sh
===================================================================
--- /dev/null
+++ files/sweethome3d.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+APP_CLASSPATH=""
+JAVA_EXEC=""
+JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
+
+if [ -z "$JAVA_HOME" ]; then
+ export JAVA_HOME=/usr/lib64/openjdk-11
+fi
+
+if [ -n "${JAVA_HOME}" ]
+then
+ if [ -x "${JAVA_HOME}/bin/java" ]
+ then
+ JAVA_EXEC="${JAVA_HOME}/bin/java"
+ fi
+else
+ JAVA_EXEC="$(which java)"
+fi
+
+if [ -z "${JAVA_EXEC}" ]
+then
+ echo "No 'java' executable can be found, please set JAVA_HOME variable or"
+ exit 1
+fi
+
+# Build classpath
+APP_CLASSPATH="SweetHome3D.jar:Furniture.jar:Textures.jar:Examples.jar:Help.jar:iText-2.1.7.jar:freehep-vectorgraphics-svg-2.1.1b.jar:sunflow-0.07.3i.jar:jmf.jar:batik-svgpathparser-1.7.jar:jeksparser-calculator.jar:jnlp.jar"
+if [ "${SWEETHOME3D_JAVA3D}" = "1.6" ]
+then
+ JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/lib/sweethome3d/java3d-1.6 -Djogamp.gluegen.UseTempJarCache=false"
+ APP_CLASSPATH="${APP_CLASSPATH}:/usr/lib/sweethome3d/java3d-1.6/j3dcore.jar:/usr/lib/sweethome3d/java3d-1.6/j3dutils.jar:/usr/lib/sweethome3d/java3d-1.6/vecmath.jar:/usr/lib/sweethome3d/java3d-1.6/gluegen-rt.jar:/usr/lib/sweethome3d/java3d-1.6/jogl-all.jar"
+else
+ JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/lib/sweethome3d/java3d-1.5"
+ APP_CLASSPATH="${APP_CLASSPATH}:/usr/lib/sweethome3d/java3d-1.5/j3dcore.jar:/usr/lib/sweethome3d/java3d-1.5/j3dutils.jar:/usr/lib/sweethome3d/java3d-1.5/vecmath.jar"
+fi
+
+cd "/usr/share/java/sweethome3d"
+
+exec "${JAVA_EXEC}" \
+ -classpath "${APP_CLASSPATH}" \
+ ${JAVA_OPTS} \
+ -Dcom.eteks.sweethome3d.applicationId=SweetHome3D#Installer \
+ com.eteks.sweethome3d.SweetHome3D \
+ -open "$1"
+
Index: files/sweethome3d.xml
===================================================================
--- /dev/null
+++ files/sweethome3d.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-sweethome3d">
+ <comment>Sweet Home 3D project</comment>
+ <glob pattern="*.sh3d"/>
+ </mime-type>
+</mime-info>
Index: package.yml
===================================================================
--- /dev/null
+++ package.yml
@@ -0,0 +1,44 @@
+name : sweethome3d
+version : 6.3
+release : 1
+source :
+ - https://sourceforge.net/projects/sweethome3d/files/SweetHome3D-source/SweetHome3D-6.3-src/SweetHome3D-6.3-src.zip/download : b741adc7ae8f893a971e5251b1bc07e61efcecd42ba56039182649815145d640
+license :
+ - GPL-2.0-or-later
+ - public-domain
+component : desktop.multimedia
+summary : Interior design application
+description: |
+ An interior design application to draw the plan of your house in a 3D environment
+builddeps :
+ - apache-ant
+ - imagemagick
+rundeps :
+ - openjdk-11
+setup : |
+ %apply_patches
+build : |
+ ant application textures furniture examples help java3dLibraries
+install : |
+ # Desktop and launchers
+ install -m00755 -D "$pkgfiles/sweethome3d.sh" "$installdir/usr/bin/sweethome3d"
+ install -m00755 -D "$pkgfiles/sweethome3d.desktop" "$installdir/usr/share/applications/sweethome3d.desktop"
+ install -m00644 -D "$pkgfiles/sweethome3d.xml" "$installdir/usr/share/mime/packages/sweethome3d.xml"
+ # Install icon
+ install -m00644 -D "$workdir/deploy/SweetHome3DIcon48x48.png" "$installdir/usr/share/pixmaps/sweethome3d.png"
+ # Install main program and libraries
+ install -m00755 -d "$installdir/usr/share/java/sweethome3d"
+ install -m00644 -t "$installdir/usr/share/java/sweethome3d" build/*.jar
+ install -m00644 -t "$installdir/usr/share/java/sweethome3d" libtest/jnlp.jar
+ pushd "lib"
+ install -m00644 -t "$installdir/usr/share/java/sweethome3d" *.jar
+ # Java3D 1.5 libraries
+ install -m00755 -d "$installdir/usr/lib/sweethome3d/java3d-1.5"
+ mv -t "$installdir/usr/lib/sweethome3d/java3d-1.5" \
+ "$installdir"/usr/share/java/sweethome3d/{j3dcore.jar,j3dutils.jar,vecmath.jar}
+ install -m00755 -t "$installdir/usr/lib/sweethome3d/java3d-1.5" linux/x64/libj3dcore-ogl.so
+ # Java3D 1.6 libraries
+ install -m00755 -d "$installdir/usr/lib/sweethome3d/java3d-1.6"
+ install -m00644 -t "$installdir/usr/lib/sweethome3d/java3d-1.6" java3d-1.6/*.jar
+ install -m00755 -t "$installdir/usr/lib/sweethome3d/java3d-1.6" java3d-1.6/linux/amd64/*.so
+ popd
Index: pspec_x86_64.xml
===================================================================
--- /dev/null
+++ pspec_x86_64.xml
@@ -0,0 +1,63 @@
+<PISI>
+ <Source>
+ <Name>sweethome3d</Name>
+ <Packager>
+ <Name>Christoph Korn</Name>
+ <Email>christoph.korn@posteo.de</Email>
+ </Packager>
+ <License>GPL-2.0-or-later</License>
+ <License>public-domain</License>
+ <PartOf>desktop.multimedia</PartOf>
+ <Summary xml:lang="en">Interior design application</Summary>
+ <Description xml:lang="en">An interior design application to draw the plan of your house in a 3D environment
+</Description>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+ </Source>
+ <Package>
+ <Name>sweethome3d</Name>
+ <Summary xml:lang="en">Interior design application</Summary>
+ <Description xml:lang="en">An interior design application to draw the plan of your house in a 3D environment
+</Description>
+ <PartOf>desktop.multimedia</PartOf>
+ <Files>
+ <Path fileType="executable">/usr/bin/sweethome3d</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.5/j3dcore.jar</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.5/j3dutils.jar</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.5/libj3dcore-ogl.so</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.5/vecmath.jar</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/gluegen-rt.jar</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/j3dcore.jar</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/j3dutils.jar</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/jogl-all.jar</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/libgluegen-rt.so</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/libjogl_desktop.so</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/libnativewindow_awt.so</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/libnativewindow_x11.so</Path>
+ <Path fileType="library">/usr/lib/sweethome3d/java3d-1.6/vecmath.jar</Path>
+ <Path fileType="data">/usr/share/applications/sweethome3d.desktop</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/Examples.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/Furniture.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/Help.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/SweetHome3D.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/Textures.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/batik-svgpathparser-1.7.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/freehep-vectorgraphics-svg-2.1.1b.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/iText-2.1.7.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/jeksparser-calculator.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/jmf.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/jnlp.jar</Path>
+ <Path fileType="data">/usr/share/java/sweethome3d/sunflow-0.07.3i.jar</Path>
+ <Path fileType="data">/usr/share/mime/packages/sweethome3d.xml</Path>
+ <Path fileType="data">/usr/share/pixmaps/sweethome3d.png</Path>
+ </Files>
+ </Package>
+ <History>
+ <Update release="1">
+ <Date>2020-07-22</Date>
+ <Version>6.3</Version>
+ <Comment>Packaging update</Comment>
+ <Name>Christoph Korn</Name>
+ <Email>christoph.korn@posteo.de</Email>
+ </Update>
+ </History>
+</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Jul 26, 5:04 PM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5806277
Default Alt Text
D9276.diff (12 KB)
Attached To
Mode
D9276: sweethome3d
Attached
Detach File
Event Timeline
Log In to Comment