From 07e3eaad3352d0735567ea12b5271ac0d7b5cfd9 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 25 Aug 2018 09:58:44 +0000 Subject: [PATCH] opera: fix bogus dependency on rpi-userland reverts 84a1df20218d9c5d8135d15adee8390da0b6ac37 as it doesn't work as intended. This is an old issue initially fixed in 7cece6a8dd3d0b079f1aa4f9e0e8130a8fa0a706. The fix got removed for unknown reasons in fc294a11bfafcc162b13e22b63a18a036f548640. --- common/shlibs | 1 + srcpkgs/opera/template | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 36a6f0e5d85..57200679c8c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -124,6 +124,7 @@ libGLESv1_CM.so.1 libGLES-1.0_1 libGLESv2.so.2 libGLES-1.0_1 libEGL.so rpi-userland-0.0.0.0.20150907_1 libGLESv2.so rpi-userland-0.0.0.0.20150907_1 +libGLESv2.so opera-55.0.2994.37_2 libbrcmEGL.so rpi-userland-20180103_2 libbrcmGLESv2.so rpi-userland-20180103_2 libbrcmOpenVG.so rpi-userland-20180103_2 diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 639ecf31bfa..bdc4bc0ce29 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,11 +1,11 @@ # Template file for 'opera' pkgname=opera version=55.0.2994.37 -revision=1 +revision=2 only_for_archs="x86_64" repository="nonfree" nostrip=yes -depends="ffmpeg desktop-file-utils hicolor-icon-theme libGLES" +depends="ffmpeg desktop-file-utils hicolor-icon-theme" short_desc="Fast, secure, easy to use browser" maintainer="Diogo Leal " license="Proprietary" @@ -13,10 +13,6 @@ homepage="https://www.opera.com/computer" distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" checksum=780ff37fbbf5adc4b2c683bfab5c9a087e3373ea12e1a21fb9c748a185a5f9d0 -# This soname is wrong and is only available on rpi-userland, the correct one is -# libGLESv2.so.2, skip checking this and add libGLES explicitly to depends= -skiprdeps="/usr/lib/opera/libGLESv2.so" - do_extract() { ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}_amd64.deb tar xf data.tar.xz --exclude=./usr/share/{lintian,menu}