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 | c81bfadc555127ad148b9a896e440e243e376765 (patch) | |
| tree | 761edfc4425e836603f5c8dba25a70d46423b984 /app-admin | |
| parent | Add snapshot from new repo (diff) | |
| download | historical-c81bfadc555127ad148b9a896e440e243e376765.tar.gz historical-c81bfadc555127ad148b9a896e440e243e376765.tar.bz2 historical-c81bfadc555127ad148b9a896e440e243e376765.zip | |
fix compilation with npapi-sdk currently in tree, close bug #423911
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/packagekit-base/packagekit-base-0.6.22.ebuild | 8 |
3 files changed, 13 insertions, 5 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/Manifest b/app-admin/packagekit-base/Manifest index 023f647c5fc4..9152269d179b 100644 --- a/app-admin/packagekit-base/Manifest +++ b/app-admin/packagekit-base/Manifest @@ -3,7 +3,7 @@ AUX packagekit-base-0.7.x-npapi-api-change.patch 412 SHA256 f225f6f9400e994bc7db AUX packagekit-base-0.7.x-npapi-sdk.patch 2332 SHA256 59e2b756898c38bf06fad76ab085d8693f5afae854a12e26f395b99e128a5e59 SHA512 641313323a1461ec0efd44098a9efcf14612732c8cb73c0aac4737ae32045771166cb2d4d1be905a82a06406f3e1d4d35e0b637583ffeacf38ec88c2e434d8b2 WHIRLPOOL 619b143e8ab4c0558a04633a5ea763424c46b4223286c1953eb01a10639f1af8f51ea5a3822b83586ecac3a1a793f0d09abaf75b6bc031eb20b00d3485faad4b DIST PackageKit-0.6.22.tar.xz 7886160 SHA256 b9f71721b0b16e106c0a1ce28c97b2277a34b0c15d1a171f4898f34117ebaa2d SHA512 965647e0016f6ffc21084722393bd71464d1e18c939be49414dbdcb3eec6d89115690f8b30bd6648e2f297c72cccc35ec8600377453a51e8b28b4f4b055dca85 WHIRLPOOL 013520e1e0ae821ec1c0a6f908a1e71a8521663ac44b2c1921ff8351390804d629f5e133229dc6db1086e69784324a5da0d82c522ff874ddd9e6b67c2bf72a77 DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3 -EBUILD packagekit-base-0.6.22.ebuild 5125 SHA256 be4c58d12669e6577d266d0d0aa67041d0b5c850145c618ce8cd5457fd61f948 SHA512 ed62e334ee6a27868e004a286b7cda95d576188dfc9ecf71bea622cbbca460149701594ac4929ff7111a8a60bf4f31c8fd0ca3c09826f202242073d202d0bae7 WHIRLPOOL 6943acb2988f3163168780832d22da6f363c0ed5ca874c3416cf09b26d2d91daf7c98dbd66313d8f07bf7a2695085125a48033f93d2726cd03017c558e6a7234 +EBUILD packagekit-base-0.6.22.ebuild 5369 SHA256 665cf624887c31270ff48e92abfd8939f604ad4d6f44d434764904c45161d776 SHA512 db751e9a92f938f8c11ccf618625a7dd7e4114e6cf032ef8b630c2e9b6379d8a28c58819b3606d1ceba10da4d0f8f6ea00bd224178a0f4ee4c43a71f7f6ee592 WHIRLPOOL d50c8e1434980766eb28fc47bda95abef176cf12936d8d15411932b70b52841664b74f4b4123508b902863006a26af3e0351031faaa98fa6392ceb74847d067f EBUILD packagekit-base-0.7.4.ebuild 5528 SHA256 df127dc0869ef209c63ce3af62bde1cea7af7160fdee9d413be8dc9cdbfab58e SHA512 2168a26bc469a8447143a175dae161e830b65eff11b65b976f5420e4f3a73e9833c6e1ee46d3a629c6fa2722f95e9a9841f4db95780989e39082e99d7a84e370 WHIRLPOOL 3420e9ea266b2987b6bc148dfaad9abfea7e5946cead3c23a0e30f62c7ac7c393e4933b67d663e09e3bb93b5fc6b2904b870ad2d42f40293c3ed31375c1e70f9 -MISC ChangeLog 4775 SHA256 61870a1f086c74c02c9d817e12942592ad676e62bf8d1f7998349182821e3691 SHA512 c24cbf964ee3149e49a613afba91ff83f11fb29fc8345516e9348119be436d994c4751eabfd8728fbe26799dad6e6040a0fb568c3e1ba721dfda92cdeed732d1 WHIRLPOOL fecb0344311b3048a40b9845c5bf389591dcfbe0d45618b1595c31facecd7939aecaf50847a39895db2ad2bcb110d37d88da75c99444ea50f80c586d74a818de +MISC ChangeLog 4929 SHA256 b9ad19b19adbaa8bb91bd3003a10d712707f2c7f77dadc0a34a5721c1045eb46 SHA512 d2bb84aae76cd30cfc04d16fb137094062768db7bab55c52fd1312651a0a18ff40111eebb76d0253544bac6f8a3b531b1902c9a78c8f9f675b9a348ef74bcd60 WHIRLPOOL 07017b396c3b364a5bdd555aed6ff9accd21fadc4f59ae77f4ddffb7e4e1a8a02f17d6f81669694ad6eefae2c9ce262fc9df1e0583f969630efd5bfe73d95526 MISC metadata.xml 639 SHA256 f37178ff7b755a3ce7a17d8cef4edaafd4a535e61b40c503ddfb801b67ed840e SHA512 b25dcab4c1c43ec9bd0fb996b77a0e594469f928a471ccda29188f23ac3758db756d1f0e6fc81221f41579e063c180b5eb108790fa457817d414cdb39d89c9a3 WHIRLPOOL 1cf89e87686d588a2b708dc634536445771b7945443e6064e0e4f1834cac9b82f9c640ed349d189af931efcb8ec3faef2780af5bad44c49722ef09917cdec334 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 \ |