From 74e14a7d0ae4a365d08bdcc31bff99092dc068a6 Mon Sep 17 00:00:00 2001
From: Nowa Ammerlaan <nowa@gentoo.org>
Date: Wed, 3 Dec 2025 17:55:32 +0100
Subject: [PATCH] media-video/popcorntime-bin: update src_uri and unbundle nwjs

The checksum at the new url is different, but the difference is only
in libatomic.so, which we never installed in the first place.

While digging into this I decided to unbundle nwjs completely which
cleans this up a lot and makes it possible to potentially push the
version of nwjs up. I tried version 100 but this did not work for
me, so pinning to the version that is bundled upstream for the time
being.

Closes: https://bugs.gentoo.org/963350
Closes: https://bugs.gentoo.org/927409
Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>
---
 media-video/popcorntime-bin/Manifest          |  2 +-
 ...ebuild => popcorntime-bin-0.5.1-r2.ebuild} | 54 +++++++------------
 2 files changed, 20 insertions(+), 36 deletions(-)
 rename media-video/popcorntime-bin/{popcorntime-bin-0.5.1-r1.ebuild => popcorntime-bin-0.5.1-r2.ebuild} (59%)

diff --git a/media-video/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest
index d0adbee6aadd..28968d6e3ff5 100644
--- a/media-video/popcorntime-bin/Manifest
+++ b/media-video/popcorntime-bin/Manifest
@@ -2,4 +2,4 @@ DIST Popcorn-Time-0.4.9-amd64.deb 101129244 BLAKE2B a36d4ef4702ec9dd6b353ad0c0dd
 DIST Popcorn-Time-0.4.9-i386.deb 104225348 BLAKE2B d162f6afc7f57b2cc1ddf8d14a044cdb23a010b6949432418092b1ddfc778197298e61e3e1f0778ddf8becd57ecb72be78a55e39ef02bf6981c0d9e02844a08a SHA512 5513a0e6a7e49a54ce4bca2cd16e82c763cc16a7d92bf6661e18ee6eecceb3d61043c3e106136ad286c85921de86033371abcc602112a3781b1a9e12ce73c660
 DIST Popcorn-Time-0.5.0-amd64.deb 154055688 BLAKE2B e099038e6cd6f3a214209243c0ab3791b607b2c127ea92b8f1a024f64b0ad1fbea7d1f108619a64a40f4531b5b8e1f0cce3371abc30beadf1b4a4decedf7e3dd SHA512 b81ab4c9a2af1dde80b1fea883d481a64ab04babfc3faa5eec993a8f07ab09f0b6bab7c36292988de375cd70f3ce03f325cd833f083072f2aa900191ef0092bf
 DIST Popcorn-Time-0.5.0-i386.deb 159146908 BLAKE2B 2eebf6bd8c473b68dbd8019ae85155b85f249d9b2e5ec74d467606dc6b455b5e03413d6394d2b220eb70326a6b45bd25386a04fc8de546256b49af6b4774cdcd SHA512 6a45fe9c977fbadeb21133a67fb16fa0795b2e7d7af24e5a0e72c57963d11674de03fec89880d61cd7a2f218efc6db8666a1878e12628b346e4f5b6afc03bfa5
-DIST Popcorn-Time-0.5.1-amd64.deb 150323412 BLAKE2B 6c15e01ba8d9a1f6efac0b663b6112a52a5c5aa82b93e627bacad4e1c8e3c29b81898769dc16e58cc0adc6f4f1684c66063a2ded8b6236adebd8c5f3f0168f67 SHA512 ad6646b8f1e6f4ffa40ab4276fabb957a418c764442bca3a775df4af4a6621e9514ef22ceaf435025d8aa515e9bf7a8490f285faacc824c3f26ccf6e5dfe5f79
+DIST popcorntime-bin-0.5.1-r2-amd64.deb 150327218 BLAKE2B 230fa548d2f47fa774164704aef703f75bf543fb666ce73300bc1c56b1ee1b3133e229d02608c7584b72f81550c1bc480b8368128efdb38b77ee4061dac44224 SHA512 de2a3538da8e98d5d8ba3adc88355adec1c6c681a6bf82a46c678a38e1989d5754659e6f9f9dab9c197ec507d0c90b6b60ca3a068f861abb0cbbbf7020f68a97
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.5.1-r1.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.5.1-r2.ebuild
similarity index 59%
rename from media-video/popcorntime-bin/popcorntime-bin-0.5.1-r1.ebuild
rename to media-video/popcorntime-bin/popcorntime-bin-0.5.1-r2.ebuild
index e8fb9e1cdf91..4e7189f8db6f 100644
--- a/media-video/popcorntime-bin/popcorntime-bin-0.5.1-r1.ebuild
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,11 +12,10 @@ CHROMIUM_LANGS="
 inherit chromium-2 desktop unpacker xdg
 
 DESCRIPTION="BitTorrent client that includes an integrated media player"
-HOMEPAGE="https://github.com/popcorn-official/popcorn-desktop"
-SRC_URI="https://github.com/popcorn-official/popcorn-desktop/releases/download/v${PV}/Popcorn-Time-${PV}-amd64.deb"
+HOMEPAGE="https://github.com/popcorn-time-ru/popcorn-desktop"
+SRC_URI="https://github.com/popcorn-time-ru/popcorn-desktop/releases/download/v${PV}/Popcorn-Time-${PV}-amd64.deb -> ${PF}-amd64.deb"
 S="${WORKDIR}"
 
-# Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
 	unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
@@ -26,31 +25,7 @@ KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror"
 
 RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
+	~dev-libs/nwjs-0.86.0
 "
 
 QA_PREBUILT="opt/Popcorn-Time/*"
@@ -82,17 +57,26 @@ src_install() {
 	local DESTDIR="/opt/Popcorn-Time"
 	pushd "opt/Popcorn-Time" || die
 
-	exeinto "${DESTDIR}/lib"
-	doexe lib/*.so
+	nwjs_files=(
+		chrome_crashpad_handler
+		icudtl.dat
+		lib
+		nw
+		nw_100_percent.pak
+		nw_200_percent.pak
+		resources.pak
+		v8_context_snapshot.bin
+	)
 
-	insinto "${DESTDIR}/lib"
-	doins *.json
+	for file in ${nwjs_files[@]}; do
+		dosym ."./nwjs/${file}" "${DESTDIR}/${file}"
+	done
 
 	exeinto "${DESTDIR}"
-	doexe Popcorn-Time nwjc minidump_stackwalk chromedriver chrome_crashpad_handler
+	doexe Popcorn-Time nwjc minidump_stackwalk chromedriver
 
 	insinto "${DESTDIR}"
-	doins *.pak *.bin *.json *.dat
+	doins package.json git.json
 	insopts -m0755
 	doins -r locales src node_modules