Mercurial > mxe-octave

comparison src/gdk-pixbuf-1-fixes.patch @ 2819:7bbe1601a5ed

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