[arch-commits] Commit in sweethome3d/trunk (PKGBUILD sweethome3d.sh)

2022-07-31 Thread Fabio Castelli via arch-commits 
Date: Sunday, July 31, 2022 @ 23:05:42
  Author: muflone
Revision: 1259549

upgpkg: sweethome3d 7.0.2-1

Modified:
  sweethome3d/trunk/PKGBUILD
  sweethome3d/trunk/sweethome3d.sh

+
 PKGBUILD   |8 
 sweethome3d.sh |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-07-31 22:41:33 UTC (rev 1259548)
+++ PKGBUILD2022-07-31 23:05:42 UTC (rev 1259549)
@@ -6,8 +6,8 @@
 # Contributor: Archan Paul 
 
 pkgname=sweethome3d
-pkgver=6.6
-pkgrel=4
+pkgver=7.0.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/;
@@ -18,8 +18,8 @@
 "${pkgname}.sh"
 "${pkgname}.desktop"
 "${pkgname}.xml")
-sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b'
-'6b3ef93a004d05ea083953d651e151af5491f5ca91e00dfd4ec3f0e4e1c87782'
+sha256sums=('f49bff53b69f1baf8bc0f07a221a8b78f8d003aedb3ca7a53fe51cbaf8b306aa'
+'285bc64c5f79927d1a5e74de17bf5d3c25998d91001506bed27b9e124cf81ad6'
 '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')
 install="${pkgname}.install"

Modified: sweethome3d.sh
===
--- sweethome3d.sh  2022-07-31 22:41:33 UTC (rev 1259548)
+++ sweethome3d.sh  2022-07-31 23:05:42 UTC (rev 1259549)
@@ -22,7 +22,7 @@
 fi
 
 # Find Java version
-JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d 
'"')"
+JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | grep ' version ' | 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
@@ -30,7 +30,7 @@
 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)"
+  _PREVIOUS_JAVA_VERSION="$(archlinux-java status | tail -n +2 | sort | cut -d 
' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '17-|18-' -m 1)"
   if [ -z "${_PREVIOUS_JAVA_VERSION}" ]
   then
 echo "No others Java version are available, please install a Java version 
< 17"
@@ -39,7 +39,7 @@
 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 '"')"
+export JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | grep ' version ' | 
head -1 | cut -d' ' -f 3 | tr -d '"')"
   fi
 fi

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

2022-03-02 Thread Allan McRae via arch-commits 
Date: Wednesday, March 2, 2022 @ 08:35:29
  Author: allan
Revision: 1139338

upgpkg: sweethome3d 6.6-4: rebuild due to obsolete signing key

Modified:
  sweethome3d/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-02 08:33:04 UTC (rev 1139337)
+++ PKGBUILD2022-03-02 08:35:29 UTC (rev 1139338)
@@ -7,7 +7,7 @@
 
 pkgname=sweethome3d
 pkgver=6.6
-pkgrel=3
+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/;

[arch-commits] Commit in sweethome3d/trunk (PKGBUILD sweethome3d.sh)

2021-11-28 Thread Fabio Castelli via arch-commits 
Date: Sunday, November 28, 2021 @ 23:40:29
  Author: muflone
Revision: 1055866

upgpkg: sweethome3d 6.6-3

Modified:
  sweethome3d/trunk/PKGBUILD
  sweethome3d/trunk/sweethome3d.sh

+
 PKGBUILD   |6 +++---
 sweethome3d.sh |   19 +++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-11-28 23:40:11 UTC (rev 1055865)
+++ PKGBUILD2021-11-28 23:40:29 UTC (rev 1055866)
@@ -7,12 +7,12 @@
 
 pkgname=sweethome3d
 pkgver=6.6
-pkgrel=2
+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>=8' 'shared-mime-info' 'desktop-file-utils' 'libxext' 
'libgl' 'libxrender' 'libnsl')
+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"
@@ -19,7 +19,7 @@
 "${pkgname}.desktop"
 "${pkgname}.xml")
 sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b'
-'71abd705684d373a19bc434ca5dc42072faf6e1716b9f0a6005bae122326bfa9'
+'6b3ef93a004d05ea083953d651e151af5491f5ca91e00dfd4ec3f0e4e1c87782'
 '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')
 install="${pkgname}.install"

