diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-03 20:56:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-03 20:56:28 +0100 |
commit | fbda87924e6faa7a1919f1a2b4182490bde5ec5c (patch) | |
tree | f3114a4ed212a754756adce027aeef3a4a1a2e2a /app-i18n/xcin/files | |
parent | 3b08f674e3f771b49370edb144dab0958c8cf721 (diff) |
gentoo resync : 03.09.2021
Diffstat (limited to 'app-i18n/xcin/files')
-rw-r--r-- | app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch | 110 | ||||
-rw-r--r-- | app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch | 96 | ||||
-rw-r--r-- | app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch | 118 | ||||
-rw-r--r-- | app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch | 37 |
4 files changed, 0 insertions, 361 deletions
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch deleted file mode 100644 index 3d472f95b0f4..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En ---- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En 2000-12-13 18:55:41.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En 2009-12-29 18:09:20.000000000 +0200 -@@ -481,13 +481,13 @@ - char *lc_ctype; /* LC_CTYPE locale category name */ - char *lc_messages; /* LC_MESSAGES locale category name */ - char *encoding; /* encoding name */ -- } locale_t; -+ } xcin_locale_t; - - typedef struct { - char *rcfile; /* rcfile name. */ - char *default_dir; /* Default module directory. */ - char *user_dir; /* User data directory. */ -- locale_t locale; /* Locale name. */ -+ xcin_locale_t locale; /* Locale name. */ - } xcin_rc_t; - - The return value of this function is True when excuting successfully, -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module ---- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module 2002-10-29 13:53:42.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module 2009-12-29 18:09:24.000000000 +0200 -@@ -423,13 +423,13 @@ - char *lc_ctype; /* LC_CTYPE locale category name */ - char *lc_messages; /* LC_MESSAGES locale category name */ - char *encoding; /* encoding name */ -- } locale_t; -+ } xcin_locale_t; - - typedef struct { - char *rcfile; /* rcfile name. */ - char *default_dir; /* Default module directory. */ - char *user_dir; /* User data directory. */ -- locale_t locale; /* Locale name. */ -+ xcin_locale_t locale; /* Locale name. */ - } xcin_rc_t; - - 本函式若成功傳回 True, 失敗傳回 False。 -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h 2002-10-29 13:53:42.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h 2009-12-29 18:09:01.000000000 +0200 -@@ -202,12 +202,12 @@ - char *lc_messages; - char *encoding; - int encid, locid; --} locale_t; -+} xcin_locale_t; - - typedef struct { - int argc; /* Command line arguement list */ - char **argv; -- locale_t locale; /* Locale name. */ -+ xcin_locale_t locale; /* Locale name. */ - char *usrhome; /* User home directory. */ - char *default_dir; /* Default module directory. */ - char *user_dir; /* User data directory. */ -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c 2009-12-29 18:07:44.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c 2009-12-29 18:09:12.000000000 +0200 -@@ -233,7 +233,7 @@ - } - - static void --cin2tab_setlocale(locale_t *locale) -+cin2tab_setlocale(xcin_locale_t *locale) - { - char loc_return[128], enc_return[128]; - int ret; -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c 2003-01-20 19:50:05.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c 2009-12-29 18:09:06.000000000 +0200 -@@ -56,7 +56,7 @@ - static void - xcin_setlocale(void) - { -- locale_t *locale = &(xcin_core.xcin_rc.locale); -+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale); - char loc_return[128], enc_return[128]; - - set_perr("xcin"); -@@ -332,7 +332,7 @@ - char *cmd[2], value[256], *s, loc_buf[64], *loc_name=NULL; - char *fmt = N_("%s:\n\tlocale section \"%s\": %s: value not specified.\n"); - xcin_rc_t *xrc = &(xcin_core.xcin_rc); -- locale_t *locale = &(xcin_core.xcin_rc.locale); -+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale); - /* - * Determine the true locale setting name. - */ -@@ -409,7 +409,7 @@ - char *cmd[2], value[256], *s, *s1, objname[100], objenc[100]; - char *fmt = N_("%s:\n\tIM section \"%s\": %s: %s.\n"); - xcin_rc_t *xrc = &(xcin_core.xcin_rc); -- locale_t *locale = &(xcin_core.xcin_rc.locale); -+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale); - int setkey; - /* - * Go to each CINPUT sub-node and read important keywords. -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c xcin-2.5.2.99.pre2+cvs20030224/src/xim.c ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c 2009-12-29 18:07:44.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/xim.c 2009-12-29 18:09:06.000000000 +0200 -@@ -1032,7 +1032,7 @@ - XIMTriggerKeys on_keys; - XIMEncodings encodings; - Window mainwin; -- locale_t *locale; -+ xcin_locale_t *locale; - char* imlocale = NULL; - int i; - diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch deleted file mode 100644 index 374490848980..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in 2001-11-11 21:50:46.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -15,7 +15,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) $(LIB) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in 2011-11-21 01:07:12.878761904 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in 2011-11-21 08:32:24.024474064 +0900 -@@ -21,7 +21,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) $(LIB) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir) - include .depend - - sort_word: sort_word.c key2pho.c -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in 2001-11-11 21:50:46.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -15,7 +15,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) $(LIB) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in 2001-11-11 21:50:47.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -14,7 +14,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) -rpath $(moddir) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in 2001-11-05 01:47:26.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in 2011-11-21 01:08:53.576059606 +0900 -@@ -26,7 +26,7 @@ - - $(BIN): subsys $(OBJ) - @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -export-dynamic \ -- $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB) -+ $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB) - include .depend - - subsys: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in 2001-09-21 02:00:57.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -23,7 +23,7 @@ - - $(LXCIN_NAME): make_subdir - ( OBJS=`ls $(LXCIN_OBJ)`; \ -- $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LIB) -rpath $(libdir) \ -+ $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LDFLAGS) $(LIB) -rpath $(libdir) \ - -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) ) - - make_subdir: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in 2001-11-05 01:47:29.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -14,7 +14,7 @@ - all: $(BIN) - - $(BIN): $(OBJ) -- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in 2002-01-01 22:49:17.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in 2011-11-21 08:33:44.547672718 +0900 -@@ -15,7 +15,7 @@ - all: $(BIN) - - $(BIN): $(OBJ) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LIB) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIB) - include .depend - - depend: diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch deleted file mode 100644 index d5967c31476f..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in 2001-09-07 00:41:32.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in 2011-11-21 00:44:20.979695505 +0900 -@@ -9,43 +9,43 @@ - all: all-$(OS_TYPE) - - all-LINUX: -- ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules make-big5 make-big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules make-big5 make-big5hkscs ) - - all-FREEBSD: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - all-OPENBSD: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - all-NETBSD: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - all-HPUX: -- ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules make-big5 make-big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules make-big5 make-big5hkscs ) - - all-SOLARIS: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - - install: all install-$(OS_TYPE) - - install-LINUX: -- ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules install_big5 install_big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules install_big5 install_big5hkscs ) - - install-FREEBSD: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - install-OPENBSD: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - install-NETBSD: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - install-HPUX: -- ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules install_big5 install_big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules install_big5 install_big5hkscs ) - - install-SOLARIS: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - - clean: -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in 2001-09-07 00:41:33.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in 2011-11-21 00:44:07.491653510 +0900 -@@ -9,43 +9,43 @@ - all: all-$(OS_TYPE) - - all-LINUX: -- ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules make-gb2312 make-gbk ) -+ ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules make-gb2312 make-gbk ) - - all-FREEBSD: -- ( GB2312ENC=euc make -f Rules make-gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 ) - - all-OPENBSD: -- ( GB2312ENC=euc make -f Rules make-gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 ) - - all-NETBSD: -- ( GB2312ENC=euccn make -f Rules make-gb2312 ) -+ ( GB2312ENC=euccn $(MAKE) -f Rules make-gb2312 ) - - all-HPUX: -- ( GB2312ENC=hp15cn make -f Rules make-gb2312 ) -+ ( GB2312ENC=hp15cn $(MAKE) -f Rules make-gb2312 ) - - all-SOLARIS: -- ( GB2312ENC=euc make -f Rules make-gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 ) - - - install: all install-$(OS_TYPE) - - install-LINUX: -- ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules install_gb2312 install_gbk ) -+ ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules install_gb2312 install_gbk ) - - install-FREEBSD: -- ( GB2312ENC=euc make -f Rules install_gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 ) - - install-OPENBSD: -- ( GB2312ENC=euc make -f Rules install_gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 ) - - install-NETBSD: -- ( GB2312ENC=euccn make -f Rules install_gb2312 ) -+ ( GB2312ENC=euccn $(MAKE) -f Rules install_gb2312 ) - - install-HPUX: -- ( GB2312ENC=hp15cn make -f Rules install_gb2312 ) -+ ( GB2312ENC=hp15cn $(MAKE) -f Rules install_gb2312 ) - - install-SOLARIS: -- ( GB2312ENC=euc make -f Rules install_gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 ) - - clean: - rm -f *.tab* core diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch deleted file mode 100644 index 747c8c5ca022..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 376d5276758b7eb2ee2b5e11d60f2105aac263f2 -Author: orbea <orbea@riseup.net> -Date: Sat Apr 10 16:40:33 2021 -0700 - - build: Fix linking with slibtool. - - Linking with the static libraries is not ideal, but since - that is what is provided... - -diff --git a/src/Makefile.in b/src/Makefile.in -index 62e6154..ac15131 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -6,8 +6,8 @@ top_srcdir = @top_srcdir@ - include $(top_srcdir)/Rules - - INC = ${xcininc} ${intl_inc} ${x_includes} -I${ximd_inc} --LIB = ${xcinlib} -lXimd -lim_comm lib/libxcin.la \ -- ${x_libraries} ${locale_lib} ${dl_lib} ${intl_lib} -lm -+LIB = lib/libxcin.la lib/libim_comm.a lib/libXimd.a ${x_libraries} \ -+ ${locale_lib} ${dl_libs} ${intl_lib} -lm - - BIN = xcin - SRC = xcin_main.c module.c gui.c xim.c xim_IC.c fkey.c gui_main.c \ -diff --git a/src/util/cin2tab/Makefile.in b/src/util/cin2tab/Makefile.in -index a2ad6f8..0663c5e 100644 ---- a/src/util/cin2tab/Makefile.in -+++ b/src/util/cin2tab/Makefile.in -@@ -3,7 +3,7 @@ top_srcdir = @top_srcdir@ - include $(top_srcdir)/Rules - - INC = $(x_includes) $(xcininc) $(intl_inc) --LIB = $(xcinlib) -lim_comm ../../lib/libxcin.la $(locale_lib) $(intl_lib) -lm -+LIB = ../../lib/libxcin.la ../../lib/libim_comm.a $(locale_lib) $(intl_lib) -lm - - BIN = cin2tab - SRC = cin2tab.c syscin.c gencin.c bimscin.c |