apply all patches from debiian according to @dev-zero recommendation

3 files changed, 55 insertions, 269 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4472d4e42632..826fc5eb4afe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,36 @@
 pkgbase = grace
 	pkgdesc = 2D plotting tool
 	pkgver = 5.1.25
-	pkgrel = 6
+	pkgrel = 7
 	url = http://plasma-gate.weizmann.ac.il/Grace/
 	arch = x86_64
 	license = GPL
-	depends = libjpeg
-	depends = libpng
 	depends = openmotif
 	depends = t1lib
 	depends = netcdf
 	depends = fftw
 	options = staticlibs
 	source = ftp://ftp.fu-berlin.de/unix/graphics/grace/src/grace5/grace-5.1.25.tar.gz
-	source = grace-fftw3.patch
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/gracerc.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/tmpnam_to_mkstemp.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/fftw3.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/netcdf-build-fix.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/netbook_small_screen_2.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/non-resizable-dialogs.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/nonlinear_extended.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/source-hardening.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/t1lib-general.diff
+	source = https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/font-extension-t1.diff
 	sha512sums = 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a
-	sha512sums = 6d9190a1a51bd411e067bd02910e60b3612df48bee2002d5f33c97ecca38bbc5d79538e73b2e743eda234f2921fe59ebfd855efe56097c3692a72593ddd10611
+	sha512sums = 05045afb2b350bcbf6d34f5b572a85443725739236a2cb8d083fc391965db204a1e24e74a13ddfbe873eaa48077e8c0a352f77df82af86ce3d956fa9a2b5d594
+	sha512sums = 7a1984fabf04c8981ee82c10ab1980fed922a73ea24808bb262d445ed9b37bcab2c8b81ba023005048e9ddb46abb8eda90566ef79e408c608958c47068b4b202
+	sha512sums = a2c0d8725289069ca5766b7ab3dfee5a08ee15922e9734bc95d6a9ad008d4264e90c8cb5db8ab5e3c41cb4b29c14fca815d8a5d875dbb35977d810052ed566ea
+	sha512sums = 741e694a0f44ade9ab3747fbd17b889c84c82f231cc63c86368963e37ca8df610c1bccd290a1468f2d2dcb5c10243e0868563cf1d75015d19a989d172224ac34
+	sha512sums = 70daaf9ca492a42bd11d0dfb3dae02850d517931343ba7674f3062d3f866c9700ce3ab0edbf1ae940e72c7bc291bebd0436953a126742f79d20e821191f050ca
+	sha512sums = f4897d4c3acd3f4c4898fd3d5a90048442dc9066b6491121e526df39d3c1bfaab9d4c64a8e89d25d8d12015c6ccc31416dcc0e9c1f45d24b7851184cb19ddaed
+	sha512sums = 8835b94ec4ec5d2d87328811c639585916f95784adf29c77306cd28bdb809284238e01549da360cf31bdcfbf3c6bf5f28bfacdefc6696606e9c6f322107edf23
+	sha512sums = d9bc22f67771061d7f4d5555dc57056eadadfff50169f525d2b87cab36dc1fcc8a7a3d88f685ffe3eb5b5140a25061efa3be08331dd44de2d55bba720a6166e7
+	sha512sums = 2554226633e3187c3f1909c7227d0d155208a418452ff192710a3d3b132125789f1ab7c6d3cfdc3d422e34c491c391c6ee12720df9a686a23a1c8a0947f525e2
+	sha512sums = ffa8cc1a97b26192efbfb3597e9209e4c15455d27988cda30464a0fbd3c53167ce0fcc4f93eda7a14ebd8d6f798de08855f814f8dfbca010a7dcb504dd4b6097
 
 pkgname = grace
-
diff --git a/PKGBUILD b/PKGBUILD
index c7cb5a793f58..4750f69166f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,52 @@
 
 pkgname=grace
 pkgver=5.1.25
-pkgrel=6
+pkgrel=7
 pkgdesc="2D plotting tool"
 arch=(x86_64)
 url="http://plasma-gate.weizmann.ac.il/Grace/"
