1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 38f4e914e458de6963a3fddbb57dbf8cd0fb83b4 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 24 Sep 2010 23:31:24 +0200
Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 411ceb6..64db155 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -230,12 +230,12 @@ get_file_formats (void)
#ifdef G_OS_WIN32
-/* DllMain function needed to tuck away the gdk-pixbuf DLL handle */
+/* static _disabled_DllMain function needed to tuck away the gdk-pixbuf DLL handle */
static HMODULE gdk_pixbuf_dll;
BOOL WINAPI
-DllMain (HINSTANCE hinstDLL,
+gdkpixbuf_DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
--
1.7.10.4
From 0903d316c228bf2a6ba9fe11188851a357cde43e Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 12 Oct 2012 12:24:51 +0200
Subject: [PATCH 2/3] add libtiff to required.private in .pc
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index 7addefc..a07a46f 100644
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -12,7 +12,7 @@ Name: GdkPixbuf
Description: Image loading and scaling
Version: @VERSION@
Requires: gobject-2.0
-Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
+Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ libtiff-4
Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@
Libs.private: @GDK_PIXBUF_EXTRA_LIBS@
Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
--
1.7.10.4
From 1e76ff73dcd6f191584bb05c8ccc9b0a16394a0d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 12 Oct 2012 12:25:27 +0200
Subject: [PATCH 3/3] allow static
diff --git a/configure.ac b/configure.ac
index a5224f8..a1fc2d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,16 +131,16 @@ case $host in
;;
esac
-if test "$os_win32" = "yes"; then
- if test x$enable_static = xyes -o x$enable_static = x; then
- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
- enable_static=no
- fi
- if test x$enable_shared = xno; then
- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
- fi
- enable_shared=yes
-fi
+dnl if test "$os_win32" = "yes"; then
+dnl if test x$enable_static = xyes -o x$enable_static = x; then
+dnl AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
+dnl enable_static=no
+dnl fi
+dnl if test x$enable_shared = xno; then
+dnl AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
+dnl fi
+dnl enable_shared=yes
+dnl fi
dnl Initialize libtool
LT_PREREQ([2.2.6])
--
1.7.10.4
|
