[PR PATCH] sublime-text3: remove elf files from /usr/share

[PR PATCH] sublime-text3: remove elf files from /usr/share

[abenson]

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

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

https://github.com/abenson/void-packages subl3_fix_elfshare
https://github.com/void-linux/void-packages/pull/27394

sublime-text3: remove elf files from /usr/share
Closes #27344

A patch file from https://github.com/void-linux/void-packages/pull/27394.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-subl3_fix_elfshare-27394.patch --]
[-- Type: text/x-diff, Size: 1839 bytes --]

From 686f4d957ab45445e224f09e7f57bdfdf023f197 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 24 Dec 2020 00:09:10 -0600
Subject: [PATCH] sublime-text3: remove elf files from /usr/share

Closes #27344
---
 srcpkgs/sublime-text3/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index e87de887ad0..f86f71942d8 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,11 +1,11 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=1
+revision=2
 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="Propietary"
+license="custom:Proprietary"
 homepage="http://www.sublimetext.com/3dev"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@@ -23,12 +23,12 @@ nopie=yes
 
 do_install() {
 	vmkdir "usr/bin"
-	vmkdir "usr/share/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/share/sublime_text"
+	vmkdir "usr/libexec/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/libexec/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/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	ln -s /usr/libexec/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/libexec/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
 }

Re: [PR REVIEW] sublime-text3: remove elf files from /usr/share

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27394#discussion_r548409777

Comment:
vsed?

Re: [PR PATCH] [Updated] sublime-text3: remove elf files from /usr/share

[abenson]

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

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

https://github.com/abenson/void-packages subl3_fix_elfshare
https://github.com/void-linux/void-packages/pull/27394

sublime-text3: remove elf files from /usr/share
Closes #27344

A patch file from https://github.com/void-linux/void-packages/pull/27394.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-subl3_fix_elfshare-27394.patch --]
[-- Type: text/x-diff, Size: 1915 bytes --]

From bb9f4cea0c73644affeef04ea152ac5b93f13c90 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 24 Dec 2020 00:09:10 -0600
Subject: [PATCH] sublime-text3: update to 3211.

---
 srcpkgs/sublime-text3/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index e87de887ad0..c693768e6e4 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,11 +1,11 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=1
+revision=2
 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="Propietary"
+license="custom:Proprietary"
 homepage="http://www.sublimetext.com/3dev"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@@ -23,12 +23,14 @@ nopie=yes
 
 do_install() {
 	vmkdir "usr/bin"
-	vmkdir "usr/share/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/share/sublime_text"
+	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/"
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
 	done
-	ln -s /usr/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	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
 }

Re: [PR PATCH] [Merged]: sublime-text3: remove elf files from /usr/share

[abenson]

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

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

sublime-text3: remove elf files from /usr/share
https://github.com/void-linux/void-packages/pull/27394

Description:
Closes #27344