From 196faa660660198f3bd0deb66b627601861d9a03 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Wed, 7 Sep 2022 00:24:06 +0900 Subject: app-i18n/uim: rename patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Akinori Hattori --- app-i18n/uim/files/uim-1.8.8-zh-TW.patch | 11 +++++++++++ .../uim-1.8.9_pre20210103-remove-Wconversion-replace.patch | 13 ------------- app-i18n/uim/files/uim-Wconversion.patch | 13 +++++++++++++ app-i18n/uim/files/uim-zh-TW.patch | 11 ----------- app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 app-i18n/uim/files/uim-1.8.8-zh-TW.patch delete mode 100644 app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch create mode 100644 app-i18n/uim/files/uim-Wconversion.patch delete mode 100644 app-i18n/uim/files/uim-zh-TW.patch (limited to 'app-i18n') diff --git a/app-i18n/uim/files/uim-1.8.8-zh-TW.patch b/app-i18n/uim/files/uim-1.8.8-zh-TW.patch new file mode 100644 index 000000000000..f73850013178 --- /dev/null +++ b/app-i18n/uim/files/uim-1.8.8-zh-TW.patch @@ -0,0 +1,11 @@ +--- a/xim/convdisp.cpp ++++ b/xim/convdisp.cpp +@@ -69,7 +69,7 @@ + #endif + + const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"; +-const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0"; ++const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0"; + const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0"; + const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0"; + diff --git a/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch b/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch deleted file mode 100644 index d90433b414bf..000000000000 --- a/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/qt4/common.pro.in -+++ b/qt4/common.pro.in -@@ -20,10 +20,6 @@ - QMAKE_CXX = @CXX@ - QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ - QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ --# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings --# from Qt4 header files --QMAKE_CXXFLAGS_DEBUG = $$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "") --QMAKE_CXXFLAGS_RELEASE = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "") - QMAKE_LINK = @CXX@ - QMAKE_LFLAGS = @LDFLAGS@ - QMAKE_STRIP = diff --git a/app-i18n/uim/files/uim-Wconversion.patch b/app-i18n/uim/files/uim-Wconversion.patch new file mode 100644 index 000000000000..d90433b414bf --- /dev/null +++ b/app-i18n/uim/files/uim-Wconversion.patch @@ -0,0 +1,13 @@ +--- a/qt4/common.pro.in ++++ b/qt4/common.pro.in +@@ -20,10 +20,6 @@ + QMAKE_CXX = @CXX@ + QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ + QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ +-# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings +-# from Qt4 header files +-QMAKE_CXXFLAGS_DEBUG = $$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "") +-QMAKE_CXXFLAGS_RELEASE = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "") + QMAKE_LINK = @CXX@ + QMAKE_LFLAGS = @LDFLAGS@ + QMAKE_STRIP = diff --git a/app-i18n/uim/files/uim-zh-TW.patch b/app-i18n/uim/files/uim-zh-TW.patch deleted file mode 100644 index f73850013178..000000000000 --- a/app-i18n/uim/files/uim-zh-TW.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xim/convdisp.cpp -+++ b/xim/convdisp.cpp -@@ -69,7 +69,7 @@ - #endif - - const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"; --const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0"; -+const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0"; - const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0"; - const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0"; - diff --git a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild index 8bafde17b650..0b0228923d41 100644 --- a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild +++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild @@ -90,9 +90,9 @@ PATCHES=( "${FILESDIR}"/${PN}-kde.patch "${FILESDIR}"/${PN}-slibtool.patch "${FILESDIR}"/${PN}-tinfo.patch + "${FILESDIR}"/${PN}-Wconversion.patch "${FILESDIR}"/${PN}-xkb.patch - "${FILESDIR}"/${PN}-zh-TW.patch - "${FILESDIR}"/${P}-remove-Wconversion-replace.patch + "${FILESDIR}"/${PN}-1.8.8-zh-TW.patch ) DOCS=( AUTHORS NEWS README RELNOTE doc ) -- cgit v1.2.3-65-gdbad