summaryrefslogtreecommitdiff
path: root/app-i18n/uim
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-06-09 09:27:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-06-09 09:27:03 +0100
commitcb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree047fc92023c520d07f13ec5ac96e094d1b312a7a /app-i18n/uim
parent7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
gentoo resync : 09.06.2018
Diffstat (limited to 'app-i18n/uim')
-rw-r--r--app-i18n/uim/Manifest7
-rw-r--r--app-i18n/uim/files/uim-1.8.6-qt.patch16
-rw-r--r--app-i18n/uim/uim-1.8.6-r1.ebuild4
-rw-r--r--app-i18n/uim/uim-1.8.6-r2.ebuild4
-rw-r--r--app-i18n/uim/uim-1.8.8.ebuild2
5 files changed, 28 insertions, 5 deletions
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 21ecdcaca6f7..eeb5d4e68437 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,6 +1,7 @@
AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
AUX uim-1.8.6-gentoo.patch 618 BLAKE2B 339602558ab7f8d09ef49f9be948f735c6f262961e82d74d22f83a47b9a4072c64d1d197147a168caaa9fbe3fd4b9b1cbc2364576130d400d06cc77551544a75 SHA512 b48d80d26d15956ece6457df32ea35c8ccb2b37cd222699bd35a1cbf40cd6fec14ae424cac17ee91db159a9369a37cc7b8af29c2613d55eb1e82be4e06324d86
AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
+AUX uim-1.8.6-qt.patch 755 BLAKE2B dccef1b392e331b230f99f34c3dfc2829a49d5c5a15ac7c41eef201f06e5e6bd5c78ea7a3253b7bbcbbccb77feee7bfae677368cdccc1090c4dd8df26a38a5eb SHA512 ba3b80fe5951e2d508c8fc280038f17523a2de5a0bb136179a486c076aa3dd343112dcc976b2d2e4ae157aaa81682ea85031fcb51682776ecdcdb929f6aceb65
AUX uim-1.8.6-tinfo.patch 2646 BLAKE2B edb4fde474b7264ed8a4a4db329ac06068ddb68e4b0bb6bd33e011018b5450de8ecc2b94716ca486a8a3b965867ee62eb0b3be2b2e939155a0cc34a02264a7a6 SHA512 34c2df710f0053c40b858369036d2e4bbac6a5da6f81794c3d97f6c58713d14c4bffffda555d9fc10ce2d70406578b2a50c9397b23c008ec4b106aa0a4582338
AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
@@ -8,7 +9,7 @@ AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411
AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.6-r1.ebuild 4976 BLAKE2B e819e53f6112104dcb1d07f56c531ea0bd089e79c976a16dabce298f1655cddc8b95cee460d835e3f9d081012a5603943b25928ae4079dc19f58332f6a696f90 SHA512 384f14cbf35c6f791f16e6d462f032731a9a86c41b82d3aa958bb439e6922ec33af21b7054d56f72843627f47f2958334dfbd2d988c44a0ff61da43af170e1b7
-EBUILD uim-1.8.6-r2.ebuild 5081 BLAKE2B b2e2e6122b8b3ba52444b65e7262fb4d1e44a632295e85575ae38419412a67b0cba40d9933b7b0dd1fb9d4f3d9b6fd2b26a386ea5e5a6ddef5b96ef180c1b49d SHA512 c897f747f5126e59ebc52658d839b6ee5e2136ecdc89f20fbf3fc4d9e55c4868ee04068a57453078801d28ae3c2b6b23c92fa0d4971a85a95c33cad0b069de59
-EBUILD uim-1.8.8.ebuild 5210 BLAKE2B d21cd6233b3d415a7dc4abea701d509deea009672ca51ca14f6fb1772f96f91337beb9929d6442ae03e440311d99bbb8ef00d2525e5bc9c0bf06584e267382f4 SHA512 d8ff76a51500a3a91755c0b6c94047397c04f6f690d57872ffc87cc41c5472fcf130bdfe0803a02e0b4cd8bcdac7e99f5e42bb07766d01fba1eb027b51d6ff6d
+EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab
+EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0
+EBUILD uim-1.8.8.ebuild 5300 BLAKE2B c778627e7f1868b6c8c54133965c24619f8450a5ebcae0f58cc093d6b23f3176fa7e67ac7b1622434a10fa96d1202a1693c81c554514a28f8a4d6221ba0bf36b SHA512 ab7edd45870830ae7a5149a4f69903624dc8ec323cc9274384b50076da2c7375284368690dbd64b1b05cc4f051a25a30760fdda0fcabef0d7980fe28312258e5
MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
new file mode 100644
index 000000000000..6c0cb7eee667
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-qt.patch
@@ -0,0 +1,16 @@
+--- a/m4/ax_path_qmake4.m4
++++ b/m4/ax_path_qmake4.m4
+@@ -23,10 +23,10 @@
+ # the copyright notice and this notice are preserved.
+
+ AC_DEFUN([AX_PATH_QMAKE4], [
+- ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
++ ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
+ AC_PROG_EGREP
+- AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
+- AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
++ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
++ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
+
+ AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
+ ax_cv_path_QMAKE4=no
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 84c5fa527ebd..af634f34baf1 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
DESCRIPTION="A multilingual input method framework"
HOMEPAGE="https://github.com/uim/uim"
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-qt.patch
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
)
@@ -144,6 +145,7 @@ src_configure() {
myconf+=( --disable-pref )
fi
+ export QT4DIR="$(qt4_get_libdir)"
econf "${myconf[@]}"
}
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index ccec49f28693..8ecd96c02155 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
DESCRIPTION="A multilingual input method framework"
HOMEPAGE="https://github.com/uim/uim"
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-libressl.patch
+ "${FILESDIR}"/${P}-qt.patch
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
)
@@ -148,6 +149,7 @@ src_configure() {
myconf+=( --disable-pref )
fi
+ export QT4DIR="$(qt4_get_libdir)"
econf "${myconf[@]}"
}
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index b77ac271174f..96c19d017d73 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -92,6 +92,8 @@ SITEFILE="50${PN}-gentoo.el"
src_prepare() {
default
sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+ # fix build with >=dev-scheme/chicken-4, bug #656852
+ touch scm/json-parser-expanded.scm
eautoreconf
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 04:03:08 +0000