- rediff patches

diff --git a/elinks-date-format.patch b/elinks-date-format.patch
index 7160a7cdb0551f6e824355b42368c5a8a79cccab..bb506a6caa67a05f9938283afec88e7fd307fa49 100644 (file)
--- a/elinks-date-format.patch
+++ b/elinks-date-format.patch
@@ -1,30 +1,9 @@
---- elinks-0.11.3/src/util/file.h.orig 2007-12-02 01:03:26.631355000 +0100
-+++ elinks-0.11.3/src/util/file.h      2007-12-02 01:19:06.416911036 +0100
-@@ -461,16 +461,16 @@ stat_date(struct string *string, struct 
- 
-               if (current_time > when + 6L * 30L * 24L * 60L * 60L
-                   || current_time < when - 60L * 60L)
--                      fmt = "%b %e  %Y";
-+                      fmt = gettext("%b %e  %Y");
-               else
--                      fmt = "%b %e %H:%M";
-+                      fmt = gettext("%b %e %H:%M");
- 
-               add_date_to_string(string, fmt, &when);
-               add_char_to_string(string, ' ');
-               return;
-       }
- #endif
--      add_to_string(string, "             ");
-+      add_to_string(string, gettext("             "));
- }
- 
- 
---- elinks-0.11.3/po/pl.po.orig        2007-04-15 22:51:02.000000000 +0200
-+++ elinks-0.11.3/po/pl.po     2007-12-02 01:29:45.701341779 +0100
-@@ -7428,6 +7428,18 @@
- msgid "Use EPSV instead of EPRT (passive vs active mode, IPv6 only)."
- msgstr "U¿ywaj EPSV zamiast EPRT (tryb pasywny kontra aktywny, tylko IPv6)."
+diff -urNp -x '*.orig' elinks-0.13-20180901.org/po/pl.po elinks-0.13-20180901/po/pl.po
+--- elinks-0.13-20180901.org/po/pl.po  2017-07-23 19:50:15.000000000 +0200
++++ elinks-0.13-20180901/po/pl.po      2021-05-07 22:58:24.518524650 +0200
+@@ -7194,6 +7194,18 @@ msgstr "Czy na pewno chcesz skasować ws
+ msgid "Authentication manager"
+ msgstr "Zarządca uwierzytelniania"
  
 +#: src/protocol/ftp/ftp.c:1160 src/util/file.c:464
 +msgid "%b %e  %Y"
@@ -39,11 +18,12 @@
 +msgstr "             "
 +
  #. name:
