diff --git a/pspp/pspp.patch b/pspp/pspp.patch index 39ba6e890a..7b4f853308 100644 --- a/pspp/pspp.patch +++ b/pspp/pspp.patch @@ -1,57 +1,64 @@ -Index: configure ---- configure.orig 2016-07-23 18:52:00.000000000 +0200 -+++ configure 2017-04-09 23:05:35.919024000 +0200 -@@ -15932,8 +15932,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pspp_cv_build_exeext" >&5 - $as_echo "$pspp_cv_build_exeext" >&6; } - EXEEXT_FOR_BUILD="" -- test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex --t} -+ test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeext} - fi - - Index: src/output/cairo.c ---- src/output/cairo.c.orig 2016-02-21 06:38:52.000000000 +0100 -+++ src/output/cairo.c 2017-04-09 23:56:35.963403000 +0200 -@@ -48,7 +48,9 @@ +--- src/output/cairo.c.orig 2023-02-16 23:20:13.000000000 +0100 ++++ src/output/cairo.c 2024-01-01 13:07:50.805384000 +0100 +@@ -31,7 +31,9 @@ #include #include +#if 0 #include +#endif - #include - #include - #include -@@ -425,8 +427,10 @@ - surface = cairo_pdf_surface_create (file_name, width_pt, length_pt); - else if (file_type == XR_PS) - surface = cairo_ps_surface_create (file_name, width_pt, length_pt); -+#if 0 - else if (file_type == XR_SVG) - surface = cairo_svg_surface_create (file_name, width_pt, length_pt); -+#endif - else - NOT_REACHED (); -@@ -493,6 +497,7 @@ - return od ; + #include + #include +@@ -314,12 +316,14 @@ + return xr_create (fh, device_type, o, XR_PS); } +#if 0 static struct output_driver * xr_svg_create (struct file_handle *fh, enum settings_output_devices device_type, - struct string_map *o) -@@ -501,6 +506,7 @@ - fh_unref (fh); - return od ; + struct driver_options *o) + { + return xr_create (fh, device_type, o, XR_SVG); } +#endif - static void - xr_destroy (struct output_driver *driver) -@@ -1242,8 +1248,10 @@ + static struct output_driver * + xr_png_create (struct file_handle *fh, enum settings_output_devices device_type, +@@ -440,6 +444,7 @@ + cairo_surface_show_page (xr->dest_surface); + break; + ++#if 0 + case XR_SVG: + { + cairo_surface_t *svg = cairo_svg_surface_create ( +@@ -449,6 +454,7 @@ + cairo_surface_destroy (svg); + } + break; ++#endif + + case XR_PNG: + { +@@ -479,6 +485,7 @@ + cairo_surface_show_page (xr->dest_surface); + break; + ++#if 0 + case XR_SVG: + { + cairo_surface_t *svg = cairo_svg_surface_create ( +@@ -488,6 +495,7 @@ + cairo_surface_destroy (svg); + } + break; ++#endif + + case XR_PNG: + xr_report_error (cairo_surface_write_to_png (xr->drawing_surface, +@@ -617,8 +625,10 @@ { "pdf", "pspp.pdf", xr_pdf_create }; struct output_driver_factory ps_driver_factory = { "ps", "pspp.ps", xr_ps_create }; @@ -59,31 +66,29 @@ Index: src/output/cairo.c struct output_driver_factory svg_driver_factory = { "svg", "pspp.svg", xr_svg_create }; +#endif + struct output_driver_factory png_driver_factory = + { "png", "pspp.png", xr_png_create }; - static const struct output_driver_class cairo_driver_class = - { Index: src/output/driver.c ---- src/output/driver.c.orig 2016-02-20 06:36:08.000000000 +0100 -+++ src/output/driver.c 2017-04-09 23:56:53.367947000 +0200 -@@ -293,8 +293,10 @@ - #ifdef HAVE_CAIRO - extern const struct output_driver_factory pdf_driver_factory; +--- src/output/driver.c.orig 2024-01-01 13:06:08.591671000 +0100 ++++ src/output/driver.c 2024-01-01 13:08:18.229186000 +0100 +@@ -508,7 +508,9 @@ + extern const struct output_driver_factory png_driver_factory; extern const struct output_driver_factory ps_driver_factory; + extern const struct output_driver_factory spv_driver_factory; +#if 0 extern const struct output_driver_factory svg_driver_factory; - #endif +#endif + extern const struct output_driver_factory tex_driver_factory; + extern const struct output_driver_factory txt_driver_factory; - static const struct output_driver_factory *factories[] = - { -@@ -308,8 +310,10 @@ - #ifdef HAVE_CAIRO +@@ -522,7 +524,9 @@ + &spv_driver_factory, &pdf_driver_factory, &ps_driver_factory, +#if 0 &svg_driver_factory, - #endif +#endif + &png_driver_factory, + &tex_driver_factory, NULL - }; - diff --git a/pspp/pspp.spec b/pspp/pspp.spec index 418d2547d6..aad0d72df8 100644 --- a/pspp/pspp.spec +++ b/pspp/pspp.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: EVAL Group: Algorithm License: GPL -Version: 1.2.0 -Release: 20181108 +Version: 2.0.1 +Release: 20251222 # list of sources Source0: http://ftp.gnu.org/gnu/pspp/pspp-%{version}.tar.gz