Date: Friday, May 1, 2020 @ 18:51:54 Author: muflone Revision: 624173
archrelease: copy trunk to community-x86_64 Added: sweethome3d/repos/community-x86_64/PKGBUILD (from rev 624172, sweethome3d/trunk/PKGBUILD) sweethome3d/repos/community-x86_64/build_with_source_1.8.patch (from rev 624172, sweethome3d/trunk/build_with_source_1.8.patch) sweethome3d/repos/community-x86_64/sweethome3d.desktop (from rev 624172, sweethome3d/trunk/sweethome3d.desktop) sweethome3d/repos/community-x86_64/sweethome3d.install (from rev 624172, sweethome3d/trunk/sweethome3d.install) sweethome3d/repos/community-x86_64/sweethome3d.sh (from rev 624172, sweethome3d/trunk/sweethome3d.sh) sweethome3d/repos/community-x86_64/sweethome3d.xml (from rev 624172, sweethome3d/trunk/sweethome3d.xml) Deleted: sweethome3d/repos/community-x86_64/PKGBUILD sweethome3d/repos/community-x86_64/build_with_source_1.8.patch sweethome3d/repos/community-x86_64/sweethome3d.desktop sweethome3d/repos/community-x86_64/sweethome3d.install sweethome3d/repos/community-x86_64/sweethome3d.sh sweethome3d/repos/community-x86_64/sweethome3d.xml -----------------------------+ PKGBUILD | 132 +++++++++++++++++++++--------------------- build_with_source_1.8.patch | 62 +++++++++---------- sweethome3d.desktop | 22 +++---- sweethome3d.install | 21 +++--- sweethome3d.sh | 86 +++++++++++++-------------- 5 files changed, 162 insertions(+), 161 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-01 18:50:52 UTC (rev 624172) +++ PKGBUILD 2020-05-01 18:51:54 UTC (rev 624173) @@ -1,66 +0,0 @@ -# Maintainer: Muflone http://www.muflone.com/contacts/english/ -# Contributor: jsteel <mail at jsteel dot org> -# Contributor: Daniel YC Lin <dlin.tw at gmail> -# Contributor: Tdy <t...@gmx.com> -# Contributor: Biginoz <biginoz at free.fr> -# Contributor: Archan Paul <paul.arc...@gmail.com> - -pkgname=sweethome3d -pkgver=6.2 -pkgrel=1 -pkgdesc="An interior design application to draw the plan of your house in a 3D environment" -arch=('x86_64') -url="http://www.sweethome3d.com/" -license=('GPL' 'custom') -depends=('java-runtime>=8' 'shared-mime-info' 'desktop-file-utils' 'libxext' 'libgl' 'libxrender' 'libnsl') -makedepends=('ant') -source=("SweetHome3D-${pkgver}-src.zip"::"https://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-src.zip" - "build_with_source_1.8.patch" - "${pkgname}.sh" - "${pkgname}.desktop" - "${pkgname}.xml") -sha256sums=('285cb97aee9254de66a195469e494fb28bb77dc1f14b0a92802e7896bd7870ad' - '524286451144548fdc5ae0ca9e4f9180c96eb4bc00e86121d7f38ab3ecad07ff' - '6a5e2fd8de2ec37975a6a299befe7523d106f82c20f8838b48c17191928d7e2d' - '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e' - 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5') -install="${pkgname}.install" - -prepare() { - cd "SweetHome3D-${pkgver}-src" - patch -Np1 -i "${srcdir}/build_with_source_1.8.patch" - -} - -build() { - cd "SweetHome3D-${pkgver}-src" - ant application textures furniture examples help java3dLibraries -} - -package() { - # Desktop and launchers - install -m 755 -D "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -m 755 -D "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -m 644 -D "${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" - # Install licenses - cd "SweetHome3D-${pkgver}-src" - install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m 755 -t "${pkgdir}/usr/share/licenses/${pkgname}" THIRDPARTY-LICENSE-* - # Install icon - install -m 644 -D "deploy/SweetHome3DIcon48x48.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - # Install main program and libraries - install -m 755 -d "${pkgdir}/usr/share/java/${pkgname}" - install -m 644 -t "${pkgdir}/usr/share/java/${pkgname}" build/*.jar - install -m 644 -t "${pkgdir}/usr/share/java/${pkgname}" libtest/jnlp.jar - cd "lib" - install -m 644 -t "${pkgdir}/usr/share/java/${pkgname}" *.jar - # Java3D 1.5 libraries - install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/java3d-1.5" - mv -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.5" \ - "${pkgdir}"/usr/share/java/${pkgname}/{j3dcore.jar,j3dutils.jar,vecmath.jar} - install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.5" linux/x64/libj3dcore-ogl.so - # Java3D 1.6 libraries - install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" - install -m 644 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" java3d-1.6/*.jar - install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" java3d-1.6/linux/amd64/*.so -} Copied: sweethome3d/repos/community-x86_64/PKGBUILD (from rev 624172, sweethome3d/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-01 18:51:54 UTC (rev 624173) @@ -0,0 +1,66 @@ +# Maintainer: Muflone http://www.muflone.com/contacts/english/ +# Contributor: jsteel <mail at jsteel dot org> +# Contributor: Daniel YC Lin <dlin.tw at gmail> +# Contributor: Tdy <t...@gmx.com> +# Contributor: Biginoz <biginoz at free.fr> +# Contributor: Archan Paul <paul.arc...@gmail.com> + +pkgname=sweethome3d +pkgver=6.3 +pkgrel=1 +pkgdesc="An interior design application to draw the plan of your house in a 3D environment" +arch=('x86_64') +url="http://www.sweethome3d.com/" +license=('GPL' 'custom') +depends=('java-runtime>=8' 'shared-mime-info' 'desktop-file-utils' 'libxext' 'libgl' 'libxrender' 'libnsl') +makedepends=('ant') +source=("SweetHome3D-${pkgver}-src.zip"::"https://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-src.zip" + "build_with_source_1.8.patch" + "${pkgname}.sh" + "${pkgname}.desktop" + "${pkgname}.xml") +sha256sums=('b741adc7ae8f893a971e5251b1bc07e61efcecd42ba56039182649815145d640' + '524286451144548fdc5ae0ca9e4f9180c96eb4bc00e86121d7f38ab3ecad07ff' + '9fd31f209e53de4aa4ef6c8b2e5adff9228d6226e76fd33f6793abbb079700ed' + '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e' + 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5') +install="${pkgname}.install" + +prepare() { + cd "SweetHome3D-${pkgver}-src" + patch -Np1 -i "${srcdir}/build_with_source_1.8.patch" + +} + +build() { + cd "SweetHome3D-${pkgver}-src" + ant application textures furniture examples help java3dLibraries +} + +package() { + # Desktop and launchers + install -m 755 -D "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" + install -m 755 -D "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -m 644 -D "${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" + # Install licenses + cd "SweetHome3D-${pkgver}-src" + install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m 755 -t "${pkgdir}/usr/share/licenses/${pkgname}" THIRDPARTY-LICENSE-* + # Install icon + install -m 644 -D "deploy/SweetHome3DIcon48x48.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + # Install main program and libraries + install -m 755 -d "${pkgdir}/usr/share/java/${pkgname}" + install -m 644 -t "${pkgdir}/usr/share/java/${pkgname}" build/*.jar + install -m 644 -t "${pkgdir}/usr/share/java/${pkgname}" libtest/jnlp.jar + cd "lib" + install -m 644 -t "${pkgdir}/usr/share/java/${pkgname}" *.jar + # Java3D 1.5 libraries + install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/java3d-1.5" + mv -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.5" \ + "${pkgdir}"/usr/share/java/${pkgname}/{j3dcore.jar,j3dutils.jar,vecmath.jar} + install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.5" linux/x64/libj3dcore-ogl.so + # Java3D 1.6 libraries + install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" + install -m 644 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" java3d-1.6/*.jar + install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" java3d-1.6/linux/amd64/*.so +} Deleted: build_with_source_1.8.patch =================================================================== --- build_with_source_1.8.patch 2020-05-01 18:50:52 UTC (rev 624172) +++ build_with_source_1.8.patch 2020-05-01 18:51:54 UTC (rev 624173) @@ -1,31 +0,0 @@ -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"/> Copied: sweethome3d/repos/community-x86_64/build_with_source_1.8.patch (from rev 624172, sweethome3d/trunk/build_with_source_1.8.patch) =================================================================== --- build_with_source_1.8.patch (rev 0) +++ build_with_source_1.8.patch 2020-05-01 18:51:54 UTC (rev 624173) @@ -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"/> Deleted: sweethome3d.desktop =================================================================== --- sweethome3d.desktop 2020-05-01 18:50:52 UTC (rev 624172) +++ sweethome3d.desktop 2020-05-01 18:51:54 UTC (rev 624173) @@ -1,11 +0,0 @@ -[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 Copied: sweethome3d/repos/community-x86_64/sweethome3d.desktop (from rev 624172, sweethome3d/trunk/sweethome3d.desktop) =================================================================== --- sweethome3d.desktop (rev 0) +++ sweethome3d.desktop 2020-05-01 18:51:54 UTC (rev 624173) @@ -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 Deleted: sweethome3d.install =================================================================== --- sweethome3d.install 2020-05-01 18:50:52 UTC (rev 624172) +++ sweethome3d.install 2020-05-01 18:51:54 UTC (rev 624173) @@ -1,10 +0,0 @@ -post_install() { - echo "If the application claims there's no graphic support for 3D rendering" - echo "you can switch to Java3D 1.5 by using:" - echo "SWEETHOME3D_JAVA3D=1.5 sweethome3d" - echo "or set the SWEETHOME3D_JAVA3D environment variable in your profile" -} - -post_upgrade() { - post_install $1 -} Copied: sweethome3d/repos/community-x86_64/sweethome3d.install (from rev 624172, sweethome3d/trunk/sweethome3d.install) =================================================================== --- sweethome3d.install (rev 0) +++ sweethome3d.install 2020-05-01 18:51:54 UTC (rev 624173) @@ -0,0 +1,11 @@ +post_install() { + echo "If the application crashes during the startup or claims there's" + echo "no graphic support for 3D rendering you can switch to Java3D 1.6" + echo "by using:" + echo "SWEETHOME3D_JAVA3D=1.6 sweethome3d" + echo "or set the SWEETHOME3D_JAVA3D environment variable in your profile" +} + +post_upgrade() { + post_install $1 +} Deleted: sweethome3d.sh =================================================================== --- sweethome3d.sh 2020-05-01 18:50:52 UTC (rev 624172) +++ sweethome3d.sh 2020-05-01 18:51:54 UTC (rev 624173) @@ -1,43 +0,0 @@ -#!/bin/sh - -APP_CLASSPATH="" -JAVA_EXEC="" -JAVA_OPTS="${JAVA_OPTS} -Xmx1024m" - -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" - echo "use the 'archlinux-java' script to set the Java version." - 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.5" ] -then - 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" -else - 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" -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" - Copied: sweethome3d/repos/community-x86_64/sweethome3d.sh (from rev 624172, sweethome3d/trunk/sweethome3d.sh) =================================================================== --- sweethome3d.sh (rev 0) +++ sweethome3d.sh 2020-05-01 18:51:54 UTC (rev 624173) @@ -0,0 +1,43 @@ +#!/bin/sh + +APP_CLASSPATH="" +JAVA_EXEC="" +JAVA_OPTS="${JAVA_OPTS} -Xmx1024m" + +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" + echo "use the 'archlinux-java' script to set the Java version." + 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" + Deleted: sweethome3d.xml =================================================================== (Binary files differ) Copied: sweethome3d/repos/community-x86_64/sweethome3d.xml (from rev 624172, sweethome3d/trunk/sweethome3d.xml) =================================================================== (Binary files differ)