diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
| commit | 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch) | |
| tree | 53bf797418ac5e9b99c41ca0382c87b82421e5de /app-i18n/imsettings | |
| parent | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff) | |
gentoo new year resync : 01.01.2021
Diffstat (limited to 'app-i18n/imsettings')
| -rw-r--r-- | app-i18n/imsettings/Manifest | 3 | ||||
| -rw-r--r-- | app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch | 11 | ||||
| -rw-r--r-- | app-i18n/imsettings/imsettings-1.7.2.ebuild | 18 |
3 files changed, 23 insertions, 9 deletions
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest index 0c56555178ce..50673214ba7d 100644 --- a/app-i18n/imsettings/Manifest +++ b/app-i18n/imsettings/Manifest @@ -1,3 +1,4 @@ +AUX imsettings-1.7.2-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69 DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0 -EBUILD imsettings-1.7.2.ebuild 1789 BLAKE2B 7227bf82d4af977b95dd3a60e55794a6b077fe6c9a86f764c81c92fbaf013289f8f34f20769cab33802373cc8bd7d5733797e502f6d909acd20990b11c0ffc60 SHA512 5f2b52791ef53c5d15f3bffcf199feaeb01fbb788ee8a1d3694b8e5f3225caf13d40262cf3c417c644b2a3e8c96fa2ac2670fa185fe0f37ebb0e131e0cf65e58 +EBUILD imsettings-1.7.2.ebuild 1787 BLAKE2B a32a55cb94527a601c38b6f40ba47495cc48c385d793682b0d9174875ba9b73edf985ec627249d8ef36f1c62901583655452810e1e320b04eba307d174aee98f SHA512 4283751cff7ab98e639eed3d41d8c7bb9a341ea97c90fa45103242e728a5a5b8bfeac18c2b048e827b6dabbb1317ff148f50f3fab6bd40320b5f17bf71a42811 MISC metadata.xml 618 BLAKE2B c16dbfede5fb6a394335483488c6bc195020c4161278088f7f44d82506f5e4b6e8afac64747098b703200b83b6ee8d7f18b790b5b2cb79e71647e0e6025e8820 SHA512 029b4a98d5fb139a0f504161627461e227b58a712d578aeba4da9deb2c5ae04a78a83a1cf42c0966315d6c43db860f64ac7f6a38a22ae3e4d87b2960fde14301 diff --git a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch b/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch new file mode 100644 index 000000000000..0845bd31820a --- /dev/null +++ b/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch @@ -0,0 +1,11 @@ +--- a/imsettings-daemon/imsettings-server.c ++++ b/imsettings-daemon/imsettings-server.c +@@ -93,7 +93,7 @@ GDBusInterfaceVTable __iface_vtable = { + NULL, + NULL, + }; +-guint signals[LAST_SIGNAL]; ++extern guint signals[LAST_SIGNAL]; + + G_DEFINE_TYPE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); + G_LOCK_DEFINE_STATIC (logger); diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild index f2f473de2fa8..789cc72bb3e2 100644 --- a/app-i18n/imsettings/imsettings-1.7.2.ebuild +++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools xdg-utils +inherit autotools DESCRIPTION="Delivery framework for general Input Method configuration" HOMEPAGE="https://tagoh.bitbucket.io/imsettings" @@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="gconf gtk2 qt5 +introspection static-libs xfconf" +IUSE="gconf gtk2 qt5 +introspection xfconf" RESTRICT="test" RDEPEND="dev-libs/glib:2 @@ -26,7 +26,8 @@ RDEPEND="dev-libs/glib:2 !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive @@ -35,6 +36,8 @@ DEPEND="${RDEPEND} MY_XINPUTSH="90-xinput" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_prepare() { sed -i \ -e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \ @@ -49,18 +52,17 @@ src_prepare() { default eautoreconf - xdg_environment_reset } src_configure() { econf \ - $(use_enable static-libs static) \ + --disable-static \ --with-xinputsh=${MY_XINPUTSH} } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH} } |