From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] sublime suite: unrestrict
Date: Fri, 17 Jun 2022 05:39:31 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37593@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sublime-freedom
https://github.com/void-linux/void-packages/pull/37593
sublime suite: unrestrict
- sublime-merge-bin: unrestrict, merge template with sublime-merge
- sublime-text3-bin: unrestrict, merge template with sublime-text3
- sublime-text4: unrestrict
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Sublime's [EULA](https://www.sublimehq.com/eula) was updated recently to allow for redistribution of the Linux version (emphasis mine):
> 2.b. Distribution.
> You may not distribute or sell license keys or the SOFTWARE PRODUCT to third parties. **Only the Linux version of the SOFTWARE PRODUCT may be distributed to third parties.** Distribution or sale of the SOFTWARE PRODUCT to third parties outside of this exception will result in revocation of the license.
This means these packages no longer need to be restricted, however they are still nonfree, and will stay in that repo.
closes #37589
A patch file from https://github.com/void-linux/void-packages/pull/37593.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-freedom-37593.patch --]
[-- Type: text/x-diff, Size: 8547 bytes --]
From 7a8c9bcb27e4915af88ddb70d283f03e02003ed7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 16 Jun 2022 23:32:02 -0400
Subject: [PATCH 1/3] sublime-merge-bin: unrestrict, merge template with
sublime-merge
---
srcpkgs/sublime-merge | 1 +
srcpkgs/sublime-merge-bin/template | 10 +++++++---
srcpkgs/sublime-merge/INSTALL.msg | 4 ----
srcpkgs/sublime-merge/template | 13 -------------
4 files changed, 8 insertions(+), 20 deletions(-)
create mode 120000 srcpkgs/sublime-merge
delete mode 100644 srcpkgs/sublime-merge/INSTALL.msg
delete mode 100644 srcpkgs/sublime-merge/template
diff --git a/srcpkgs/sublime-merge b/srcpkgs/sublime-merge
new file mode 120000
index 000000000000..2b9e9361dba4
--- /dev/null
+++ b/srcpkgs/sublime-merge
@@ -0,0 +1 @@
+sublime-merge-bin
\ No newline at end of file
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index b2d4b79214cb..a7adf52e01db 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,7 +1,7 @@
# Template file for 'sublime-merge-bin'
pkgname=sublime-merge-bin
version=2074
-revision=1
+revision=2
archs="x86_64"
wrksrc=sublime_merge
hostmakedepends="w3m"
@@ -16,8 +16,6 @@ checksum=444a39f4ba62d1f9803a9d1725ae08967dd52b147991188ca73db37eacf5310b
_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24
nopie=yes
repository=nonfree
-restricted=yes
-replaces="sublime-merge>0"
post_extract() {
$XBPS_FETCH_CMD https://www.sublimehq.com/eula
@@ -44,3 +42,9 @@ do_install() {
ln -s /opt/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
vlicense EULA
}
+
+sublime-merge_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="sublime-merge-bin>=${version}_${revision}"
+}
diff --git a/srcpkgs/sublime-merge/INSTALL.msg b/srcpkgs/sublime-merge/INSTALL.msg
deleted file mode 100644
index baae44d2cb82..000000000000
--- a/srcpkgs/sublime-merge/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-sublime-merge is replaced with the restricted sublime-merge-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-merge/template b/srcpkgs/sublime-merge/template
deleted file mode 100644
index 896d05963434..000000000000
--- a/srcpkgs/sublime-merge/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'sublime-merge'
-pkgname=sublime-merge
-version=2032
-revision=1
-build_style=meta
-short_desc="Empty meta-package for sublime-merge"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="custom:EULA" #no vlicense check
-homepage="https://www.sublimemerge.com"
-
-do_install() {
- vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg" README.voidlinux
-}
From ba25dd2c5b1328313d889cc9269a20583a0b5f31 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 16 Jun 2022 23:33:22 -0400
Subject: [PATCH 2/3] sublime-text3-bin: unrestrict, merge template with
sublime-text3
---
srcpkgs/sublime-text3 | 1 +
srcpkgs/sublime-text3-bin/template | 30 +++++++++++++++++++-----------
srcpkgs/sublime-text3/INSTALL.msg | 4 ----
srcpkgs/sublime-text3/template | 15 ---------------
4 files changed, 20 insertions(+), 30 deletions(-)
create mode 120000 srcpkgs/sublime-text3
delete mode 100644 srcpkgs/sublime-text3/INSTALL.msg
delete mode 100644 srcpkgs/sublime-text3/template
diff --git a/srcpkgs/sublime-text3 b/srcpkgs/sublime-text3
new file mode 120000
index 000000000000..43dfb218a22c
--- /dev/null
+++ b/srcpkgs/sublime-text3
@@ -0,0 +1 @@
+sublime-text3-bin
\ No newline at end of file
diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
index 73d67ea9c631..decca299da27 100644
--- a/srcpkgs/sublime-text3-bin/template
+++ b/srcpkgs/sublime-text3-bin/template
@@ -1,7 +1,7 @@
# Template file for 'sublime-text3-bin'
pkgname=sublime-text3-bin
version=3211
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="sublime_text_3"
hostmakedepends="w3m"
@@ -10,19 +10,21 @@ 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"
+conflicts="sublime-text4"
-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
+case "$XBPS_TARGET_MACHINE" in
+ x86_64)
+ distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+ checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+ ;;
+ i686)
+ distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+ checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+ ;;
+esac
+_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24
post_extract() {
$XBPS_FETCH_CMD https://www.sublimehq.com/eula
@@ -53,3 +55,9 @@ do_install() {
-i ${DESTDIR}/usr/share/applications/sublime_text.desktop
vlicense EULA
}
+
+sublime-text3_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="sublime-text3-bin>=${version}_${revision}"
+}
diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
deleted file mode 100644
index cf4c4e70a7a9..000000000000
--- a/srcpkgs/sublime-text3/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index c077963863d3..000000000000
--- a/srcpkgs/sublime-text3/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'sublime-text3'
-pkgname=sublime-text3
-version=3211
-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:EULA" #no vlicense check
-homepage="http://www.sublimetext.com/3dev"
-repository="nonfree"
-
-do_install() {
- vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg" README.voidlinux
-}
From 48efa25c2e68931deb20de86ef6c440d8f9dc785 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 16 Jun 2022 23:34:03 -0400
Subject: [PATCH 3/3] sublime-text4: unrestrict
---
srcpkgs/sublime-text4/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sublime-text4/template b/srcpkgs/sublime-text4/template
index 8f3edc50ad74..b98cecea99fe 100644
--- a/srcpkgs/sublime-text4/template
+++ b/srcpkgs/sublime-text4/template
@@ -1,7 +1,7 @@
# Template file for 'sublime-text4'
pkgname=sublime-text4
version=4126
-revision=1
+revision=2
archs="x86_64 aarch64"
wrksrc="sublime_text"
hostmakedepends="w3m"
@@ -10,22 +10,21 @@ short_desc="Sophisticated text editor for code, markup and prose"
maintainer="DirectorX <void.directorx@protonmail.com>"
license="custom:EULA"
homepage="https://www.sublimetext.com/"
-conflicts="sublime-text3"
+conflicts="sublime-text3 sublime-text3-bin"
repository="nonfree"
-restricted=yes
nopie=yes
-_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
case "$XBPS_TARGET_MACHINE" in
- x86_64)
+ x86_64)
distfiles="https://download.sublimetext.com/sublime_text_build_${version}_x64.tar.xz"
checksum=5c64e534cce0032e54d3c7028e8d6b3bdef28f3fd28a26244a360a2ce75450a1
;;
- aarch64)
+ aarch64)
distfiles="https://download.sublimetext.com/sublime_text_build_${version}_arm64.tar.xz"
checksum=0ad4ac168d47034c47ab31faaa0d8b6b4f27e233ea4e48634b930bf999efb63e
;;
esac
+_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24
post_extract() {
$XBPS_FETCH_CMD https://www.sublimehq.com/eula
next reply other threads:[~2022-06-17 3:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-17 3:39 classabbyamp [this message]
2022-06-17 16:36 ` [PR REVIEW] " Chocimier
2022-06-17 16:36 ` Chocimier
2022-06-18 6:28 ` [PR PATCH] [Updated] " classabbyamp
2022-06-18 6:41 ` classabbyamp
2022-06-18 18:59 ` [PR REVIEW] " Chocimier
2022-06-18 18:59 ` Chocimier
2022-06-18 23:33 ` [PR PATCH] [Updated] " classabbyamp
2022-06-18 23:34 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37593@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).