Browse Source

xap/compucell3d: Upgraded to compucell3d-4.1.1.

current-20191101
parent
commit
7cd0b2d56f
  1. 21
      xap/compucell3d/CompuCell3D-4.1.1-settingsdir.patch
  2. 10
      xap/compucell3d/compucell3d.SlackBuild

21
xap/compucell3d/CompuCell3D-4.1.1-settingsdir.patch

@ -0,0 +1,21 @@
diff -Naur CompuCell3D-4.1.1.orig/cc3d/core/DefaultSettingsData.py CompuCell3D-4.1.1/cc3d/core/DefaultSettingsData.py
--- CompuCell3D-4.1.1.orig/cc3d/core/DefaultSettingsData.py 2020-01-19 01:14:59.000000000 +0000
+++ CompuCell3D-4.1.1/cc3d/core/DefaultSettingsData.py 2020-04-30 20:53:25.540456846 +0100
@@ -2,4 +2,4 @@
encodes location and the name of the setting file. Global settings will be stored in
<home_directory>/.SETTINGS_FOLDER
"""
-(SETTINGS_FOLDER, SETTINGS_FILE_NAME) = ('.compucell3d_py3', '_settings.sqlite',)
+(SETTINGS_FOLDER, SETTINGS_FILE_NAME) = ('cc3d', '_settings.sqlite',)
diff -Naur CompuCell3D-4.1.1.orig/cc3d/player5/Configuration/SettingUtils.py CompuCell3D-4.1.1/cc3d/player5/Configuration/SettingUtils.py
--- CompuCell3D-4.1.1.orig/cc3d/player5/Configuration/SettingUtils.py 2020-01-19 01:14:59.000000000 +0000
+++ CompuCell3D-4.1.1/cc3d/player5/Configuration/SettingUtils.py 2020-04-30 20:53:07.859188442 +0100
@@ -79,7 +79,7 @@
returns path to the directory wit global settings
:return: {str}
"""
- global_setting_dir = os.path.abspath(os.path.join(os.path.expanduser('~'), SETTINGS_FOLDER))
+ global_setting_dir = os.path.abspath(os.path.join(os.getenv('XDG_CONFIG_HOME'), SETTINGS_FOLDER))
return global_setting_dir

10
xap/compucell3d/compucell3d.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2018,2019 Damien Goutte-Gattat
# Copyright (C) 2018,2019,2020 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -30,14 +30,14 @@
# Source package infos
NAMESRC=${NAMESRC:-CompuCell3D}
VERSION=${VERSION:-4.1.0}
VERSION=${VERSION:-4.1.1}
REPOSITORY=${REPOSITORY:-https://github.com/CompuCell3D/CompuCell3D.git}
COMMIT=${COMMIT:-a30b3ba216b4564898796e1b90fcafb60a87698e}
COMMIT=${COMMIT:-c89d387903c2571c9d38a082618c5b050e28f388}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
# Build infos
NAMEPKG=${NAMEPKG:-compucell3d}
BUILD=${BUILD:-2GGD}
BUILD=${BUILD:-1GGD}
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -111,6 +111,8 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Store settings in XDG_CONFIG_HOME
patch -p 1 < $CWD/CompuCell3D-4.1.1-settingsdir.patch
mkdir CompuCell3D/build && cd CompuCell3D/build
cmake \
-DCMAKE_BUILD_TYPE=Release \

Loading…
Cancel
Save