diff --git a/FreeWnn-trad_cpp.patch b/FreeWnn-trad_cpp.patch deleted file mode 100644 index d294ed8..0000000 --- a/FreeWnn-trad_cpp.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in -=================================================================== ---- FreeWnn-1.1.1-a023.orig/Wnn/pubdicplus/Makefile.in -+++ FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in -@@ -325,7 +325,7 @@ fzk.master-.c: fzk.master - $(LN) $? $@ - - std.fsrc: fzk.master-.c $(FZK_SRC) -- $(FZK_PP) fzk.master-.c > $@ -+ $(CPP) -traditional-cpp $(FZK_FLAGS) fzk.master-.c > $@ - - full.fsrc: fzk.master-.c $(FZK_SRC) - $(FZK_PP) -DKANSAI fzk.master-.c > $@ -Index: FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in -=================================================================== ---- FreeWnn-1.1.1-a023.orig/cWnn/cdic/Makefile.in -+++ FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in -@@ -64,10 +64,10 @@ all:: $(ALLTGT) - $(DICS): $(HINSI) - - $(FULL):: $(FZK_SRCS) con.master-.c -- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - $(FULLR):: $(FZK_SRCS) con.masterR-.c -- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - # To avoid circular dependency, we don't use 'con.master?.c' - con.master-.c: con.master -Index: FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in -=================================================================== ---- FreeWnn-1.1.1-a023.orig/cWnn/tdic/Makefile.in -+++ FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in -@@ -64,10 +64,10 @@ all:: $(ALLTGT) - $(DICS): $(HINSI) - - $(FULL):: $(FZK_SRCS) con.master-.c -- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - $(FULLR):: $(FZK_SRCS) con.masterR-.c -- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - # To avoid circular dependency, we don't use 'con.master?.c' - con.master-.c: con.master -Index: FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in -=================================================================== ---- FreeWnn-1.1.1-a023.orig/kWnn/kdic/Makefile.in -+++ FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in -@@ -62,7 +62,7 @@ all:: $(ALLTGT) - $(DICS): $(HINSI) - - $(FULL):: $(FZK_SRCS) fzk.master-.c -- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - # To avoid circular dependency, we don't use 'fzk.master.c' - fzk.master-.c: fzk.master diff --git a/fwnn.changes b/fwnn.changes index 95cef7c..4543e2f 100644 --- a/fwnn.changes +++ b/fwnn.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- -Sat Mar 9 06:51:50 UTC 2019 - bkbin005@rinku.zaq.ne.jp +Sat Mar 9 07:51:43 UTC 2019 - bkbin005@rinku.zaq.ne.jp - Update to FreeWnn-1.1.1-a023.1: * Deal with "Reproducible Buids". See . -- Disable FreeWnn-trad_cpp.patch: doesn't seem to need. +- Remove FreeWnn-trad_cpp.patch: doesn't seem to need. ------------------------------------------------------------------- Thu Mar 7 13:22:01 UTC 2019 - josef.moellers@suse.com diff --git a/fwnn.spec b/fwnn.spec index 185b710..6e1899c 100644 --- a/fwnn.spec +++ b/fwnn.spec @@ -43,7 +43,6 @@ Patch1: FreeWnn-ja.patch Patch2: FreeWnn-noroot.patch Patch7: FreeWnn-s390x.patch Patch8: FreeWnn-warnings.patch -##Patch14: FreeWnn-trad_cpp.patch # doesn't seem to need BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: tcpd-devel @@ -209,7 +208,6 @@ client programs that use the Korean Input System, Free kWnn. %patch2 -p1 %patch7 -p2 -b .s390x %patch8 -# %%patch14 -p1 #%%setup -b 1 -n Xsi # add include-files for Xwnmo # SuSE setlocale patch, try to set LC_CTYPE if LC_ALL fails (Xwnmo) and #......................................................................