Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] make sublime-text3 restricted
@ 2022-02-28 23:56 classabbyamp
  2022-02-28 23:57 ` [PR REVIEW] " classabbyamp
                   ` (21 more replies)
  0 siblings, 22 replies; 23+ messages in thread
From: classabbyamp @ 2022-02-28 23:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sublime-text3-restricted
https://github.com/void-linux/void-packages/pull/35896

make sublime-text3 restricted
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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/35896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-text3-restricted-35896.patch --]
[-- Type: text/x-diff, Size: 5146 bytes --]

From 15c13670adfc0e38a9f7dbfc4fa17357b5ada068 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 28 Feb 2022 18:48:24 -0500
Subject: [PATCH 1/2] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 +++++--------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..345a5ecd8461 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,13 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
 
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
-repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
-
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From b547aab3c42a7177682c507f2318f86da386634d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 28 Feb 2022 18:49:55 -0500
Subject: [PATCH 2/2] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..0af32c71d127
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-merge>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
@ 2022-02-28 23:57 ` classabbyamp
  2022-03-01  0:00 ` classabbyamp
                   ` (20 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-02-28 23:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#discussion_r816343629

Comment:
not quite sure how the version/revision should be done here and on the metapackage. open for advice.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
  2022-02-28 23:57 ` [PR REVIEW] " classabbyamp
@ 2022-03-01  0:00 ` classabbyamp
  2022-03-05 23:03 ` [PR PATCH] [Updated] " classabbyamp
                   ` (19 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-01  0:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#discussion_r816344939

Comment:
this didn't work in my testing, but it's how `sublime-merge{,-bin}` did it. what's the proper way?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
  2022-02-28 23:57 ` [PR REVIEW] " classabbyamp
  2022-03-01  0:00 ` classabbyamp
@ 2022-03-05 23:03 ` classabbyamp
  2022-03-06  3:13 ` classabbyamp
                   ` (18 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-05 23:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sublime-text3-restricted
https://github.com/void-linux/void-packages/pull/35896

make sublime-text3 restricted
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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/35896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-text3-restricted-35896.patch --]
[-- Type: text/x-diff, Size: 5146 bytes --]

From cd53e8085dd01a27719ba359d340269dd3eac991 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 28 Feb 2022 18:48:24 -0500
Subject: [PATCH 1/2] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 +++++--------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..345a5ecd8461 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,13 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
 
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
-repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
-
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From 4f78a71725de57730930c5e8a269d9240e1c32f1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 28 Feb 2022 18:49:55 -0500
Subject: [PATCH 2/2] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..0af32c71d127
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-merge>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (2 preceding siblings ...)
  2022-03-05 23:03 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-06  3:13 ` classabbyamp
  2022-03-06 13:31 ` paper42
                   ` (17 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06  3:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sublime-text3-restricted
https://github.com/void-linux/void-packages/pull/35896

make sublime-text3 restricted
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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/35896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-text3-restricted-35896.patch --]
[-- Type: text/x-diff, Size: 5146 bytes --]

From 9bfeddbcbf9be555af2c85250a8b62d0cb01a0ea Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 28 Feb 2022 18:48:24 -0500
Subject: [PATCH 1/2] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 +++++--------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..345a5ecd8461 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,13 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
 
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
-repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
-
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From 3d300b12629634f5b5e3314f1846217ffeae1ecf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 28 Feb 2022 18:49:55 -0500
Subject: [PATCH 2/2] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..0af32c71d127
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-merge>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (3 preceding siblings ...)
  2022-03-06  3:13 ` classabbyamp
@ 2022-03-06 13:31 ` paper42
  2022-03-06 15:17 ` [PR PATCH] [Updated] " classabbyamp
                   ` (16 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-03-06 13:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1059963424

Comment:
I would just mark sublime-text3 as restricted. This way it will be the same as `sublime-text4`.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (4 preceding siblings ...)
  2022-03-06 13:31 ` paper42
