[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

[Akinori Hattori]

commit:     4b7d73f24f8fc0467b410bdb90463c500a9e2ac4
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 13:18:57 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 13:31:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7d73f2

app-i18n/uim: update patch

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/files/uim-slibtool.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch
index 51560d439e25..2efec471c2cc 100644
--- a/app-i18n/uim/files/uim-slibtool.patch
+++ b/app-i18n/uim/files/uim-slibtool.patch
@@ -7,7 +7,7 @@
 -                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs
 -LIBS += -lreplace -luim -luim-scm
 +                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs \
-+		@abs_top_builddir@/sigscheme/libgcroots/.libs
++                @abs_top_builddir@/sigscheme/libgcroots/.libs
 +LIBS += -lreplace -luim -luim-scm -lgcroots
  !win32:!embedded:!mac {
      LIBS += -luim-x-util

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

[Akinori Hattori]

commit:     472fd64b5f966e862c8b97add0330753b3668703
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 13:29:35 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 13:31:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472fd64b

app-i18n/uim: fix build with Clang 16+

Closes: https://bugs.gentoo.org/870520
Closes: https://bugs.gentoo.org/870637
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/files/uim-gentoo.patch | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app-i18n/uim/files/uim-gentoo.patch b/app-i18n/uim/files/uim-gentoo.patch
index 9b7f1111b17a..649288932259 100644
--- a/app-i18n/uim/files/uim-gentoo.patch
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -38,6 +38,7 @@
+@@ -56,6 +56,7 @@
  AC_PATH_PROGS(SED, sed gsed)
  AX_PATH_QMAKE4
  AX_PATH_QMAKE5
@@ -8,7 +8,19 @@
  
  AM_MAINTAINER_MODE
  
-@@ -1618,7 +1619,7 @@
+@@ -575,6 +576,11 @@
+ AC_CHECK_FUNCS([waitpid])
+ AC_CHECK_FUNCS([daemon])
+ 
++AC_CHECK_DECL([va_copy],
++              [AC_DEFINE(HAVE_VA_COPY, 1, [Define to 1 if you have the `va_copy' macro.])],
++              [AC_CHECK_DECL([__va_copy],
++                             [AC_DEFINE(HAVE___VA_COPY, 1, [Define to 1 if you have the `__va_copy' macro.])])])
++
+ # IRIX has a const char return value for gai_strerror()
+ AC_CHECK_FUNCS(gai_strerror,[
+         AC_DEFINE(HAVE_GAI_STRERROR)
+@@ -1637,7 +1643,7 @@
    fi
    AX_LANG_WNOERROR  # end AC_LANG_WERROR
  
@@ -17,7 +29,7 @@
  else
    CFLAGS="$CFLAGS -DNDEBUG"
    CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1629,7 +1630,7 @@
+@@ -1648,7 +1654,7 @@
    AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
    AX_LANG_WNOERROR  # end AC_LANG_WERROR
  

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

[Akinori Hattori]

commit:     6db62a1d137760edf49318690cb4b8aee32907ab
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 13:00:01 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 13:31:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db62a1d

app-i18n/uim: fix CMake warning

Closes: https://bugs.gentoo.org/870394
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/files/uim-kde.patch | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
index 8a291650ae3d..dfac6b556435 100644
--- a/app-i18n/uim/files/uim-kde.patch
+++ b/app-i18n/uim/files/uim-kde.patch
@@ -29,7 +29,15 @@
  AC_ARG_ENABLE(pref,
    AC_HELP_STRING([--disable-pref],
      [do not build graphical utility to edit user settings]),
-@@ -1948,12 +1970,15 @@
+@@ -1883,7 +1905,6 @@
+   cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}"
+   cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}"
+   cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true"
+-  cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false"
+ fi
+ 
+ if test "x$with_qt4" = xyes; then
+@@ -1948,12 +1969,15 @@
      qt5_immodule_option="DEFINES+=QT5_IMMODULE"
    fi
    set -e
@@ -51,7 +59,7 @@
    ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
      ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
    ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
-@@ -2007,6 +2032,7 @@
+@@ -2007,6 +2031,7 @@
     Qt5 immodule    : ${with_qt5_immodule}
     KDE3 Applet     : ${enable_kde_applet}
     KDE4 Applet     : ${enable_kde4_applet}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

[Sam James]

commit:     0435f69f59143b128c06f82700578edbb5ab1e51
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 05:03:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 06:06:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0435f69f

app-i18n/uim: add partial upstream link for clang 16 patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/uim/files/uim-clang-16-configure.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch b/app-i18n/uim/files/uim-clang-16-configure.patch
index 46e3bac01534..9a1a4726eb18 100644
--- a/app-i18n/uim/files/uim-clang-16-configure.patch
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
@@ -1,3 +1,4 @@
+Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

[Sam James]

commit:     d3c8c3c88a466243342bce3a60f2d7fdad377051
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 23:30:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 01:31:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c8c3c8

app-i18n/uim: link to upstream PR for Clang 16 patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/uim/files/uim-clang-16.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-i18n/uim/files/uim-clang-16.patch b/app-i18n/uim/files/uim-clang-16.patch
index 9a1a4726eb18..b8b32532881a 100644
--- a/app-i18n/uim/files/uim-clang-16.patch
+++ b/app-i18n/uim/files/uim-clang-16.patch
@@ -1,4 +1,6 @@
 Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
+
+The rest was done in https://github.com/uim/uim/pull/198.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then