Mercurial > mxe-octave
annotate src/gdk-pixbuf-1-fixes.patch @ 2988:aca8511e7751
qt.mk: link to correct files in bin directory
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 16 May 2013 13:32:57 -0400 |
| parents | 7bbe1601a5ed |
| children | e19ca43b6edd |
| 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 |
| 2819 | 6 From 38f4e914e458de6963a3fddbb57dbf8cd0fb83b4 Mon Sep 17 00:00:00 2001 |
| 7 From: Mark Brand <mabrand@mabrand.nl> | |
| 1219 | 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 | 10 |
|
1192
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
11 |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
12 diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c |
| 2819 | 13 index 411ceb6..64db155 100644 |
|
1192
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
14 --- 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
|
15 +++ b/gdk-pixbuf/gdk-pixbuf-io.c |
| 2819 | 16 @@ -230,12 +230,12 @@ get_file_formats (void) |
| 17 | |
|
1192
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
18 #ifdef G_OS_WIN32 |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
20 -/* 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
|
21 +/* 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
|
22 |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 static HMODULE gdk_pixbuf_dll; |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
25 BOOL WINAPI |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
26 -DllMain (HINSTANCE hinstDLL, |
|
2396
f3e8d1172278
gdk-pixbuf: rename DllMain to gdkpixbuf_DllMain
Matthias Gehre <M.Gehre@gmx.de>
parents:
2353
diff
changeset
|
27 +gdkpixbuf_DllMain (HINSTANCE hinstDLL, |
|
1192
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
28 DWORD fdwReason, |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
29 LPVOID lpvReserved) |
|
92877f4655f9
remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
30 { |
| 1219 | 31 -- |
| 2819 | 32 1.7.10.4 |
| 33 | |
| 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 | |
| 1219 | 62 |
|
2190
861ed76f2041
packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
1612
diff
changeset
|
63 |
| 2819 | 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 |