rpms/grads/devel grads-build_system.patch, 1.1, 1.2 grads-dap_build_fixes.patch, 1.1, 1.2 grads.spec, 1.24, 1.25
Patrice Dumas
pertusus at fedoraproject.org
Thu Sep 11 16:16:50 UTC 2008
- Previous message (by thread): comps comps-f10.xml.in,1.100,1.101
- Next message (by thread): rpms/xscreensaver/F-8 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/grads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26674
Modified Files:
grads-build_system.patch grads-dap_build_fixes.patch
grads.spec
Log Message:
* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-25
- rebuild for new libnc-dap
- rediff patches
- use new netcdf devel file locations
grads-build_system.patch:
Index: grads-build_system.patch
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads-build_system.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads-build_system.patch 22 Aug 2007 10:48:32 -0000 1.1
+++ grads-build_system.patch 11 Sep 2008 16:16:20 -0000 1.2
@@ -1,181 +1,6 @@
-diff -up grads-1.9b4/src/config.h.in.build_system grads-1.9b4/src/config.h.in
---- grads-1.9b4/src/config.h.in.build_system 2004-12-15 22:00:03.000000000 +0100
-+++ grads-1.9b4/src/config.h.in 2007-08-22 10:36:54.000000000 +0200
-@@ -61,6 +61,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-+/* prepend sd_ to netcdf symbols */
-+#undef HDF_SD_NETCDF
-+
- /* Enhanced readline with history */
- #undef MM_READLINE
-
-@@ -88,6 +91,9 @@
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
-
-+/* Use GetFile from freq */
-+#undef USEFREQ
-+
- /* Enable GUI widgets */
- #undef USEGUI
-
-@@ -116,5 +122,11 @@
- /* Define to empty if `const' does not conform to ANSI C. */
- #undef const
-
--/* Define to `long' if <sys/types.h> does not define. */
-+/* Define to `long int' if <sys/types.h> does not define. */
- #undef off_t
-+
-+
-+#ifdef HDF_SD_NETCDF
-+#include "gawrapsd.h"
-+#endif
-+
-diff -up grads-1.9b4/src/Makefile.am.build_system grads-1.9b4/src/Makefile.am
---- grads-1.9b4/src/Makefile.am.build_system 2004-12-15 22:00:03.000000000 +0100
-+++ grads-1.9b4/src/Makefile.am 2007-08-22 10:36:43.000000000 +0200
-@@ -63,7 +63,7 @@ hdr_png = gd13gif.h mtables.
- hdr_lats = lats.h latsint.h latsparm.h latstime.h \
- fgrib.h fgrib_init.h
- noinst_HEADERS = $(hdr_core) $(hdr_x11) $(hdr_sdf) $(hdr_png) $(hdr_gui) \
-- $(hdr_lats) $(hdr_img) $(hdr_pc) $(hdr_bufr)
-+ $(hdr_pc) $(hdr_bufr)
-
- # Get rid of buildinfo.h on "make distclean"
- DISTCLEANFILES = buildinfo.h
-@@ -198,10 +198,13 @@ EXTRA_gradsnc_SOURCES = galats.c lats
-
- # Object files that should not be reused by the other GrADS binaries,
- # plus libraries needed by this GrADS binary
--gradsnc_LDADD = latsnc-nc.o gaddes-nc.o gacfg-nc.o gaio-nc.o \
-+gradsnc_LDADD = gaddes-nc.o gacfg-nc.o gaio-nc.o \
- gauser-nc.o gasdf-nc.o \
- $(common_ldadd) \
- $(nc_libs)
-+if USELATS
-+gradsnc_LDADD += latsnc-nc.o
-+endif
-
- # Custom compilation for object files specific to this GrADS binary
- COMPILE_NC = $(COMPILE) -I$(supp_include_dir)/nc \
-@@ -296,11 +299,14 @@ gradsdods_LINK = $(CXX) $(AM_CFL
-
- # Object files that should not be reused by the other GrADS binaries,
- # plus libraries needed by this GrADS binary
--gradsdods_LDADD = latsnc-nc.o gaddes-dods.o gacfg-dods.o gaio-dods.o \
-+gradsdods_LDADD = gaddes-dods.o gacfg-dods.o gaio-dods.o \
- gauser-dods.o gasdf-dods.o \
- $(common_ldadd) \
- $(dods_libs) \
- $(dods_darwin_libs)
-+if USELATS
-+gradsdods_LDADD += latsnc-nc.o
-+endif
-
- # Custom compilation for object files specific to this GrADS binary
- COMPILE_DODS = $(COMPILE) -I$(supp_include_dir)/dods \
-diff -up grads-1.9b4/configure.in.build_system grads-1.9b4/configure.in
---- grads-1.9b4/configure.in.build_system 2005-05-23 17:04:40.000000000 +0200
-+++ grads-1.9b4/configure.in 2007-08-22 10:36:43.000000000 +0200
-@@ -274,14 +274,24 @@ echo
-
-
- use_gui=no
-+use_new_gui=no
- if test "$with_gui" != "no" ; then
- echo "Check GrADS GUI support..."
- GA_CHECK_GUI([use_gui=yes])
-+ if test $use_gui = no; then
-+ GA_CHECK_NEW_GUI([use_new_gui=yes; use_gui=yes])
-+ fi
- fi
- if test $use_gui = "yes" ; then
- AC_DEFINE(USEGUI, 1, [Enable GUI widgets])
- echo "+ GUI enabled"
-- GA_SET_LIB_VAR(gui_libs, [sx freq])
-+ if test $use_new_gui = no; then
-+ GA_SET_LIB_VAR(gui_libs, [sx freq])
-+ AC_DEFINE(USEFREQ, 1, [Use GetFile from freq])
-+ else
-+ GA_SET_LIB_VAR([gui_libs], [sx])
-+ AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
-+ fi
- gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
- AC_SUBST(gui_libs)
- else
-@@ -366,6 +376,11 @@ else
- fi
- echo
-
-+AH_BOTTOM([
-+#ifdef HDF_SD_NETCDF
-+#include "gawrapsd.h"
-+#endif
-+])
-
- use_hdf=no
- if test "$with_hdf" != "no" ; then
-@@ -373,6 +388,13 @@ if test "$with_hdf" != "no" ; then
- fi
- if test $use_hdf = "yes" ; then
- GA_SET_LIB_VAR(hdf_libs, [mfhdf df jpeg udunits z])
-+ if test "${ga_dyn_supplibs}" = "yes"; then
-+ ac_save_LIBS="$LIBS"
-+ LIBS="$LIBS $hdf_libs"
-+ AC_CHECK_FUNC([sd_ncopen],
-+ [AC_DEFINE([HDF_SD_NETCDF],[],[prepend sd_ to netcdf symbols])])
-+ LIBS="$ac_save_LIBS"
-+ fi
- AC_SUBST(hdf_libs)
- extra_bins="$extra_bins gradshdf"
- echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
-@@ -383,15 +405,25 @@ echo
-
-
- use_dods=no
-+dods_ncdap=no
- if test "$with_dods" != "no" ; then
- GA_CHECK_DODS([use_dods=yes])
-+ if test "z$use_dods" = "zno" -a "${ga_dyn_supplibs}" = "yes" ; then
-+ AC_CHECK_HEADER([udunits.h],
-+ [ AC_CHECK_HEADER([netcdf.h],
-+ [ GA_CHECK_LIB([udunits], [utInit],
-+ [AC_CHECK_NC_DODS([dods_ncdap=yes; use_dods=yes])])
-+ ])
-+ ])
-+ fi
- fi
-
- if test $use_dods = "yes" ; then
-
- extra_bins="$extra_bins gradsdods"
-- GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
--
-+ if test "z$dods_ncdap" = "zno" ; then
-+ GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
-+ fi
-
- GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
- if test $use_gadods = "yes" ; then
-@@ -404,7 +436,11 @@ if test $use_dods = "yes" ; then
- echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
- fi
-
-- dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
-+ if test "z$dods_ncdap" = "zyes" ; then
-+ dods_libs="$NC_DAP_LIBS -ludunits"
-+ else
-+ dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
-+ fi
- AC_SUBST(dods_libs)
- AC_SUBST(gadods_def)
- else
diff -up grads-1.9b4/acinclude.m4.build_system grads-1.9b4/acinclude.m4
--- grads-1.9b4/acinclude.m4.build_system 2003-10-02 16:01:15.000000000 +0200
-+++ grads-1.9b4/acinclude.m4 2007-08-22 10:41:24.000000000 +0200
++++ grads-1.9b4/acinclude.m4 2008-09-11 18:03:44.000000000 +0200
@@ -12,7 +12,7 @@ dnl GA_SET_FLAGS : Adds supplibs to the
dnl compiler or linker flags given, and saves original settings
dnl for restoration by GA_UNSET_FLAGS
@@ -356,3 +181,178 @@
ga_check_dods="no"
AC_CHECK_HEADER(udunits.h,
+diff -up grads-1.9b4/configure.in.build_system grads-1.9b4/configure.in
+--- grads-1.9b4/configure.in.build_system 2005-05-23 17:04:40.000000000 +0200
++++ grads-1.9b4/configure.in 2008-09-11 18:03:44.000000000 +0200
+@@ -274,14 +274,24 @@ echo
+
+
+ use_gui=no
++use_new_gui=no
+ if test "$with_gui" != "no" ; then
+ echo "Check GrADS GUI support..."
+ GA_CHECK_GUI([use_gui=yes])
++ if test $use_gui = no; then
++ GA_CHECK_NEW_GUI([use_new_gui=yes; use_gui=yes])
++ fi
+ fi
+ if test $use_gui = "yes" ; then
+ AC_DEFINE(USEGUI, 1, [Enable GUI widgets])
+ echo "+ GUI enabled"
+- GA_SET_LIB_VAR(gui_libs, [sx freq])
++ if test $use_new_gui = no; then
++ GA_SET_LIB_VAR(gui_libs, [sx freq])
++ AC_DEFINE(USEFREQ, 1, [Use GetFile from freq])
++ else
++ GA_SET_LIB_VAR([gui_libs], [sx])
++ AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
++ fi
+ gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
+ AC_SUBST(gui_libs)
+ else
+@@ -366,6 +376,11 @@ else
+ fi
+ echo
+
++AH_BOTTOM([
++#ifdef HDF_SD_NETCDF
++#include "gawrapsd.h"
++#endif
++])
+
+ use_hdf=no
+ if test "$with_hdf" != "no" ; then
+@@ -373,6 +388,13 @@ if test "$with_hdf" != "no" ; then
+ fi
+ if test $use_hdf = "yes" ; then
+ GA_SET_LIB_VAR(hdf_libs, [mfhdf df jpeg udunits z])
++ if test "${ga_dyn_supplibs}" = "yes"; then
++ ac_save_LIBS="$LIBS"
++ LIBS="$LIBS $hdf_libs"
++ AC_CHECK_FUNC([sd_ncopen],
++ [AC_DEFINE([HDF_SD_NETCDF],[],[prepend sd_ to netcdf symbols])])
++ LIBS="$ac_save_LIBS"
++ fi
+ AC_SUBST(hdf_libs)
+ extra_bins="$extra_bins gradshdf"
+ echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
+@@ -383,15 +405,25 @@ echo
+
+
+ use_dods=no
++dods_ncdap=no
+ if test "$with_dods" != "no" ; then
+ GA_CHECK_DODS([use_dods=yes])
++ if test "z$use_dods" = "zno" -a "${ga_dyn_supplibs}" = "yes" ; then
++ AC_CHECK_HEADER([udunits.h],
++ [ AC_CHECK_HEADER([netcdf.h],
++ [ GA_CHECK_LIB([udunits], [utInit],
++ [AC_CHECK_NC_DODS([dods_ncdap=yes; use_dods=yes])])
++ ])
++ ])
++ fi
+ fi
+
+ if test $use_dods = "yes" ; then
+
+ extra_bins="$extra_bins gradsdods"
+- GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
+-
++ if test "z$dods_ncdap" = "zno" ; then
++ GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
++ fi
+
+ GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
+ if test $use_gadods = "yes" ; then
+@@ -404,7 +436,11 @@ if test $use_dods = "yes" ; then
+ echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
+ fi
+
+- dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
++ if test "z$dods_ncdap" = "zyes" ; then
++ dods_libs="$NC_DAP_LIBS -ludunits"
++ else
++ dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
++ fi
+ AC_SUBST(dods_libs)
+ AC_SUBST(gadods_def)
+ else
+diff -up grads-1.9b4/src/config.h.in.build_system grads-1.9b4/src/config.h.in
+--- grads-1.9b4/src/config.h.in.build_system 2004-12-15 22:00:03.000000000 +0100
++++ grads-1.9b4/src/config.h.in 2008-09-11 18:03:44.000000000 +0200
+@@ -61,6 +61,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+
++/* prepend sd_ to netcdf symbols */
++#undef HDF_SD_NETCDF
++
+ /* Enhanced readline with history */
+ #undef MM_READLINE
+
+@@ -88,6 +91,9 @@
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+
++/* Use GetFile from freq */
++#undef USEFREQ
++
+ /* Enable GUI widgets */
+ #undef USEGUI
+
+@@ -116,5 +122,11 @@
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+
+-/* Define to `long' if <sys/types.h> does not define. */
++/* Define to `long int' if <sys/types.h> does not define. */
+ #undef off_t
++
++
++#ifdef HDF_SD_NETCDF
++#include "gawrapsd.h"
++#endif
++
+diff -up grads-1.9b4/src/Makefile.am.build_system grads-1.9b4/src/Makefile.am
+--- grads-1.9b4/src/Makefile.am.build_system 2004-12-15 22:00:03.000000000 +0100
++++ grads-1.9b4/src/Makefile.am 2008-09-11 18:03:44.000000000 +0200
+@@ -63,7 +63,7 @@ hdr_png = gd13gif.h mtables.
+ hdr_lats = lats.h latsint.h latsparm.h latstime.h \
+ fgrib.h fgrib_init.h
+ noinst_HEADERS = $(hdr_core) $(hdr_x11) $(hdr_sdf) $(hdr_png) $(hdr_gui) \
+- $(hdr_lats) $(hdr_img) $(hdr_pc) $(hdr_bufr)
++ $(hdr_pc) $(hdr_bufr)
+
+ # Get rid of buildinfo.h on "make distclean"
+ DISTCLEANFILES = buildinfo.h
+@@ -198,10 +198,13 @@ EXTRA_gradsnc_SOURCES = galats.c lats
+
+ # Object files that should not be reused by the other GrADS binaries,
+ # plus libraries needed by this GrADS binary
+-gradsnc_LDADD = latsnc-nc.o gaddes-nc.o gacfg-nc.o gaio-nc.o \
++gradsnc_LDADD = gaddes-nc.o gacfg-nc.o gaio-nc.o \
+ gauser-nc.o gasdf-nc.o \
+ $(common_ldadd) \
+ $(nc_libs)
++if USELATS
++gradsnc_LDADD += latsnc-nc.o
++endif
+
+ # Custom compilation for object files specific to this GrADS binary
+ COMPILE_NC = $(COMPILE) -I$(supp_include_dir)/nc \
+@@ -296,11 +299,14 @@ gradsdods_LINK = $(CXX) $(AM_CFL
+
+ # Object files that should not be reused by the other GrADS binaries,
+ # plus libraries needed by this GrADS binary
+-gradsdods_LDADD = latsnc-nc.o gaddes-dods.o gacfg-dods.o gaio-dods.o \
++gradsdods_LDADD = gaddes-dods.o gacfg-dods.o gaio-dods.o \
+ gauser-dods.o gasdf-dods.o \
+ $(common_ldadd) \
+ $(dods_libs) \
+ $(dods_darwin_libs)
++if USELATS
++gradsdods_LDADD += latsnc-nc.o
++endif
+
+ # Custom compilation for object files specific to this GrADS binary
+ COMPILE_DODS = $(COMPILE) -I$(supp_include_dir)/dods \
grads-dap_build_fixes.patch:
Index: grads-dap_build_fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads-dap_build_fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads-dap_build_fixes.patch 22 Aug 2007 10:48:32 -0000 1.1
+++ grads-dap_build_fixes.patch 11 Sep 2008 16:16:20 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur grads-1.9b4/src/gacfg.c grads-1.9b4_new/src/gacfg.c
---- grads-1.9b4/src/gacfg.c 2005-05-18 14:29:17.000000000 +0000
-+++ grads-1.9b4_new/src/gacfg.c 2005-11-03 13:18:45.000000000 +0000
+diff -up grads-1.9b4/src/gacfg.c.dap_build_fixes grads-1.9b4/src/gacfg.c
+--- grads-1.9b4/src/gacfg.c.dap_build_fixes 2005-05-18 16:29:17.000000000 +0200
++++ grads-1.9b4/src/gacfg.c 2008-09-11 18:03:44.000000000 +0200
@@ -32,6 +32,7 @@
*/
@@ -9,9 +9,9 @@
#include "grads.h"
#include "buildinfo.h"
-diff -Naur grads-1.9b4/src/gaexpr.c grads-1.9b4_new/src/gaexpr.c
---- grads-1.9b4/src/gaexpr.c 2005-05-18 14:48:36.000000000 +0000
-+++ grads-1.9b4_new/src/gaexpr.c 2005-11-03 11:22:27.000000000 +0000
+diff -up grads-1.9b4/src/gaexpr.c.dap_build_fixes grads-1.9b4/src/gaexpr.c
+--- grads-1.9b4/src/gaexpr.c.dap_build_fixes 2005-05-18 16:48:36.000000000 +0200
++++ grads-1.9b4/src/gaexpr.c 2008-09-11 18:03:44.000000000 +0200
@@ -13,6 +13,7 @@
#endif
@@ -20,9 +20,9 @@
#include <math.h>
#include "grads.h"
-diff -Naur grads-1.9b4/src/gaio.c grads-1.9b4_new/src/gaio.c
---- grads-1.9b4/src/gaio.c 2005-05-23 17:59:01.000000000 +0000
-+++ grads-1.9b4_new/src/gaio.c 2005-11-03 11:37:35.000000000 +0000
+diff -up grads-1.9b4/src/gaio.c.dap_build_fixes grads-1.9b4/src/gaio.c
+--- grads-1.9b4/src/gaio.c.dap_build_fixes 2005-05-23 19:59:01.000000000 +0200
++++ grads-1.9b4/src/gaio.c 2008-09-11 18:03:44.000000000 +0200
@@ -22,6 +22,7 @@
#include "grads.h"
#include <math.h>
@@ -31,10 +31,10 @@
#if USESDF == 1
#include <netcdf.h>
#if USEHDF == 1
-diff -Naur grads-1.9b4/src/gasdf.c grads-1.9b4_new/src/gasdf.c
---- grads-1.9b4/src/gasdf.c 2005-05-18 14:29:17.000000000 +0000
-+++ grads-1.9b4_new/src/gasdf.c 2005-11-04 10:02:05.000000000 +0000
-@@ -5785,7 +5785,11 @@
+diff -up grads-1.9b4/src/gasdf.c.dap_build_fixes grads-1.9b4/src/gasdf.c
+--- grads-1.9b4/src/gasdf.c.dap_build_fixes 2005-05-18 16:29:17.000000000 +0200
++++ grads-1.9b4/src/gasdf.c 2008-09-11 18:03:44.000000000 +0200
+@@ -5785,7 +5785,11 @@ get_netcdf_attname (cdfid, varid, attnum
/* Turn off automatic error handling. */
ncopts = 0;
@@ -46,7 +46,7 @@
ncopts = oldncopts ;
return Failure;
}
-@@ -5813,10 +5817,23 @@
+@@ -5813,10 +5817,23 @@ get_netcdf_att_info (cdfid, varid, aname
/* Turn off automatic error handling. */
ncopts = 0;
@@ -70,7 +70,7 @@
/* Allocate space for values. */
if ((*atype == NC_BYTE) || (*atype == NC_CHAR)) {
-@@ -5831,6 +5848,7 @@
+@@ -5831,6 +5848,7 @@ get_netcdf_att_info (cdfid, varid, aname
*adata = (double *) malloc (sizeof (double) * *alen);
} else {
ncopts = oldncopts ;
@@ -78,7 +78,7 @@
return Failure;
}
-@@ -5840,10 +5858,65 @@
+@@ -5840,10 +5858,65 @@ get_netcdf_att_info (cdfid, varid, aname
}
/* Retrieve values. */
@@ -144,9 +144,20 @@
/* If character, set last byte to null. */
if (*atype == NC_CHAR) {
-diff -Naur grads-1.9b4/src/gxdxwd.c grads-1.9b4_new/src/gxdxwd.c
---- grads-1.9b4/src/gxdxwd.c 2002-10-28 19:08:33.000000000 +0000
-+++ grads-1.9b4_new/src/gxdxwd.c 2005-11-03 13:37:45.000000000 +0000
+diff -up grads-1.9b4/src/gauser.c.dap_build_fixes grads-1.9b4/src/gauser.c
+--- grads-1.9b4/src/gauser.c.dap_build_fixes 2005-05-18 20:51:01.000000000 +0200
++++ grads-1.9b4/src/gauser.c 2008-09-11 18:03:44.000000000 +0200
+@@ -42,6 +42,7 @@
+ #endif
+
+ /* int gxhpng (char *, int, int, int, int); */
++int gxhpng (char *, int, int, int, int, char *, char *, int) ;
+
+ /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
+ extern struct gamfcmn mfcmn;
+diff -up grads-1.9b4/src/gxdxwd.c.dap_build_fixes grads-1.9b4/src/gxdxwd.c
+--- grads-1.9b4/src/gxdxwd.c.dap_build_fixes 2002-10-28 20:08:33.000000000 +0100
++++ grads-1.9b4/src/gxdxwd.c 2008-09-11 18:03:44.000000000 +0200
@@ -7,6 +7,7 @@
#endif
@@ -155,7 +166,7 @@
#include <errno.h>
#include <X11/Xos.h>
-@@ -22,7 +23,7 @@
+@@ -22,7 +23,7 @@ typedef unsigned long Pixel;
* writting.
*/
@@ -164,7 +175,7 @@
#include "X11/XWDFile.h"
-@@ -92,6 +91,7 @@
+@@ -92,6 +93,7 @@ Window_Dump(window, out)
int bw;
Window dummywin;
XWDFileHeader header;
@@ -172,7 +183,7 @@
/*
-@@ -232,7 +232,8 @@
+@@ -232,7 +234,8 @@ Window_Dump(window, out)
* Write out the color maps, if any
*/
@@ -182,9 +193,9 @@
/*
{
int icineca=0;
-diff -Naur grads-1.9b4/src/gxeps.c grads-1.9b4_new/src/gxeps.c
---- grads-1.9b4/src/gxeps.c 2004-02-27 14:42:11.000000000 +0000
-+++ grads-1.9b4_new/src/gxeps.c 2005-11-03 14:45:16.000000000 +0000
+diff -up grads-1.9b4/src/gxeps.c.dap_build_fixes grads-1.9b4/src/gxeps.c
+--- grads-1.9b4/src/gxeps.c.dap_build_fixes 2004-02-27 15:42:11.000000000 +0100
++++ grads-1.9b4/src/gxeps.c 2008-09-11 18:03:44.000000000 +0200
@@ -6,6 +6,8 @@
#include <config.h>
#endif
@@ -194,9 +205,9 @@
/***********************************************************
* GXEPS a grads metafile to PostScript converter
* Copyright (c) 1999 - 2001 Matthias Munnich
-diff -Naur grads-1.9b4/src/gxhpng.c grads-1.9b4_new/src/gxhpng.c
---- grads-1.9b4/src/gxhpng.c 2004-03-12 16:14:04.000000000 +0000
-+++ grads-1.9b4_new/src/gxhpng.c 2005-11-03 11:56:53.000000000 +0000
+diff -up grads-1.9b4/src/gxhpng.c.dap_build_fixes grads-1.9b4/src/gxhpng.c
+--- grads-1.9b4/src/gxhpng.c.dap_build_fixes 2004-03-12 17:14:04.000000000 +0100
++++ grads-1.9b4/src/gxhpng.c 2008-09-11 18:03:44.000000000 +0200
@@ -6,7 +6,6 @@
#include <config.h>
#endif
@@ -205,19 +216,31 @@
/* Rasterize current metafile buffer via gd library. Loosly based
on the gxpng utility:
-@@ -455,7 +452,7 @@
- im->polyInts[ints++] = (y-y1) * (x2-x1) / (y2-y1) + x1;
- }
- }
+@@ -379,6 +378,11 @@ short *poi,*pend;
+
+ int gdCompareInt(const void *a, const void *b);
+
++int gdCompareInt(const void *a, const void *b)
++{
++ return (*(const int *)a) - (*(const int *)b);
++}
++
+ /* Version of gdImageFilledPolygon to invoke my local
+ version of gdImageLne. Nothing else changed... B.Doty 5/31/01 */
+
+@@ -455,7 +459,7 @@ void gdImageFilldPolygon(gdImagePtr im,
+ im->polyInts[ints++] = (y-y1) * (x2-x1) / (y2-y1) + x1;
+ }
+ }
- qsort(im->polyInts, ints, sizeof(int), gdCompareInt);
+ qsort(im->polyInts, ints, sizeof(int), (void *) gdCompareInt);
-
- for (i=0; (i < (ints)); i+=2) {
- gdImageLne(im, im->polyInts[i], y,
-diff -Naur grads-1.9b4/src/gxX.c grads-1.9b4_new/src/gxX.c
---- grads-1.9b4/src/gxX.c 2005-05-18 14:29:17.000000000 +0000
-+++ grads-1.9b4_new/src/gxX.c 2005-11-03 11:28:15.000000000 +0000
-@@ -270,7 +270,7 @@
+
+ for (i=0; (i < (ints)); i+=2) {
+ gdImageLne(im, im->polyInts[i], y,
+diff -up grads-1.9b4/src/gxX.c.dap_build_fixes grads-1.9b4/src/gxX.c
+--- grads-1.9b4/src/gxX.c.dap_build_fixes 2005-05-18 16:29:17.000000000 +0200
++++ grads-1.9b4/src/gxX.c 2008-09-11 18:03:44.000000000 +0200
+@@ -270,7 +270,7 @@ char **flist,*xfnam;
/* Set up icon pixmap */
@@ -226,7 +249,7 @@
icon_bitmap_width, icon_bitmap_height);
/* Set standard properties */
-@@ -402,7 +402,7 @@
+@@ -402,7 +402,7 @@ char **flist,*xfnam;
if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
else flist = NULL;
if (flist==NULL) {
@@ -235,7 +258,7 @@
}
if (flist==NULL) {
flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-120*", 1, &i);
-@@ -418,7 +418,7 @@
+@@ -418,7 +418,7 @@ char **flist,*xfnam;
if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
else flist = NULL;
if (flist==NULL) {
@@ -244,37 +267,12 @@
}
if (flist==NULL) {
flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-120*", 1, &i);
-@@ -3267,7 +3267,7 @@
+@@ -3267,7 +3267,7 @@ Pixmap stipple_pixmap;
}
if (typ>1) {
- stipple_pixmap = XCreateBitmapFromData(display, win, bitmap_bits,
+ stipple_pixmap = XCreateBitmapFromData(display, win, (char *) bitmap_bits,
- bitmap_width, bitmap_height);
+ bitmap_width, bitmap_height);
XSetStipple(display, gc, stipple_pixmap);
XSetFillStyle(display, gc, FillStippled);
-diff -u --recursive grads-1.9b4-orig/src/gauser.c grads-1.9b4-rpm/src/gauser.c
---- grads-1.9b4-orig/src/gauser.c 2005-05-18 20:51:01.000000000 +0200
-+++ grads-1.9b4-rpm/src/gauser.c 2006-02-17 15:19:32.000000000 +0100
-@@ -42,6 +42,7 @@
- #endif
-
- /* int gxhpng (char *, int, int, int, int); */
-+int gxhpng (char *, int, int, int, int, char *, char *, int) ;
-
- /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
- extern struct gamfcmn mfcmn;
---- grads-1.9b4-orig/src/gxhpng.c 2004-03-12 17:14:04.000000000 +0100
-+++ grads-1.9b4-rpm/src/gxhpng.c 2006-02-17 15:19:32.000000000 +0100
-@@ -379,6 +379,11 @@
-
- int gdCompareInt(const void *a, const void *b);
-
-+int gdCompareInt(const void *a, const void *b)
-+{
-+ return (*(const int *)a) - (*(const int *)b);
-+}
-+
- /* Version of gdImageFilledPolygon to invoke my local
- version of gdImageLne. Nothing else changed... B.Doty 5/31/01 */
-
Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- grads.spec 11 Sep 2008 15:08:45 -0000 1.24
+++ grads.spec 11 Sep 2008 16:16:20 -0000 1.25
@@ -1,6 +1,6 @@
Name: grads
Version: 1.9b4
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: Tool for easy acces, manipulation, and visualization of data
Group: Applications/Engineering
@@ -81,7 +81,7 @@
%build
./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
make %{?_smp_mflags}
@@ -121,8 +121,10 @@
%changelog
-* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-24
+* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-25
- rebuild for new libnc-dap
+- rediff patches
+- use new netcdf devel file locations
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9b4-23
- Autorebuild for GCC 4.3
- Previous message (by thread): comps comps-f10.xml.in,1.100,1.101
- Next message (by thread): rpms/xscreensaver/F-8 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list