- #: src/protocol/gopher/gopher.c:46
- msgid "Gopher"
---- elinks-0.12pre1/src/protocol/ftp/ftp.c.old 2008-07-01 18:51:59.000000000 +0200
-+++ elinks-0.12pre1/src/protocol/ftp/ftp.c     2008-07-01 18:59:09.000000000 +0200
-@@ -1185,7 +1185,7 @@ display_dir_entry(struct cache_entry *ca
+ #: src/protocol/bittorrent/bittorrent.c:26
+ #: src/protocol/bittorrent/bittorrent.c:339
+diff -urNp -x '*.orig' elinks-0.13-20180901.org/src/protocol/ftp/ftp.c elinks-0.13-20180901/src/protocol/ftp/ftp.c
+--- elinks-0.13-20180901.org/src/protocol/ftp/ftp.c    2017-07-23 19:50:15.000000000 +0200
++++ elinks-0.13-20180901/src/protocol/ftp/ftp.c        2021-05-07 22:58:24.518524650 +0200
+@@ -1237,7 +1237,7 @@ display_dir_entry(struct cache_entry *ca
                /* LC_TIME=fi_FI.UTF_8 can generate "elo___ 31 23:59"
                 * where each _ denotes U+00A0 encoded as 0xC2 0xA0,
                 * thus needing a 19-byte buffer.  */
@@ -52,7 +32,7 @@
                int wr;
  
                if (ftp_info->local_time_zone)
-@@ -1195,16 +1195,16 @@ display_dir_entry(struct cache_entry *ca
+@@ -1247,16 +1247,16 @@ display_dir_entry(struct cache_entry *ca
  
                if (current_time > when + 6L * 30L * 24L * 60L * 60L
                    || current_time < when - 60L * 60L)
@@ -72,7 +52,7 @@
        /* TODO: Above, the number of spaces might not match the width
         * of the string generated by strftime.  It depends on the
         * locale.  So if ELinks knows the timestamps of some FTP
-@@ -1218,8 +1218,6 @@ display_dir_entry(struct cache_entry *ca
+@@ -1270,8 +1270,6 @@ display_dir_entry(struct cache_entry *ca
         * Any solution chosen here should also be applied to the
         * file: protocol handler.  */
  
@@ -81,3 +61,26 @@
        if (ftp_info->type == FTP_FILE_DIRECTORY && format->colorize_dir) {
                add_to_string(&string, "<font color=\"");
                add_to_string(&string, format->dircolor);
+diff -urNp -x '*.orig' elinks-0.13-20180901.org/src/util/file.h elinks-0.13-20180901/src/util/file.h
+--- elinks-0.13-20180901.org/src/util/file.h   2017-07-23 19:50:15.000000000 +0200
++++ elinks-0.13-20180901/src/util/file.h       2021-05-07 22:58:24.518524650 +0200
+@@ -248,16 +248,16 @@ stat_date(struct string *string, struct
+ 
+               if (current_time > when + 6L * 30L * 24L * 60L * 60L
+                   || current_time < when - 60L * 60L)
+-                      fmt = "%b %e  %Y";
++                      fmt = gettext("%b %e  %Y");
+               else
+-                      fmt = "%b %e %H:%M";
++                      fmt = gettext("%b %e %H:%M");
+ 
+               add_date_to_string(string, fmt, &when);
+               add_char_to_string(string, ' ');
+               return;
+       }
+ #endif
+-      add_to_string(string, "             ");
++      add_to_string(string, gettext("             "));
+ }
+ 
+ 

diff --git a/elinks-home_etc.patch b/elinks-home_etc.patch
index 611364d7ade6d2fdb1106eba20fa681e5742b087..334fff3b0f536fcc1c545d4780835ccaac65cb76 100644 (file)
--- a/elinks-home_etc.patch
+++ b/elinks-home_etc.patch
@@ -1,7 +1,8 @@
---- elinks-0.12pre1/doc/man/man1/elinks.1.in.old       2008-07-01 02:11:44.000000000 +0200
-+++ elinks-0.12pre1/doc/man/man1/elinks.1.in   2008-07-01 18:36:50.000000000 +0200
-@@ -315,6 +315,12 @@ The path to the users home directory. Us
- ~/.
+diff -urNp -x '*.orig' elinks-0.13-20180901.org/doc/man/man1/elinks.1.in elinks-0.13-20180901/doc/man/man1/elinks.1.in
+--- elinks-0.13-20180901.org/doc/man/man1/elinks.1.in  2017-07-23 19:50:15.000000000 +0200
++++ elinks-0.13-20180901/doc/man/man1/elinks.1.in      2021-05-07 22:58:22.368520341 +0200
+@@ -322,6 +322,12 @@ The path to the users home directory\&.
+ ~/\&.
  .RE
  .PP
 +HOME_ETC
@@ -13,8 +14,9 @@
  WWW_HOME
  .RS 4
  Homepage location (as in
---- elinks-0.12pre1/src/config/home.c.old      2008-07-01 02:11:44.000000000 +0200
-+++ elinks-0.12pre1/src/config/home.c  2008-07-01 18:41:01.000000000 +0200
+diff -urNp -x '*.orig' elinks-0.13-20180901.org/src/config/home.c elinks-0.13-20180901/src/config/home.c
+--- elinks-0.13-20180901.org/src/config/home.c 2017-07-23 19:50:15.000000000 +0200
++++ elinks-0.13-20180901/src/config/home.c     2021-05-07 22:58:22.368520341 +0200
 @@ -110,7 +110,8 @@ static unsigned char *
  get_home(void)
  {