diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-03-08 04:10:35 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-09 17:20:43 +0700 |
| commit | 73cb335d3b822ca688a9ab42a204f04b50328037 (patch) | |
| tree | fc064a8b9fbd971decd4a427daf02b7481cd8b55 | |
| parent | 9028ee796e4c8b132036b8b96a1886e592138095 (diff) | |
academic/fityk: Fix wxPython/wxGTK3 conflict.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | academic/fityk/README | 3 | ||||
| -rw-r--r-- | academic/fityk/fityk.SlackBuild | 21 |
2 files changed, 13 insertions, 11 deletions
diff --git a/academic/fityk/README b/academic/fityk/README index 7eb0de3a522f5..0217e00966bac 100644 --- a/academic/fityk/README +++ b/academic/fityk/README @@ -15,3 +15,6 @@ Pearson VII, bifurcated Gaussian, EMG, Doniach-Sunjic, etc.); but it is suitable for fitting any curve to 2D (x,y) data. Fityk is distributed under an open source licence (GPLv2+). + +Optional dependency: Sphinx. If installed, it will be used to generate +HTML documentation, which will be installed in /usr/share/fityk/html. diff --git a/academic/fityk/fityk.SlackBuild b/academic/fityk/fityk.SlackBuild index 26bfef5d536da..5af5ab5af27a6 100644 --- a/academic/fityk/fityk.SlackBuild +++ b/academic/fityk/fityk.SlackBuild @@ -22,12 +22,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220308 bkw: Modified by SlackBuilds.org, BUILD=3: +# - fix conflict between wxPython/wxGTK3. +# - remove useless INSTALL from doc dir. +# - mention Sphinx as optional dep in README. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fityk VERSION=${VERSION:-20210925_e022356} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +43,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -76,9 +77,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++14" \ @@ -88,16 +89,14 @@ CXXFLAGS="$SLKCFLAGS -std=c++14" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --enable-python \ + --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 \ --build=$ARCH-slackware-linux make -make DESTDIR=$PKG install - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +make DESTDIR=$PKG install-strip mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild gzip -9 $PKG/usr/man/man1/fityk.1 |