Mercurial > mxe-octave
annotate src/gdk-pixbuf-1-fixes.patch @ 4327:8e9b2a147e2a
of-tsa: update to v4.4.5
* src/of-tsa.mk: update version, chcksum
* src/of-tsa-1-cross-fixes.patch: removed
* dist-files.mk: remove of-tsa-1-cross-fixes.patch
* build_packages.m: update tsa version
author | John D |
---|---|
date | Wed, 11 Jan 2017 16:12:35 -0500 |
parents | e19ca43b6edd |
children |
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 |
3165
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
2819
diff
changeset
|
16 @@ -207,12 +207,16 @@ get_file_formats (void) |
2819 | 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 |
3165
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
2819
diff
changeset
|
26 +#ifdef DLL_EXPORT |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
2819
diff
changeset
|
27 DllMain (HINSTANCE hinstDLL, |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
2819
diff
changeset
|
28 +#else |
2396
f3e8d1172278
gdk-pixbuf: rename DllMain to gdkpixbuf_DllMain
Matthias Gehre <M.Gehre@gmx.de>
parents:
2353
diff
changeset
|
29 +gdkpixbuf_DllMain (HINSTANCE hinstDLL, |
3165
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
2819
diff
changeset
|
30 +#endif |
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 | 34 -- |
2819 | 35 1.7.10.4 |
36 | |
37 | |
38 From 0903d316c228bf2a6ba9fe11188851a357cde43e Mon Sep 17 00:00:00 2001 | |
39 From: Mark Brand <mabrand@mabrand.nl> | |
40 Date: Fri, 12 Oct 2012 12:24:51 +0200 | |
41 Subject: [PATCH 2/3] add libtiff to required.private in .pc | |
42 | |
43 | |
44 diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in | |
45 index 7addefc..a07a46f 100644 | |
46 --- a/gdk-pixbuf-2.0.pc.in | |
47 +++ b/gdk-pixbuf-2.0.pc.in | |
48 @@ -12,7 +12,7 @@ Name: GdkPixbuf | |
49 Description: Image loading and scaling | |
50 Version: @VERSION@ | |
51 Requires: gobject-2.0 | |
52 -Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ | |
53 +Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ libtiff-4 | |
54 Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ | |
55 Libs.private: @GDK_PIXBUF_EXTRA_LIBS@ | |
56 Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ | |
57 -- | |
58 1.7.10.4 | |
59 | |
60 | |
61 From 1e76ff73dcd6f191584bb05c8ccc9b0a16394a0d Mon Sep 17 00:00:00 2001 | |
62 From: Mark Brand <mabrand@mabrand.nl> | |
63 Date: Fri, 12 Oct 2012 12:25:27 +0200 | |
64 Subject: [PATCH 3/3] allow static | |
1219 | 65 |
2190
861ed76f2041
packages gdk-pixbuf wxwidgets: tiff 4 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
1612
diff
changeset
|
66 |
2819 | 67 diff --git a/configure.ac b/configure.ac |
68 index a5224f8..a1fc2d0 100644 | |
69 --- a/configure.ac | |
70 +++ b/configure.ac | |
71 @@ -131,16 +131,16 @@ case $host in | |
72 ;; | |
73 esac | |
74 | |
75 -if test "$os_win32" = "yes"; then | |
76 - if test x$enable_static = xyes -o x$enable_static = x; then | |
77 - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) | |
78 - enable_static=no | |
79 - fi | |
80 - if test x$enable_shared = xno; then | |
81 - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) | |
82 - fi | |
83 - enable_shared=yes | |
84 -fi | |
85 +dnl if test "$os_win32" = "yes"; then | |
86 +dnl if test x$enable_static = xyes -o x$enable_static = x; then | |
87 +dnl AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) | |
88 +dnl enable_static=no | |
89 +dnl fi | |
90 +dnl if test x$enable_shared = xno; then | |
91 +dnl AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) | |
92 +dnl fi | |
93 +dnl enable_shared=yes | |
94 +dnl fi | |
95 | |
96 dnl Initialize libtool | |
97 LT_PREREQ([2.2.6]) | |
98 -- | |
99 1.7.10.4 | |
100 |