summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2011-09-05 20:36:10 +0000
committerFabio Erculiani <lxnay@gentoo.org>2011-09-05 20:36:10 +0000
commit631d9eeee401efa136a8a75e7f33f4e7bc18bb38 (patch)
tree2186dd070c729f326c96d0ad93b39284c696fd95 /app-admin/packagekit-qt4
parentadd ~arm, bug #379651 (diff)
downloadgentoo-2-631d9eeee401efa136a8a75e7f33f4e7bc18bb38.tar.gz
gentoo-2-631d9eeee401efa136a8a75e7f33f4e7bc18bb38.tar.bz2
gentoo-2-631d9eeee401efa136a8a75e7f33f4e7bc18bb38.zip
fix compilation with qt4 4.7, remove pre-built .moc files
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/packagekit-qt4')
-rw-r--r--app-admin/packagekit-qt4/ChangeLog5
-rw-r--r--app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild8
2 files changed, 11 insertions, 2 deletions
diff --git a/app-admin/packagekit-qt4/ChangeLog b/app-admin/packagekit-qt4/ChangeLog
index 022c31a2761c..e64d093417a3 100644
--- a/app-admin/packagekit-qt4/ChangeLog
+++ b/app-admin/packagekit-qt4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/packagekit-qt4
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/ChangeLog,v 1.5 2011/09/05 20:05:15 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/ChangeLog,v 1.6 2011/09/05 20:36:10 lxnay Exp $
+
+ 05 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> packagekit-qt4-0.6.18.ebuild:
+ fix compilation with qt4 4.7, remove pre-built .moc files
05 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> packagekit-qt4-0.6.16.ebuild,
packagekit-qt4-0.6.17.ebuild, packagekit-qt4-0.6.18.ebuild:
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
index 4037c5d02645..9f0335a024c4 100644
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.2 2011/09/05 20:05:15 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.3 2011/09/05 20:36:10 lxnay Exp $
EAPI="3"
@@ -56,6 +56,12 @@ src_configure() {
src_compile() {
for qtdir in packagekit-qt packagekit-qt2; do
cd "${S}"/lib/${qtdir} || die
+ # fix buildsystem, make .moc files to get regenerated
+ if [[ "${qtdir}" = "packagekit-qt" ]]; then
+ rm src/*.moc || die
+ else
+ rm *.moc || die
+ fi
emake || die "emake install failed"
done
}