summaryrefslogtreecommitdiffstats
path: root/glib
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-12 16:05:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-13 13:15:25 +0100
commit452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch)
tree950d062f9e183873d64b06e212568a3b0968bb58 /glib
parentWaE: declaration of 'rand' shadows a global declaration (diff)
downloadcore-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.tar.gz
core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.zip
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard" so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'glib')
-rw-r--r--glib/glib-2.28.1-win32.patch24
1 files changed, 3 insertions, 21 deletions
diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch
index 3089f938b17c..f45b46f1c24d 100644
--- a/glib/glib-2.28.1-win32.patch
+++ b/glib/glib-2.28.1-win32.patch
@@ -73,26 +73,17 @@
!IFDEF ZLIB
ZLIB_CFLAGS = -I $(ZLIB)
-ZLIB_LIBS = $(ZLIB)\projects\visualc6\Win32_LIB_Release\zlib.lib
-+ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib
++ZLIB_LIBS = $(OUTDIR)\lib\z.lib
!ELSE
-ZLIB_CFLAGS = -I $(DEVTOP)\include
-ZLIB_LIBS = $(DEVTOP)\lib\zdll.lib
-+ZLIB_CFLAGS = -I $(OUTDIR)\inc\external\zlib
-+ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib
++ZLIB_CFLAGS = -I $(OUTDIR)\inc\external
++ZLIB_LIBS = $(OUTDIR)\lib\z.lib
!ENDIF
################
--- misc/glib-2.28.1/gio/gzlibcompressor.c 2011-02-11 16:23:12.000000000 +0100
+++ misc/build/glib-2.28.1/gio/gzlibcompressor.c 2011-03-07 10:33:19.559189800 +0100
-@@ -25,7 +25,7 @@
- #include "gzlibcompressor.h"
-
- #include <errno.h>
--#include <zlib.h>
-+#include <zlib/zlib.h>
- #include <string.h>
-
- #include "gfileinfo.h"
@@ -64,8 +64,10 @@
GZlibCompressorFormat format;
@@ -115,15 +106,6 @@
if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP ||
--- misc/glib-2.28.1/gio/gzlibdecompressor.c 2011-03-07 09:13:41.324890400 +0100
+++ misc/build/glib-2.28.1/gio/gzlibdecompressor.c 2011-03-04 11:28:39.712480200 +0100
-@@ -25,7 +25,7 @@
- #include "gzlibdecompressor.h"
-
- #include <errno.h>
--#include <zlib.h>
-+#include <zlib/zlib.h>
- #include <string.h>
-
- #include "gfileinfo.h"
@@ -76,7 +76,7 @@
g_zlib_decompressor_set_gzheader (GZlibDecompressor *decompressor)
{