summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2006-12-29 23:04:50 +0000
committerCédric Krier <cedk@gentoo.org>2006-12-29 23:04:50 +0000
commitc6618df5c70405889a4402e30c8ed2a480c866a0 (patch)
treedad118bb3919142496a35ad92d1126101d0c93de /dev-util/nsis/files
parentVersion bump. Dropped old version. (diff)
downloadgentoo-2-c6618df5c70405889a4402e30c8ed2a480c866a0.tar.gz
gentoo-2-c6618df5c70405889a4402e30c8ed2a480c866a0.tar.bz2
gentoo-2-c6618df5c70405889a4402e30c8ed2a480c866a0.zip
Version bump
(Portage version: 2.1.1-r2)
Diffstat (limited to 'dev-util/nsis/files')
-rw-r--r--dev-util/nsis/files/digest-nsis-2.223
-rw-r--r--dev-util/nsis/files/nsis-2.22-config.patch43
2 files changed, 46 insertions, 0 deletions
diff --git a/dev-util/nsis/files/digest-nsis-2.22 b/dev-util/nsis/files/digest-nsis-2.22
new file mode 100644
index 000000000000..62f71866caa3
--- /dev/null
+++ b/dev-util/nsis/files/digest-nsis-2.22
@@ -0,0 +1,3 @@
+MD5 dfa6e8587cb691ddbb244f447dbc4476 nsis-2.22-src.tar.bz2 1603505
+RMD160 6c7294d1c5b1ccb6922ba345e5e47e74741fcf44 nsis-2.22-src.tar.bz2 1603505
+SHA256 4df89ea7d3d5055b0a1ffedb79ad8e2bec04a58f5174da4c86f9ef5a6bc620dc nsis-2.22-src.tar.bz2 1603505
diff --git a/dev-util/nsis/files/nsis-2.22-config.patch b/dev-util/nsis/files/nsis-2.22-config.patch
new file mode 100644
index 000000000000..88c5fdc12c83
--- /dev/null
+++ b/dev-util/nsis/files/nsis-2.22-config.patch
@@ -0,0 +1,43 @@
+diff -ru nsis-2.22-src~/Contrib/Math/SConscript nsis-2.22-src/Contrib/Math/SConscript
+--- nsis-2.22-src~/Contrib/Math/SConscript 2006-12-29 23:45:50.000000000 +0100
++++ nsis-2.22-src/Contrib/Math/SConscript 2006-12-29 23:55:03.000000000 +0100
+@@ -23,9 +23,6 @@
+
+ Import('BuildPlugin env')
+
+-if float(env['MSVS_VERSION'].replace('Exp','')) >= 8.0:
+- files += ['Source/mathcrtmt.lib']
+-else:
+- files += ['Source/mathcrt.lib']
++files += ['Source/mathcrtmt.lib']
+
+ BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG'])
+diff -ru nsis-2.22-src~/SCons/Config/gnu nsis-2.22-src/SCons/Config/gnu
+--- nsis-2.22-src~/SCons/Config/gnu 2006-12-29 23:45:50.000000000 +0100
++++ nsis-2.22-src/SCons/Config/gnu 2006-12-29 23:46:22.000000000 +0100
+@@ -68,6 +68,7 @@
+ if not defenv['DEBUG']:
+ stub_env.Append(LINKFLAGS = '-s') # strip
+ stub_env.Append(LINKFLAGS = '-mwindows') # build windows executables
++stub_env.Append(LINKFLAGS = '-L/usr/mingw32/usr/lib')
+ stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG') # no standard libraries
+ stub_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align
+ stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point
+@@ -83,8 +84,6 @@
+
+ conf = FlagsConfigure(makensis_env)
+ conf.CheckLinkFlag('$MAP_FLAG') # generate map file
+-if not defenv['DEBUG']:
+- TestStrip(conf) # strip
+ conf.Finish()
+
+ ### plugin environment
+@@ -112,8 +111,6 @@
+
+ conf = FlagsConfigure(cp_util_env)
+ conf.CheckLinkFlag('$MAP_FLAG') # generate map file
+-if not defenv['DEBUG']:
+- TestStrip(conf) # strip
+ conf.Finish()
+
+ ### util environment