-depends=('libjpeg' 'libpng' 'openmotif' 't1lib' 'netcdf' 'fftw')
+depends=('openmotif' 't1lib' 'netcdf' 'fftw')
 license=('GPL')
 options=('staticlibs')
 source=("ftp://ftp.fu-berlin.de/unix/graphics/grace/src/grace5/$pkgname-$pkgver.tar.gz"
-        "grace-fftw3.patch")
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/gracerc.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/tmpnam_to_mkstemp.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/fftw3.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/netcdf-build-fix.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/netbook_small_screen_2.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/non-resizable-dialogs.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/nonlinear_extended.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/source-hardening.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/t1lib-general.diff"
+        "https://sources.debian.org/data/main/g/grace/1%3A5.1.25-9/debian/patches/font-extension-t1.diff")
 sha512sums=('9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a'
-            '6d9190a1a51bd411e067bd02910e60b3612df48bee2002d5f33c97ecca38bbc5d79538e73b2e743eda234f2921fe59ebfd855efe56097c3692a72593ddd10611')
+            '05045afb2b350bcbf6d34f5b572a85443725739236a2cb8d083fc391965db204a1e24e74a13ddfbe873eaa48077e8c0a352f77df82af86ce3d956fa9a2b5d594'
+            '7a1984fabf04c8981ee82c10ab1980fed922a73ea24808bb262d445ed9b37bcab2c8b81ba023005048e9ddb46abb8eda90566ef79e408c608958c47068b4b202'
+            'a2c0d8725289069ca5766b7ab3dfee5a08ee15922e9734bc95d6a9ad008d4264e90c8cb5db8ab5e3c41cb4b29c14fca815d8a5d875dbb35977d810052ed566ea'
+            '741e694a0f44ade9ab3747fbd17b889c84c82f231cc63c86368963e37ca8df610c1bccd290a1468f2d2dcb5c10243e0868563cf1d75015d19a989d172224ac34'
+            '70daaf9ca492a42bd11d0dfb3dae02850d517931343ba7674f3062d3f866c9700ce3ab0edbf1ae940e72c7bc291bebd0436953a126742f79d20e821191f050ca'
+            'f4897d4c3acd3f4c4898fd3d5a90048442dc9066b6491121e526df39d3c1bfaab9d4c64a8e89d25d8d12015c6ccc31416dcc0e9c1f45d24b7851184cb19ddaed'
+            '8835b94ec4ec5d2d87328811c639585916f95784adf29c77306cd28bdb809284238e01549da360cf31bdcfbf3c6bf5f28bfacdefc6696606e9c6f322107edf23'
+            'd9bc22f67771061d7f4d5555dc57056eadadfff50169f525d2b87cab36dc1fcc8a7a3d88f685ffe3eb5b5140a25061efa3be08331dd44de2d55bba720a6166e7'
+            '2554226633e3187c3f1909c7227d0d155208a418452ff192710a3d3b132125789f1ab7c6d3cfdc3d422e34c491c391c6ee12720df9a686a23a1c8a0947f525e2'
+            'ffa8cc1a97b26192efbfb3597e9209e4c15455d27988cda30464a0fbd3c53167ce0fcc4f93eda7a14ebd8d6f798de08855f814f8dfbca010a7dcb504dd4b6097')
 
 prepare() {
   cd "$pkgname-$pkgver"
   sed -i '1,1i#include <zlib.h>' src/rstdrv.c
   sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|g' src/rstdrv.c
-  patch -p1 -i ../grace-fftw3.patch # port to FFTW3 (Debian)
+
+  # debian patches
+  patch -p1 -i ../gracerc.diff
+  patch -p1 -i ../tmpnam_to_mkstemp.diff
+  patch -p1 -i ../fftw3.diff  # port to fftw3
+  patch -p1 -i ../netcdf-build-fix.diff  # update netcdf macro in autotools
+  patch -p1 -i ../netbook_small_screen_2.diff  # improve display on small-resolution screens
+  patch -p1 -i ../non-resizable-dialogs.diff  # set certain dialog boxes to fixed sizes
+  patch -p1 -i ../nonlinear_extended.diff  # add multiple non-linear data fitting functions
+  patch -p1 -i ../source-hardening.diff  # permit compilation with hardening flags
+  patch -p1 -i ../t1lib-general.diff  # apply several updates and fixes to t1lib
+  patch -p1 -i ../font-extension-t1.diff  # search for .t1 as a font file extension, in addition to .pfa/.pfb
 }
 
 build() {
diff --git a/grace-fftw3.patch b/grace-fftw3.patch
deleted file mode 100644
index d964445255e7..000000000000
--- a/grace-fftw3.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Description: Switch dependency from FFTW2 to FFTW3
-Author: Ionut Georgescu
-Bug: http://bugs.debian.org/264201
-Index: grace-5.1.24-patch/src/fourier.c
-===================================================================
---- grace-5.1.24-patch.orig/src/fourier.c
-+++ grace-5.1.24-patch/src/fourier.c
-@@ -230,7 +230,8 @@ static int bit_swap(int i, int nu)
- #else
- /* Start of new FFTW-based transforms by Marcus H. Mendenhall */
- 
--#include <fftw.h>
-+#include <complex.h>
-+#include <fftw3.h>
- #include <string.h>
- 
- static char  *wisdom_file=0;
-@@ -258,7 +259,7 @@ void dft(double *jr, double *ji, int n,
-   fftw_plan plan;
-   int i;
-   double ninv;
--  FFTW_COMPLEX *cbuf;
-+  fftw_complex *cbuf;
-   static int wisdom_inited=0;
-   char *ram_cache_wisdom;
-   int plan_flags;
-@@ -274,7 +275,7 @@ void dft(double *jr, double *ji, int n,
-     if(wisdom_file && wisdom_file[0] ) {
-       /* if a file was specified in GRACE_FFTW_WISDOM_FILE, try to read it */
-       FILE *wf;
--      fftw_status fstat;
-+      int fstat;
-       wf=fopen(wisdom_file,"r");
-       if(wf) {
- 	fstat=fftw_import_wisdom_from_file(wf);
-@@ -286,30 +287,35 @@ void dft(double *jr, double *ji, int n,
-     }
-   }
- 
--  plan_flags=using_wisdom? (FFTW_USE_WISDOM | FFTW_MEASURE) : FFTW_ESTIMATE;
--
--  plan=fftw_create_plan(n, iflag?FFTW_BACKWARD:FFTW_FORWARD,
--		   plan_flags | FFTW_IN_PLACE);
--  cbuf=xcalloc(n, sizeof(*cbuf));
-+  /* fftw_malloc behaves like malloc except that it properly aligns the array
-+   * when SIMD instructions (such as SSE and Altivec) are available.
-+   */
-+  cbuf=(fftw_complex *)fftw_malloc(n*sizeof(fftw_complex));
-   if(!cbuf) return;
-+
-   for(i=0; i<n; i++) {
--    cbuf[i].re=jr[i]; cbuf[i].im=ji[i];
-+    cbuf[i] = jr[i] + I * ji[i];
-   }
--  fftw(plan, 1, cbuf, 1, 1, 0, 1, 1);
-+
-+  plan_flags=using_wisdom? (FFTW_MEASURE) : FFTW_ESTIMATE;
-+  plan=fftw_plan_dft_1d(n, cbuf, cbuf, iflag?FFTW_BACKWARD:FFTW_FORWARD,
-+		   plan_flags);
-+
-+  fftw_execute(plan);
-   fftw_destroy_plan(plan);
- 
-   if(!iflag) {
-     ninv=1.0/n;
-     for(i=0; i<n; i++) {
--    jr[i]=cbuf[i].re*ninv; ji[i]=cbuf[i].im*ninv;
-+    jr[i]=creal(cbuf[i])*ninv; ji[i]=cimag(cbuf[i])*ninv;
-     }
-   } else {
-     for(i=0; i<n; i++) {
--      jr[i]=cbuf[i].re; ji[i]=cbuf[i].im;
-+      jr[i]=creal(cbuf[i]); ji[i]=cimag(cbuf[i]);
-     }
-   }
- 
--  XCFREE(cbuf);
-+  fftw_free(cbuf);
-   
- }
- 
-Index: grace-5.1.24-patch/ac-tools/configure.in
-===================================================================
---- grace-5.1.24-patch.orig/ac-tools/configure.in
-+++ grace-5.1.24-patch/ac-tools/configure.in
-@@ -554,8 +554,17 @@ fi
- 
- if test $fftw = true
- then
--  ACX_CHECK_FFTW(2.1.3, AC_DEFINE(HAVE_FFTW),
--                 AC_MSG_RESULT(--> using legacy unoptimized FFT code))
-+  AC_CHECK_HEADERS(fftw3.h,
-+  [
-+	AC_CHECK_LIB(fftw3, fftw_execute,
-+	[
-+		FFTW_LIB="-lfftw3"
-+		AC_DEFINE(HAVE_FFTW)
-+	],
-+	[AC_MSG_RESULT([--> using legacy unoptimized FFT code])]
-+	)
-+  ],
-+  [AC_MSG_RESULT([--> using legacy unoptimized FFT code])])
- fi
- 
- dnl **** check for libz - needed for PDF and PNG drivers and XmHTML
-Index: grace-5.1.24-patch/configure
-===================================================================
---- grace-5.1.24-patch.orig/configure
-+++ grace-5.1.24-patch/configure
-@@ -748,7 +748,6 @@ with_printcmd
- enable_debug
- enable_maintainer
- with_netcdf_libraries
--with_fftw_library
- with_zlib_library
- with_jpeg_library
- with_png_library
-@@ -1412,7 +1411,6 @@ Optional Packages:
-   --with-helpviewer=COMMAND    define help viewer command ["mozilla %s"]
-   --with-printcmd=PROG         use PROG for printing
-   --with-netcdf-libraries=OBJ  use OBJ as netCDF libraries [-lnetcdf]
--  --with-fftw-library=OBJ      use OBJ as FFTW library [-lfftw]
-   --with-zlib-library=OBJ      use OBJ as ZLIB library [-lz]
-   --with-jpeg-library=OBJ      use OBJ as JPEG library [-ljpeg]
-   --with-png-library=OBJ       use OBJ as PNG library [-lpng]
-@@ -8225,84 +8223,69 @@ fi
- 
- if test $fftw = true
- then
-+  for ac_header in fftw3.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
-+if test "x$ac_cv_header_fftw3_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FFTW3_H 1
-+_ACEOF
- 
--
--# Check whether --with-fftw_library was given.
--if test "${with_fftw_library+set}" = set; then :
--  withval=$with_fftw_library; fftw_library="$withval"
--fi
--
--  if test "x$fftw_library" = "x"
--  then
--    fftw_library=-lfftw
--  fi
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW library >= 2.1.3" >&5
--$as_echo_n "checking for FFTW library >= 2.1.3... " >&6; }
--if ${acx_cv_fftw+:} false; then :
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5
-+$as_echo_n "checking for fftw_execute in -lfftw3... " >&6; }
-+if ${ac_cv_lib_fftw3_fftw_execute+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if ${acx_cv_fftw_library+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  acx_cv_fftw_library=$fftw_library
--fi
--
--
--    save_CFLAGS=$CFLAGS
--    save_CPPFLAGS=$CPPFLAGS
--    save_LDFLAGS=$LDFLAGS
--    save_LIBS=$LIBS
--
--    LIBS="$acx_cv_fftw_library $LIBS"
--    if test "$cross_compiling" = yes; then :
--  acx_cv_fftw="no"
--
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lfftw3  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--#include <fftw.h>
--#include <string.h>
--      int main(void) {
--        char *vlib = (char *) fftw_version;
--        if (strcmp(vlib, "2.1.3") < 0) {
--          exit(1);
--        }
--        exit(0);
--      }
--
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char fftw_execute ();
-+int
-+main ()
-+{
-+return fftw_execute ();
-+  ;
-+  return 0;
-+}
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  acx_cv_fftw="yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_fftw3_fftw_execute=yes
- else
--  acx_cv_fftw="no"
-+  ac_cv_lib_fftw3_fftw_execute=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5
-+$as_echo "$ac_cv_lib_fftw3_fftw_execute" >&6; }
-+if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then :
- 
-+		FFTW_LIB="-lfftw3"
-+		$as_echo "#define HAVE_FFTW 1" >>confdefs.h
- 
- 
--    CFLAGS=$save_CFLAGS
--    CPPFLAGS=$save_CPPFLAGS
--    LDFLAGS=$save_LDFLAGS
--    LIBS=$save_LIBS
--
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: --> using legacy unoptimized FFT code" >&5
-+$as_echo "--> using legacy unoptimized FFT code" >&6; }
- 
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_fftw" >&5
--$as_echo "$acx_cv_fftw" >&6; }
--  if test "$acx_cv_fftw" = "yes"
--  then
--    FFTW_LIB="$acx_cv_fftw_library"
--    $as_echo "#define HAVE_FFTW 1" >>confdefs.h
- 
--  else
--    FFTW_LIB=
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: --> using legacy unoptimized FFT code" >&5
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: --> using legacy unoptimized FFT code" >&5
- $as_echo "--> using legacy unoptimized FFT code" >&6; }
--  fi
-+fi
-+
-+done
- 
- fi
- 
-