[arch-commits] Commit in opera/trunk (PKGBUILD)

[Ike Devolder]

    Date: Thursday, March 24, 2022 @ 13:25:04
  Author: idevolder
Revision: 1174704

upgpkg: opera 85.0.4341.18-1

Modified:
  opera/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-24 13:23:43 UTC (rev 1174703)
+++ PKGBUILD	2022-03-24 13:25:04 UTC (rev 1174704)
@@ -9,7 +9,7 @@
 # Contributor: eworm
 
 pkgname=opera
-pkgver=84.0.4316.42
+pkgver=85.0.4341.18
 pkgrel=1
 pkgdesc="A fast and secure web browser"
 url="https://www.opera.com/"
@@ -23,7 +23,7 @@
     'upower: opera battery save'
 )
 source=(
-    "https://get.geo.opera.com/pub/${pkgname}/desktop/${pkgver}/linux/${pkgname}-stable_${pkgver}_amd64.rpm"
+    "https://get.geo.opera.com/pub/${pkgname}/desktop/${pkgver}/linux/${pkgname}-stable_${pkgver}_amd64.deb"
     "opera"
     "default"
     'eula.html'
@@ -30,7 +30,7 @@
     'terms.html'
     'privacy.html'
 )
-sha512sums=('3cee8492dbbe7a88d2dc63db133ad2ea78458fdf3c6c2b1d45c12e91bfe43f1c53c06357473e7d15c0e7778ad31afb524d431f547fcbc3b9144cd2bd88ff91ee'
+sha512sums=('b116d499e5d3c3db7efb156769252bdb8c5f4c63e63614b1e14f4960519ec6ef9deba938cf792a6e69452195368bda79348aacee51a8c67301087f1872005586'
             '7e854e4c972785b8941f60117fbe4b88baeb8d7ca845ef2e10e8064043411da73821ba1ab0068df61e902f242a3ce355b51ffa9eab5397ff3ae3b5defd1be496'
             'ddb1773877fcfd7d9674e63263a80f9dd5a3ba414cda4cc6c411c88d49c1d5175eede66d9362558ddd53c928c723101e4e110479ae88b8aec4d2366ec179297f'
             'aaaa4435a3b6a08bf8e6ad4802afcbf111c1e8f477054251f031b70ae57ac1234fa19048121d64c878dc3b1de03522ce7ef11a263a86dc7062f643d569ecff82'
@@ -45,10 +45,15 @@
 }
 
 package() {
-    install -dm755 "$pkgdir/usr"
-    cp -a usr/share "$pkgdir/usr/"
-    cp -a usr/lib64 "$pkgdir/usr/lib"
+    tar -xf data.tar.xz --exclude=usr/share/{lintian,menu} -C "$pkgdir/"
 
+    # get rid of the extra subfolder {i386,x86_64}-linux-gnu
+    (
+        cd "$pkgdir/usr/lib/"*-linux-gnu/
+        mv "$pkgname" ../
+    )
+    rm -rf "$pkgdir/usr/lib/"*-linux-gnu
+
     # suid opera_sandbox
     chmod 4755 "$pkgdir/usr/lib/$pkgname/opera_sandbox"
 
@@ -56,13 +61,13 @@
     install -Dm644 "$srcdir/default" "$pkgdir/etc/$pkgname/default"
 
     # install opera wrapper
-    #rm "$pkgdir/usr/bin/$pkgname"
+    rm "$pkgdir/usr/bin/$pkgname"
     install -Dm755 "$srcdir/opera" "$pkgdir/usr/bin/$pkgname"
 
     # license
-    #install -Dm644 \
-        #"$pkgdir/usr/share/doc/${pkgname}-stable/copyright" \
-        #"$pkgdir/usr/share/licenses/$pkgname/copyright"
+    install -Dm644 \
+        "$pkgdir/usr/share/doc/${pkgname}-stable/copyright" \
+        "$pkgdir/usr/share/licenses/$pkgname/copyright"
 
     # eula
     install -Dm644 \