diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2012-07-20 17:30:53 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2012-07-20 17:30:53 +0000 |
| commit | fc863f304501331b141b1556c40af8f43057f146 (patch) | |
| tree | 1097f8b02134e17c87cbdc58e7e32e9dd236f29d /app-admin | |
| parent | Add snapshot from new repo (diff) | |
| download | gentoo-2-fc863f304501331b141b1556c40af8f43057f146.tar.gz gentoo-2-fc863f304501331b141b1556c40af8f43057f146.tar.bz2 gentoo-2-fc863f304501331b141b1556c40af8f43057f146.zip | |
fix compilation with npapi-sdk currently in tree, close bug #423911
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/packagekit-base/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/packagekit-base/packagekit-base-0.6.22.ebuild | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app-admin/packagekit-base/ChangeLog b/app-admin/packagekit-base/ChangeLog index ddf22a2aa311..d4ae93457aaa 100644 --- a/app-admin/packagekit-base/ChangeLog +++ b/app-admin/packagekit-base/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/packagekit-base # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.26 2012/07/20 13:36:26 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.27 2012/07/20 17:30:53 lxnay Exp $ + + 20 Jul 2012; Fabio Erculiani <lxnay@gentoo.org> + packagekit-base-0.6.22.ebuild: + fix compilation with npapi-sdk currently in tree, close bug #423911 20 Jul 2012; Fabio Erculiani <lxnay@gentoo.org> packagekit-base-0.7.4.ebuild, +files/packagekit-base-0.7.x-npapi-api-change.patch: diff --git a/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild b/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild index 87702e81e96a..b89026c1633e 100644 --- a/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild +++ b/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild,v 1.1 2012/05/19 11:21:34 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild,v 1.2 2012/07/20 17:30:53 lxnay Exp $ EAPI="3" @@ -38,7 +38,7 @@ CDEPEND="connman? ( net-misc/connman ) >=sys-apps/dbus-1.3.0" DEPEND="${CDEPEND} doc? ( dev-util/gtk-doc ) - nsplugin? ( >=net-misc/npapi-sdk-0.27 ) + nsplugin? ( <net-misc/npapi-sdk-0.27.1 ) dev-libs/libxslt >=dev-util/intltool-0.35.0 virtual/pkgconfig @@ -65,6 +65,8 @@ RESTRICT="test" # tests are failing atm # doc is in the tarball and always installed # mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2 # (R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247 +# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree +# drop the npapi-api-change patch below and relax the dependency constraints # UPSTREAM: # documentation/website with --enable-doc-install @@ -72,6 +74,7 @@ RESTRICT="test" # tests are failing atm src_prepare() { epatch "${FILESDIR}"/${PN}-0.6.22-npapi-sdk.patch #383141 + epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711 } src_configure() { @@ -120,6 +123,7 @@ src_configure() { --disable-gtk-module \ $(use_enable introspection) \ $(use_enable networkmanager) \ + $(use_enable connman) \ $(use_enable nsplugin browser-plugin) \ $(use_enable pm-utils) \ --disable-qt \ |