- updated to 4.15.4; devel part is gone (no longer installed)

[packages/a2ps.git] / a2ps-glibcpaper.patch

diff --git a/a2ps-glibcpaper.patch b/a2ps-glibcpaper.patch
index fdbe1965a33a2bf37e531b1d10f465eebdf90438..87b408504a5311fc6d9512ae797578af1be39b1e 100644 (file)
--- a/a2ps-glibcpaper.patch
+++ b/a2ps-glibcpaper.patch
@@ -1,25 +1,25 @@
---- a2ps-4.13/lib/jobs.c.glibcpaper    Sat Jan 15 18:15:07 2000
-+++ a2ps-4.13/lib/jobs.c       Tue Feb 20 18:44:48 2001
-@@ -138,6 +138,7 @@
+--- a2ps-4.15.4/liba2ps/jobs.c.orig    2023-06-11 19:59:27.481861785 +0200
++++ a2ps-4.15.4/liba2ps/jobs.c 2023-06-11 19:59:52.208394496 +0200
+@@ -119,6 +119,7 @@ a2ps_job_new (void)
+   setlocale (LC_TIME, "");
    setlocale (LC_MESSAGES, "");
- #endif
    setlocale (LC_CTYPE, "");
 +  setlocale (LC_PAPER, "");
  
    bindtextdomain (PACKAGE, LOCALEDIR);
-   textdomain (PACKAGE);
---- a2ps-4.13/lib/options.c.glibcpaper Tue Aug 31 13:42:41 1999
-+++ a2ps-4.13/lib/options.c    Tue Feb 20 18:44:48 2001
-@@ -54,6 +54,8 @@
- #include "argv.h"
- #include "quotearg.h"
- #include "filalign.h"
+   bindtextdomain (PACKAGE "-gnulib", LOCALEDIR);
+--- a2ps-4.15.4/liba2ps/options.c.orig 2023-04-12 20:50:51.000000000 +0200
++++ a2ps-4.15.4/liba2ps/options.c      2023-06-11 20:00:19.368247359 +0200
+@@ -23,6 +23,8 @@
+ /*                                                                      */
+ /************************************************************************/
+ #include <config.h>
 +#include <locale.h>
 +#include <langinfo.h>
  
- #define MAN_LINES               66    /* no lines for a man */
- extern char *program_name;
-@@ -281,7 +283,8 @@
+ #include "a2ps.h"
+ #include "routines.h"
+@@ -267,7 +269,8 @@ a2ps_handle_options (a2ps_job * job, int
    struct opt_optarg *opt_optarg_head = NULL;
    struct opt_optarg *opt_optarg = NULL;
    int res;
@@ -29,7 +29,7 @@
    /* Reset optind so that getopt is reinitialized. */
    optind = 0;
  
-@@ -545,7 +548,14 @@
+@@ -515,7 +518,14 @@ a2ps_handle_options (a2ps_job * job, int
        break;
  
        case 'M':                               /* select a medium */
@@ -45,13 +45,13 @@
        break;
  
        case 'n':                               /* n copies */
---- a2ps-4.13/src/main.c.glibcpaper    Wed Jan 26 19:29:15 2000
-+++ a2ps-4.13/src/main.c       Tue Feb 20 18:45:18 2001
-@@ -945,6 +945,7 @@
+--- a2ps-4.15.4/src/main.c.orig        2023-06-11 20:00:41.568127092 +0200
++++ a2ps-4.15.4/src/main.c     2023-06-11 20:01:05.021333368 +0200
+@@ -926,6 +926,7 @@ main (int argc, char *argv[])
+   setlocale (LC_TIME, "");
    setlocale (LC_MESSAGES, "");
- #endif
    setlocale (LC_CTYPE, "");
 +  setlocale (LC_PAPER, "");
  
    bindtextdomain (PACKAGE, LOCALEDIR);
-   textdomain (PACKAGE);
+   bindtextdomain (PACKAGE "-gnulib", LOCALEDIR);