| 1 |
commit: bb03d7cc4088b1690afba0e78180a59442594746 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 28 17:19:11 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 28 17:27:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb03d7cc |
| 7 |
|
| 8 |
x11-misc/lightdm: ensure the correct version of qmake is used |
| 9 |
|
| 10 |
Gentoo-bug: 566950 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.1 |
| 13 |
|
| 14 |
x11-misc/lightdm/lightdm-1.18.2.ebuild | 6 +++++- |
| 15 |
x11-misc/lightdm/lightdm-1.19.4.ebuild | 6 +++++- |
| 16 |
2 files changed, 10 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/lightdm/lightdm-1.18.2.ebuild b/x11-misc/lightdm/lightdm-1.18.2.ebuild |
| 19 |
index 511958a..198bbfc 100644 |
| 20 |
--- a/x11-misc/lightdm/lightdm-1.18.2.ebuild |
| 21 |
+++ b/x11-misc/lightdm/lightdm-1.18.2.ebuild |
| 22 |
@@ -3,7 +3,7 @@ |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
-inherit autotools eutils pam readme.gentoo-r1 systemd versionator xdg-utils |
| 27 |
+inherit autotools eutils pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils |
| 28 |
|
| 29 |
TRUNK_VERSION="$(get_version_component_range 1-2)" |
| 30 |
DESCRIPTION="A lightweight display manager" |
| 31 |
@@ -60,6 +60,10 @@ src_prepare() { |
| 32 |
"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ |
| 33 |
data/lightdm.conf || die "Failed to fix lightdm.conf" |
| 34 |
|
| 35 |
+ # use correct version of qmake. bug #566950 |
| 36 |
+ sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die |
| 37 |
+ sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die |
| 38 |
+ |
| 39 |
default |
| 40 |
|
| 41 |
# Remove bogus Makefile statement. This needs to go upstream |
| 42 |
|
| 43 |
diff --git a/x11-misc/lightdm/lightdm-1.19.4.ebuild b/x11-misc/lightdm/lightdm-1.19.4.ebuild |
| 44 |
index 511958a..198bbfc 100644 |
| 45 |
--- a/x11-misc/lightdm/lightdm-1.19.4.ebuild |
| 46 |
+++ b/x11-misc/lightdm/lightdm-1.19.4.ebuild |
| 47 |
@@ -3,7 +3,7 @@ |
| 48 |
# $Id$ |
| 49 |
|
| 50 |
EAPI=6 |
| 51 |
-inherit autotools eutils pam readme.gentoo-r1 systemd versionator xdg-utils |
| 52 |
+inherit autotools eutils pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils |
| 53 |
|
| 54 |
TRUNK_VERSION="$(get_version_component_range 1-2)" |
| 55 |
DESCRIPTION="A lightweight display manager" |
| 56 |
@@ -60,6 +60,10 @@ src_prepare() { |
| 57 |
"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ |
| 58 |
data/lightdm.conf || die "Failed to fix lightdm.conf" |
| 59 |
|
| 60 |
+ # use correct version of qmake. bug #566950 |
| 61 |
+ sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die |
| 62 |
+ sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die |
| 63 |
+ |
| 64 |
default |
| 65 |
|
| 66 |
# Remove bogus Makefile statement. This needs to go upstream |
Archives