diff --git a/srcpkgs/sublime-merge-bin b/srcpkgs/sublime-merge-bin new file mode 120000 index 00000000000..521a4f32931 --- /dev/null +++ b/srcpkgs/sublime-merge-bin @@ -0,0 +1 @@ +sublime-merge \ No newline at end of file diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template deleted file mode 100644 index b2d4b79214c..00000000000 --- a/srcpkgs/sublime-merge-bin/template +++ /dev/null @@ -1,46 +0,0 @@ -# Template file for 'sublime-merge-bin' -pkgname=sublime-merge-bin -version=2074 -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="mobinmob " -license="custom:EULA" -homepage="https://www.sublimemerge.com" -changelog="https://www.sublimemerge.com/download" -distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz" -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 - sed -n ' - /is licensed.*not sold/p - /
    /,${ /<\/ol>/{x;p;d}; H } - $a
- ' 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/INSTALL.msg b/srcpkgs/sublime-merge/INSTALL.msg deleted file mode 100644 index baae44d2cb8..00000000000 --- 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 index 896d0596343..5a29d273a99 100644 --- a/srcpkgs/sublime-merge/template +++ b/srcpkgs/sublime-merge/template @@ -1,13 +1,50 @@ # Template file for 'sublime-merge' pkgname=sublime-merge -version=2032 -revision=1 -build_style=meta -short_desc="Empty meta-package for sublime-merge" +version=2074 +revision=2 +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="mobinmob " -license="custom:EULA" #no vlicense check +license="custom:EULA" homepage="https://www.sublimemerge.com" +changelog="https://www.sublimemerge.com/download" +distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz" +checksum=444a39f4ba62d1f9803a9d1725ae08967dd52b147991188ca73db37eacf5310b +_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24 +nopie=yes +repository=nonfree + +post_extract() { + $XBPS_FETCH_CMD https://www.sublimehq.com/eula + sed -n ' + /is licensed.*not sold/p + /
    /,${ /<\/ol>/{x;p;d}; H } + $a
+ ' EULA + + filesum="$(xbps-digest EULA)" + if [ "$filesum" != "$_license_checksum" ]; then + msg_error "SHA256 mismatch for EULA:\n$filesum\n" + fi +} do_install() { - vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg" README.voidlinux + 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 +} + +sublime-merge-bin_package() { + build_style=meta + short_desc+=" (transitional dummy package)" + depends="sublime-merge>=${version}_${revision}" } diff --git a/srcpkgs/sublime-merge-bin/update b/srcpkgs/sublime-merge/update similarity index 100% rename from srcpkgs/sublime-merge-bin/update rename to srcpkgs/sublime-merge/update