upgrade to 0.3.30 version

4 files changed, 37 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a81a1e28ef19..8d6985b1b8d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,28 @@
 # Maintainer : karamaz0v
 
 pkgname=p4vasp
-pkgver=0.3.29
+pkgver=0.3.30
 pkgrel=1
 pkgdesc="A visualization suite for the Vienna Ab-initio Simulation Package (VASP)"
 url="http://www.p4vasp.at/"
 license=('GPL2')
-arch=("i686" "x86_64")
+arch=("x86_64")
 depends=('python2' 'mesa' 'fltk' 'glu' 'swig')
 options=(!strip staticlibs)
-source=("http://www.p4vasp.at/index.php/downloads/finish/2-source-code/16-p4vasp-0-3-29/${pkgname}-${pkgver}.tgz"
+source=("http://www.p4vasp.at/files/${pkgname}-${pkgver}.tgz"
         "${pkgname}.desktop" 
         "${pkgname}.png" 
         'python2-call.patch' 
         'purge-ext.patch' 
         'swig.patch' 
 	'p4vasp_home.patch')
-md5sums=('845063c013e726a1f695399825082bdd'
+md5sums=('3af30cc650cf4623b145138f92436b23'
          'f6cd7d2771e3e8cb83238542b486471b'
          '071dea8ea3223048466933a6e175a262'
-         '6af582aec9b6aee3070051c318de10d9'
-         '3420044e9a173caab2d0c30df0851e10'  
+         'd3c2a5db23b3f8d32d1317bd7a8bf931'
+         '04f68eff94b1fb3a049e45c32b318bb4'
          '33d9191f7a2e46ae9a292f07d67720a0'
-         '0eaf2bae665eae3da2c4f923218e5224')
-
+	 '78f6b4e79bd20b370d47d025f9554b19')
 
 prepare() {
         cd "$srcdir/$pkgname-$pkgver"
diff --git a/p4vasp_home.patch b/p4vasp_home.patch
index 542cd6e3b5f3..df9d3e53d6d3 100644
--- a/p4vasp_home.patch
+++ b/p4vasp_home.patch
@@ -1,20 +1,18 @@
---- Makefile	2014-03-02 15:58:56.500145994 -0300
-+++ Makefile	2014-03-07 02:57:31.418682724 -0300
-@@ -13,7 +13,12 @@
- # BINDIR        - where the executable will go (e.g. /usr/bin)       #
+--- Makefile	2018-05-16 15:30:58.974859448
++++ Makefile	2018-05-16 15:36:00.684482264
+@@ -14,6 +14,11 @@
  ######################################################################
  
---include install/Configuration.mk
+ -include install/Configuration.mk
 +P4VASP_HOME   = $(DESTDIR)
 +SITE_PACKAGES = $(P4VASP_HOME)/python-packages
 +INCLUDEDIR    = $(P4VASP_HOME)/include
 +LIBDIR        = $(P4VASP_HOME)/lib
 +BINDIR        = $(P4VASP_HOME)/bin
-+
  
  P4VCONFIG     = lib/p4vasp/config.py
  VINFO         = vinfo.py
-@@ -55,7 +55,7 @@
+@@ -50,7 +55,7 @@
  	cd odpdom && $(MAKE) libODP.a	
  	cd src && $(MAKE)
  p4vasp_config:
@@ -23,7 +21,7 @@
  	cat $(VINFO) >> $(P4VCONFIG)
  devver:
  	echo "name       ='p4vasp-devel'" > $(VINFO)
-@@ -150,7 +150,7 @@
+@@ -146,7 +151,7 @@
  clean: clean_p4vasp clean_odpdom
  cleanall: cleanall_p4vasp cleanall_odpdom cleanall_doc
  	
@@ -32,7 +30,7 @@
  	mkdir -p $(SITE_PACKAGES)/p4vasp
  	cd lib; cp -R p4vasp $(SITE_PACKAGES); cd ..
  	chmod -R 755 $(SITE_PACKAGES)/p4vasp
-@@ -164,7 +164,7 @@
+@@ -160,7 +165,7 @@
  	chmod -R 755 $(SITE_PACKAGES)/p4vasp/piddle	
  	cd src; install -m755  cp4vasp.py _cp4vasp.so $(SITE_PACKAGES); cd ..
  	
@@ -41,7 +39,7 @@
  	mkdir -p     $(P4VASP_HOME)
  	cp -R data   $(P4VASP_HOME)
  	cp -R utils  $(P4VASP_HOME)
-@@ -207,7 +207,7 @@
+@@ -203,7 +208,7 @@
  	chmod -R 755   $(P4VASP_HOME)/doc/intro
  	chmod    644   $(P4VASP_HOME)/doc/intro/*
  		
diff --git a/purge-ext.patch b/purge-ext.patch
index 504e3c30ff6c..fd0c1fc8f74c 100644
--- a/purge-ext.patch
+++ b/purge-ext.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-09-28
  	cd odpdom && $(MAKE) libODP.a	
  	cd src && $(MAKE)
  p4vasp_config:
-@@ -143,7 +143,7 @@
+@@ -144,7 +144,7 @@
  	cd ext && sh clean.sh
          
  clean: clean_p4vasp clean_odpdom
@@ -26,13 +26,12 @@ Last-Update: 2013-09-28
  	mkdir -p $(SITE_PACKAGES)/p4vasp
 --- src/Configuration.mk
 +++ src/Configuration.mk
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
 -LIBS=  -L../odpdom -lODP `python2 fltk-config.py --use-gl --ldstaticflags` -lpthread
--CFLAGS= -g -O0 -fpic  -Wall $(FLAGS) `python2 fltk-config.py --cxxflags` -I$(PYINCLUDE) \
 +LIBS=  -L../odpdom -lODP $(shell fltk-config --use-gl --ldflags) -lGLU -lGL -lm -lpthread
-+CFLAGS= -g -O0 -fpic  -Wall $(FLAGS) $(shell fltk-config --cxxflags) -I$(PYINCLUDE) \
+ CFLAGS?= -g -Wall
+-CFLAGS+= -fpic $(FLAGS) `python2 fltk-config.py --cxxflags` -I$(PYINCLUDE) \
++CFLAGS+= -fpic $(FLAGS) $(shell fltk-config --cxxflags) -I$(PYINCLUDE) \
          -Iinclude -I../odpdom/include
  PYINCLUDE=`python2 -c "import sys;import os.path;print os.path.join(sys.prefix,\"include\",\"python\"+sys.version[:3])"`
--LDFLAGS= -shared -L.
-\ No newline at end of file
-+LDFLAGS= -shared -L.
+ LDFLAGS+= -shared -L.
diff --git a/python2-call.patch b/python2-call.patch
index 59e89f4b9cba..fe442059c015 100644
--- a/python2-call.patch
+++ b/python2-call.patch
@@ -402,7 +402,7 @@ Last-Update: 2014-03-02
  #
  # HappyDoc:docStringFormat='ClassicStructuredText'
  #
-@@ -95,7 +95,7 @@ Following calculation properties are ava
+@@ -98,7 +98,7 @@
  
    example:
  
@@ -421,7 +421,7 @@ Last-Update: 2014-03-02
  #
 --- Makefile	2014-02-18 17:07:00.000000000 -0300
 +++ Makefile	2014-03-02 15:58:56.500145994 -0300
-@@ -43,9 +43,9 @@ P4V           = p4v
+@@ -43,9 +43,9 @@
  
  all: p4vasp
  local:
@@ -433,12 +433,12 @@ Last-Update: 2014-03-02
  p4vasp: p4vasp_config uninstallsh fltk appletlist
  	cd odpdom && $(MAKE) libODP.a	
  	cd src && $(MAKE)
-@@ -66,9 +66,9 @@ launcher:
- 	echo "export PYTHONPATH=\$$PYTHONPATH:"$(SITE_PACKAGES) >>$(P4V)
- 	echo "export APPMENU_DISPLAY_BOTH=1" >>$(P4V)
+@@ -67,9 +67,9 @@
+ 	echo "#export APPMENU_DISPLAY_BOTH=1" >>$(P4V)
+ 	echo "export UBUNTU_MENUPROXY=0" >>$(P4V)
  	echo "export P4VASP_HOME="$(P4VASP_HOME) >> $(P4V)
--	echo "exec python "$(BINDIR)"/p4v.py \$$1 \$$2 \$$3" >>$(P4V)
-+	echo "exec python2 "$(BINDIR)"/p4v.py \$$1 \$$2 \$$3" >>$(P4V)
+-	echo "exec python "$(BINDIR)"/p4v.py \"\$$@\"" >>$(P4V)
++	echo "exec python2 "$(BINDIR)"/p4v.py \"\$$@\"" >>$(P4V)
  appletlist:
 -	cd install && python makeappletlist.py
 +	cd install && python2 makeappletlist.py
@@ -447,13 +447,13 @@ Last-Update: 2014-03-02
  	cat $(SETENVIRONMENT) >> ~/.bashrc
 --- odpdom/Makefile	2014-02-18 17:07:00.000000000 -0300
 +++ odpdom/Makefile	2014-03-02 15:58:56.506812765 -0300
-@@ -9,7 +9,7 @@ FLAGS   = -DPY_DOMEXC_MODULE="\"xml.dom.
+@@ -9,7 +9,7 @@
  #          -DNO_POS_CACHE
  #	  -DNO_THROW
  
 -PYINCLUDE=`python -c "import sys;import os.path;print os.path.join(sys.prefix,\"include\",\"python\"+sys.version[:3])"`
 +PYINCLUDE=`python2 -c "import sys;import os.path;print os.path.join(sys.prefix,\"include\",\"python\"+sys.version[:3])"`
- CFLAGS  = -fpic -g $(FLAGS) -I$(PYINCLUDE)  -Iinclude
+ CFLAGS  += -fpic -g $(FLAGS) -I$(PYINCLUDE)  -Iinclude
  
  SWIGFLAGS = -python -c++ $(FLAGS)
 --- odpdom/setup.py	2014-02-18 17:07:00.000000000 -0300
@@ -474,16 +474,18 @@ Last-Update: 2014-03-02
  from __future__ import generators
 --- src/Configuration.mk
 +++ src/Configuration.mk
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
 -LIBS=  -L../odpdom -lODP `python fltk-config.py --use-gl --ldstaticflags` -lpthread
--CFLAGS= -g -O0 -fpic  -Wall $(FLAGS) `python fltk-config.py --cxxflags` -I$(PYINCLUDE) \
 +LIBS=  -L../odpdom -lODP `python2 fltk-config.py --use-gl --ldstaticflags` -lpthread
-+CFLAGS= -g -O0 -fpic  -Wall $(FLAGS) `python2 fltk-config.py --cxxflags` -I$(PYINCLUDE) \
+ CFLAGS?= -g -Wall
+-CFLAGS+= -fpic $(FLAGS) `python fltk-config.py --cxxflags` -I$(PYINCLUDE) \
++CFLAGS+= -fpic $(FLAGS) `python2 fltk-config.py --cxxflags` -I$(PYINCLUDE) \
          -Iinclude -I../odpdom/include
 -PYINCLUDE=`python -c "import sys;import os.path;print os.path.join(sys.prefix,\"include\",\"python\"+sys.version[:3])"`
-+PYINCLUDE=`python2 -c "import sys;import os.path;print os.path.join(sys.prefix,\"include\",\"python\"+sys.version[:3])"`
- LDFLAGS= -shared -L.
+-LDFLAGS+= -shared -L.
 \ No newline at end of file
++PYINCLUDE=`python2 -c "import sys;import os.path;print os.path.join(sys.prefix,\"include\",\"python\"+sys.version[:3])"`
++LDFLAGS+= -shared -L.
 --- src/fltk-config.py	2014-02-18 17:07:00.000000000 -0300
 +++ src/fltk-config.py	2014-03-02 15:58:56.360143799 -0300
 @@ -1,4 +1,4 @@