summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUniversebenzene2018-12-16 13:56:26 +0800
committerUniversebenzene2018-12-16 13:56:26 +0800
commit3b45543e2bf5b2c150fdd141c9100b773f641149 (patch)
tree08fca59e87fc913332f202205b0f30b59398ed10
parent9f4b953ed57190b349c62485ff01308cade54ef5 (diff)
downloadaur-3b45543e2bf5b2c150fdd141c9100b773f641149.tar.gz
Fix patches
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--gdl-tirpc.patch164
3 files changed, 96 insertions, 85 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad48c282091..60103bb201d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Dec 16 05:53:07 UTC 2018
pkgbase = gnudatalanguage
pkgdesc = An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)
pkgver = 0.9.8
- pkgrel = 2
+ pkgrel = 3
url = http://gnudatalanguage.sourceforge.net/
arch = i686
arch = x86_64
@@ -25,8 +27,10 @@ pkgbase = gnudatalanguage
depends = libtirpc
options = !makeflags
source = http://downloads.sourceforge.net/gnudatalanguage/gdl-0.9.8.tgz
+ source = gdl-tirpc.patch
source = gdl.profile
md5sums = 451532f1263bbaa8745a4ca8978533c0
+ md5sums = cad6430a812e906ee7f1e15b4589dcac
md5sums = 40aa5fd8278cd8e80425c62a577563cc
pkgname = gnudatalanguage
diff --git a/PKGBUILD b/PKGBUILD
index f08b560a3a8..24e469d677d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
# Maintainer: Miguel de Val-Borro <miguel@archlinux.net>
# Contributor: James Tappin <jtappinatgmaildotcom>
# Contributor: Orlando Garcia Feal <rodland at gmail dot com>
+# Contributor: Jan Kohnert <kohni.jk at gmail dot com>
pkgname=gnudatalanguage
pkgver=0.9.8
-pkgrel=2
+pkgrel=3
pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
arch=('i686' 'x86_64')
url="http://gnudatalanguage.sourceforge.net/"
@@ -15,10 +16,17 @@ depends=('python2' 'python2-numpy' 'plplot510' 'gsl' 'readline' 'hdf5' 'netcdf'
makedepends=('cmake')
options=('!makeflags')
source=(http://downloads.sourceforge.net/gnudatalanguage/gdl-${pkgver}.tgz \
+ gdl-tirpc.patch \
gdl.profile)
md5sums=('451532f1263bbaa8745a4ca8978533c0'
+ 'cad6430a812e906ee7f1e15b4589dcac'
'40aa5fd8278cd8e80425c62a577563cc')
+prepare() {
+ cd $srcdir/gdl-${pkgver}/
+ patch -p1 < ../gdl-tirpc.patch
+}
+
build() {
cd $srcdir/gdl-${pkgver}
if [[ -d build ]]; then
@@ -34,6 +42,7 @@ build() {
-I/usr/lib/python2.7/site-packages/numpy/core/include" ..
make
}
+
package() {
cd $srcdir/gdl-${pkgver}/build
make DESTDIR=$pkgdir install
diff --git a/gdl-tirpc.patch b/gdl-tirpc.patch
index 9e2597559ed..fbe0bcbfb7d 100644
--- a/gdl-tirpc.patch
+++ b/gdl-tirpc.patch
@@ -1,85 +1,83 @@
-+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)
+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 @@
+
-+-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)
++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)
+
-+-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)
-++