| 1 |
commit: 723b62b005dd709cbf78165a8a49119a4354a415 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Dec 28 15:17:03 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 15:17:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723b62b0 |
| 7 |
|
| 8 |
app-i18n/imsettings: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/708250 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
.../imsettings/files/imsettings-1.7.2-fno-common.patch | 11 +++++++++++ |
| 16 |
app-i18n/imsettings/imsettings-1.7.2.ebuild | 18 ++++++++++-------- |
| 17 |
2 files changed, 21 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..0845bd31820 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch |
| 24 |
@@ -0,0 +1,11 @@ |
| 25 |
+--- a/imsettings-daemon/imsettings-server.c |
| 26 |
++++ b/imsettings-daemon/imsettings-server.c |
| 27 |
+@@ -93,7 +93,7 @@ GDBusInterfaceVTable __iface_vtable = { |
| 28 |
+ NULL, |
| 29 |
+ NULL, |
| 30 |
+ }; |
| 31 |
+-guint signals[LAST_SIGNAL]; |
| 32 |
++extern guint signals[LAST_SIGNAL]; |
| 33 |
+ |
| 34 |
+ G_DEFINE_TYPE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); |
| 35 |
+ G_LOCK_DEFINE_STATIC (logger); |
| 36 |
|
| 37 |
diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild |
| 38 |
index f2f473de2fa..789cc72bb3e 100644 |
| 39 |
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild |
| 40 |
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild |
| 41 |
@@ -1,9 +1,9 @@ |
| 42 |
-# Copyright 1999-2019 Gentoo Authors |
| 43 |
+# Copyright 1999-2020 Gentoo Authors |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
-EAPI="6" |
| 47 |
+EAPI=7 |
| 48 |
|
| 49 |
-inherit autotools xdg-utils |
| 50 |
+inherit autotools |
| 51 |
|
| 52 |
DESCRIPTION="Delivery framework for general Input Method configuration" |
| 53 |
HOMEPAGE="https://tagoh.bitbucket.io/imsettings" |
| 54 |
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" |
| 55 |
LICENSE="LGPL-2.1" |
| 56 |
SLOT="0" |
| 57 |
KEYWORDS="amd64 ~x86" |
| 58 |
-IUSE="gconf gtk2 qt5 +introspection static-libs xfconf" |
| 59 |
+IUSE="gconf gtk2 qt5 +introspection xfconf" |
| 60 |
RESTRICT="test" |
| 61 |
|
| 62 |
RDEPEND="dev-libs/glib:2 |
| 63 |
@@ -26,7 +26,8 @@ RDEPEND="dev-libs/glib:2 |
| 64 |
!gtk2? ( x11-libs/gtk+:3 ) |
| 65 |
introspection? ( dev-libs/gobject-introspection ) |
| 66 |
xfconf? ( xfce-base/xfconf )" |
| 67 |
-DEPEND="${RDEPEND} |
| 68 |
+DEPEND="${RDEPEND}" |
| 69 |
+BDEPEND=" |
| 70 |
dev-util/glib-utils |
| 71 |
dev-util/intltool |
| 72 |
sys-devel/autoconf-archive |
| 73 |
@@ -35,6 +36,8 @@ DEPEND="${RDEPEND} |
| 74 |
|
| 75 |
MY_XINPUTSH="90-xinput" |
| 76 |
|
| 77 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
| 78 |
+ |
| 79 |
src_prepare() { |
| 80 |
sed -i \ |
| 81 |
-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \ |
| 82 |
@@ -49,18 +52,17 @@ src_prepare() { |
| 83 |
|
| 84 |
default |
| 85 |
eautoreconf |
| 86 |
- xdg_environment_reset |
| 87 |
} |
| 88 |
|
| 89 |
src_configure() { |
| 90 |
econf \ |
| 91 |
- $(use_enable static-libs static) \ |
| 92 |
+ --disable-static \ |
| 93 |
--with-xinputsh=${MY_XINPUTSH} |
| 94 |
} |
| 95 |
|
| 96 |
src_install() { |
| 97 |
default |
| 98 |
- find "${D}" -name '*.la' -delete || die |
| 99 |
+ find "${ED}" -name '*.la' -delete || die |
| 100 |
|
| 101 |
fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH} |
| 102 |
} |
Archives