[fix] Cleanup and rename to sublime-text2

8 files changed, 66 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 289b6446b002..b2e03f73061b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,38 @@
-pkgbase = sublime-text
-	pkgdesc = Sophisticated text editor for code, html and prose
+pkgbase = sublime-text2
+	pkgdesc = Sophisticated text editor for code, html and prose (legacy version)
 	pkgver = 2.0.2
-	pkgrel = 4
-	url = http://www.sublimetext.com/2
-	install = sublime-text.install
+	pkgrel = 1
+	url = https://www.sublimetext.com/2
 	arch = i686
 	arch = x86_64
-	license = custom
+	license = custom: commercial
 	depends = libpng
 	depends = gtk2
 	depends = bash
-	depends = procps-ng
 	depends = xdg-utils
 	depends = desktop-file-utils
 	depends = shared-mime-info
-	source = sublime-text-EULA
-	source = sublime-text.desktop
-	source = sublime-text.sh
+	conflicts = sublime-text
+	source = sublime-text2-EULA
+	source = sublime-text2.desktop
+	source = sublime-text2.sh
 	source = http://downloads.sourceforge.net/libpng/libpng-1.6.2.tar.xz
 	source = http://downloads.sourceforge.net/libpng-apng/libpng-1.6.2-apng.patch.gz
 	source = 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
 	source = 0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
 	source = adjust-apng-patch-for-libpng16-git-changes.patch
-	sha256sums = 43aa2cf3becee23697177c6e6ecd4fc2c4b459499631bfdb2533cdb60c27530e
-	sha256sums = 3f11bf8cb814b68ed81b535dd13cc86bb28c71010d74141bfa06137782fd2f7d
-	sha256sums = 765c8a65ef429dc81a983d14d94c97a2d185575d74e702861ad3e374e2759338
+	sha256sums = dec26169ec941f1089810b7be599193577d0250f20e465d1399b062f71f2a244
+	sha256sums = 7a3d0ea23fc0eb8d1e4d322df96a18aab214f8f7ef5808a60f9ad4866c0fc14b
+	sha256sums = 153cfa48f8f058cba03e30aa39dc90d9b9ab1d07ce9bfb3bceb78b2c699c47e8
 	sha256sums = 1c97a90bc22107e50f04f77a0115f4ec890d5c6a373ac4c560e8fb87259e92de
 	sha256sums = 4196f3c3894f455a78a65170209fc948b01a7448304d8c39bc29d37852b8c73b
 	sha256sums = 0632ea1d588cb7b85dfc2c13444de1682e9d7e61caaf8cce118fc535bc9f4d90
 	sha256sums = 2a65904c85ff492d4f91edd55e17f81ba36ee6af1cac7402f786580f3fc56216
 	sha256sums = 1f51e33233ce560c5d8002bc096aa4cc5be70c082e08b14db4376a9a02f2714a
-	source_i686 = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2
+	source_i686 = https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2
 	sha256sums_i686 = 07338e041cfb348938fa8069f0aad3b5b43c319b7ec564ffff1489796f2dcf08
-	source_x86_64 = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2%20x64.tar.bz2
+	source_x86_64 = https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2
 	sha256sums_x86_64 = 01baed30d66432e30002a309ff0393967be1daba5cce653e43bba6bd6c38ab84
 
-pkgname = sublime-text
+pkgname = sublime-text2
 
diff --git a/PKGBUILD b/PKGBUILD
index e3f92a97ed00..b3a9ffa5c48c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,15 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
-# Contributor: Josh Kropf <josh@slashdev.ca>
-# Contributor: Bartosz Chmura <chmurli at gmail dot com>
-# Contributor: Mikkel Kroman <mk at maero dot dk>
 
-pkgname=sublime-text
+pkgname=sublime-text2
 pkgver=2.0.2
-pkgrel=4
-pkgdesc="Sophisticated text editor for code, html and prose"
+pkgrel=1
+pkgdesc="Sophisticated text editor for code, html and prose (legacy version)"
 arch=('i686' 'x86_64')