Modified: sweethome3d.sh
===
--- sweethome3d.sh  2021-11-28 23:40:11 UTC (rev 1055865)
+++ sweethome3d.sh  2021-11-28 23:40:29 UTC (rev 1055866)
@@ -24,6 +24,25 @@
 # 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/

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

2021-08-23 Thread Felix Yan via arch-commits 
Date: Monday, August 23, 2021 @ 15:07:50
  Author: felixonmars
Revision: 1004392

upgpkg: sweethome3d 6.6-2: rebuild with libnsl 2.0.0

Modified:
  sweethome3d/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-08-23 15:05:31 UTC (rev 1004391)
+++ PKGBUILD2021-08-23 15:07:50 UTC (rev 1004392)
@@ -7,7 +7,7 @@
 
 pkgname=sweethome3d
 pkgver=6.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An interior design application to draw the plan of your house in a 3D 
environment"
 arch=('x86_64')
 url="http://www.sweethome3d.com/;

[arch-commits] Commit in sweethome3d/trunk (PKGBUILD sweethome3d.sh)

2021-07-31 Thread Fabio Castelli via arch-commits 
Date: Saturday, July 31, 2021 @ 19:01:28
  Author: muflone
Revision: 991303

upgpkg: sweethome3d 6.6-1

Modified:
  sweethome3d/trunk/PKGBUILD
  sweethome3d/trunk/sweethome3d.sh

+
 PKGBUILD   |4 ++--
 sweethome3d.sh |   14 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-07-31 19:01:18 UTC (rev 991302)
+++ PKGBUILD2021-07-31 19:01:28 UTC (rev 991303)
@@ -12,7 +12,7 @@
 arch=('x86_64')
 url="http://www.sweethome3d.com/;
 license=('GPL' 'custom')
-depends=('java-runtime>=11' 'shared-mime-info' 'desktop-file-utils' 'libxext' 
'libgl' 'libxrender' 'libnsl')
+depends=('java-runtime>=8' '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"
@@ -19,7 +19,7 @@
 "${pkgname}.desktop"
 "${pkgname}.xml")
 sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b'
-'6ab8b6cc3859f2c68acbc21370bd37466d93ea39d3b5896e0c2fc3d598ee883e'
+'71abd705684d373a19bc434ca5dc42072faf6e1716b9f0a6005bae122326bfa9'
 '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')
 install="${pkgname}.install"

Modified: sweethome3d.sh
===
--- sweethome3d.sh  2021-07-31 19:01:18 UTC (rev 991302)
+++ sweethome3d.sh  2021-07-31 19:01:28 UTC (rev 991303)
@@ -2,7 +2,7 @@
 
 APP_CLASSPATH=""
 JAVA_EXEC=""
-JAVA_OPTS="${JAVA_OPTS} -Xmx1024m --illegal-access=permit"
+JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
 
 if [ -n "${JAVA_HOME}" ]
 then
@@ -21,6 +21,18 @@
   exit 1
 fi
 
+# Find Java version
+JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d 
'"')"
+
+# 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" ]

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

2021-07-31 Thread Fabio Castelli via arch-commits 
Date: Saturday, July 31, 2021 @ 18:30:10
  Author: muflone
Revision: 991255

upgpkg: sweethome3d 6.6-1

Modified:
  sweethome3d/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-07-31 18:29:25 UTC (rev 991254)
+++ PKGBUILD2021-07-31 18:30:10 UTC (rev 991255)
@@ -6,19 +6,19 @@
 # Contributor: Archan Paul 
 
 pkgname=sweethome3d
-pkgver=6.5.2
+pkgver=6.6
 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')
+depends=('java-runtime>=11' '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=('e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8'
+sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b'
 '6ab8b6cc3859f2c68acbc21370bd37466d93ea39d3b5896e0c2fc3d598ee883e'
 '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')

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

2021-07-18 Thread Fabio Castelli via arch-commits 
Date: Sunday, July 18, 2021 @ 10:28:48
  Author: muflone
Revision: 978469

upgpkg: sweethome3d 6.5.2-1

Modified:
  sweethome3d/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-07-18 09:55:30 UTC (rev 978468)
+++ PKGBUILD2021-07-18 10:28:48 UTC (rev 978469)
@@ -6,8 +6,8 @@
 # Contributor: Archan Paul 
 
 pkgname=sweethome3d