@ 2022-03-06 15:17 ` classabbyamp
  2022-03-06 15:17 ` classabbyamp
                   ` (15 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06 15:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sublime-text3-restricted
https://github.com/void-linux/void-packages/pull/35896

make sublime-text3 restricted
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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/35896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-text3-restricted-35896.patch --]
[-- Type: text/x-diff, Size: 1883 bytes --]

From 4aca6e00a79556aced6b35346ccbeeae6c26189f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 6 Mar 2022 10:16:42 -0500
Subject: [PATCH] sublime-text3: make restricted

---
 srcpkgs/sublime-text3/template | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..a1565fcea98b 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -2,11 +2,18 @@
 pkgname=sublime-text3
 version=3211
 revision=2
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
 depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
 short_desc="Sophisticated text editor for code, markup and prose"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA"
 homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
@@ -16,12 +23,23 @@ else
 	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
 fi
 
-repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
 
 do_install() {
+	vlicense EULA
+	rm eula EULA
 	vmkdir "usr/bin"
 	vmkdir "usr/lib/sublime_text"
 	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (5 preceding siblings ...)
  2022-03-06 15:17 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-06 15:17 ` classabbyamp
  2022-03-06 15:22 ` classabbyamp
                   ` (14 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06 15:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1059981541

Comment:
adjusted

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (6 preceding siblings ...)
  2022-03-06 15:17 ` classabbyamp
@ 2022-03-06 15:22 ` classabbyamp
  2022-03-06 15:22 ` classabbyamp
                   ` (13 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06 15:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1059981541

Comment:
adjusted

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (7 preceding siblings ...)
  2022-03-06 15:22 ` classabbyamp
@ 2022-03-06 15:22 ` classabbyamp
  2022-03-06 16:31 ` paper42
                   ` (12 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06 15:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1059982365

Comment:
should it be revbumped?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (8 preceding siblings ...)
  2022-03-06 15:22 ` classabbyamp
@ 2022-03-06 16:31 ` paper42
  2022-03-06 16:32 ` [PR REVIEW] " paper42
                   ` (11 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-03-06 16:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1059994334

Comment:
> should it be revbumped?

yes

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (9 preceding siblings ...)
  2022-03-06 16:31 ` paper42
@ 2022-03-06 16:32 ` paper42
  2022-03-06 16:46 ` classabbyamp
                   ` (10 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-03-06 16:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#discussion_r820257129

Comment:
Why is this necessary?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (10 preceding siblings ...)
  2022-03-06 16:32 ` [PR REVIEW] " paper42
@ 2022-03-06 16:46 ` classabbyamp
  2022-03-06 16:47 ` classabbyamp
                   ` (9 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06 16:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#discussion_r820258913

Comment:
a couple lines down it runs `cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text", which catches `eula` (the unprocessed HTML) and `EULA` (the text-only EULA) and puts them in the wrong place

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (11 preceding siblings ...)
  2022-03-06 16:46 ` classabbyamp
@ 2022-03-06 16:47 ` classabbyamp
  2022-03-06 16:49 ` [PR PATCH] [Updated] " classabbyamp
                   ` (8 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06 16:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#discussion_r820258913

Comment:
a couple lines down it runs `cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"`, which catches `eula` (the unprocessed HTML) and `EULA` (the text-only EULA) and puts them in the wrong place

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (12 preceding siblings ...)
  2022-03-06 16:47 ` classabbyamp
@ 2022-03-06 16:49 ` classabbyamp
  2022-03-08 19:35 ` [PR REVIEW] " Chocimier
                   ` (7 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-06 16:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sublime-text3-restricted
https://github.com/void-linux/void-packages/pull/35896

make sublime-text3 restricted
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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/35896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-text3-restricted-35896.patch --]
[-- Type: text/x-diff, Size: 1934 bytes --]

From 689c757690babe5da76b94a7a3a30a7b52cb5a20 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 6 Mar 2022 10:16:42 -0500
Subject: [PATCH] sublime-text3: make restricted

---
 srcpkgs/sublime-text3/template | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..56358a021fde 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,12 +1,19 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
+revision=3
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
 depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
 short_desc="Sophisticated text editor for code, markup and prose"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA"
 homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
@@ -16,12 +23,23 @@ else
 	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
 fi
 
-repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
 
 do_install() {
+	vlicense EULA
+	rm eula EULA
 	vmkdir "usr/bin"
 	vmkdir "usr/lib/sublime_text"
 	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (13 preceding siblings ...)
  2022-03-06 16:49 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-08 19:35 ` Chocimier
  2022-03-08 19:37 ` classabbyamp
                   ` (6 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Chocimier @ 2022-03-08 19:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#discussion_r822003715

Comment:
set `sublime-text3>0` and not `sublime-merge>0`

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (14 preceding siblings ...)
  2022-03-08 19:35 ` [PR REVIEW] " Chocimier
@ 2022-03-08 19:37 ` classabbyamp
  2022-03-08 19:39 ` Chocimier
                   ` (5 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-08 19:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#discussion_r822005267

Comment:
unneeded, I changed approach: https://github.com/void-linux/void-packages/pull/35896#issuecomment-1059963424

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (15 preceding siblings ...)
  2022-03-08 19:37 ` classabbyamp
@ 2022-03-08 19:39 ` Chocimier
  2022-03-14 19:11 ` [PR PATCH] [Updated] " classabbyamp
                   ` (4 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Chocimier @ 2022-03-08 19:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1062135011

Comment:
Sublime-merge was turned into empty package in order to remove from all the mirrors and from repodata, what anticipates "why can't fetch that" complaints.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (16 preceding siblings ...)
  2022-03-08 19:39 ` Chocimier
@ 2022-03-14 19:11 ` classabbyamp
  2022-03-14 19:21 ` Chocimier
                   ` (3 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-14 19:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sublime-text3-restricted
https://github.com/void-linux/void-packages/pull/35896

make sublime-text3 restricted
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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/35896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-text3-restricted-35896.patch --]
[-- Type: text/x-diff, Size: 5146 bytes --]

From 432317466c0aff7bc798d72acfd99d3a80f7133b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:10:03 -0400
Subject: [PATCH 1/2] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 +++++--------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..345a5ecd8461 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,13 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
 
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
-repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
-
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From 2a743c8cdfe6b1f737e24b38189bb2dfbc8af94d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:11:07 -0400
Subject: [PATCH 2/2] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..73d67ea9c631
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-text3>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (17 preceding siblings ...)
  2022-03-14 19:11 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-14 19:21 ` Chocimier
  2022-03-14 19:25 ` [PR PATCH] [Updated] " classabbyamp
                   ` (2 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Chocimier @ 2022-03-14 19:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1067198230

Comment:
`repository=nonfree` need to stay to remove previous pakcage from repo, `archs` can be kept too. Otherwise fine.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (18 preceding siblings ...)
  2022-03-14 19:21 ` Chocimier
@ 2022-03-14 19:25 ` classabbyamp
  2022-03-14 19:27 ` classabbyamp
  2022-03-15 20:31 ` [PR PATCH] [Merged]: " Chocimier
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-14 19:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sublime-text3-restricted
https://github.com/void-linux/void-packages/pull/35896

make sublime-text3 restricted
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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/35896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-text3-restricted-35896.patch --]
[-- Type: text/x-diff, Size: 5168 bytes --]

From 1fa550f28e7fd6a45311f4496e208d01125f5ac9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:24:34 -0400
Subject: [PATCH 1/2] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 ++++++-------------------------
 2 files changed, 10 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..c077963863d3 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,15 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+archs="i686 x86_64"
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
-
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
 repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
 
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From 8a793cd387b74e72ac6079cb68d17bfefb797d00 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:25:10 -0400
Subject: [PATCH 2/2] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..73d67ea9c631
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-text3>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (19 preceding siblings ...)
  2022-03-14 19:25 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-14 19:27 ` classabbyamp
  2022-03-15 20:31 ` [PR PATCH] [Merged]: " Chocimier
  21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2022-03-14 19:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35896#issuecomment-1067203097

Comment:
got it, should be all good now

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Merged]: make sublime-text3 restricted
  2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
                   ` (20 preceding siblings ...)
  2022-03-14 19:27 ` classabbyamp
@ 2022-03-15 20:31 ` Chocimier
  21 siblings, 0 replies; 23+ messages in thread
From: Chocimier @ 2022-03-15 20:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]

There's a merged pull request on the void-packages repository

make sublime-text3 restricted
https://github.com/void-linux/void-packages/pull/35896

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

from the [EULA](https://www.sublimehq.com/eula) 2b (emphasis mine):
> **You may not distribute** or sell license keys or **the SOFTWARE PRODUCT to third parties**. Licenses will be revoked if distributed or sold to third parties.

I followed the example of sublime-merge -> sublime-merge-bin

<!--
#### 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
-->


^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2022-03-15 20:31 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-28 23:56 [PR PATCH] make sublime-text3 restricted classabbyamp
2022-02-28 23:57 ` [PR REVIEW] " classabbyamp
2022-03-01  0:00 ` classabbyamp
2022-03-05 23:03 ` [PR PATCH] [Updated] " classabbyamp
2022-03-06  3:13 ` classabbyamp
2022-03-06 13:31 ` paper42
2022-03-06 15:17 ` [PR PATCH] [Updated] " classabbyamp
2022-03-06 15:17 ` classabbyamp
2022-03-06 15:22 ` classabbyamp
2022-03-06 15:22 ` classabbyamp
2022-03-06 16:31 ` paper42
2022-03-06 16:32 ` [PR REVIEW] " paper42
2022-03-06 16:46 ` classabbyamp
2022-03-06 16:47 ` classabbyamp
2022-03-06 16:49 ` [PR PATCH] [Updated] " classabbyamp
2022-03-08 19:35 ` [PR REVIEW] " Chocimier
2022-03-08 19:37 ` classabbyamp
2022-03-08 19:39 ` Chocimier
2022-03-14 19:11 ` [PR PATCH] [Updated] " classabbyamp
2022-03-14 19:21 ` Chocimier
2022-03-14 19:25 ` [PR PATCH] [Updated] " classabbyamp
2022-03-14 19:27 ` classabbyamp
2022-03-15 20:31 ` [PR PATCH] [Merged]: " Chocimier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).