public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/
Date: Sat, 24 Sep 2022 13:32:17 +0000 (UTC)	[thread overview]
Message-ID: <1664026310.6db62a1d137760edf49318690cb4b8aee32907ab.hattya@gentoo> (raw)

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}


             reply	other threads:[~2022-09-24 13:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-24 13:32 Akinori Hattori [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-09-24 13:32 [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/ Akinori Hattori
2022-09-24 13:32 Akinori Hattori
2022-12-03  6:06 Sam James
2023-10-25  1:32 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1664026310.6db62a1d137760edf49318690cb4b8aee32907ab.hattya@gentoo \
    --to=hattya@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox