OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Dec-2009 11:10:49
Branch: HEAD Handle: 2009120710104900
Modified files:
openpkg-src/nsis nsis.patch nsis.spec
Log:
upgrading package: nsis 2.45 -> 2.46
Summary:
Revision Changes Path
1.6 +30 -30 openpkg-src/nsis/nsis.patch
1.13 +2 -2 openpkg-src/nsis/nsis.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nsis/nsis.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 nsis.patch
--- openpkg-src/nsis/nsis.patch 27 Jun 2009 12:53:28 -0000 1.5
+++ openpkg-src/nsis/nsis.patch 7 Dec 2009 10:10:49 -0000 1.6
@@ -47,9 +47,9 @@
conf.Finish()
### weird GCC requirements
-Index: nsis-2.45/Contrib/Modern UI 2/Deprecated.nsh
---- nsis-2.45/Contrib/Modern UI 2/Deprecated.nsh.orig 2007-12-22
12:13:28 +0100
-+++ nsis-2.45/Contrib/Modern UI 2/Deprecated.nsh 2009-06-26 20:20:56
+0200
+Index: nsis-2.46/Contrib/Modern UI 2/Deprecated.nsh
+--- nsis-2.46/Contrib/Modern UI 2/Deprecated.nsh.orig 2007-12-22
12:13:28 +0100
++++ nsis-2.46/Contrib/Modern UI 2/Deprecated.nsh 2009-06-26 20:20:56
+0200
@@ -67,6 +67,6 @@
!macro MUI_RESERVEFILE_INSTALLOPTIONS
@@ -58,9 +58,9 @@
+ !error "MUI_RESERVEFILE_INSTALLOPTIONS is no longer supported as
InstallOptions is no longer used by MUI2. Instead, use ReserveFile
'${MUI_DOLLAR}{NSISDIR}/Plugins/InstallOptions.dll'. It is also recommended to
upgrade to nsDialogs."
!macroend
-Index: nsis-2.45/Contrib/Modern UI 2/Interface.nsh
---- nsis-2.45/Contrib/Modern UI 2/Interface.nsh.orig 2008-04-18 20:20:50
+0200
-+++ nsis-2.45/Contrib/Modern UI 2/Interface.nsh 2009-06-26 20:21:29
+0200
+Index: nsis-2.46/Contrib/Modern UI 2/Interface.nsh
+--- nsis-2.46/Contrib/Modern UI 2/Interface.nsh.orig 2008-04-18 20:20:50
+0200
++++ nsis-2.46/Contrib/Modern UI 2/Interface.nsh 2009-06-26 20:21:29
+0200
@@ -43,17 +43,17 @@
!endif
@@ -116,9 +116,9 @@
!endif
!ifdef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL
-Index: nsis-2.45/Contrib/Modern UI 2/Localization.nsh
---- nsis-2.45/Contrib/Modern UI 2/Localization.nsh.orig 2008-03-29
18:35:08 +0100
-+++ nsis-2.45/Contrib/Modern UI 2/Localization.nsh 2009-06-26 20:21:51
+0200
+Index: nsis-2.46/Contrib/Modern UI 2/Localization.nsh
+--- nsis-2.46/Contrib/Modern UI 2/Localization.nsh.orig 2008-03-29
18:35:08 +0100
++++ nsis-2.46/Contrib/Modern UI 2/Localization.nsh 2009-06-26 20:21:51
+0200
@@ -35,10 +35,10 @@
!insertmacro MUI_INSERT
@@ -141,9 +141,9 @@
!verbose pop
-Index: nsis-2.45/Contrib/Modern UI 2/MUI2.nsh
---- nsis-2.45/Contrib/Modern UI 2/MUI2.nsh.orig 2009-02-01 16:44:30
+0100
-+++ nsis-2.45/Contrib/Modern UI 2/MUI2.nsh 2009-06-26 20:20:47 +0200
+Index: nsis-2.46/Contrib/Modern UI 2/MUI2.nsh
+--- nsis-2.46/Contrib/Modern UI 2/MUI2.nsh.orig 2009-02-01 16:44:30
+0100
++++ nsis-2.46/Contrib/Modern UI 2/MUI2.nsh 2009-06-26 20:20:47 +0200
@@ -22,7 +22,7 @@
!verbose ${MUI_VERBOSE}
@@ -176,9 +176,9 @@
;--------------------------------
-Index: nsis-2.45/Contrib/Modern UI 2/Pages/Components.nsh
---- nsis-2.45/Contrib/Modern UI 2/Pages/Components.nsh.orig 2008-02-21
00:34:12 +0100
-+++ nsis-2.45/Contrib/Modern UI 2/Pages/Components.nsh 2009-06-26
20:22:20 +0200
+Index: nsis-2.46/Contrib/Modern UI 2/Pages/Components.nsh
+--- nsis-2.46/Contrib/Modern UI 2/Pages/Components.nsh.orig 2008-02-21
00:34:12 +0100
++++ nsis-2.46/Contrib/Modern UI 2/Pages/Components.nsh 2009-06-26
20:22:20 +0200
@@ -27,10 +27,10 @@
Var mui.ComponentsPage.SpaceRequired
@@ -193,9 +193,9 @@
;Apply settings
-Index: nsis-2.45/Contrib/Modern UI 2/Pages/Finish.nsh
---- nsis-2.45/Contrib/Modern UI 2/Pages/Finish.nsh.orig 2009-06-06
17:26:08 +0200
-+++ nsis-2.45/Contrib/Modern UI 2/Pages/Finish.nsh 2009-06-26 20:22:47
+0200
+Index: nsis-2.46/Contrib/Modern UI 2/Pages/Finish.nsh
+--- nsis-2.46/Contrib/Modern UI 2/Pages/Finish.nsh.orig 2009-06-06
17:26:08 +0200
++++ nsis-2.46/Contrib/Modern UI 2/Pages/Finish.nsh 2009-06-26 20:22:47
+0200
@@ -71,7 +71,7 @@
!endif
!endif
@@ -226,9 +226,9 @@
!endif
;Positiong of controls
-Index: nsis-2.45/Contrib/Modern UI 2/Pages/Welcome.nsh
---- nsis-2.45/Contrib/Modern UI 2/Pages/Welcome.nsh.orig 2008-12-20
10:17:14 +0100
-+++ nsis-2.45/Contrib/Modern UI 2/Pages/Welcome.nsh 2009-06-26 20:23:23
+0200
+Index: nsis-2.46/Contrib/Modern UI 2/Pages/Welcome.nsh
+--- nsis-2.46/Contrib/Modern UI 2/Pages/Welcome.nsh.orig 2008-12-20
10:17:14 +0100
++++ nsis-2.46/Contrib/Modern UI 2/Pages/Welcome.nsh 2009-06-26 20:23:23
+0200
@@ -23,7 +23,7 @@
Var mui.WelcomePage.Text
!endif
@@ -259,9 +259,9 @@
!endif
;Positiong of controls
-Index: nsis-2.45/Contrib/Modern UI/System.nsh
---- nsis-2.45/Contrib/Modern UI/System.nsh.orig 2009-02-01 16:44:30
+0100
-+++ nsis-2.45/Contrib/Modern UI/System.nsh 2009-06-26 20:20:15 +0200
+Index: nsis-2.46/Contrib/Modern UI/System.nsh
+--- nsis-2.46/Contrib/Modern UI/System.nsh.orig 2009-02-01 16:44:30
+0100
++++ nsis-2.46/Contrib/Modern UI/System.nsh 2009-06-26 20:20:15 +0200
@@ -117,26 +117,26 @@
!insertmacro MUI_NSISCONF
!endif
@@ -377,16 +377,16 @@
;Add language to list of languages for selection dialog
!ifndef MUI_LANGDLL_LANGUAGES
-Index: nsis-2.45/Include/MUI.nsh
---- nsis-2.45/Include/MUI.nsh.orig 2007-12-01 13:43:02 +0100
-+++ nsis-2.45/Include/MUI.nsh 2009-06-26 20:15:19 +0200
+Index: nsis-2.46/Include/MUI.nsh
+--- nsis-2.46/Include/MUI.nsh.orig 2007-12-01 13:43:02 +0100
++++ nsis-2.46/Include/MUI.nsh 2009-06-26 20:15:19 +0200
@@ -1 +1 @@
-!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
\ No newline at end of file
+!include "${NSISDIR}/Contrib/Modern-UI/System.nsh"
-Index: nsis-2.45/Include/MUI2.nsh
---- nsis-2.45/Include/MUI2.nsh.orig 2007-12-01 13:43:02 +0100
-+++ nsis-2.45/Include/MUI2.nsh 2009-06-26 20:15:19 +0200
+Index: nsis-2.46/Include/MUI2.nsh
+--- nsis-2.46/Include/MUI2.nsh.orig 2007-12-01 13:43:02 +0100
++++ nsis-2.46/Include/MUI2.nsh 2009-06-26 20:15:19 +0200
@@ -1 +1 @@
-!include "${NSISDIR}\Contrib\Modern UI 2\MUI2.nsh"
\ No newline at end of file
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsis/nsis.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 nsis.spec
--- openpkg-src/nsis/nsis.spec 2 Jul 2009 16:35:10 -0000 1.12
+++ openpkg-src/nsis/nsis.spec 7 Dec 2009 10:10:49 -0000 1.13
@@ -31,8 +31,8 @@
Class: EVAL
Group: System
License: GPL
-Version: 2.45
-Release: 20090702
+Version: 2.46
+Release: 20091207
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/nsis/nsis-%{version}-src.tar.bz2
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
