gdk_pixbuf2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (178) hide show
  1. data/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c +49 -40
  2. data/ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c +50 -40
  3. data/ext/gdk_pixbuf2/rbgdk-pixbuf.c +250 -168
  4. data/ext/gdk_pixbuf2/rbgdk-pixbuf.h +25 -18
  5. data/ext/gdk_pixbuf2/rbgdk-pixbuf2conversions.h +42 -0
  6. data/ext/gdk_pixbuf2/rbgdk-pixbuf2private.h +35 -0
  7. data/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c +46 -83
  8. data/ext/gdk_pixbuf2/rbgdk-pixbufanimationiter.c +71 -0
  9. data/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c +29 -17
  10. data/ext/gdk_pixbuf2/rbgdk-pixdata.c +81 -77
  11. data/lib/1.8/gdk_pixbuf2.so +0 -0
  12. data/lib/1.9/gdk_pixbuf2.so +0 -0
  13. data/vendor/local/bin/gdk-pixbuf-csource.exe +0 -0
  14. data/vendor/local/bin/gdk-pixbuf-query-loaders.exe +0 -0
  15. data/vendor/local/bin/libgdk_pixbuf-2.0-0.dll +0 -0
  16. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h +40 -0
  17. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h +200 -5
  18. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h +82 -3
  19. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h +170 -0
  20. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h +6 -1
  21. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h +5 -0
  22. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h +42 -1
  23. data/vendor/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache +2 -2
  24. data/vendor/local/lib/gdk_pixbuf-2.0.lib +0 -0
  25. data/vendor/local/lib/libgdk_pixbuf-2.0.dll.a +0 -0
  26. data/vendor/local/lib/pkgconfig/gdk-pixbuf-2.0.pc +4 -2
  27. data/vendor/local/manifest/{gdk-pixbuf-dev_2.22.1-1_win32.mft → gdk-pixbuf-dev_2.24.0-1_win32.mft} +12 -13
  28. data/vendor/local/manifest/{gdk-pixbuf_2.22.1-1_win32.mft → gdk-pixbuf_2.24.0-1_win32.mft} +2 -1
  29. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html +181 -150
  30. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html +30 -9
  31. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html +3 -3
  32. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html +4 -4
  33. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html +6 -6
  34. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html +35 -3
  35. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html +13 -9
  36. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html +6 -6
  37. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html +5 -5
  38. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html +7 -7
  39. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-full.html +251 -629
  40. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Animations.html +644 -0
  41. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-Loading.html +372 -0
  42. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-saving.html +642 -0
  43. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html +417 -0
  44. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Inline-data.html +495 -0
  45. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html +485 -184
  46. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html +168 -0
  47. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/{gdk-pixbuf-scaling.html → gdk-pixbuf-Scaling.html} +296 -190
  48. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-The-GdkPixbuf-Structure.html +617 -0
  49. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/{gdk-pixbuf-util.html → gdk-pixbuf-Utilities.html} +83 -93
  50. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html +63 -26
  51. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html +16 -16
  52. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html +8 -8
  53. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html +8 -8
  54. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html +12 -12
  55. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2 +149 -128
  56. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/index.html +18 -18
  57. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/index.sgml +184 -154
  58. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/license.html +3 -3
  59. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/rn01.html +18 -18
  60. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/rn02.html +5 -5
  61. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/style.css +2 -1
  62. data/vendor/local/share/locale/af/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  63. data/vendor/local/share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  64. data/vendor/local/share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  65. data/vendor/local/share/locale/as/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  66. data/vendor/local/share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  67. data/vendor/local/share/locale/az/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  68. data/vendor/local/share/locale/be/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  69. data/vendor/local/share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  70. data/vendor/local/share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  71. data/vendor/local/share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  72. data/vendor/local/share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  73. data/vendor/local/share/locale/br/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  74. data/vendor/local/share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  75. data/vendor/local/share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  76. data/vendor/local/share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  77. data/vendor/local/share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  78. data/vendor/local/share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  79. data/vendor/local/share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  80. data/vendor/local/share/locale/da/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  81. data/vendor/local/share/locale/de/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  82. data/vendor/local/share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  83. data/vendor/local/share/locale/el/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  84. data/vendor/local/share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  85. data/vendor/local/share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  86. data/vendor/local/share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  87. data/vendor/local/share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  88. data/vendor/local/share/locale/es/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  89. data/vendor/local/share/locale/et/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  90. data/vendor/local/share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  91. data/vendor/local/share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  92. data/vendor/local/share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  93. data/vendor/local/share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  94. data/vendor/local/share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  95. data/vendor/local/share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  96. data/vendor/local/share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  97. data/vendor/local/share/locale/he/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  98. data/vendor/local/share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  99. data/vendor/local/share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  100. data/vendor/local/share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  101. data/vendor/local/share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  102. data/vendor/local/share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  103. data/vendor/local/share/locale/id/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  104. data/vendor/local/share/locale/io/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  105. data/vendor/local/share/locale/is/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  106. data/vendor/local/share/locale/it/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  107. data/vendor/local/share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  108. data/vendor/local/share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  109. data/vendor/local/share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  110. data/vendor/local/share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  111. data/vendor/local/share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  112. data/vendor/local/share/locale/li/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  113. data/vendor/local/share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  114. data/vendor/local/share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  115. data/vendor/local/share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  116. data/vendor/local/share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  117. data/vendor/local/share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  118. data/vendor/local/share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  119. data/vendor/local/share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  120. data/vendor/local/share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  121. data/vendor/local/share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  122. data/vendor/local/share/locale/my/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  123. data/vendor/local/share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  124. data/vendor/local/share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  125. data/vendor/local/share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  126. data/vendor/local/share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  127. data/vendor/local/share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  128. data/vendor/local/share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  129. data/vendor/local/share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  130. data/vendor/local/share/locale/or/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  131. data/vendor/local/share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  132. data/vendor/local/share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  133. data/vendor/local/share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  134. data/vendor/local/share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  135. data/vendor/local/share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  136. data/vendor/local/share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  137. data/vendor/local/share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  138. data/vendor/local/share/locale/si/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  139. data/vendor/local/share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  140. data/vendor/local/share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  141. data/vendor/local/share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  142. data/vendor/local/share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  143. data/vendor/local/share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  144. data/vendor/local/share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  145. data/vendor/local/share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  146. data/vendor/local/share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  147. data/vendor/local/share/locale/te/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  148. data/vendor/local/share/locale/th/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  149. data/vendor/local/share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  150. data/vendor/local/share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  151. data/vendor/local/share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  152. data/vendor/local/share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  153. data/vendor/local/share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  154. data/vendor/local/share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  155. data/vendor/local/share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  156. data/vendor/local/share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  157. data/vendor/local/share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  158. data/vendor/local/share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  159. data/vendor/local/share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  160. data/vendor/local/share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  161. data/vendor/local/share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  162. data/vendor/local/share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  163. data/vendor/local/share/man/man1/gdk-pixbuf-csource.1 +2 -2
  164. data/vendor/local/share/man/man1/gdk-pixbuf-query-loaders.1 +2 -2
  165. data/vendor/local/src/dieterv/packaging/gdk-pixbuf_2.24.0-1_win32.log +956 -0
  166. data/vendor/local/src/dieterv/packaging/gdk-pixbuf_2.24.0-1_win32.sh +97 -0
  167. metadata +26 -24
  168. data/ChangeLog +0 -482
  169. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html +0 -654
  170. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html +0 -406
  171. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html +0 -402
  172. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-saving.html +0 -685
  173. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html +0 -460
  174. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-inline.html +0 -516
  175. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html +0 -132
  176. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp +0 -175
  177. data/vendor/local/src/tml/packaging/gdk-pixbuf_2.22.1-1_win32.log +0 -1012
  178. data/vendor/local/src/tml/packaging/gdk-pixbuf_2.22.1-1_win32.sh +0 -256