-url="http://www.sublimetext.com/2"
-license=('custom')
-depends=("libpng" "gtk2" "bash" "procps-ng" "xdg-utils" "desktop-file-utils"
-         "shared-mime-info")
-install="$pkgname.install"
-                        # EULA file is from http://www.sublimetext.com/eula
-                        # converted with 'html2text --ignore-links --body-width=80'
+url="https://www.sublimetext.com/2"
+license=('custom: commercial')
+depends=("libpng" "gtk2" "bash" "xdg-utils" "desktop-file-utils" "shared-mime-info")
+conflicts=("sublime-text")
+        # EULA file: 'html2text --body-width=80 https://www.sublimetext.com/eula'
 source=("$pkgname-EULA"
         "$pkgname.desktop"
         "$pkgname.sh"
@@ -23,11 +18,11 @@ source=("$pkgname-EULA"
         "0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch"
         "0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch"
         "adjust-apng-patch-for-libpng16-git-changes.patch")
-source_i686=("http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${pkgver}.tar.bz2")
-source_x86_64=("http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${pkgver}%20x64.tar.bz2")
-sha256sums=('43aa2cf3becee23697177c6e6ecd4fc2c4b459499631bfdb2533cdb60c27530e'
-            '3f11bf8cb814b68ed81b535dd13cc86bb28c71010d74141bfa06137782fd2f7d'
-            '765c8a65ef429dc81a983d14d94c97a2d185575d74e702861ad3e374e2759338'
+source_i686=("https://download.sublimetext.com/Sublime%20Text%20${pkgver}.tar.bz2")
+source_x86_64=("https://download.sublimetext.com/Sublime%20Text%20${pkgver}%20x64.tar.bz2")
+sha256sums=('dec26169ec941f1089810b7be599193577d0250f20e465d1399b062f71f2a244'
+            '7a3d0ea23fc0eb8d1e4d322df96a18aab214f8f7ef5808a60f9ad4866c0fc14b'
+            '153cfa48f8f058cba03e30aa39dc90d9b9ab1d07ce9bfb3bceb78b2c699c47e8'
             '1c97a90bc22107e50f04f77a0115f4ec890d5c6a373ac4c560e8fb87259e92de'
             '4196f3c3894f455a78a65170209fc948b01a7448304d8c39bc29d37852b8c73b'
             '0632ea1d588cb7b85dfc2c13444de1682e9d7e61caaf8cce118fc535bc9f4d90'
@@ -40,29 +35,29 @@ prepare() {
   # libpng
   rm -rf png_fake_install
   mkdir png_fake_install
+  patch -Np0 < adjust-apng-patch-for-libpng16-git-changes.patch
   cd libpng-1.6.2
   patch -Np1 < ../0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
-  patch -Np1 -i ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
-  patch -d .. -Np0 < ../adjust-apng-patch-for-libpng16-git-changes.patch
+  patch -Np1 < ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
   patch -Np1 < ../libpng-1.6.2-apng.patch
 }
 
 build() {
   # libpng
   cd libpng-1.6.2
-  ./configure --prefix=/ --with-binconfigs=no --enable-shared --disable-static
+  ./configure --prefix=/ --without-binconfigs --enable-shared --disable-static
   make install DESTDIR="$srcdir"/png_fake_install
 }
 
 package () {
   install -d "$pkgdir"/opt
-  cp -rup "Sublime Text 2" "$pkgdir"/opt/$pkgname
+  cp -r "Sublime Text 2" "$pkgdir"/opt/$pkgname
 
   # launcher
-  install -Dm755 $pkgname.sh "$pkgdir"/usr/bin/subl
+  install -Dm0755 $pkgname.sh "$pkgdir"/usr/bin/subl
 
   # .desktop file and icons
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  install -Dm0644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
   for _res in 256x256 128x128 48x48 32x32 16x16; do
     install -d "$pkgdir"/usr/share/icons/hicolor/$_res/apps
     ln -s /opt/$pkgname/Icon/$_res/sublime_text.png \
@@ -70,10 +65,10 @@ package () {
   done
 
   # license
-  install -Dm644 $pkgname-EULA "$pkgdir"/usr/share/licenses/$pkgname/EULA
+  install -Dm0644 $pkgname-EULA "$pkgdir"/usr/share/licenses/$pkgname/EULA
 
   # libpng
-  install -m644 png_fake_install/lib/libpng16.so.16.2.0 \
+  install -m0644 png_fake_install/lib/libpng16.so.16.2.0 \
     "$pkgdir"/opt/$pkgname/lib/libpng16.so.16.2.0
   ln -s libpng16.so.16.2.0 "$pkgdir"/opt/$pkgname/lib/libpng16.so.16
   ln -s libpng16.so.16 "$pkgdir"/opt/$pkgname/lib/libpng16.so
diff --git a/sublime-text.desktop b/sublime-text.desktop
deleted file mode 100644
index d23aa62d1e85..000000000000
--- a/sublime-text.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sublime Text
-Comment=Sophisticated text editor for code, html and prose
-Exec=subl %F
-Icon=sublime-text
-Categories=Utility;TextEditor;
-Terminal=false
-MimeType=text/plain;
diff --git a/sublime-text.install b/sublime-text.install
deleted file mode 100644
index 83427c8491a5..000000000000
--- a/sublime-text.install
+++ /dev/null
@@ -1,14 +0,0 @@
-
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/sublime-text.sh b/sublime-text.sh
deleted file mode 100755
index 905aea64111d..000000000000
--- a/sublime-text.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Please note that Sublime Text 2 for some reason opens an empty instance
-# if the project you're trying to open is already open in another instance,
-# instead of just giving it focus.
-
-BIN=/opt/sublime-text/sublime_text
-
-PID=$(ps -Ao comm,pid | awk '$1 == "sublime_text" { print $2 }')
-ARGS="--class=sublime_text"
-
-if [[ ${1:(-16)} == ".sublime-project" ]]; then
-	ARGS="${ARGS} --project"
-fi
-
-# LD_LIBRARY_PATH is needed for old libpng
-
-if [[ -n ${PID} ]]; then
-	LD_LIBRARY_PATH=/opt/sublime-text/lib ${BIN} ${ARGS} "$@"
-else
-	LD_LIBRARY_PATH=/opt/sublime-text/lib ${BIN} ${ARGS} "$@" &
-fi
diff --git a/sublime-text-EULA b/sublime-text2-EULA
index 7682a5a80a36..f089c94b4c6a 100644
--- a/sublime-text-EULA
+++ b/sublime-text2-EULA
@@ -1,4 +1,4 @@
-# EULA
+# End User License Agreement
 
 The SOFTWARE PRODUCT (SUBLIME TEXT) is protected by copyright laws and
 international copyright treaties, as well as other intellectual property laws
@@ -49,3 +49,4 @@ SUBLIME TEXT 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.
 
+© Sublime HQ Pty Ltd
diff --git a/sublime-text2.desktop b/sublime-text2.desktop
new file mode 100644
index 000000000000..f8bc3e29a50c
--- /dev/null
+++ b/sublime-text2.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Sublime Text 2
+GenericName=Editor
+Comment=Sophisticated text editor for code, html and prose (legacy version)
+Exec=subl %F
+Icon=sublime-text2
+Categories=Utility;TextEditor;
+Terminal=false
+StartupWMClass=sublime_text
+MimeType=text/plain;
diff --git a/sublime-text2.sh b/sublime-text2.sh
new file mode 100644
index 000000000000..2df213db10c0
--- /dev/null
+++ b/sublime-text2.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+ST=/opt/sublime-text2
+
+# needed for .desktop launcher
+ARGS="--class=sublime_text"
+
+# Note: Sublime Text 2 opens an empty instance if the project to open is
+# already opened in another instance instead of just giving it focus.
+if [[ ${1:(-16)} == ".sublime-project" ]]; then
+  ARGS="${ARGS} --project"
+fi
+
+# LD_LIBRARY_PATH is needed for old libpng
+export LD_LIBRARY_PATH=${ST}/lib:${LD_LIBRARY_PATH}
+
+exec ${ST}/sublime_text ${ARGS} "$@" &