[patch] nsiswrapper 3.4.fc11

Richard W.M. Jones rjones at redhat.com
Thu Jun 4 17:11:23 UTC 2009


On Thu, Jun 04, 2009 at 11:30:41AM -0500, René Berber wrote:
> Hi,
> 
> In the course of cross-building a Qt and Gtk version of Transmission I
> had to patch nsiswrapper as follows, only 2 changes: add case
> insensitive option to grep, add more system libraries; still left undone
> check_path should be made into a case insensitive search (had to use a
> workaround linking Qt's libraries with all lowercase names).
> 
> --- /usr/bin/nsiswrapper.orig   2009-05-23 16:21:13.343406085 +0000
> +++ /usr/bin/nsiswrapper        2009-05-26 07:40:43.493333337 +0000
> @@ -443,7 +443,7 @@
>      if (m/\.exe$/i || m/\.dll$/i) {
>         my $cmd = "$objdump -p '$file' |
>                     grep 'DLL Name:' |
> -                   grep -Eo '[-._[:alnum:]]+\.dll' |
> +                   grep -Eio '[-._[:alnum:]]+\.dll' |
>                     sort -u"; # XXX quoting
>         open DEPS, "$cmd |" or die "$cmd: $!";
>         foreach (<DEPS>) {
> @@ -493,7 +493,19 @@
>         $_ eq 'ole32.dll' ||
>         $_ eq 'mscoree.dll' ||
>         $_ eq 'msvcrt.dll' ||
> -       $_ eq 'user32.dll'
> +       $_ eq 'user32.dll' ||
> +       $_ eq 'advapi32.dll' ||
> +       $_ eq 'comctl32.dll' ||
> +       $_ eq 'comdlg32.dll' ||
> +       $_ eq 'imm32.dll' ||
> +       $_ eq 'msimg32.dll' ||
> +       $_ eq 'oleaut32.dll' ||
> +       $_ eq 'shell32.dll' ||
> +       $_ eq 'shlwapi.dll' ||
> +       $_ eq 'winmm.dll' ||
> +       $_ eq 'wsock32.dll' ||
> +       $_ eq 'ws2_32.dll' ||
> +       $_ eq 'wldap32.dll'
>  }
> 
>  # Add Gtk dependencies, if --with-gtk.
> 
> The version in the subject is what 'yum info ming32-nsiswrapper' shows
> as version.release (the file itself doesn't have anything to identify it
> inside).

+1.

I will commit unless anyone has any objections.

Rich.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw



More information about the mingw mailing list