@@ -1,256 +0,0 @@
1
- # This is a shell script that calls functions and scripts from
2
- # tml@iki.fi's personal work env�ronment. It is not expected to be
3
- # usable unmodified by others, and is included only for reference.
4
-
5
- MOD=gdk-pixbuf
6
- VER=2.22.1
7
- REV=1
8
- ARCH=win32
9
-
10
- THIS=${MOD}_${VER}-${REV}_${ARCH}
11
-
12
- RUNZIP=${MOD}_${VER}-${REV}_${ARCH}.zip
13
- DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
14
-
15
- HEX=`echo $THIS | md5sum | cut -d' ' -f1`
16
- TARGET=c:/devel/target/$HEX
17
-
18
- usedev
19
- usemsvs6
20
-
21
- (
22
-
23
- set -x
24
-
25
- DEPS=`latest --arch=${ARCH} zlib glib pkg-config libpng`
26
- GETTEXT_RUNTIME=`latest --arch=${ARCH} gettext-runtime`
27
-
28
- PKG_CONFIG_PATH=
29
- for D in $DEPS; do
30
- PATH=/devel/dist/${ARCH}/$D/bin:$PATH
31
- [ -d /devel/dist/${ARCH}/$D/lib/pkgconfig ] && PKG_CONFIG_PATH=/devel/dist/${ARCH}/$D/lib/pkgconfig:$PKG_CONFIG_PATH
32
- done
33
-
34
- LIBPNG=`latest --arch=${ARCH} libpng`
35
- ZLIB=`latest --arch=${ARCH} zlib`
36
-
37
- patch --verbose -p0 --fuzz=0 <<'EOF' &&
38
- --- gdk-pixbuf-2.0.pc.in
39
- +++ gdk-pixbuf-2.0.pc.in
40
- @@ -12,6 +12,6 @@
41
- Description: Image loading and scaling
42
- Version: @VERSION@
43
- Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
44
- -Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
45
- +Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@
46
- Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
47
-
48
- EOF
49
-
50
- patch --verbose -p1 --fuzz=0 <<'EOF' &&
51
- commit 737e577536a54e7ef21e64faf922a6c41dbb06bd
52
- Author: Tor Lillqvist <tml@iki.fi>
53
- Date: Mon Dec 27 14:51:13 2010 +0200
54
-
55
- Use dynamically constructed replacement for GDK_PIXBUF_LIBDIR on Windows
56
-
57
- Instead of the hardcoded configure- and compile-time GDK_PIXBUF_LIBDIR
58
- which is not expected to exist at run-time at all, use a pathname
59
- constructed from where the program binary is, and assuming the normal
60
- conventions.
61
-
62
- This gets used in the --update-cache case to construct the pathname of
63
- the loaders.cache file.
64
-
65
- Note that there already is similar code in main() to construct the
66
- pathname to where the loader DLLs normally are. There is probably some
67
- degree of overlap there that could be factored out, but I don't care.
68
-
69
- diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
70
- index 037c39a..6087bd8 100644
71
- --- a/gdk-pixbuf/queryloaders.c
72
- +++ b/gdk-pixbuf/queryloaders.c
73
- @@ -212,6 +212,35 @@ query_module (GString *contents, const char *dir, const char *file)
74
- g_free (path);
75
- }
76
-
77
- +#ifdef G_OS_WIN32
78
- +
79
- +static char *
80
- +get_toplevel (void)
81
- +{
82
- + static char *toplevel = NULL;
83
- +
84
- + if (toplevel == NULL)
85
- + toplevel = g_win32_get_package_installation_directory_of_module (NULL);
86
- +
87
- + return toplevel;
88
- +}
89
- +
90
- +static char *
91
- +get_libdir (void)
92
- +{
93
- + static char *libdir = NULL;
94
- +
95
- + if (libdir == NULL)
96
- + libdir = g_build_filename (get_toplevel (), "lib", NULL);
97
- +
98
- + return libdir;
99
- +}
100
- +
101
- +#undef GDK_PIXBUF_LIBDIR
102
- +#define GDK_PIXBUF_LIBDIR get_libdir()
103
- +
104
- +#endif
105
- +
106
- static gchar *
107
- gdk_pixbuf_get_module_file (void)
108
- {
109
- EOF
110
-
111
- patch --verbose -p1 --fuzz=0 <<'EOF' &&
112
- commit 98d373ed51df92a1c784a91af91d880bf741208e
113
- Author: Tor Lillqvist <tml@iki.fi>
114
- Date: Mon Dec 27 16:16:59 2010 +0200
115
-
116
- Use run-time message catalog directory on Windows
117
-
118
- Construct pathname at run-time instead of using a hardcoded
119
- GDK_PIXBUF_LOCALEDIR.
120
-
121
- Should fix bug #634659.
122
-
123
- diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
124
- index b5e6c4d..d01575c 100644
125
- --- a/gdk-pixbuf/gdk-pixbuf-io.c
126
- +++ b/gdk-pixbuf/gdk-pixbuf-io.c
127
- @@ -244,8 +244,8 @@ DllMain (HINSTANCE hinstDLL,
128
- return TRUE;
129
- }
130
-
131
- -static char *
132
- -get_toplevel (void)
133
- +char *
134
- +_gdk_pixbuf_win32_get_toplevel (void)
135
- {
136
- static char *toplevel = NULL;
137
-
138
- @@ -261,7 +261,7 @@ get_libdir (void)
139
- static char *libdir = NULL;
140
-
141
- if (libdir == NULL)
142
- - libdir = g_build_filename (get_toplevel (), "lib", NULL);
143
- + libdir = g_build_filename (_gdk_pixbuf_win32_get_toplevel (), "lib", NULL);
144
-
145
- return libdir;
146
- }
147
- @@ -290,7 +290,7 @@ correct_prefix (gchar **path)
148
- * installation prefix on this machine.
149
- */
150
- tem = *path;
151
- - *path = g_strconcat (get_toplevel (), tem + strlen (GDK_PIXBUF_PREFIX), NULL);
152
- + *path = g_strconcat (_gdk_pixbuf_win32_get_toplevel (), tem + strlen (GDK_PIXBUF_PREFIX), NULL);
153
- g_free (tem);
154
- }
155
- }
156
- diff --git a/gdk-pixbuf/gdk-pixbuf-util.c b/gdk-pixbuf/gdk-pixbuf-util.c
157
- index fcac31f..08d09c6 100644
158
- --- a/gdk-pixbuf/gdk-pixbuf-util.c
159
- +++ b/gdk-pixbuf/gdk-pixbuf-util.c
160
- @@ -333,6 +333,32 @@ gdk_pixbuf_apply_embedded_orientation (GdkPixbuf *src)
161
- return dest;
162
- }
163
-
164
- +#ifdef G_OS_WIN32
165
- +
166
- +static const gchar *
167
- +get_localedir (void)
168
- +{
169
- + gchar *temp;
170
- + gchar *retval;
171
- +
172
- + /* In gdk-pixbuf-io.c */
173
- + extern char *_gdk_pixbuf_win32_get_toplevel (void);
174
- +
175
- + temp = g_build_filename (_gdk_pixbuf_win32_get_toplevel (), "share/locale", NULL);
176
- +
177
- + /* The localedir is passed to bindtextdomain() which isn't
178
- + * UTF-8-aware.
179
- + */
180
- + retval = g_win32_locale_filename_from_utf8 (temp);
181
- + g_free (temp);
182
- + return retval;
183
- +}
184
- +
185
- +#undef GDK_PIXBUF_LOCALEDIR
186
- +#define GDK_PIXBUF_LOCALEDIR get_localedir ()
187
- +
188
- +#endif
189
- +
190
- const gchar *
191
- gdk_pixbuf_gettext (const gchar *msgid)
192
- {
193
- EOF
194
-
195
-
196
- # Don't do any relinking and don't use any wrappers in libtool. It
197
- # just causes trouble, IMHO.
198
-
199
- sed -e 's/need_relink=yes/need_relink=no # no way --tml/' \
200
- -e 's/wrappers_required=yes/wrappers_required=no # no thanks --tml/' \
201
- <ltmain.sh >ltmain.temp && mv ltmain.temp ltmain.sh
202
-
203
- lt_cv_deplibs_check_method='pass_all' \
204
- CC='gcc -mthreads' \
205
- CPPFLAGS="-I/devel/dist/${ARCH}/${LIBPNG}/include \
206
- -I/devel/dist/${ARCH}/${ZLIB}/include \
207
- -I/devel/dist/${ARCH}/${GETTEXT_RUNTIME}/include" \
208
- LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
209
- -L/devel/dist/${ARCH}/${ZLIB}/lib \
210
- -L/devel/dist/${ARCH}/${GETTEXT_RUNTIME}/lib \
211
- -Wl,--enable-auto-image-base" \
212
- LIBS=-lintl \
213
- LIBPNG=`pkg-config --libs libpng` \
214
- CFLAGS=-O2 \
215
- ./configure \
216
- --enable-gdiplus \
217
- --with-included-loaders \
218
- --without-libjasper \
219
- --enable-debug=yes \
220
- --enable-explicit-deps=no \
221
- --disable-gtk-doc \
222
- --disable-static \
223
- --prefix=$TARGET &&
224
-
225
- PATH="$PWD/gdk-pixbuf/.libs:/devel/target/$HEX/bin:$PATH" make -j4 install &&
226
-
227
- PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >$TARGET/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache &&
228
-
229
- (echo '# Note: After adding a new separate gdk-pixbuf loader (for instance the svg one)' &&
230
- echo '# run gdk-pixbuf-query-loaders.exe redirecting its output into this file.' &&
231
- echo &&
232
- echo '# Note that the LoaderDir folder below does not name a folder that is' &&
233
- echo '# expected to exist. It was just a temporary directory used at build time.' &&
234
- echo &&
235
- cat $TARGET/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ) >$TARGET/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.temp &&
236
- mv $TARGET/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.temp $TARGET/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache &&
237
-
238
- rm -f /tmp/$RUNZIP /tmp/$DEVZIP &&
239
-
240
- (cd $TARGET &&
241
- zip /tmp/$RUNZIP bin/libgdk_pixbuf-2.0-0.dll &&
242
- zip /tmp/$RUNZIP bin/gdk-pixbuf-query-loaders.exe &&
243
- zip /tmp/$RUNZIP lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders.cache lib/gdk-pixbuf-2.0/2.10.0/loaders &&
244
- zip -r -D /tmp/$RUNZIP share/locale &&
245
-
246
- zip -r -D /tmp/$DEVZIP include/gdk-pixbuf-2.0 &&
247
- zip -r -D /tmp/$DEVZIP lib/libgdk_pixbuf-2.0.dll.a lib/gdk_pixbuf-2.0.lib &&
248
- zip -r -D /tmp/$DEVZIP lib/pkgconfig &&
249
- zip /tmp/$DEVZIP bin/gdk-pixbuf-csource.exe &&
250
- zip -r -D /tmp/$DEVZIP share/man share/gtk-doc &&
251
- :) &&
252
-
253
- :) 2>&1 | tee /devel/src/tml/packaging/$THIS.log
254
-
255
- (cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) &&
256
- manifestify /tmp/$RUNZIP /tmp/$DEVZIP