OSDN Git Service

Apply local patch
authorAkihiro Motoki <amotoki@gmail.com>
Thu, 18 Feb 2016 20:34:29 +0000 (05:34 +0900)
committerAkihiro Motoki <amotoki@gmail.com>
Thu, 18 Feb 2016 20:34:29 +0000 (05:34 +0900)
In coreutils 8.25 there is a bug that PO file header
is displayed in stty help message.

Makefile
patch-8.25.diff [new file with mode: 0644]

index baeb2ce..1b1b1b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,13 @@ stamp-setup: $(tarball)
          && git commit -m 'Import $(PACKAGE_NAME).' > /dev/null \
        )
        mkdir -p source/locale/ja/LC_MESSAGES
-       set -e ; if [ -f ja.po/ja.po.$(V) ]; then \
+       @set -e ; if [ -f patch-$(V).diff ]; then \
+         patch -p0 < patch-$(V).diff; \
+       fi
+       @set -e ; if [ -f ja.po/ja.po.$(V) ]; then \
          rm -f source/po/ja.po; \
          ln -s ../../ja.po/ja.po.$(V) source/po/ja.po; \
+         echo "Use JM-maintained ja.po for translation."; \
        else \
          echo "No JM-maintained ja.po found for $(V)."; \
        fi
diff --git a/patch-8.25.diff b/patch-8.25.diff
new file mode 100644 (file)
index 0000000..d0d0a5c
--- /dev/null
@@ -0,0 +1,11 @@
+--- coreutils-8.25/src/stty.c.orig     2016-02-19 04:42:49.092838666 +0900
++++ coreutils-8.25/src/stty.c  2016-02-19 04:38:56.033176525 +0900
+@@ -953,8 +953,6 @@
+ #endif
+ );
+       fputs (_("\
+-"), stdout);
+-      fputs (_("\
+    oddp          same as parenb parodd cs7\n\
+    -oddp         same as -parenb cs8\n\
+    [-]parity     same as [-]evenp\n\