summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-04-21 11:01:27 +0200
committerErich Eckner <git@eckner.net>2020-04-21 11:02:07 +0200
commiteedf3f0288fd4f1c62c9e9fb7574d321e57f6ef5 (patch)
tree7432b29abf072266aa54af01379c7f41536a3fea
parent068a2a43895dcbca5e670cd3bc1e25a00f31513a (diff)
downloadarchlinuxewe-eedf3f0288fd4f1c62c9e9fb7574d321e57f6ef5.tar.xz
xcrysden: :1.5.60-4 -> :1.6.2-1
-rw-r--r--xcrysden/Make.sys8
-rw-r--r--xcrysden/PKGBUILD12
-rw-r--r--xcrysden/fix-xcrysden-install.patch36
3 files changed, 23 insertions, 33 deletions
diff --git a/xcrysden/Make.sys b/xcrysden/Make.sys
index fd635ed0b..eb5876313 100644
--- a/xcrysden/Make.sys
+++ b/xcrysden/Make.sys
@@ -1,7 +1,7 @@
#########################################################################
#
# System-dependent definitions suitable for compiling xcrysden using
-# a system shared libraries (needs Tcl/Tk/GL/GLU/FFTW libraries)
+# a system shared libraries (needs Tcl/Tk/Togl/GL/GLU/FFTW libraries)
#
########################################################################
@@ -21,7 +21,7 @@ CC = gcc -g
#LDLIB = -ldl
MATH = -lm -lc
-FFLAGS =
+FFLAGS =
FC = gfortran -std=legacy -fdefault-double-8 -fdefault-real-8 -O2
#-------------------------------------------
@@ -43,6 +43,7 @@ X_INCDIR =
TCL_LIB = -ltcl
TK_LIB = -ltk
+TOGL_LIB = -L/usr/lib/Togl2.0 -lTogl$(TOGL_VER) -Wl,-rpath=/usr/lib/Togl2.0
GLU_LIB = -lGLU
GL_LIB = -lGL
FFTW3_LIB = -lfftw3
@@ -54,8 +55,9 @@ EXT_LIB = -lgl2ps
# Include directories
#
-TCL_INCDIR = -I/usr/include
+TCL_INCDIR =
TK_INCDIR =
+TOGL_INCDIR =
GL_INCDIR =
FFTW3_INCDIR =
# this is only used for some testing purposes
diff --git a/xcrysden/PKGBUILD b/xcrysden/PKGBUILD
index 4be94abd6..6001fd6e7 100644
--- a/xcrysden/PKGBUILD
+++ b/xcrysden/PKGBUILD
@@ -3,21 +3,21 @@
# Previous Maintainer: Vit <vitruss@gmail.com>
pkgname=xcrysden
-pkgver=1.5.60
-pkgrel=4
+pkgver=1.6.2
+pkgrel=1
epoch=
pkgdesc="crystalline and molecular structure visualisation program"
arch=('i686' 'pentium4' 'x86_64')
url="http://www.xcrysden.org/"
license=('GPL2')
-depends=('tk' 'tcl' 'gl2ps' 'fftw' 'bwidget' 'imagemagick' 'gcc-fortran' 'glu' 'libxmu')
+depends=('tk' 'tcl' 'tk-togl' 'gl2ps' 'fftw' 'bwidget' 'imagemagick' 'gcc-fortran' 'glu' 'libxmu')
replaces=('xcrysden-bin')
source=("http://www.xcrysden.org/download/xcrysden-${pkgver}.tar.gz"
"fix-xcrysden-install.patch"
"Make.sys")
-sha256sums=('a695729f1bb3e486b86a74106c06a392c8aca048dc6b0f20785c3c311cfb2ef4'
- '61a0bbc7728beff05bcb7f1676053de468ebb926b638869174aa2bbcb5bc554c'
- '077ca35a6d7264c0b13489a3c06cb49041c6afaf394d136c303ba9b4a5614d66')
+sha512sums=('43e65e421be70528b4f979eefe03abbf0b4c2177bae51fa71247ca70ecc3dfbd36a793e99c2ee9b50fea31f37f4060b44c662f222f5bc31d3f1dc96d51273b19'
+ '17981ae72fc1b1d36388830c49ebc5d5d6916ee56c06b3fd3132edbe21a880d39bd85903183a4270b494e510e2c76d9276660ffeed92d6cc34abf33c3b2ae0ff'
+ '2ed95be6a775cdca1a61634948065ebc2ce2ecd305b30140b8a04b1785c0546344f511755510a9e6634afb6ff0aaa82f02565682d62cf6657f3b8039d37a7453')
prepare() {
mv Make.sys "$pkgname-$pkgver"
diff --git a/xcrysden/fix-xcrysden-install.patch b/xcrysden/fix-xcrysden-install.patch
index 9d3c3f252..7dd0a7a8f 100644
--- a/xcrysden/fix-xcrysden-install.patch
+++ b/xcrysden/fix-xcrysden-install.patch
@@ -12,16 +12,16 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
-@@ -17,7 +17,7 @@
- # some varibales ...
+@@ -18,7 +18,7 @@
- all: tcl tk mesa fftw meschach xcrysden
+ all: tcl tk mesa togl fftw xcrysden
+ # meschach
-xcrysden: usage bwidget bindir src-C src-F src-Tcl
+xcrysden: usage bindir src-C src-F src-Tcl
usage: $(TOPDIR)/docs/xcrysden.1
man $(TOPDIR)/docs/xcrysden.1 | awk 'BEGIN {lprint=0; print "## do not edit changes will be lost (file automatically generated)\n"; } /SYNOPSIS/ { lprint=1; } /SEE ALSO/ { lprint=0; } /a*/ { if (lprint) print; }' > usage
-@@ -226,9 +226,9 @@
+@@ -234,9 +234,9 @@
#
# ------------------------------------------------------------------------
@@ -33,49 +33,37 @@ Forwarded: not-needed
install: xcrysden
@echo
---- a/C/Makefile
-+++ b/C/Makefile
-@@ -29,7 +29,7 @@
-
- xcrys: $(XC_OBJS) $(EXTERNAL_OBJS)
- $(CC) $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
-- -o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB)
-+ -o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB) $(EXT_LIB)
-
- xctclsh: xcTclsh.o
- $(CC) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB)
--- a/C/make-objects
+++ b/C/make-objects
@@ -1,6 +1,5 @@
+ # togl.o
EXTERNAL_OBJS = \
- togl.o \
- gl2ps.o \
sgiRasterFont.o \
sgiAux.o
--- a/C/gl2psPrintTogl.c
+++ b/C/gl2psPrintTogl.c
-@@ -18,8 +18,8 @@
-
+@@ -19,7 +19,7 @@
#include <stdio.h>
#include <string.h>
--#include "togl.h"
+ #include <togl.h>
-#include "gl2ps.h"
-+#include "togl.h"
+#include <gl2ps.h>
#include "xcfunc.h"
- extern void (*xcDisplay)(struct Togl *togl);
+ extern struct Togl *mesa_togl;
--- a/sys_utils/wrappers.sh
+++ b/sys_utils/wrappers.sh
@@ -5,8 +5,8 @@
#!/bin/sh -f
-
+
# simple wrapper to run $cmd
--XCRYSDEN_TOPDIR=$prefix/share/$xcrysden
--XCRYSDEN_LIB_BINDIR=$prefix/lib/$xcrysden
+-XCRYSDEN_TOPDIR="$prefix/share/$xcrysden"
+-XCRYSDEN_LIB_BINDIR="$prefix/lib/$xcrysden"
+XCRYSDEN_TOPDIR=/usr/share/xcrysden
+XCRYSDEN_LIB_BINDIR=/usr/lib/xcrysden
export XCRYSDEN_TOPDIR
export XCRYSDEN_LIB_BINDIR
+