[arch-commits] Commit in sweethome3d/trunk (3 files)

Fabio Castelli muflone at archlinux.org
Sun Jan 13 00:19:01 UTC 2019


    Date: Sunday, January 13, 2019 @ 00:18:58
  Author: muflone
Revision: 422779

upgpkg: sweethome3d 6.0-1

Added:
  sweethome3d/trunk/build_with_source_1.8.patch
Modified:
  sweethome3d/trunk/PKGBUILD
  sweethome3d/trunk/sweethome3d.sh

-----------------------------+
 PKGBUILD                    |   39 ++++++++++++++++++++++++++-------------
 build_with_source_1.8.patch |   31 +++++++++++++++++++++++++++++++
 sweethome3d.sh              |    5 ++---
 3 files changed, 59 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-12 22:59:28 UTC (rev 422778)
+++ PKGBUILD	2019-01-13 00:18:58 UTC (rev 422779)
@@ -6,39 +6,52 @@
 # Contributor: Archan Paul <paul.archan at gmail.com>
 
 pkgname=sweethome3d
-pkgver=5.7
-pkgrel=2
+pkgver=6.0
+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')
-source=("SweetHome3D-${pkgver}-linux-x64.tgz"::"http://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-linux-x64.tgz"
+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=('e6912b03e4c0ac990c10995d0d29a82c089021b2446ca16517650a3214f096ff'
-            'c1a76d4131ddf04375bab3e98d646543b4967af623a6aee0e19bac7d40d7ecef'
+sha256sums=('46ff2b8d0d3d1e3fcb1d1c4943895412af5ee01375d67f2d9e0da682fc9d7926'
+            '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
-  cd "${srcdir}"
   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}"
+  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 "SweetHome3DIcon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  # Install javaws.jar from jre8
+  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}" jre8/lib/javaws.jar
-  # Install main program and libraries
+  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
@@ -45,9 +58,9 @@
   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" libj3dcore-ogl.so
+  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/*.so
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" java3d-1.6/linux/amd64/*.so
 }

Added: build_with_source_1.8.patch
===================================================================
--- build_with_source_1.8.patch	                        (rev 0)
+++ build_with_source_1.8.patch	2019-01-13 00:18:58 UTC (rev 422779)
@@ -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"/>

Modified: sweethome3d.sh
===================================================================
--- sweethome3d.sh	2019-01-12 22:59:28 UTC (rev 422778)
+++ sweethome3d.sh	2019-01-13 00:18:58 UTC (rev 422779)
@@ -22,7 +22,7 @@
 fi
 
 # Build classpath
-APP_CLASSPATH="SweetHome3D.jar:Furniture.jar:Textures.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"
+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"
@@ -29,9 +29,8 @@
   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-java3d.jar"
+  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
-APP_CLASSPATH="${APP_CLASSPATH}:javaws.jar"
 
 cd "/usr/share/java/sweethome3d"
 



More information about the arch-commits mailing list