[-- Attachment #1: Type: text/plain, Size: 1232 bytes --] There is a new pull request by mobinmob against master on the void-packages repository https://github.com/mobinmob/void-packages stremio-shell https://github.com/void-linux/void-packages/pull/34123 stremio-shell: fix server start, adopt. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/34123.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-stremio-shell-34123.patch --] [-- Type: text/x-diff, Size: 2679 bytes --] From 4775cde2f0504f49cafa063bae03946245719a55 Mon Sep 17 00:00:00 2001 From: mobinmob <mobinmob@disroot.org> Date: Wed, 17 Nov 2021 23:24:18 +0200 Subject: [PATCH] stremio-shell: fix server start, adopt. --- srcpkgs/stremio-shell/template | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template index 3d29d1da3303..b6577aedc590 100644 --- a/srcpkgs/stremio-shell/template +++ b/srcpkgs/stremio-shell/template @@ -1,7 +1,7 @@ # Template file for 'stremio-shell' pkgname=stremio-shell version=4.4.142 -revision=2 +revision=3 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef build_style=qmake @@ -12,7 +12,7 @@ makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime qt5-webengine" short_desc="Hub for video content aggregation" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="mobinmob <mobinmob@disroot.org>" license="GPL-3.0-or-later" homepage="https://www.stremio.com" distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz @@ -35,21 +35,27 @@ post_extract() { } post_install() { + # Fix the bizarre locations vmkdir usr/lib/stremio - mv "${DESTDIR}"/usr/opt/stremio/stremio ${DESTDIR}/usr/lib/stremio + mv "${DESTDIR}/usr/opt/stremio/stremio" "${DESTDIR}/usr/lib/stremio" + # Copy .desktop file vmkdir usr/share/applications - mv "${DESTDIR}"/usr/opt/stremio/smartcode-stremio.desktop ${DESTDIR}/usr/share/applications + mv "${DESTDIR}/usr/opt/stremio/smartcode-stremio.desktop" "${DESTDIR}/usr/share/applications" + + # Link executable in PATH + vmkdir usr/bin + ln -s /usr/lib/stremio/stremio "${DESTDIR}/usr/bin/stremio" - echo "#!/bin/sh" > stremio - echo "cd /usr/lib/stremio && exec ./stremio" >> stremio - vbin stremio + # Symlink node in the instalation directory + ln -s /usr/bin/node "${DESTDIR}/usr/lib/stremio/node" - echo "#!/bin/sh" > stremio-server - echo "cd /usr/lib/stremio && exec node server.js" >> stremio-server - vbin stremio-server + # Install icon + vmkdir usr/share/icons + cp "${wrksrc}/images/stremio_window.png" "${DESTDIR}/usr/share/icons/smartcode-stremio.png" - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js ${DESTDIR}/usr/lib/stremio - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar ${DESTDIR}/usr/lib/stremio + # Copy server + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js" "${DESTDIR}/usr/lib/stremio" + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar" "${DESTDIR}/usr/lib/stremio" }
[-- Attachment #1: Type: text/plain, Size: 186 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/34123#discussion_r753684840 Comment: Please don't add misleading comments.
[-- Attachment #1: Type: text/plain, Size: 194 bytes --] New review comment by mobinmob on void-packages repository https://github.com/void-linux/void-packages/pull/34123#discussion_r753685426 Comment: I will make it less misleading - move. Thanks.
[-- Attachment #1: Type: text/plain, Size: 1237 bytes --] There is an updated pull request by mobinmob against master on the void-packages repository https://github.com/mobinmob/void-packages stremio-shell https://github.com/void-linux/void-packages/pull/34123 stremio-shell: fix server start, adopt. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/34123.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-stremio-shell-34123.patch --] [-- Type: text/x-diff, Size: 2698 bytes --] From 9dd9cacb85139420308b2547da236357f4a84247 Mon Sep 17 00:00:00 2001 From: mobinmob <mobinmob@disroot.org> Date: Wed, 17 Nov 2021 23:24:18 +0200 Subject: [PATCH] stremio-shell: fix server start, adopt. --- srcpkgs/stremio-shell/template | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template index 3d29d1da3303..5e74be56b18e 100644 --- a/srcpkgs/stremio-shell/template +++ b/srcpkgs/stremio-shell/template @@ -1,7 +1,7 @@ # Template file for 'stremio-shell' pkgname=stremio-shell version=4.4.142 -revision=2 +revision=3 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef build_style=qmake @@ -12,7 +12,7 @@ makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime qt5-webengine" short_desc="Hub for video content aggregation" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="mobinmob <mobinmob@disroot.org>" license="GPL-3.0-or-later" homepage="https://www.stremio.com" distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz @@ -35,21 +35,27 @@ post_extract() { } post_install() { + # Fix the bizarre locations vmkdir usr/lib/stremio - mv "${DESTDIR}"/usr/opt/stremio/stremio ${DESTDIR}/usr/lib/stremio + mv "${DESTDIR}/usr/opt/stremio/stremio" "${DESTDIR}/usr/lib/stremio" + # Move .desktop file to proper location vmkdir usr/share/applications - mv "${DESTDIR}"/usr/opt/stremio/smartcode-stremio.desktop ${DESTDIR}/usr/share/applications + mv "${DESTDIR}/usr/opt/stremio/smartcode-stremio.desktop" "${DESTDIR}/usr/share/applications" + + # Link executable in PATH + vmkdir usr/bin + ln -s /usr/lib/stremio/stremio "${DESTDIR}/usr/bin/stremio" - echo "#!/bin/sh" > stremio - echo "cd /usr/lib/stremio && exec ./stremio" >> stremio - vbin stremio + # Symlink node in the instalation directory + ln -s /usr/bin/node "${DESTDIR}/usr/lib/stremio/node" - echo "#!/bin/sh" > stremio-server - echo "cd /usr/lib/stremio && exec node server.js" >> stremio-server - vbin stremio-server + # Install icon + vmkdir usr/share/icons + cp "${wrksrc}/images/stremio_window.png" "${DESTDIR}/usr/share/icons/smartcode-stremio.png" - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js ${DESTDIR}/usr/lib/stremio - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar ${DESTDIR}/usr/lib/stremio + # Copy server + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js" "${DESTDIR}/usr/lib/stremio" + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar" "${DESTDIR}/usr/lib/stremio" }
[-- Attachment #1: Type: text/plain, Size: 173 bytes --] New comment by thkormas on void-packages repository https://github.com/void-linux/void-packages/pull/34123#issuecomment-975882936 Comment: thanks man its working perfect
[-- Attachment #1: Type: text/plain, Size: 208 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/34123#issuecomment-985964392 Comment: `stremio-server` is now missing from `/usr/bin`, was that expected?
[-- Attachment #1: Type: text/plain, Size: 220 bytes --] New comment by mobinmob on void-packages repository https://github.com/void-linux/void-packages/pull/34123#issuecomment-985976717 Comment: > `stremio-server` is now missing from `/usr/bin`, was that expected? Yes.
[-- Attachment #1: Type: text/plain, Size: 239 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/34123#issuecomment-986043253 Comment: Please explain that in tbe commit message,then. It's not clear what the PR is doing to fix things.
[-- Attachment #1: Type: text/plain, Size: 1049 bytes --] New comment by mobinmob on void-packages repository https://github.com/void-linux/void-packages/pull/34123#issuecomment-991218049 Comment: > Please explain that in tbe commit message,then. It's not clear what the PR is doing to fix things. The stremio-server needs to be autostarted by the stremio binary. In order for that to happen the node binary or a symlink to the node binary has to be in the same directory as the stremio-server script. That is the main change in the commit. The previous situation was... awkward: There was a seperate stremio-server script that the user should start manually in addition to the stremio binary. When started in that way, stremio will always produce a rather vague error, but will work after that. The template not also symlinks the stremio binary to path instead of creating another shell script that will execute the binary. There was also a problem with the icon, as it was not installed in the proper location. That means that ts was missing when the icon theme did not provide a stremio icon.
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --] New comment by mobinmob on void-packages repository https://github.com/void-linux/void-packages/pull/34123#issuecomment-991218049 Comment: > Please explain that in tbe commit message,then. It's not clear what the PR is doing to fix things. The stremio-server needs to be autostarted by the stremio binary. In order for that to happen the node binary or a symlink to the node binary has to be in the same directory as the server.js script. That is the main change in the commit. The previous situation was... awkward: There was a seperate stremio-server script that the user should start manually in addition to the stremio binary. When started in that way, stremio will always produce a rather vague error, but will work after that. The template not also symlinks the stremio binary to path instead of creating another shell script that will execute the binary. There was also a problem with the icon, as it was not installed in the proper location. That means that ts was missing when the icon theme did not provide a stremio icon.
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --] New comment by mobinmob on void-packages repository https://github.com/void-linux/void-packages/pull/34123#issuecomment-991218049 Comment: > Please explain that in tbe commit message,then. It's not clear what the PR is doing to fix things. The stremio-server needs to be autostarted by the stremio binary. In order for that to happen the node binary or a symlink to the node binary has to be in the same directory as the server.js script. That is the main change in the commit. The previous situation was... awkward: There was a seperate stremio-server script that the user should start manually in addition to the stremio binary. When started in that way, stremio will always produce a rather vague error, but will work after that. The template not also symlinks the stremio binary to path instead of creating another shell script that will execute the binary. There was also a problem with the icon, as it was not installed in the proper location. That means that it was missing when the icon theme did not provide a stremio icon.
[-- Attachment #1: Type: text/plain, Size: 1237 bytes --] There is an updated pull request by mobinmob against master on the void-packages repository https://github.com/mobinmob/void-packages stremio-shell https://github.com/void-linux/void-packages/pull/34123 stremio-shell: fix server start, adopt. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/34123.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-stremio-shell-34123.patch --] [-- Type: text/x-diff, Size: 2920 bytes --] From 5c181a79afdda4ef798e77469e620dc22ee7491e Mon Sep 17 00:00:00 2001 From: mobinmob <mobinmob@disroot.org> Date: Wed, 17 Nov 2021 23:24:18 +0200 Subject: [PATCH] stremio-shell: fix server start, adopt. - autostart server.js using a node symlink ands remove the stremio-server script - install an icon to the proper location (fixes missing icon in most icon themes) - replace the stremio script with a symlink to the binary. --- srcpkgs/stremio-shell/template | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template index 3d29d1da3303..5e74be56b18e 100644 --- a/srcpkgs/stremio-shell/template +++ b/srcpkgs/stremio-shell/template @@ -1,7 +1,7 @@ # Template file for 'stremio-shell' pkgname=stremio-shell version=4.4.142 -revision=2 +revision=3 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef build_style=qmake @@ -12,7 +12,7 @@ makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime qt5-webengine" short_desc="Hub for video content aggregation" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="mobinmob <mobinmob@disroot.org>" license="GPL-3.0-or-later" homepage="https://www.stremio.com" distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz @@ -35,21 +35,27 @@ post_extract() { } post_install() { + # Fix the bizarre locations vmkdir usr/lib/stremio - mv "${DESTDIR}"/usr/opt/stremio/stremio ${DESTDIR}/usr/lib/stremio + mv "${DESTDIR}/usr/opt/stremio/stremio" "${DESTDIR}/usr/lib/stremio" + # Move .desktop file to proper location vmkdir usr/share/applications - mv "${DESTDIR}"/usr/opt/stremio/smartcode-stremio.desktop ${DESTDIR}/usr/share/applications + mv "${DESTDIR}/usr/opt/stremio/smartcode-stremio.desktop" "${DESTDIR}/usr/share/applications" + + # Link executable in PATH + vmkdir usr/bin + ln -s /usr/lib/stremio/stremio "${DESTDIR}/usr/bin/stremio" - echo "#!/bin/sh" > stremio - echo "cd /usr/lib/stremio && exec ./stremio" >> stremio - vbin stremio + # Symlink node in the instalation directory + ln -s /usr/bin/node "${DESTDIR}/usr/lib/stremio/node" - echo "#!/bin/sh" > stremio-server - echo "cd /usr/lib/stremio && exec node server.js" >> stremio-server - vbin stremio-server + # Install icon + vmkdir usr/share/icons + cp "${wrksrc}/images/stremio_window.png" "${DESTDIR}/usr/share/icons/smartcode-stremio.png" - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js ${DESTDIR}/usr/lib/stremio - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar ${DESTDIR}/usr/lib/stremio + # Copy server + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js" "${DESTDIR}/usr/lib/stremio" + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar" "${DESTDIR}/usr/lib/stremio" }
[-- Attachment #1: Type: text/plain, Size: 1237 bytes --] There is an updated pull request by mobinmob against master on the void-packages repository https://github.com/mobinmob/void-packages stremio-shell https://github.com/void-linux/void-packages/pull/34123 stremio-shell: fix server start, adopt. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/34123.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-stremio-shell-34123.patch --] [-- Type: text/x-diff, Size: 2919 bytes --] From 0e5c3ddf6a2d510c8a3c3e1445b8affafee96ae2 Mon Sep 17 00:00:00 2001 From: mobinmob <mobinmob@disroot.org> Date: Wed, 17 Nov 2021 23:24:18 +0200 Subject: [PATCH] stremio-shell: fix server start, adopt. - autostart server.js using a node symlink and remove the stremio-server script - install an icon to the proper location (fixes missing icon in most icon themes) - replace the stremio script with a symlink to the binary. --- srcpkgs/stremio-shell/template | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template index 3d29d1da3303..5e74be56b18e 100644 --- a/srcpkgs/stremio-shell/template +++ b/srcpkgs/stremio-shell/template @@ -1,7 +1,7 @@ # Template file for 'stremio-shell' pkgname=stremio-shell version=4.4.142 -revision=2 +revision=3 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef build_style=qmake @@ -12,7 +12,7 @@ makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime qt5-webengine" short_desc="Hub for video content aggregation" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="mobinmob <mobinmob@disroot.org>" license="GPL-3.0-or-later" homepage="https://www.stremio.com" distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz @@ -35,21 +35,27 @@ post_extract() { } post_install() { + # Fix the bizarre locations vmkdir usr/lib/stremio - mv "${DESTDIR}"/usr/opt/stremio/stremio ${DESTDIR}/usr/lib/stremio + mv "${DESTDIR}/usr/opt/stremio/stremio" "${DESTDIR}/usr/lib/stremio" + # Move .desktop file to proper location vmkdir usr/share/applications - mv "${DESTDIR}"/usr/opt/stremio/smartcode-stremio.desktop ${DESTDIR}/usr/share/applications + mv "${DESTDIR}/usr/opt/stremio/smartcode-stremio.desktop" "${DESTDIR}/usr/share/applications" + + # Link executable in PATH + vmkdir usr/bin + ln -s /usr/lib/stremio/stremio "${DESTDIR}/usr/bin/stremio" - echo "#!/bin/sh" > stremio - echo "cd /usr/lib/stremio && exec ./stremio" >> stremio - vbin stremio + # Symlink node in the instalation directory + ln -s /usr/bin/node "${DESTDIR}/usr/lib/stremio/node" - echo "#!/bin/sh" > stremio-server - echo "cd /usr/lib/stremio && exec node server.js" >> stremio-server - vbin stremio-server + # Install icon + vmkdir usr/share/icons + cp "${wrksrc}/images/stremio_window.png" "${DESTDIR}/usr/share/icons/smartcode-stremio.png" - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js ${DESTDIR}/usr/lib/stremio - cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar ${DESTDIR}/usr/lib/stremio + # Copy server + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js" "${DESTDIR}/usr/lib/stremio" + cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar" "${DESTDIR}/usr/lib/stremio" }
[-- Attachment #1: Type: text/plain, Size: 1073 bytes --] There's a merged pull request on the void-packages repository stremio-shell: fix server start, adopt. https://github.com/void-linux/void-packages/pull/34123 Description: <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->