From fabdb5709eec617917681764f5c623c95d7f4996 Mon Sep 17 00:00:00 2001 From: mobinmob 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 " -license="custom:EULA" +build_style=meta +short_desc="Empty meta-package for sublime-merge" +maintainer="mobinmob " +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 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 " +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)'