diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | LICENSE | 21 | ||||
| -rw-r--r-- | PKGBUILD | 70 | ||||
| -rw-r--r-- | smerge | 2 |
4 files changed, 67 insertions, 44 deletions
@@ -1,19 +1,17 @@ pkgbase = sublime-merge pkgdesc = Meet a new Git Client, from the makers of Sublime Text - pkgver = 1116 - pkgrel = 1 + pkgver = 2091 + pkgrel = 2 url = https://www.sublimemerge.com arch = x86_64 license = custom depends = gtk3 - conflicts = sublime-merge-dev - source = smerge - source = https://download.sublimetext.com/sublime_merge_build_1116_x64.tar.xz - source = https://download.sublimetext.com/sublime_merge_build_1116_x64.tar.xz.asc + source = https://download.sublimetext.com/sublime_merge_build_2091_x64.tar.xz + source = https://download.sublimetext.com/sublime_merge_build_2091_x64.tar.xz.asc + source = LICENSE validpgpkeys = 1EDDE2CDFC025D17F6DA9EC0ADAE6AD28A8F901A - sha256sums = ddd804f64fa218d053f00ca82b5bb2625f9812d3530c2f2f88049dac9bb41a7d - sha256sums = a6b364b557bc88fe6202af9c67b6e486a172c9add28e882e434f83dd0eb19b33 - sha256sums = SKIP + b2sums = 5027eb92f6a67764bba7928469cc2fb53478946a5ab1121a8ea6e8096c191e09fbe62cce6dfca1ec60a87f0eac60a971e6a53f0a5049a45ad97e27a1d407edcf + b2sums = SKIP + b2sums = e17f9223fc423b385d20f78fd54bf8bdc0722134cb89e1a12f9105a4d130e9ae12f81997904b52ce6d6db45810d23db53c8f90c8a9bc1ac0ae4a8532d1097396 pkgname = sublime-merge - diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000000..cb4338f38ea2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The SOFTWARE PRODUCT (SUBLIME MERGE) is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold. + +1. LICENSES + SUBLIME MERGE is licensed as follows: + a. Installation and Usage. + Licenses are per user and valid for use on all supported operating systems. License keys may be used on multiple computers and operating systems, provided the license key holder is the primary user. Businesses must purchase at least as many licenses as the number of people using SUBLIME MERGE. + b. Backup Copies. + You may make copies of the license key and or SUBLIME MERGE for backup and archival purposes. +2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS + a. Maintenance of Copyright Notices. + You must not remove or alter any copyright notices on any copy of SUBLIME MERGE. + 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. + c. Rental. + You may not rent, lease, or lend the license key or SUBLIME MERGE. +3. COPYRIGHT + All title, including but not limited to copyrights, in and to SUBLIME MERGE and any copies thereof are owned by SUBLIME HQ PTY LTD. +4. NO WARRANTIES + SUBLIME HQ PTY LTD expressly disclaims any warranty for SUBLIME MERGE, which is provided 'as is' without any express or implied warranty of any kind, including but not limited to any warranties of merchantability, non-infringement, or fitness of a particular purpose. +5. LIMITATION OF LIABILITY + In no event shall SUBLIME HQ PTY LTD be liable for any damages due to use of SUBLIME MERGE, to the maximum extent permitted by law. This includes without limitation, lost profits, business interruption, or lost information. In no event will SUBLIME HQ PTY LTD be liable for loss of data or for indirect, special, incidental, consequential (including lost profit), or other damages. SUBLIME HQ PTY LTD shall have no liability with respect to the content of SUBLIME MERGE or any part thereof, including but not limited to errors or omissions contained therein, libel, trademark rights, business interruption, loss of privacy or the disclosure of confidential information. @@ -1,43 +1,49 @@ -# Maintainer: Honghao Li <im@rasphino.cn> +# Maintainer: Frederik Schwan <freswa at archlinux dot org> +# Contributor: Honghao Li <im@rasphino.cn> pkgname=sublime-merge -pkgver=1116 -pkgrel=1 -pkgdesc="Meet a new Git Client, from the makers of Sublime Text" +pkgver=2091 +pkgrel=2 +pkgdesc='Meet a new Git Client, from the makers of Sublime Text' arch=('x86_64') -url="https://www.sublimemerge.com" +url='https://www.sublimemerge.com' license=('custom') depends=('gtk3') -optdepends=() -conflicts=('sublime-merge-dev') -#install=${pkgname}.install - -source=('smerge' - https://download.sublimetext.com/sublime_merge_build_${pkgver}_x64.tar.xz - https://download.sublimetext.com/sublime_merge_build_${pkgver}_x64.tar.xz.asc) - -sha256sums=('ddd804f64fa218d053f00ca82b5bb2625f9812d3530c2f2f88049dac9bb41a7d' - 'a6b364b557bc88fe6202af9c67b6e486a172c9add28e882e434f83dd0eb19b33' - 'SKIP') - +source=("https://download.sublimetext.com/sublime_merge_build_${pkgver}_x64.tar.xz" + "https://download.sublimetext.com/sublime_merge_build_${pkgver}_x64.tar.xz.asc" + LICENSE) +b2sums=('5027eb92f6a67764bba7928469cc2fb53478946a5ab1121a8ea6e8096c191e09fbe62cce6dfca1ec60a87f0eac60a971e6a53f0a5049a45ad97e27a1d407edcf' + 'SKIP' + 'e17f9223fc423b385d20f78fd54bf8bdc0722134cb89e1a12f9105a4d130e9ae12f81997904b52ce6d6db45810d23db53c8f90c8a9bc1ac0ae4a8532d1097396') validpgpkeys=('1EDDE2CDFC025D17F6DA9EC0ADAE6AD28A8F901A') package() { - cd "${srcdir}" - - install -dm755 "${pkgdir}/opt" - cp --preserve=mode -r "sublime_merge" "${pkgdir}/opt/sublime_merge" - - for res in 128x128 16x16 256x256 32x32 48x48; do - install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps" - ln -s "/opt/sublime_merge/Icon/${res}/sublime-merge.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/sublime-merge.png" + cd sublime_merge + install -dm755 "${pkgdir}"/usr/bin + + # Install binaries + install -Dm755 -t "${pkgdir}"/opt/sublime_merge/ \ + crash_handler \ + git-credential-sublime \ + ssh-askpass-sublime \ + sublime_merge + + # link executable to /usr/bin/ + ln -s /opt/sublime_merge/sublime_merge "${pkgdir}"/usr/bin/smerge + + # copy misc files + cp --preserve=mode -r -t "${pkgdir}"/opt/sublime_merge/ \ + changelog.txt \ + Packages \ + Icon + + # link app icons to system folder + for res in 256x256 128x128 48x48 32x32 16x16; do + install -dm755 "${pkgdir}"/usr/share/icons/hicolor/${res}/apps + ln -s /opt/sublime_merge/Icon/${res}/sublime-merge.png "${pkgdir}"/usr/share/icons/hicolor/${res}/apps/sublime-merge.png done - install -dm755 "${pkgdir}/usr/share/applications" - mv "${pkgdir}/opt/sublime_merge/sublime_merge.desktop" "${pkgdir}/usr/share/applications/sublime_merge.desktop" - - install -dm755 "${pkgdir}/usr/bin" - install -Dm755 "smerge" "${pkgdir}/usr/bin/smerge" - + # install desktop file and license + install -Dm644 -t "${pkgdir}"/usr/share/applications/ "${srcdir}"/sublime_merge/sublime_merge.desktop + install -Dm644 -t "${pkgdir}"/usr/share/licenses/${pkgname}/ "${srcdir}"/LICENSE } - diff --git a/smerge b/smerge deleted file mode 100644 index a19f4003b5ca..000000000000 --- a/smerge +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /opt/sublime_merge/sublime_merge "$@" |