-pkgver=6.5
-pkgrel=3
+pkgver=6.5.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/;
@@ -18,7 +18,7 @@
 "${pkgname}.sh"
 "${pkgname}.desktop"
 "${pkgname}.xml")
-sha256sums=('9f91ecd38d89e8c9c40c93561cc0002d424435e977080f219afdf085f5247220'
+sha256sums=('e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8'
 '6ab8b6cc3859f2c68acbc21370bd37466d93ea39d3b5896e0c2fc3d598ee883e'
 '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')

[arch-commits] Commit in sweethome3d/trunk (PKGBUILD sweethome3d.sh)

2021-06-27 Thread Fabio Castelli via arch-commits 
Date: Sunday, June 27, 2021 @ 22:42:45
  Author: muflone
Revision: 967622

upgpkg: sweethome3d 6.5-3

Modified:
  sweethome3d/trunk/PKGBUILD
  sweethome3d/trunk/sweethome3d.sh

+
 PKGBUILD   |4 ++--
 sweethome3d.sh |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-27 21:45:52 UTC (rev 967621)
+++ PKGBUILD2021-06-27 22:42:45 UTC (rev 967622)
@@ -7,7 +7,7 @@
 
 pkgname=sweethome3d
 pkgver=6.5
-pkgrel=2
+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/;
@@ -19,7 +19,7 @@
 "${pkgname}.desktop"
 "${pkgname}.xml")
 sha256sums=('9f91ecd38d89e8c9c40c93561cc0002d424435e977080f219afdf085f5247220'
-'9fd31f209e53de4aa4ef6c8b2e5adff9228d6226e76fd33f6793abbb079700ed'
+'6ab8b6cc3859f2c68acbc21370bd37466d93ea39d3b5896e0c2fc3d598ee883e'
 '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')
 install="${pkgname}.install"

Modified: sweethome3d.sh
===
--- sweethome3d.sh  2021-06-27 21:45:52 UTC (rev 967621)
+++ sweethome3d.sh  2021-06-27 22:42:45 UTC (rev 967622)
@@ -2,7 +2,7 @@
 
 APP_CLASSPATH=""
 JAVA_EXEC=""
-JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
+JAVA_OPTS="${JAVA_OPTS} -Xmx1024m --illegal-access=permit"
 
 if [ -n "${JAVA_HOME}" ]
 then

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

2021-04-15 Thread Fabio Castelli via arch-commits 
Date: Thursday, April 15, 2021 @ 21:42:21
  Author: muflone
Revision: 919225

upgpkg: sweethome3d 6.5-2

Modified:
  sweethome3d/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-15 21:39:17 UTC (rev 919224)
+++ PKGBUILD2021-04-15 21:42:21 UTC (rev 919225)
@@ -7,13 +7,13 @@
 
 pkgname=sweethome3d
 pkgver=6.5
-pkgrel=1
+pkgrel=2
 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')
+makedepends=('ant' 'strip-nondeterminism')
 
source=("SweetHome3D-${pkgver}-src.zip"::"https://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-src.zip;
 "${pkgname}.sh"
 "${pkgname}.desktop"
@@ -27,6 +27,8 @@
 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() {

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

2021-03-21 Thread Fabio Castelli via arch-commits 
Date: Sunday, March 21, 2021 @ 22:42:34
  Author: muflone
Revision: 898563

upgpkg: sweethome3d 6.5-1

Modified:
  sweethome3d/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-03-21 22:36:24 UTC (rev 898562)
+++ PKGBUILD2021-03-21 22:42:34 UTC (rev 898563)
@@ -6,7 +6,7 @@
 # Contributor: Archan Paul 
 
 pkgname=sweethome3d
-pkgver=6.4.2
+pkgver=6.5
 pkgrel=1
 pkgdesc="An interior design application to draw the plan of your house in a 3D 
environment"
 arch=('x86_64')
@@ -15,23 +15,15 @@
 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=('59e6f4d6ef48cbbf4eeffd53c034a3a4aa24af75edec04a0b20244b273528b73'
-'524286451144548fdc5ae0ca9e4f9180c96eb4bc00e86121d7f38ab3ecad07ff'
+sha256sums=('9f91ecd38d89e8c9c40c93561cc0002d424435e977080f219afdf085f5247220'
 '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