Date: Wednesday, March 2, 2022 @ 08:36:01 Author: allan Revision: 1139339
archrelease: copy trunk to community-x86_64 Added: sweethome3d/repos/community-x86_64/PKGBUILD (from rev 1139338, sweethome3d/trunk/PKGBUILD) sweethome3d/repos/community-x86_64/sweethome3d.desktop (from rev 1139338, sweethome3d/trunk/sweethome3d.desktop) sweethome3d/repos/community-x86_64/sweethome3d.install (from rev 1139338, sweethome3d/trunk/sweethome3d.install) sweethome3d/repos/community-x86_64/sweethome3d.sh (from rev 1139338, sweethome3d/trunk/sweethome3d.sh) sweethome3d/repos/community-x86_64/sweethome3d.xml (from rev 1139338, sweethome3d/trunk/sweethome3d.xml) Deleted: sweethome3d/repos/community-x86_64/PKGBUILD 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 | 120 ++++++++++++++++++++-------------------- sweethome3d.desktop | 22 +++---- sweethome3d.install | 22 +++---- sweethome3d.sh | 148 +++++++++++++++++++++++++------------------------- 4 files changed, 156 insertions(+), 156 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-03-02 08:35:29 UTC (rev 1139338) +++ PKGBUILD 2022-03-02 08:36:01 UTC (rev 1139339) @@ -1,60 +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.6 -pkgrel=3 -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<17' 'shared-mime-info' 'desktop-file-utils' 'libxext' 'libgl' 'libxrender' 'libnsl') -makedepends=('ant' 'strip-nondeterminism') -source=("SweetHome3D-${pkgver}-src.zip"::"https://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-src.zip" - "${pkgname}.sh" - "${pkgname}.desktop" - "${pkgname}.xml") -sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b' - '6b3ef93a004d05ea083953d651e151af5491f5ca91e00dfd4ec3f0e4e1c87782' - '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e' - 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5') -install="${pkgname}.install" - -build() { - cd "SweetHome3D-${pkgver}-src" - ant application textures furniture examples help java3dLibraries - # FS#70332 ( https://bugs.archlinux.org/task/70332 ) - find "${srcdir}" -type f -name '*.jar' -exec strip-nondeterminism {} + -} - -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 1139338, sweethome3d/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-03-02 08:36:01 UTC (rev 1139339) @@ -0,0 +1,60 @@ +# 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.6 +pkgrel=4 +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<17' 'shared-mime-info' 'desktop-file-utils' 'libxext' 'libgl' 'libxrender' 'libnsl') +makedepends=('ant' 'strip-nondeterminism') +source=("SweetHome3D-${pkgver}-src.zip"::"https://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-src.zip" + "${pkgname}.sh" + "${pkgname}.desktop" + "${pkgname}.xml") +sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b' + '6b3ef93a004d05ea083953d651e151af5491f5ca91e00dfd4ec3f0e4e1c87782' + '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e' + 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5') +install="${pkgname}.install" + +build() { + cd "SweetHome3D-${pkgver}-src" + ant application textures furniture examples help java3dLibraries + # FS#70332 ( https://bugs.archlinux.org/task/70332 ) + find "${srcdir}" -type f -name '*.jar' -exec strip-nondeterminism {} + +} + +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: sweethome3d.desktop =================================================================== --- sweethome3d.desktop 2022-03-02 08:35:29 UTC (rev 1139338) +++ sweethome3d.desktop 2022-03-02 08:36:01 UTC (rev 1139339) @@ -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 1139338, sweethome3d/trunk/sweethome3d.desktop) =================================================================== --- sweethome3d.desktop (rev 0) +++ sweethome3d.desktop 2022-03-02 08:36:01 UTC (rev 1139339) @@ -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 2022-03-02 08:35:29 UTC (rev 1139338) +++ sweethome3d.install 2022-03-02 08:36:01 UTC (rev 1139339) @@ -1,11 +0,0 @@ -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 -} Copied: sweethome3d/repos/community-x86_64/sweethome3d.install (from rev 1139338, sweethome3d/trunk/sweethome3d.install) =================================================================== --- sweethome3d.install (rev 0) +++ sweethome3d.install 2022-03-02 08:36:01 UTC (rev 1139339) @@ -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 2022-03-02 08:35:29 UTC (rev 1139338) +++ sweethome3d.sh 2022-03-02 08:36:01 UTC (rev 1139339) @@ -1,74 +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 - -# Find Java version -JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d '"')" - -# Skip Java versions higher than 16 as Sweethome3D actually is not yet compatible -# Fallback to any previous version available -# https://bugs.archlinux.org/task/72623 -if [ $(vercmp "${JAVA_VERSION}" "17") -gt 0 ] -then - echo "Warning: Sweethome 3D actually is not compatible with Java version > 16" - _PREVIOUS_JAVA_VERSION="$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '17-' -m 1)" - if [ -z "${_PREVIOUS_JAVA_VERSION}" ] - then - echo "No others Java version are available, please install a Java version < 17" - exit 1 - else - echo "Falling back to ${_PREVIOUS_JAVA_VERSION}" - export JAVA_HOME="/usr/lib/jvm/${_PREVIOUS_JAVA_VERSION}" - export JAVA_EXEC="${JAVA_HOME}/bin/java" - export JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d '"')" - fi -fi - -# Fix for Java 16 compatibility -# https://bugs.archlinux.org/task/71255 -# https://sourceforge.net/p/sweethome3d/bugs/1021/ -if [ $(vercmp "${JAVA_VERSION}" "11") -gt 0 ] -then - # Add illegal-access=permit argument - JAVA_OPTS="${JAVA_OPTS} --illegal-access=permit" -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" - Copied: sweethome3d/repos/community-x86_64/sweethome3d.sh (from rev 1139338, sweethome3d/trunk/sweethome3d.sh) =================================================================== --- sweethome3d.sh (rev 0) +++ sweethome3d.sh 2022-03-02 08:36:01 UTC (rev 1139339) @@ -0,0 +1,74 @@ +#!/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 + +# Find Java version +JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d '"')" + +# Skip Java versions higher than 16 as Sweethome3D actually is not yet compatible +# Fallback to any previous version available +# https://bugs.archlinux.org/task/72623 +if [ $(vercmp "${JAVA_VERSION}" "17") -gt 0 ] +then + echo "Warning: Sweethome 3D actually is not compatible with Java version > 16" + _PREVIOUS_JAVA_VERSION="$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '17-' -m 1)" + if [ -z "${_PREVIOUS_JAVA_VERSION}" ] + then + echo "No others Java version are available, please install a Java version < 17" + exit 1 + else + echo "Falling back to ${_PREVIOUS_JAVA_VERSION}" + export JAVA_HOME="/usr/lib/jvm/${_PREVIOUS_JAVA_VERSION}" + export JAVA_EXEC="${JAVA_HOME}/bin/java" + export JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d '"')" + fi +fi + +# Fix for Java 16 compatibility +# https://bugs.archlinux.org/task/71255 +# https://sourceforge.net/p/sweethome3d/bugs/1021/ +if [ $(vercmp "${JAVA_VERSION}" "11") -gt 0 ] +then + # Add illegal-access=permit argument + JAVA_OPTS="${JAVA_OPTS} --illegal-access=permit" +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 1139338, sweethome3d/trunk/sweethome3d.xml) =================================================================== (Binary files differ)