* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-unikey/, app-i18n/ibus-unikey/files/
@ 2021-10-18 13:20 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2021-10-18 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 7abb7680facbd146756e450e58afad24b160f79b
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 13:16:17 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 13:16:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abb7680
app-i18n/ibus-unikey: fix build with sys-devel/slibtool
Closes: https://bugs.gentoo.org/783213
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
.../ibus-unikey/files/ibus-unikey-slibtool.patch | 27 ++++++++++++++++++++++
app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild | 12 +++++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
new file mode 100644
index 00000000000..02551ba608f
--- /dev/null
+++ b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
@@ -0,0 +1,27 @@
+--- a/setup/Makefile.am
++++ b/setup/Makefile.am
+@@ -34,7 +34,8 @@
+
+ ibus_setup_unikey_LDFLAGS = \
+ @IBUS_LIBS@ \
+- @GTK_LIBS@ \
++ @GTK_LIBS@
++
++ibus_setup_unikey_LDADD = \
+ $(top_builddir)/ukengine/libunikey-ibus.la \
+ $(top_builddir)/src/ibus_engine_unikey-utils.o
+-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,8 +25,9 @@
+
+ ibus_engine_unikey_LDFLAGS = \
+ @IBUS_LIBS@ \
+- @X11_LIBS@ \
+- $(top_builddir)/ukengine/libunikey-ibus.la
++ @X11_LIBS@
++
++ibus_engine_unikey_LDADD = $(top_builddir)/ukengine/libunikey-ibus.la
+
+ component_DATA = unikey.xml
+
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
index 5cc835df166..bbe90180754 100644
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
@@ -3,6 +3,8 @@
EAPI="7"
+inherit autotools
+
DESCRIPTION="Vietnamese UniKey engine for IBus"
HOMEPAGE="https://github.com/vn-input/ibus-unikey"
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
@@ -22,7 +24,15 @@ BDEPEND="virtual/pkgconfig
dev-util/intltool
nls? ( sys-devel/gettext )"
-PATCHES=( "${DISTDIR}"/${P}-gcc6.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-slibtool.patch
+ "${DISTDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
src_configure() {
econf \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-unikey/, app-i18n/ibus-unikey/files/
@ 2021-11-18 13:06 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2021-11-18 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 722f4846d5bebfc821909ca14184c5e27859ed39
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 13:05:23 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 13:05:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722f4846
app-i18n/ibus-unikey: drop old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-i18n/ibus-unikey/Manifest | 2 --
.../ibus-unikey/files/ibus-unikey-slibtool.patch | 27 --------------
app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild | 41 ----------------------
3 files changed, 70 deletions(-)
diff --git a/app-i18n/ibus-unikey/Manifest b/app-i18n/ibus-unikey/Manifest
index d0c05386d0cd..3cff7a2ea577 100644
--- a/app-i18n/ibus-unikey/Manifest
+++ b/app-i18n/ibus-unikey/Manifest
@@ -1,3 +1 @@
-DIST ibus-unikey-0.6.1-gcc6.patch 31686 BLAKE2B 5d04ba5e66b1a128a04d23e73e20a8e6a269240a07604e71f3e232e0087f0a47d9a4ff6aeaa10a001c5be9b113d8cdc2a917ecc5084d576d6f918b4c699f2ab3 SHA512 9e1b172a904076ba817c7bab80cbbf7d736c078d3ea285cb946be23552ff0f571ca8e0187cac4e5bfecc2b0032512d6f09af4435056d6b653a3648d07356d9b2
-DIST ibus-unikey-0.6.1.tar.gz 516250 BLAKE2B edb5e46df983fe54ce84f778a23814ae946c6ace772d262a06f473013b84d87d3b1293e7faa62f070763ea837eccc08dfde51cf4b23353e84ac1ceca79a44d80 SHA512 f8d519802d9b304cdaebfcee3f9fef5f17756cde48aa48b9dd357d714e2eaaba0df8f91218b658fdd1d85343804e054b7987caff2734913b29dc76263c30d4e6
DIST ibus-unikey-0.7.0_beta1.tar.gz 90086 BLAKE2B 450968ce10d5a455a9014cbd2cd9e6cbfbf559ae354dca8ca02b3a010edba4ff56caef7d79d5d80becbc51436e2192a8f9be5e936b606bae8ac65d003431188f SHA512 5e0bc188fe720014071c1c563c7bd3e92bc9e00d063c5c0647a9277fe3e05cb6c00a0aabb33e44ac5d31274f0fb03f495107195432bd7b0a89948ed3ba43d363
diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
deleted file mode 100644
index 02551ba608fb..000000000000
--- a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/setup/Makefile.am
-+++ b/setup/Makefile.am
-@@ -34,7 +34,8 @@
-
- ibus_setup_unikey_LDFLAGS = \
- @IBUS_LIBS@ \
-- @GTK_LIBS@ \
-+ @GTK_LIBS@
-+
-+ibus_setup_unikey_LDADD = \
- $(top_builddir)/ukengine/libunikey-ibus.la \
- $(top_builddir)/src/ibus_engine_unikey-utils.o
--
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -25,8 +25,9 @@
-
- ibus_engine_unikey_LDFLAGS = \
- @IBUS_LIBS@ \
-- @X11_LIBS@ \
-- $(top_builddir)/ukengine/libunikey-ibus.la
-+ @X11_LIBS@
-+
-+ibus_engine_unikey_LDADD = $(top_builddir)/ukengine/libunikey-ibus.la
-
- component_DATA = unikey.xml
-
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
deleted file mode 100644
index bbe901807543..000000000000
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="Vietnamese UniKey engine for IBus"
-HOMEPAGE="https://github.com/vn-input/ibus-unikey"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
- https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="app-i18n/ibus
- x11-libs/libX11
- x11-libs/gtk+:3
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- dev-util/intltool
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-slibtool.patch
- "${DISTDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- --with-gtk-version=3
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-unikey/, app-i18n/ibus-unikey/files/
@ 2025-09-30 18:09 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-09-30 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 09c57db734d9e2667a79411f6e867829e655b199
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 30 18:02:50 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 18:09:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c57db7
app-i18n/ibus-unikey: update EAPI 7 -> 8, fix build w/ cmake-4
Closes: https://bugs.gentoo.org/957750
Closes: https://bugs.gentoo.org/957751
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/ibus-unikey-0.7.0_beta1-cmake4.patch | 48 ++++++++++++++++++++++
.../ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild | 20 +++++----
2 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-0.7.0_beta1-cmake4.patch b/app-i18n/ibus-unikey/files/ibus-unikey-0.7.0_beta1-cmake4.patch
new file mode 100644
index 000000000000..75f7ebed820a
--- /dev/null
+++ b/app-i18n/ibus-unikey/files/ibus-unikey-0.7.0_beta1-cmake4.patch
@@ -0,0 +1,48 @@
+From 361dee19b0451c998ae8e0dd12fff310f6aeada6 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 18 Jul 2025 17:38:45 +0900
+Subject: [PATCH] Fix CMake files with CMake 4.0
+
+---
+ CMakeLists.txt | 2 +-
+ cmake/GSettings.cmake | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4eea9179a..95d0e0c22 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.0)
++cmake_minimum_required (VERSION 3.5)
+ project (ibus-unikey)
+
+ cmake_policy(SET CMP0054 NEW)
+diff --git a/cmake/GSettings.cmake b/cmake/GSettings.cmake
+index 0da7650ea..c0b8d6b16 100644
+--- a/cmake/GSettings.cmake
++++ b/cmake/GSettings.cmake
+@@ -65,6 +65,7 @@ macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX)
+ ${GSETTINGS_TARGET}
+ COMMAND
+ ${CMAKE_COMMAND} -E make_directory "${COMPILE_IN_PLACE_DIR}"
++ POST_BUILD
+ )
+
+ # Copy all schemas to the build folder.
+@@ -75,6 +76,7 @@ macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX)
+ COMMAND
+ ${CMAKE_COMMAND} -E copy "${schema_file}" "${COMPILE_IN_PLACE_DIR}"
+ COMMENT "Copying schema ${schema_file} to ${COMPILE_IN_PLACE_DIR}"
++ POST_BUILD
+ )
+ endforeach()
+
+@@ -85,6 +87,7 @@ macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX)
+ COMMAND
+ ${glib_schema_compiler} ${COMPILE_IN_PLACE_DIR}
+ COMMENT "Compiling schemas in folder: ${COMPILE_IN_PLACE_DIR}"
++ POST_BUILD
+ )
+ endif ()
+
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
index 7a1e8a57f140..366014e0545a 100644
--- a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
inherit cmake gnome2-utils
DESCRIPTION="Vietnamese UniKey engine for IBus"
HOMEPAGE="https://github.com/vn-input/ibus-unikey"
SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND="app-i18n/ibus
- x11-libs/gtk+:3
- virtual/libintl"
+RDEPEND="
+ app-i18n/ibus
+ virtual/libintl
+ x11-libs/gtk+:3"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- sys-devel/gettext"
-S="${WORKDIR}/${P/_/-}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) # bug 957750, git master
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-30 18:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-30 18:09 [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-unikey/, app-i18n/ibus-unikey/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-11-18 13:06 Akinori Hattori
2021-10-18 13:20 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox