summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Zou <xantares09@hotmail.com>2017-03-03 14:18:09 +0100
committerMichel Zou <xantares09@hotmail.com>2017-03-03 14:18:09 +0100
commit4e3612daa2ae0f35bbb835f4fad77f196a505b05 (patch)
tree711ac3f7606d2bc04008fb1164f8f7fe58d2657b
parenta062e4a1f45e1b56f44df3bcee2dc26bb67de203 (diff)
3.01
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD11
-rw-r--r--nsis-add-mingw-w64-support.patch25
3 files changed, 7 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 06d7a63..821457d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Oct 22 15:19:14 UTC 2016
+# Fri Mar 3 13:18:09 UTC 2017
pkgbase = nsis
pkgdesc = A professional open source system to create Windows installers
- pkgver = 3.0
+ pkgver = 3.01
pkgrel = 1
url = http://nsis.sourceforge.net
arch = i686
@@ -13,10 +13,8 @@ pkgbase = nsis
makedepends = mingw-w64-zlib
depends = gcc-libs
options = !strip
- source = http://downloads.sourceforge.net/project/nsis/NSIS%203/3.0/nsis-3.0-src.tar.bz2
- source = nsis-add-mingw-w64-support.patch
- md5sums = 23d2e0f58e7ea3b2df2c16791896a6f1
- md5sums = 39c4d9f24fd18b999c2a487e2bbcb788
+ source = http://downloads.sourceforge.net/project/nsis/NSIS%203/3.01/nsis-3.01-src.tar.bz2
+ md5sums = fc40b977d1ddd9f8a74511147f38ca8c
pkgname = nsis
diff --git a/PKGBUILD b/PKGBUILD
index 5bcaa6f..5b82614 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Andre Klitzing <andre () incubo () de>
pkgname=nsis
-pkgver=3.0
+pkgver=3.01
pkgrel=1
pkgdesc='A professional open source system to create Windows installers'
arch=('i686' 'x86_64')
@@ -11,16 +11,11 @@ license=('custom:zlib')
depends=('gcc-libs')
makedepends=('scons' 'mingw-w64-gcc' 'mingw-w64-zlib')
options=(!strip)
-source=(http://downloads.sourceforge.net/project/nsis/NSIS%203/$pkgver/$pkgname-$pkgver-src.tar.bz2
- nsis-add-mingw-w64-support.patch)
-md5sums=('23d2e0f58e7ea3b2df2c16791896a6f1'
- '39c4d9f24fd18b999c2a487e2bbcb788')
+source=(http://downloads.sourceforge.net/project/nsis/NSIS%203/$pkgver/$pkgname-$pkgver-src.tar.bz2)
+md5sums=('fc40b977d1ddd9f8a74511147f38ca8c')
prepare() {
cd "$srcdir/$pkgname-$pkgver-src"
-
- # https://github.com/kichik/nsis/commit/4677332
- patch -p1 -i "$srcdir/nsis-add-mingw-w64-support.patch"
}
build() {
diff --git a/nsis-add-mingw-w64-support.patch b/nsis-add-mingw-w64-support.patch
deleted file mode 100644
index 02d119a..0000000
--- a/nsis-add-mingw-w64-support.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4677332e1cded26606698fdb3f291cdc3e5eb9ef Mon Sep 17 00:00:00 2001
-From: Amir Szekely <kichik@users.sourceforge.net>
-Date: Fri, 30 Sep 2016 23:32:40 +0000
-Subject: [PATCH] more mingw versions https://github.com/kichik/nsis/pull/5/
-
-git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6784 212acab6-be3b-0410-9dea-997c60f758d6
----
- SCons/Tools/crossmingw.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py
-index 6140a2d..106f403 100644
---- a/SCons/Tools/crossmingw.py
-+++ b/SCons/Tools/crossmingw.py
-@@ -58,6 +58,10 @@
- i486-pc-mingw32-
- i586-pc-mingw32-
- i686-pc-mingw32-
-+ i386-w64-mingw32-
-+ i486-w64-mingw32-
-+ i586-w64-mingw32-
-+ i686-w64-mingw32-
- """)
-
- def find(env):