[PATCH][W32] W32 and MSys compatibility

[LRN]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 19.05.2012 21:13, LRN wrote:
> On 18.05.2012 20:36, Dan Nicholson wrote:
>> On Fri, May 18, 2012 at 09:21:08AM -0700, Dan Nicholson wrote:
>>> On Sat, Mar 31, 2012 at 09:27:54AM +0400, LRN wrote:
>>>> 09-fix-pkgconfig-pc-path-on.mingw32.patch: Can't use
>>>> deprecated w32 functions with new glib :( Also leaks a bit
>>>> less memory (no that anyone would notice...)
>>> 
>>> This one is also in bug 45742. I liked your version of the
>>> patch better where a separate symbol was added. However, I like
>>> it even more if we always use the symbol and only use the
>>> conditional once when it's constructed. I also added a version
>>> check for glib in configure to make sure we have a new enough
>>> version.
>>> 
>>> Can you give the attached patch a shot and let me know if it 
>>> works?
> 
>> Whoops, I missed a conditional in pkg.c I wanted to fix. Can you 
>> try this patch?
> It compiles (against external glib). And passes all 12 tests. I'll 
> install the compiled binaries into my buildslave to see how they
> work
OK, found a silly bug in the patch, here's a patch that fixes your patch.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPt988AAoJEOs4Jb6SI2CwNFgIAL8Y4v7YsDnKcWlREgrr813T
LUdh4gO9RoIG73s6tEJLCvg+mnz+ecB2SKrFv5O/EFXe7iWKD1CLo9vCDmdsdvmm
0eIojoQx1Nwkr+TSHY7ZOIt3YBFfWO5Fsnl+l92FekNooNzhNT/JUp71dS6ctIhl
W0EenoorFhmVBmJNWxvyV9yXKyX/7MgaD427l9i2ZUnXL3D92bk66svhKuox9x2X
ZC9HH8gVbXalkdalQ24x5Pbyub9REL6W6vJiWe1Qywx4jiQl3MFMHJ5ni5D8cfF8
36TsZhPh6HQn8TzyekLLoSrNCOjTvEfoECuqQrbBsBSotMA851Dr+SHaEieHZT4=
=Zq04
-----END PGP SIGNATURE-----
-------------- next part --------------
--- 0000-win32-no-deprecated-glib.all.patch.orig	2012-05-19 18:29:18 +0400
+++ 0000-win32-no-deprecated-glib.all.patch	2012-05-19 21:45:24 +0400
@@ -92,8 +92,8 @@
 +      return;
 +    }
 +
-+  lpath = g_build_filename (pkg_config_pc_path, "lib", "pkgconfig", NULL);
-+  shpath = g_build_filename (pkg_config_pc_path, "share", "pkgconfig", NULL);
++  lpath = g_build_filename (instdir, "lib", "pkgconfig", NULL);
++  shpath = g_build_filename (instdir, "share", "pkgconfig", NULL);
 +  pkg_config_pc_path = g_strconcat (lpath, G_SEARCHPATH_SEPARATOR_S, shpath,
 +                                    NULL);
 +  free (instdir);