* [PR PATCH] sublime-merge: update to 2032.
@ 2020-09-02 20:45 mobinmob
2020-09-03 0:09 ` [PR REVIEW] " ahesford
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: mobinmob @ 2020-09-02 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages sublime-merge
https://github.com/void-linux/void-packages/pull/24620
sublime-merge: update to 2032.
Sublime merge now installs under /opt.
A patch file from https://github.com/void-linux/void-packages/pull/24620.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-merge-24620.patch --]
[-- Type: text/x-diff, Size: 1934 bytes --]
From 930e093c2c319218d769c4576972accb87b7dc7b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 2 Sep 2020 23:38:42 +0300
Subject: [PATCH] sublime-merge: update to 2032.
---
srcpkgs/sublime-merge/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sublime-merge/template b/srcpkgs/sublime-merge/template
index 1291edc8411..dd6d5d46474 100644
--- a/srcpkgs/sublime-merge/template
+++ b/srcpkgs/sublime-merge/template
@@ -1,6 +1,6 @@
# Template file for 'sublime-merge'
pkgname=sublime-merge
-version=2027
+version=2032
revision=1
archs="x86_64"
wrksrc=sublime_merge
@@ -11,7 +11,7 @@ maintainer="Adelmo Junior <noblehelm@gmail.com>"
license="custom:EULA"
homepage="https://www.sublimemerge.com"
distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=d932503d4f006c02dbd2b787d4fb0001f730fbdfe2f51fb9b55dd5d16d0859ff
+checksum=b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c
_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
nopie=yes
repository=nonfree
@@ -29,13 +29,12 @@ post_extract() {
do_install() {
vmkdir "usr/bin"
- vmkdir "usr/share/sublime_merge"
- cp --preserve=mode -r ${wrksrc}/* "${DESTDIR}/usr/share/sublime_merge"
+ vmkdir "opt/sublime_merge"
+ cp --preserve=mode -r ${wrksrc}/* "${DESTDIR}/opt/sublime_merge"
vinstall "sublime_merge.desktop" 644 "usr/share/applications/"
for size in 16 32 48 128 256; do
vinstall "Icon/${size}x${size}/sublime-merge.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
done
- ln -s /usr/share/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
- sed -i 's:Exec=/opt/sublime_merge/sublime_merge:Exec=/usr/share/sublime_merge/sublime_merge:' ${DESTDIR}/usr/share/applications/sublime_merge.desktop
+ ln -s /opt/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
vlicense EULA
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
@ 2020-09-03 0:09 ` ahesford
2020-09-03 12:49 ` sgn
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2020-09-03 0:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#discussion_r482608963
Comment:
Shouldn't this just use `vcopy`? Also, you're already in `$wrksrc` for `do_install`, no need to use absolute paths.
```
vcopy "*" opt/sublime_merge
```
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
2020-09-03 0:09 ` [PR REVIEW] " ahesford
@ 2020-09-03 12:49 ` sgn
2020-09-03 13:44 ` ahesford
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: sgn @ 2020-09-03 12:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-686466336
Comment:
On 2020-09-02 13:45:27-0700, mobinmob <notifications@github.com> wrote:
> Sublime merge now installs under /opt.
b. Distribution.
You may not distribute or sell license keys or SUBLIME
MERGE to third parties. Licenses will be revoked if
distributed or sold to third parties.
restricted=yes?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
2020-09-03 0:09 ` [PR REVIEW] " ahesford
2020-09-03 12:49 ` sgn
@ 2020-09-03 13:44 ` ahesford
2020-09-03 19:40 ` mobinmob
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2020-09-03 13:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-686502019
Comment:
> On 2020-09-02 13:45:27-0700, mobinmob ***@***.***> wrote: Sublime merge now installs under /opt.
> b. Distribution. You may not distribute or sell license keys or SUBLIME MERGE to third parties. Licenses will be revoked if distributed or sold to third parties. restricted=yes?
`restricted=yes` seems like the right way to comply with these license terms.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (2 preceding siblings ...)
2020-09-03 13:44 ` ahesford
@ 2020-09-03 19:40 ` mobinmob
2020-09-03 19:41 ` mobinmob
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mobinmob @ 2020-09-03 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-686716038
Comment:
> On 2020-09-02 13:45:27-0700, mobinmob ***@***.***> wrote: Sublime merge now installs under /opt.
> b. Distribution. You may not distribute or sell license keys or SUBLIME MERGE to third parties. Licenses will be revoked if distributed or sold to third parties. restricted=yes?
I am all for it, but users that have sublime-merge installed will stop getting updates. Is there a way to notify for the change?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (3 preceding siblings ...)
2020-09-03 19:40 ` mobinmob
@ 2020-09-03 19:41 ` mobinmob
2020-09-04 13:29 ` ahesford
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mobinmob @ 2020-09-03 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-686716038
Comment:
> On 2020-09-02 13:45:27-0700, mobinmob ***@***.***> wrote: Sublime merge now installs under /opt.
> b. Distribution. You may not distribute or sell license keys or SUBLIME MERGE to third parties. Licenses will be revoked if distributed or sold to third parties. restricted=yes?
I am all for it, but users that have sublime-merge installed will stop getting updates from the repos. Is there a way to notify for the change?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (4 preceding siblings ...)
2020-09-03 19:41 ` mobinmob
@ 2020-09-04 13:29 ` ahesford
2020-09-04 21:03 ` [PR PATCH] [Updated] " mobinmob
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2020-09-04 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-687146291
Comment:
Unfortunately, I don't see a good way to do this. If the license terms were the same for prior releases, we were non-compliant.
Maybe the best thing to do is call this `sublime-merge-bin`, and make `sublime-merge` a meta that only has an `INSTALL.msg` telling users how to install the restricted package.
>> On Sep 3, 2020, at 3:41 PM, mobinmob <notifications@github.com> wrote:
>
> On 2020-09-02 13:45:27-0700, mobinmob @.***> wrote: Sublime merge now installs under /opt.
> b. Distribution. You may not distribute or sell license keys or SUBLIME MERGE to third parties. Licenses will be revoked if distributed or sold to third parties. restricted=yes?
>
> I am all for it, but users that have sublime-merge installed will stop getting updates. Is there a way to notify for the change?
>
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub, or unsubscribe.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (5 preceding siblings ...)
2020-09-04 13:29 ` ahesford
@ 2020-09-04 21:03 ` mobinmob
2020-09-04 21:06 ` mobinmob
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mobinmob @ 2020-09-04 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages sublime-merge
https://github.com/void-linux/void-packages/pull/24620
sublime-merge: update to 2032.
Sublime merge now installs under /opt.
A patch file from https://github.com/void-linux/void-packages/pull/24620.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-merge-24620.patch --]
[-- Type: text/x-diff, Size: 5552 bytes --]
From f0198da3cce00cbe4d040964f7c4ec551eb0d6b3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 4 Sep 2020 23:55:59 +0300
Subject: [PATCH 1/2] sublime-merge: replace with empty meta package
---
srcpkgs/sublime-merge/INSTALL.msg | 4 +++
srcpkgs/sublime-merge/template | 42 ++++---------------------------
srcpkgs/sublime-merge/update | 2 --
3 files changed, 9 insertions(+), 39 deletions(-)
create mode 100644 srcpkgs/sublime-merge/INSTALL.msg
delete mode 100644 srcpkgs/sublime-merge/update
diff --git a/srcpkgs/sublime-merge/INSTALL.msg b/srcpkgs/sublime-merge/INSTALL.msg
new file mode 100644
index 00000000000..baae44d2cb8
--- /dev/null
+++ b/srcpkgs/sublime-merge/INSTALL.msg
@@ -0,0 +1,4 @@
+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
index 1291edc8411..7527ef1e85e 100644
--- a/srcpkgs/sublime-merge/template
+++ b/srcpkgs/sublime-merge/template
@@ -1,41 +1,9 @@
# Template file for 'sublime-merge'
pkgname=sublime-merge
-version=2027
+version=2032
revision=1
-archs="x86_64"
-wrksrc=sublime_merge
-hostmakedepends="w3m"
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="New Git client, from the makers of Sublime Text"
-maintainer="Adelmo Junior <noblehelm@gmail.com>"
-license="custom:EULA"
+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"
-distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=d932503d4f006c02dbd2b787d4fb0001f730fbdfe2f51fb9b55dd5d16d0859ff
-_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
-nopie=yes
-repository=nonfree
-
-
-post_extract() {
- $XBPS_FETCH_CMD https://www.sublimehq.com/eula
- w3m -dump -I utf-8 -T text/html < eula > 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/share/sublime_merge"
- cp --preserve=mode -r ${wrksrc}/* "${DESTDIR}/usr/share/sublime_merge"
- vinstall "sublime_merge.desktop" 644 "usr/share/applications/"
- for size in 16 32 48 128 256; do
- vinstall "Icon/${size}x${size}/sublime-merge.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
- done
- ln -s /usr/share/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
- sed -i 's:Exec=/opt/sublime_merge/sublime_merge:Exec=/usr/share/sublime_merge/sublime_merge:' ${DESTDIR}/usr/share/applications/sublime_merge.desktop
- vlicense EULA
-}
diff --git a/srcpkgs/sublime-merge/update b/srcpkgs/sublime-merge/update
deleted file mode 100644
index 092438c0d9c..00000000000
--- a/srcpkgs/sublime-merge/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://www.sublimemerge.com/download"
-pattern='sublime_merge_build_\K[-.\d]+(?=_x64\.tar)'
From 45981fcbe0ab2631c41a03dff2fc3c9b40559d6b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Sep 2020 00:03:10 +0300
Subject: [PATCH 2/2] sublime-merge-bin: update to 2032
---
srcpkgs/sublime-merge-bin/template | 41 ++++++++++++++++++++++++++++++
srcpkgs/sublime-merge-bin/update | 2 ++
2 files changed, 43 insertions(+)
create mode 100644 srcpkgs/sublime-merge-bin/template
create mode 100644 srcpkgs/sublime-merge-bin/update
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
new file mode 100644
index 00000000000..e2315599c50
--- /dev/null
+++ b/srcpkgs/sublime-merge-bin/template
@@ -0,0 +1,41 @@
+# Template file for 'sublime-merge-bin'
+pkgname=sublime-merge-bin
+version=2032
+revision=1
+archs="x86_64"
+wrksrc=sublime_merge
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="New Git client, from the makers of Sublime Text"
+maintainer="Adelmo Junior <noblehelm@gmail.com>"
+license="custom:EULA"
+homepage="https://www.sublimemerge.com"
+distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
+checksum=b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c
+_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
+nopie=yes
+repository=nonfree
+restricted=yes
+replaces="sublime-merge>0"
+
+post_extract() {
+ $XBPS_FETCH_CMD https://www.sublimehq.com/eula
+ w3m -dump -I utf-8 -T text/html < eula > 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 "opt/sublime_merge"
+ vcopy "*" opt/sublime_merge
+ vinstall "sublime_merge.desktop" 644 "usr/share/applications/"
+ for size in 16 32 48 128 256; do
+ vinstall "Icon/${size}x${size}/sublime-merge.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
+ done
+ ln -s /opt/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
+ vlicense EULA
+}
diff --git a/srcpkgs/sublime-merge-bin/update b/srcpkgs/sublime-merge-bin/update
new file mode 100644
index 00000000000..092438c0d9c
--- /dev/null
+++ b/srcpkgs/sublime-merge-bin/update
@@ -0,0 +1,2 @@
+site="https://www.sublimemerge.com/download"
+pattern='sublime_merge_build_\K[-.\d]+(?=_x64\.tar)'
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (6 preceding siblings ...)
2020-09-04 21:03 ` [PR PATCH] [Updated] " mobinmob
@ 2020-09-04 21:06 ` mobinmob
2020-09-05 7:17 ` [PR REVIEW] " Chocimier
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mobinmob @ 2020-09-04 21:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-687384530
Comment:
@ahesford : Created a meta sublime-merge and sublime-merge-bin is now restricted and replaces sublime-merge>0.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (7 preceding siblings ...)
2020-09-04 21:06 ` mobinmob
@ 2020-09-05 7:17 ` Chocimier
2020-09-05 9:54 ` mobinmob
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Chocimier @ 2020-09-05 7:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#discussion_r483921347
Comment:
$XBPS_DIGEST_CMD < EULA
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (8 preceding siblings ...)
2020-09-05 7:17 ` [PR REVIEW] " Chocimier
@ 2020-09-05 9:54 ` mobinmob
2020-09-05 11:29 ` ahesford
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mobinmob @ 2020-09-05 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-687582042
Comment:
> You can make the `sublime-merge` meta a subpackage of `sublime-merge-bin`, with the install message in `sublime-merge.INSTALL.msg`.
Maybe I am missing something, but how would that work?
`sublime-merge-bin` won't be built as it is restricted, so a subpackage will also not be built...
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (9 preceding siblings ...)
2020-09-05 9:54 ` mobinmob
@ 2020-09-05 11:29 ` ahesford
2020-09-05 11:49 ` [PR REVIEW] " ahesford
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2020-09-05 11:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 717 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-687595501
Comment:
That's true; I wasn't thinking clearly. Leave the separate templates as is.
> On Sep 5, 2020, at 5:54 AM, mobinmob <notifications@github.com> wrote:
>
>
> You can make the sublime-merge meta a subpackage of sublime-merge-bin, with the install message in sublime-merge.INSTALL.msg.
>
> Maybe I am missing something, but how would that work?
> sublime-merge-bin won't be built as it is restricted, so a subpackage will also not be built...
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub, or unsubscribe.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (10 preceding siblings ...)
2020-09-05 11:29 ` ahesford
@ 2020-09-05 11:49 ` ahesford
2020-09-05 13:27 ` Chocimier
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2020-09-05 11:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#discussion_r483943485
Comment:
This validation is incredibly fragile because the checksum is almost certain to change whenever Sublime changes something trivial like the navigation header. In a restricted package, we don't care about the contents of the license because we aren't distributing anything. There's no need to do any validation here.
I recommend just dropping `_license_checksum` and everything in this function except the `w3m` dump.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (11 preceding siblings ...)
2020-09-05 11:49 ` [PR REVIEW] " ahesford
@ 2020-09-05 13:27 ` Chocimier
2020-09-05 13:32 ` Chocimier
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Chocimier @ 2020-09-05 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#discussion_r483951190
Comment:
Works since some time. Some packages sed out header and footer to increase chances of change.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (12 preceding siblings ...)
2020-09-05 13:27 ` Chocimier
@ 2020-09-05 13:32 ` Chocimier
2020-09-05 15:48 ` [PR PATCH] [Updated] " mobinmob
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Chocimier @ 2020-09-05 13:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#discussion_r483951190
Comment:
Works since some time. Some packages sed out header and footer to decrease chances of change.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (13 preceding siblings ...)
2020-09-05 13:32 ` Chocimier
@ 2020-09-05 15:48 ` mobinmob
2020-09-05 15:55 ` mobinmob
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mobinmob @ 2020-09-05 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages sublime-merge
https://github.com/void-linux/void-packages/pull/24620
sublime-merge: update to 2032.
Sublime merge now installs under /opt.
A patch file from https://github.com/void-linux/void-packages/pull/24620.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sublime-merge-24620.patch --]
[-- Type: text/x-diff, Size: 5674 bytes --]
From fabdb5709eec617917681764f5c623c95d7f4996 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 4 Sep 2020 23:55:59 +0300
Subject: [PATCH 1/2] sublime-merge: replace with empty meta package
---
srcpkgs/sublime-merge/INSTALL.msg | 4 ++++
srcpkgs/sublime-merge/template | 40 +++++--------------------------
srcpkgs/sublime-merge/update | 2 --
3 files changed, 10 insertions(+), 36 deletions(-)
create mode 100644 srcpkgs/sublime-merge/INSTALL.msg
delete mode 100644 srcpkgs/sublime-merge/update
diff --git a/srcpkgs/sublime-merge/INSTALL.msg b/srcpkgs/sublime-merge/INSTALL.msg
new file mode 100644
index 00000000000..baae44d2cb8
--- /dev/null
+++ b/srcpkgs/sublime-merge/INSTALL.msg
@@ -0,0 +1,4 @@
+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
index 1291edc8411..896d0596343 100644
--- a/srcpkgs/sublime-merge/template
+++ b/srcpkgs/sublime-merge/template
@@ -1,41 +1,13 @@
# Template file for 'sublime-merge'
pkgname=sublime-merge
-version=2027
+version=2032
revision=1
-archs="x86_64"
-wrksrc=sublime_merge
-hostmakedepends="w3m"
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="New Git client, from the makers of Sublime Text"
-maintainer="Adelmo Junior <noblehelm@gmail.com>"
-license="custom:EULA"
+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"
-distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=d932503d4f006c02dbd2b787d4fb0001f730fbdfe2f51fb9b55dd5d16d0859ff
-_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
-nopie=yes
-repository=nonfree
-
-
-post_extract() {
- $XBPS_FETCH_CMD https://www.sublimehq.com/eula
- w3m -dump -I utf-8 -T text/html < eula > 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/share/sublime_merge"
- cp --preserve=mode -r ${wrksrc}/* "${DESTDIR}/usr/share/sublime_merge"
- vinstall "sublime_merge.desktop" 644 "usr/share/applications/"
- for size in 16 32 48 128 256; do
- vinstall "Icon/${size}x${size}/sublime-merge.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
- done
- ln -s /usr/share/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
- sed -i 's:Exec=/opt/sublime_merge/sublime_merge:Exec=/usr/share/sublime_merge/sublime_merge:' ${DESTDIR}/usr/share/applications/sublime_merge.desktop
- vlicense EULA
+ vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg" README.voidlinux
}
diff --git a/srcpkgs/sublime-merge/update b/srcpkgs/sublime-merge/update
deleted file mode 100644
index 092438c0d9c..00000000000
--- a/srcpkgs/sublime-merge/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://www.sublimemerge.com/download"
-pattern='sublime_merge_build_\K[-.\d]+(?=_x64\.tar)'
From e231ee3172aa73082dfc58e72449c3bef33f0eb0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Sep 2020 18:47:21 +0300
Subject: [PATCH 2/2] sublime-merge-bin: update to 2032 - new restricted
package - replaces sublime-merge
---
srcpkgs/sublime-merge-bin/template | 41 ++++++++++++++++++++++++++++++
srcpkgs/sublime-merge-bin/update | 2 ++
2 files changed, 43 insertions(+)
create mode 100644 srcpkgs/sublime-merge-bin/template
create mode 100644 srcpkgs/sublime-merge-bin/update
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
new file mode 100644
index 00000000000..e2315599c50
--- /dev/null
+++ b/srcpkgs/sublime-merge-bin/template
@@ -0,0 +1,41 @@
+# Template file for 'sublime-merge-bin'
+pkgname=sublime-merge-bin
+version=2032
+revision=1
+archs="x86_64"
+wrksrc=sublime_merge
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="New Git client, from the makers of Sublime Text"
+maintainer="Adelmo Junior <noblehelm@gmail.com>"
+license="custom:EULA"
+homepage="https://www.sublimemerge.com"
+distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
+checksum=b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c
+_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
+nopie=yes
+repository=nonfree
+restricted=yes
+replaces="sublime-merge>0"
+
+post_extract() {
+ $XBPS_FETCH_CMD https://www.sublimehq.com/eula
+ w3m -dump -I utf-8 -T text/html < eula > 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 "opt/sublime_merge"
+ vcopy "*" opt/sublime_merge
+ vinstall "sublime_merge.desktop" 644 "usr/share/applications/"
+ for size in 16 32 48 128 256; do
+ vinstall "Icon/${size}x${size}/sublime-merge.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
+ done
+ ln -s /opt/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
+ vlicense EULA
+}
diff --git a/srcpkgs/sublime-merge-bin/update b/srcpkgs/sublime-merge-bin/update
new file mode 100644
index 00000000000..092438c0d9c
--- /dev/null
+++ b/srcpkgs/sublime-merge-bin/update
@@ -0,0 +1,2 @@
+site="https://www.sublimemerge.com/download"
+pattern='sublime_merge_build_\K[-.\d]+(?=_x64\.tar)'
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (14 preceding siblings ...)
2020-09-05 15:48 ` [PR PATCH] [Updated] " mobinmob
@ 2020-09-05 15:55 ` mobinmob
2020-09-29 2:23 ` ericonr
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mobinmob @ 2020-09-05 15:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-687628824
Comment:
> Please additionally install message as README.voidlinux.
OK, I used the INSTALL.msg...
Is that a new thing? I don't think there is anything in the Manual.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (15 preceding siblings ...)
2020-09-05 15:55 ` mobinmob
@ 2020-09-29 2:23 ` ericonr
2020-09-29 2:36 ` ahesford
2020-09-29 18:15 ` [PR PATCH] [Merged]: " Chocimier
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2020-09-29 2:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-700386766
Comment:
Is anything blocking this?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (16 preceding siblings ...)
2020-09-29 2:23 ` ericonr
@ 2020-09-29 2:36 ` ahesford
2020-09-29 18:15 ` [PR PATCH] [Merged]: " Chocimier
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2020-09-29 2:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/24620#issuecomment-700390381
Comment:
Nothing from me.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: sublime-merge: update to 2032.
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
` (17 preceding siblings ...)
2020-09-29 2:36 ` ahesford
@ 2020-09-29 18:15 ` Chocimier
18 siblings, 0 replies; 20+ messages in thread
From: Chocimier @ 2020-09-29 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
There's a merged pull request on the void-packages repository
sublime-merge: update to 2032.
https://github.com/void-linux/void-packages/pull/24620
Description:
Sublime merge now installs under /opt.
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2020-09-29 18:15 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-02 20:45 [PR PATCH] sublime-merge: update to 2032 mobinmob
2020-09-03 0:09 ` [PR REVIEW] " ahesford
2020-09-03 12:49 ` sgn
2020-09-03 13:44 ` ahesford
2020-09-03 19:40 ` mobinmob
2020-09-03 19:41 ` mobinmob
2020-09-04 13:29 ` ahesford
2020-09-04 21:03 ` [PR PATCH] [Updated] " mobinmob
2020-09-04 21:06 ` mobinmob
2020-09-05 7:17 ` [PR REVIEW] " Chocimier
2020-09-05 9:54 ` mobinmob
2020-09-05 11:29 ` ahesford
2020-09-05 11:49 ` [PR REVIEW] " ahesford
2020-09-05 13:27 ` Chocimier
2020-09-05 13:32 ` Chocimier
2020-09-05 15:48 ` [PR PATCH] [Updated] " mobinmob
2020-09-05 15:55 ` mobinmob
2020-09-29 2:23 ` ericonr
2020-09-29 2:36 ` ahesford
2020-09-29 18:15 ` [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).