Mercurial > mxe-octave

annotate src/gdk-pixbuf-1-fixes.patch @ 2614:1f6e698fb89e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package gdk-pixbuf
author Hans Petter Jansson <hpj@cl.no>
date Mon, 04 Jun 2012 17:59:36 +0200
parents f3e8d1172278
children 7bbe1601a5ed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2190
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1192
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
2190
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
6 From 74e785e4ee6cf375f1c04d9e57e4b70caec6742c Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2190
diff changeset
7 From: MXE
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
8 Date: Fri, 24 Sep 2010 23:31:24 +0200
2190
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
9 Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
10
2190
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
11 ---
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
12 gdk-pixbuf/gdk-pixbuf-io.c | 4 ++--
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
13 1 files changed, 2 insertions(+), 2 deletions(-)
1192
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
2190
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
16 index 6a5dbce..e5e1c2d 100644
1192
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 --- a/gdk-pixbuf/gdk-pixbuf-io.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 +++ b/gdk-pixbuf/gdk-pixbuf-io.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 @@ -226,12 +226,12 @@ skip_space (const char **pos)
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 #ifdef G_OS_WIN32
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 -/* DllMain function needed to tuck away the gdk-pixbuf DLL handle */
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 +/* static _disabled_DllMain function needed to tuck away the gdk-pixbuf DLL handle */
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 static HMODULE gdk_pixbuf_dll;
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 BOOL WINAPI
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 -DllMain (HINSTANCE hinstDLL,
2396
f3e8d1172278 gdk-pixbuf: rename DllMain to gdkpixbuf_DllMain
Matthias Gehre <M.Gehre@gmx.de>
parents: 2353
diff changeset
30 +gdkpixbuf_DllMain (HINSTANCE hinstDLL,
1192
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 DWORD fdwReason,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 LPVOID lpvReserved)
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 {
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
34 --
2190
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
35 1.7.8
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
36
2190
861ed76f2041 packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 1612
diff changeset
37