diff options
| author | Werner Koch <wk@gnupg.org> | 2023-04-05 14:57:40 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2023-04-05 15:01:18 +0200 |
| commit | 42ccbd6c78e61cdc9de5a87f3a771e0dd21852b8 (patch) | |
| tree | 177b2d293eb519c0af69d0f7863a51f83ee877c4 | |
| parent | build: Update gpg-error.m4. (diff) | |
| download | gnupg2-42ccbd6c78e61cdc9de5a87f3a771e0dd21852b8.tar.xz gnupg2-42ccbd6c78e61cdc9de5a87f3a771e0dd21852b8.zip | |
speedo,w32: Remove removed profiles and temporary disable runonce.
--
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 3 | ||||
| -rw-r--r-- | build-aux/speedo/w32/wixlib.wxs | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index 665c65b02..42fa2fb58 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -1462,7 +1462,8 @@ Function .onInit ;;!define MUI_LANGDLL_ALWAYSSHOW !insertmacro MUI_LANGDLL_DISPLAY - Call G4wRunOnce + # Temporay disabled until we have fixed the DLL issue (wk 2023-04-05) + # Call G4wRunOnce SetOutPath $TEMP #!ifdef SOURCES diff --git a/build-aux/speedo/w32/wixlib.wxs b/build-aux/speedo/w32/wixlib.wxs index 66e6fee62..02568fe2f 100644 --- a/build-aux/speedo/w32/wixlib.wxs +++ b/build-aux/speedo/w32/wixlib.wxs @@ -160,12 +160,6 @@ and then manually edited: <Component Id="cmpB5509E83C14EE3080355A3EAF09D1C8D" Directory="dir6694D0A4AAD84EF827096DD86D1B4FA2" Guid="FEC81836-944E-4613-A498-E620B981EB04"> <File Id="fil0615847C26E386E0B892124531F2ABBC" KeyPath="yes" Source="$(var.SourceDir)\lib\libnpth.dll.a" Name="libnpth.imp"/> </Component> - <Component Id="cmp909B0412FDFCFD5092D93932AF982A72" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F610"> - <File Id="fil322067E40CE41C36574A7CC520D75876" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\VS-NfD.prf" Name="VS-NfD.prf"/> - </Component> - <Component Id="cmp909B0412FDFCFD5092D93932AF982A73" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F611"> - <File Id="fil322067E40CE41C36574A7CC520D75877" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\Automatic.prf" Name="Automatic.prf"/> - </Component> <Component Id="cmp909B0412FDFCFD5092D93932AF982A74" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F612"> <File Id="fil322067E40CE41C36574A7CC520D75878" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\pwpattern.list" Name="pwpattern.list"/> </Component> |