summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD16
-rw-r--r--gdl-template.patch20
-rw-r--r--gdl-tirpc.patch85
4 files changed, 100 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a72f448b01..8f2e96d62be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gnudatalanguage
pkgdesc = An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)
- pkgver = 0.9.7
- pkgrel = 4
+ pkgver = 0.9.8
+ pkgrel = 1
url = http://gnudatalanguage.sourceforge.net/
arch = i686
arch = x86_64
@@ -22,12 +22,13 @@ pkgbase = gnudatalanguage
depends = grib_api
depends = udunits
depends = eigen3
+ depends = libtirpc
options = !makeflags
- source = http://downloads.sourceforge.net/gnudatalanguage/gdl-0.9.7.tgz
- source = gdl-template.patch
+ source = http://downloads.sourceforge.net/gnudatalanguage/gdl-0.9.8.tgz
+ source = gdl-tirpc.patch
source = gdl.profile
- md5sums = 0cd285d85e00e76e37b92310a76579c2
- md5sums = 5be4d8c21ec3e004847e05f7978a77f0
+ md5sums = 451532f1263bbaa8745a4ca8978533c0
+ md5sums = cad6430a812e906ee7f1e15b4589dcac
md5sums = 40aa5fd8278cd8e80425c62a577563cc
pkgname = gnudatalanguage
diff --git a/PKGBUILD b/PKGBUILD
index 0d6c838b4ef..4806af9756a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,27 @@
# Contributor: Orlando Garcia Feal <rodland at gmail dot com>
pkgname=gnudatalanguage
-pkgver=0.9.7
-pkgrel=4
+pkgver=0.9.8
+pkgrel=1
pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
arch=('i686' 'x86_64')
url="http://gnudatalanguage.sourceforge.net/"
license=('GPL')
depends=('python2' 'python2-numpy' 'plplot510' 'gsl' 'readline' 'hdf5' 'netcdf' \
- 'netcdf-cxx' 'wxgtk' 'fftw' 'udunits' 'pslib' 'grib_api' 'udunits' 'eigen3')
+ 'netcdf-cxx' 'wxgtk' 'fftw' 'udunits' 'pslib' 'grib_api' 'udunits' 'eigen3' \
+ 'libtirpc')
makedepends=('cmake')
options=('!makeflags')
source=(http://downloads.sourceforge.net/gnudatalanguage/gdl-${pkgver}.tgz \
- gdl-template.patch \
+ gdl-tirpc.patch \
gdl.profile)
-md5sums=('0cd285d85e00e76e37b92310a76579c2'
- '5be4d8c21ec3e004847e05f7978a77f0'
+md5sums=('451532f1263bbaa8745a4ca8978533c0'
+ 'cad6430a812e906ee7f1e15b4589dcac'
'40aa5fd8278cd8e80425c62a577563cc')
prepare() {
- sed -i '1d' gdl-template.patch
cd $srcdir/gdl-${pkgver}/
- patch -p1 < ../gdl-template.patch
+ patch -p1 < ../gdl-tirpc.patch
}
build() {
diff --git a/gdl-template.patch b/gdl-template.patch
deleted file mode 100644
index dc2281a65a7..00000000000
--- a/gdl-template.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up gdl-0.9.7/src/specializations.hpp.gcc6 gdl-0.9.7/src/specializations.hpp
---- gdl-0.9.7/src/specializations.hpp.gcc6 2015-08-24 15:26:47.000000000 -0600
-+++ gdl-0.9.7/src/specializations.hpp 2016-03-03 16:30:46.694379312 -0700
-@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
-
- // default_io.cpp
- template<>
--std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_);
--template<>
--std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_);
--template<>
--std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_);
--template<>
--std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_);
--template<>
--std::istream& operator>>(std::istream& is, Data_<SpDString>& data_);
--template<>
- std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
- template<>
- std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
diff --git a/gdl-tirpc.patch b/gdl-tirpc.patch
new file mode 100644
index 00000000000..9e2597559ed
--- /dev/null
+++ b/gdl-tirpc.patch
@@ -0,0 +1,85 @@
++diff -urN gdl-0.9.8_old/CMakeLists.txt gdl-0.9.8/CMakeLists.txt
++--- gdl-0.9.8_old/CMakeLists.txt 2018-08-05 20:47:42.332868644 +0200
+++++ gdl-0.9.8/CMakeLists.txt 2018-08-05 20:52:35.440704154 +0200
++@@ -356,28 +356,42 @@
++ "(suitable Fedora package: gsl-devel)")
++ endif(GSL_FOUND)
++
++-if(WIN32 AND NOT CYGWIN)
++-set(CMAKE_PREFIX_PATH ${XDRDIR})
++-find_package(Xdr)
++-set(HAVE_LIBXDR ${XDR_FOUND})
++-if(XDR_FOUND)
++- set(LIBRARIES ${LIBRARIES} ${XDR_LIBRARIES})
++- include_directories(${XDR_INCLUDE_DIR})
++-else(XDR_FOUND)
++- message(FATAL_ERROR "bsd-xdr library is required but was not found.\n"
++- "Use -DXDRDIR=DIR to specify the bsd-xdr directory tree.")
++-endif(XDR_FOUND)
+++if(UNIX)
+++ set(CMAKE_PREFIX_PATH ${RPCDIR})
+++ find_package(RPC QUIET)
+++ set(HAVE_RPC ${RPC_FOUND})
+++ if(RPC_FOUND)
+++ set(LIBRARIES ${LIBRARIES} ${RPC_LIBRARIES})
+++ include_directories(${RPC_INCLUDE_DIR})
+++ else(RPC_FOUND)
+++ message(FATAL_ERROR "RPC support is mandatory.\n"
+++ "Note that SunRPC has been removed in glibc-2.26 and later, "
+++ "while being optional in earlier versions. Consider using the "
+++ "recommended and more modern libtirpc instead.\n"
+++ "Use -DRPCDIR=DIR to specify the rpc directory tree.\n")
+++ endif(RPC_FOUND)
+++elseif(WIN32 AND NOT CYGWIN)
+++ set(CMAKE_PREFIX_PATH ${XDRDIR})
+++ find_package(Xdr)
+++ set(HAVE_LIBXDR ${XDR_FOUND})
+++ if(XDR_FOUND)
+++ set(LIBRARIES ${LIBRARIES} ${XDR_LIBRARIES})
+++ include_directories(${XDR_INCLUDE_DIR})
+++ else(XDR_FOUND)
+++ message(FATAL_ERROR "bsd-xdr library is required but was not found.\n"
+++ "Use -DXDRDIR=DIR to specify the bsd-xdr directory tree.")
+++ endif(XDR_FOUND)
++
++-set(CMAKE_PREFIX_PATH ${PCREDIR})
++-find_package(PCRE)
++-set(HAVE_LIBPCRE ${PCRE_FOUND})
++-if(PCRE_FOUND)
++- set(LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES})
++- include_directories(${PCRE_INCLUDE_DIR})
++-else(PCRE_FOUND)
++- message(FATAL_ERROR "pcre library is required but was not found.\n"
++- "Use -DPCREDIR=DIR to specify the pcre directory tree.")
++-endif(PCRE_FOUND)
+++ set(CMAKE_PREFIX_PATH ${PCREDIR})
+++ find_package(PCRE)
+++ set(HAVE_LIBPCRE ${PCRE_FOUND})
+++ if(PCRE_FOUND)
+++ set(LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES})
+++ include_directories(${PCRE_INCLUDE_DIR})
+++ else(PCRE_FOUND)
+++ message(FATAL_ERROR "pcre library is required but was not found.\n"
+++ "Use -DPCREDIR=DIR to specify the pcre directory tree.")
+++ endif(PCRE_FOUND)
++ LINK_LIBRARIES(shlwapi gnurx)
++ endif(WIN32 AND NOT CYGWIN)
++
++diff -urN gdl-0.9.8_old/CMakeModules/FindRPC.cmake gdl-0.9.8/CMakeModules/FindRPC.cmake
++--- gdl-0.9.8_old/CMakeModules/FindRPC.cmake 1970-01-01
+01:00:00.000000000 +0100
+++++ gdl-0.9.8/CMakeModules/FindRPC.cmake 2018-08-05
+20:54:31.086701032 +0200
++@@ -0,0 +1,12 @@
+++
+++include(FindPackageHandleStandardArgs)
+++find_path(RPC_INCLUDE_DIR NAMES "rpc/rpc.h" PATH_SUFFIXES "tirpc")
+++ if(RPC_INCLUDE_DIR MATCHES "/tirpc/?$")
+++ find_library(RPC_LIBRARY NAMES tirpc)
+++ set(RPC_LIBRARIES ${RPC_LIBRARY})
+++ find_package_handle_standard_args(RPC DEFAULT_MSG RPC_INCLUDE_DIR RPC_LIBRARY RPC_LIBRARIES)
+++else()
+++ find_package_handle_standard_args(RPC DEFAULT_MSG RPC_INCLUDE_DIR)
+++endif()
+++ mark_as_advanced(RPC_INCLUDE_DIR RPC_LIBRARY RPC_LIBRARIES)
+++