diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | cairo.m4 | 55 | ||||
| -rw-r--r-- | configure.ac.patch | 30 | ||||
| -rw-r--r-- | libgadap.m4 | 45 | ||||
| -rw-r--r-- | libshp.m4 | 45 |
6 files changed, 181 insertions, 26 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Sep 10 15:48:52 UTC 2017 +# Tue Aug 14 09:39:55 UTC 2018 pkgbase = grads pkgdesc = The Grid Analysis and Display System (GrADS) is an interactive desktop tool that is used for easy access, manipulation, and visualization of earth science data. The format of the data may be either binary, GRIB, NetCDF, or HDF-SDS (Scientific Data Sets). - pkgver = 2.2.0 + pkgver = 2.2.1 pkgrel = 1 url = http://cola.gmu.edu/grads/grads.php arch = i686 @@ -21,14 +21,20 @@ pkgbase = grads depends = gd provides = grads conflicts = grads - source = ftp://cola.gmu.edu/grads/2.2/grads-2.2.0-src.tar.gz + source = ftp://cola.gmu.edu/grads/2.2/grads-2.2.1-src.tar.gz source = time_unit.patch source = configure.ac.patch source = udpt - md5sums = 9abad72ff5ea7204797696e582d88966 + source = cairo.m4 + source = libshp.m4 + source = libgadap.m4 + md5sums = 2c893cacef9d9b0fd869cb802fbf4b63 md5sums = 8b6559bdff9605a1bfce506cd0315b57 - md5sums = 789224e91bda2e2b36fc5022854841d8 + md5sums = 4ba162aefeb175eab82f5c0d64b58a40 md5sums = efea7122a20000669392d55109839ddd + md5sums = a2ef71af8cfbe2825edb681648d3f03e + md5sums = a551057b73cd63db89fb11bf5b5c96ab + md5sums = 32423b1d5dd86526abf2913dd6a21ee9 pkgname = grads @@ -1,5 +1,5 @@ pkgname=grads -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="The Grid Analysis and Display System (GrADS) is an interactive \ desktop tool that is used for easy access, manipulation, and visualization \ @@ -12,16 +12,20 @@ makedepends=(g2clib gadap) arch=(i686 x86_64) provides=(grads) conflicts=(grads) -source=(ftp://cola.gmu.edu/grads/2.2/${pkgname}-${pkgver}-src.tar.gz time_unit.patch configure.ac.patch udpt) -md5sums=('9abad72ff5ea7204797696e582d88966' +source=(ftp://cola.gmu.edu/grads/2.2/${pkgname}-${pkgver}-src.tar.gz time_unit.patch configure.ac.patch udpt cairo.m4 libshp.m4 libgadap.m4) +md5sums=('2c893cacef9d9b0fd869cb802fbf4b63' '8b6559bdff9605a1bfce506cd0315b57' - '789224e91bda2e2b36fc5022854841d8' - 'efea7122a20000669392d55109839ddd') + '4ba162aefeb175eab82f5c0d64b58a40' + 'efea7122a20000669392d55109839ddd' + 'a2ef71af8cfbe2825edb681648d3f03e' + 'a551057b73cd63db89fb11bf5b5c96ab' + '32423b1d5dd86526abf2913dd6a21ee9') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i ${srcdir}/time_unit.patch - patch -Rp0 -i ${srcdir}/configure.ac.patch + patch -p0 -i ${srcdir}/configure.ac.patch + cp ${srcdir}/*.m4 m4 echo "void gxdXflush(void) { }" > src/aflush.c sed -i configure.ac -e 's/png15/png16/g' -e 's/grib2c/g2c/g' sed -i acinclude.m4 \ diff --git a/cairo.m4 b/cairo.m4 new file mode 100644 index 000000000000..f395e512dc6d --- /dev/null +++ b/cairo.m4 @@ -0,0 +1,55 @@ +dnl GA_CHECK_LIB_CAIRO : check for cairo library +dnl args : action-if-yes, action-if-no + +AC_DEFUN([GA_CHECK_LIB_CAIRO], +[ + ga_check_cairo="no" + CAIRO_LIBS= + CAIRO_CFLAGS= + CAIRO_LDFLAGS= + + ac_save_LIBS="$LIBS" + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + + ga_pkgconfig_cairo=no + ga_config_cairo=no + +dnl Check for pkg-config + PKG_CHECK_MODULES([CAIRO],[cairo],[ga_pkgconfig_cairo=yes]) + +dnl We found something; check for the header cairo.h, cairo_version + if test $ga_pkgconfig_cairo = 'yes'; then + LDFLAGS="$LDFLAGS $CAIRO_LDFLAGS" + LIBS="$LIBS $CAIRO_LIBS" + AC_CHECK_HEADER([cairo.h], + [ AC_CHECK_LIB([cairo], [cairo_version], + [ ga_check_cairo=yes + ], + [ + CAIRO_LDFLAGS= + CAIRO_LIBS= + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + ]) + ], + [ + CAIRO_CFLAGS= + CPPFLAGS="$ac_save_CPPFLAGS" + ]) + fi + + LIBS="$ac_save_LIBS" + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + + if test $ga_check_cairo = 'yes'; then + m4_if([$1], [], [:], [$1]) + else + m4_if([$2], [], [:], [$2]) + fi + +# AC_SUBST([CAIRO_LIBS]) +# AC_SUBST([CAIRO_LDFLAGS]) +# AC_SUBST([CAIRO_CFLAGS]) +]) diff --git a/configure.ac.patch b/configure.ac.patch index 4e1acdee428f..fad48b264afb 100644 --- a/configure.ac.patch +++ b/configure.ac.patch @@ -1,22 +1,22 @@ ---- configure.ac.new 2017-09-10 16:59:35.652502185 +0200 -+++ configure.ac 2017-09-10 17:00:19.119337813 +0200 -@@ -498,7 +498,7 @@ - echo hdf4 - echo ---- +--- configure.ac 2018-08-14 10:41:46.649621626 +0200 ++++ configure.ac 2018-08-14 10:43:19.946743356 +0200 +@@ -673,7 +673,7 @@ + if test "Z$ga_supplib_dir" != "Z" ; then if test "$have_zlib" = "yes" -a "$have_jpeg" = "yes" -a "$have_udunits" = "yes" ; then -- GA_SET_FLAGS([],[],[],[-ldf]) -+ GA_SET_FLAGS([]) + echo looking in $ga_supplib_dir +- GA_SET_FLAGS([]) ++ GA_SET_FLAGS([],[],[],[-ldf]) AC_CHECK_HEADER([mfhdf.h], [ AC_CHECK_LIB([df], [main], [ AC_CHECK_LIB([mfhdf], [main], ---- src/Makefile.am.new 2017-09-10 17:43:26.972602155 +0200 -+++ src/Makefile.am 2017-09-10 17:43:42.569366576 +0200 -@@ -39,7 +39,7 @@ +--- src/Makefile.am 2018-08-14 10:41:46.649621626 +0200 ++++ src/Makefile.am 2018-08-14 10:45:50.747478888 +0200 +@@ -37,7 +37,7 @@ + endif - libgxpGD_la_SOURCES = gxprintGD.c gxGD.c - libgxdX11_la_SOURCES = gxX11.c gxdxwd.c --libgxpCairo_la_SOURCES = gxprint.c gxC.c aflush.c -+libgxpCairo_la_SOURCES = gxprint.c gxC.c + if USECAIRO +-libgxpCairo_la_SOURCES = gxprint.c gxC.c ++libgxpCairo_la_SOURCES = gxprint.c gxC.c aflush.c libgxdCairo_la_SOURCES = gxX.c gxC.c - libgxdummy_la_SOURCES = gxdummy.c + endif diff --git a/libgadap.m4 b/libgadap.m4 new file mode 100644 index 000000000000..ba568eac2ab9 --- /dev/null +++ b/libgadap.m4 @@ -0,0 +1,45 @@ +dnl GA_CHECK_LIB_GADAP : check for gadap library +dnl args : action-if-yes, action-if-no + +AC_DEFUN([GA_CHECK_LIB_GADAP], +[ + ga_check_gadap="no" + GADAP_LIBS= + GADAP_CFLAGS= + GADAP_LDFLAGS= + + ac_save_LIBS="$LIBS" + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + +dnl check for the header gadap.h, gadap_open + AC_CHECK_HEADER([gadap.h], + [ AC_CHECK_LIB([gadap], [gadap_open], + [ ga_check_gadap=yes + ], + [ + GADAP_LDFLAGS= + GADAP_LIBS= + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + ]) + ], + [ + GADAP_CFLAGS= + CPPFLAGS="$ac_save_CPPFLAGS" + ]) + + LIBS="$ac_save_LIBS" + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + + if test $ga_check_gadap = 'yes'; then + m4_if([$1], [], [:], [$1]) + else + m4_if([$2], [], [:], [$2]) + fi + +# AC_SUBST([GADAP_LIBS]) +# AC_SUBST([GADAP_LDFLAGS]) +# AC_SUBST([GADAP_CFLAGS]) +]) diff --git a/libshp.m4 b/libshp.m4 new file mode 100644 index 000000000000..5a7cc8b1daf6 --- /dev/null +++ b/libshp.m4 @@ -0,0 +1,45 @@ +dnl GA_CHECK_LIB_SHP : check for shp library +dnl args : action-if-yes, action-if-no + +AC_DEFUN([GA_CHECK_LIB_SHP], +[ + ga_check_shp="no" + SHP_LIBS= + SHP_CFLAGS= + SHP_LDFLAGS= + + ac_save_LIBS="$LIBS" + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + +dnl check for the header shp.h, SHPOpen + AC_CHECK_HEADER([shapefil.h], + [ AC_CHECK_LIB([shp], [SHPOpen], + [ ga_check_shp=yes + ], + [ + SHP_LDFLAGS= + SHP_LIBS= + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + ]) + ], + [ + SHP_CFLAGS= + CPPFLAGS="$ac_save_CPPFLAGS" + ]) + + LIBS="$ac_save_LIBS" + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + + if test $ga_check_shp = 'yes'; then + m4_if([$1], [], [:], [$1]) + else + m4_if([$2], [], [:], [$2]) + fi + +# AC_SUBST([SHP_LIBS]) +# AC_SUBST([SHP_LDFLAGS]) +# AC_SUBST([SHP_CFLAGS]) +]) |