d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update packages curl gdk-pixbuf gtk2 harfbuzz imagemagick pango

This commit is contained in:
Tony Theodore 2013-06-23 20:34:21 +10:00
parent f525ac0fec
commit 08bd15ca83
9 changed files with 15 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
index.html
View File

@ -1064,7 +1064,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
</tr>
<tr>
<td id="curl-package">curl</td>
<td id="curl-version">7.30.0</td>
<td id="curl-version">7.31.0</td>
<td id="curl-website"><a href="http://curl.haxx.se/libcurl/">cURL</a></td>
</tr>
<tr>
@ -1209,7 +1209,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
</tr>
<tr>
<td id="gdk-pixbuf-package">gdk-pixbuf</td>
<td id="gdk-pixbuf-version">2.28.1</td>
<td id="gdk-pixbuf-version">2.28.2</td>
<td id="gdk-pixbuf-website"><a href="http://www.gdk-pixbuf.org/">GDK-pixbuf</a></td>
</tr>
<tr>
@ -1289,7 +1289,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
</tr>
<tr>
<td id="gtk2-package">gtk2</td>
<td id="gtk2-version">2.24.18</td>
<td id="gtk2-version">2.24.19</td>
<td id="gtk2-website"><a href="http://www.gtk.org/">GTK+</a></td>
</tr>
<tr>
@ -1334,7 +1334,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
</tr>
<tr>
<td id="harfbuzz-package">harfbuzz</td>
<td id="harfbuzz-version">0.9.17</td>
<td id="harfbuzz-version">0.9.18</td>
<td id="harfbuzz-website"><a href="http://harfbuzz.sourceforge.net/">HarfBuzz</a></td>
</tr>
<tr>
@ -1369,7 +1369,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
</tr>
<tr>
<td id="imagemagick-package">imagemagick</td>
<td id="imagemagick-version">6.8.5-8</td>
<td id="imagemagick-version">6.8.6-1</td>
<td id="imagemagick-website"><a href="http://www.imagemagick.org/">ImageMagick</a></td>
</tr>
<tr>
@ -1869,7 +1869,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
</tr>
<tr>
<td id="pango-package">pango</td>
<td id="pango-version">1.34.1</td>
<td id="pango-version">1.35.0</td>
<td id="pango-website"><a href="http://www.pango.org/">Pango</a></td>
</tr>
<tr>

16
src/curl-1-fixes.patch
View File

@ -1,16 +0,0 @@
This file is part of MXE.
See index.html for further information.
diff -ur curl-7.30.0.orig/lib/connect.c curl-7.30.0/lib/connect.c
--- curl-7.30.0.orig/lib/connect.c 2013-05-09 16:46:48.000000000 +1000
+++ curl-7.30.0/lib/connect.c 2013-05-09 16:50:27.000000000 +1000
@@ -427,8 +427,8 @@
So the scope ID, if present, is known to be numeric */
si6->sin6_scope_id = atoi(scope_ptr);
}
- }
#endif
+ }
sizeof_sa = sizeof(struct sockaddr_in6);
}
else

2
src/curl.mk
View File

@ -3,7 +3,7 @@
PKG := curl
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 97d7a52996a09711b4f561b328aefde5b4299bd8
$(PKG)_CHECKSUM := 662e5c0239b7108a684743674c95cc8111a0a245
$(PKG)_SUBDIR := curl-$($(PKG)_VERSION)
$(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma
$(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE)

2
src/gdk-pixbuf.mk
View File

@ -3,7 +3,7 @@
PKG := gdk-pixbuf
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 26494f76708a1ce9e040737fa0c490be8e8e5f7d
$(PKG)_CHECKSUM := 9876d0a20f592f8fb2a52d4a86ec43d607661beb
$(PKG)_SUBDIR := gdk-pixbuf-$($(PKG)_VERSION)
$(PKG)_FILE := gdk-pixbuf-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)

2
src/gtk2.mk
View File

@ -3,7 +3,7 @@
PKG := gtk2
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 59f725afbfe612fc2c772ab7f33842032b03e048
$(PKG)_CHECKSUM := 5faee976b76996396c79a07d5175a53b97cdaa3d
$(PKG)_SUBDIR := gtk+-$($(PKG)_VERSION)
$(PKG)_FILE := gtk+-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)

184
src/harfbuzz-1-fixes.patch
View File

@ -3,194 +3,16 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From a4f3f1b3f70d3f186c2f91a439637cc440653a29 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sun, 12 May 2013 13:12:02 +1000
Subject: [PATCH 1/2] winxp ugly
This patch has been taken from:
https://bugs.freedesktop.org/show_bug.cgi?id=55494
diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc
index 2f01c28..1c2e06d 100644
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
@@ -312,161 +312,16 @@ retry:
bidi_state.uBidiLevel = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
bidi_state.fOverrideDirection = 1;
- hr = ScriptItemizeOpenType (wchars,
- chars_len,
- MAX_ITEMS,
- &bidi_control,
- &bidi_state,
- items,
- script_tags,
- &item_count);
- if (unlikely (FAILED (hr)))
FAIL ("ScriptItemizeOpenType() failed: 0x%08xL", hr);
#undef MAX_ITEMS
- int *range_char_counts = NULL;
- TEXTRANGE_PROPERTIES **range_properties = NULL;
- int range_count = 0;
- if (num_features) {
- /* TODO setup ranges */
- }
-
- OPENTYPE_TAG language_tag = hb_uint32_swap (hb_ot_tag_from_language (buffer->props.language));
-
- unsigned int glyphs_offset = 0;
- unsigned int glyphs_len;
- bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
- for (unsigned int j = 0; j < item_count; j++)
- {
- unsigned int i = backward ? item_count - 1 - j : j;
- unsigned int chars_offset = items[i].iCharPos;
- unsigned int item_chars_len = items[i + 1].iCharPos - chars_offset;
-
- retry_shape:
- hr = ScriptShapeOpenType (font_data->hdc,
- &font_data->script_cache,
- &items[i].a,
- script_tags[i],
- language_tag,
- range_char_counts,
- range_properties,
- range_count,
- wchars + chars_offset,
- item_chars_len,
- glyphs_size - glyphs_offset,
- /* out */
- log_clusters + chars_offset,
- char_props + chars_offset,
- glyphs + glyphs_offset,
- glyph_props + glyphs_offset,
- (int *) &glyphs_len);
-
- if (unlikely (items[i].a.fNoGlyphIndex))
- FAIL ("ScriptShapeOpenType() set fNoGlyphIndex");
- if (unlikely (hr == E_OUTOFMEMORY))
- {
- buffer->ensure (buffer->allocated * 2);
- if (buffer->in_error)
- FAIL ("Buffer resize failed");
- goto retry;
- }
- if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT))
- {
- if (items[i].a.eScript == SCRIPT_UNDEFINED)
- FAIL ("ScriptShapeOpenType() failed: Font doesn't support script");
- items[i].a.eScript = SCRIPT_UNDEFINED;
- goto retry_shape;
- }
- if (unlikely (FAILED (hr)))
- {
- FAIL ("ScriptShapeOpenType() failed: 0x%08xL", hr);
- }
-
- for (unsigned int j = chars_offset; j < chars_offset + item_chars_len; j++)
- log_clusters[j] += glyphs_offset;
-
- hr = ScriptPlaceOpenType (font_data->hdc,
- &font_data->script_cache,
- &items[i].a,
- script_tags[i],
- language_tag,
- range_char_counts,
- range_properties,
- range_count,
- wchars + chars_offset,
- log_clusters + chars_offset,
- char_props + chars_offset,
- item_chars_len,
- glyphs + glyphs_offset,
- glyph_props + glyphs_offset,
- glyphs_len,
- /* out */
- advances + glyphs_offset,
- offsets + glyphs_offset,
- NULL);
- if (unlikely (FAILED (hr)))
- FAIL ("ScriptPlaceOpenType() failed: 0x%08xL", hr);
-
- glyphs_offset += glyphs_len;
- }
- glyphs_len = glyphs_offset;
-
- /* Ok, we've got everything we need, now compose output buffer,
- * very, *very*, carefully! */
-
- /* Calculate visual-clusters. That's what we ship. */
- for (unsigned int i = 0; i < glyphs_len; i++)
- vis_clusters[i] = -1;
- for (unsigned int i = 0; i < buffer->len; i++) {
- uint32_t *p = &vis_clusters[log_clusters[buffer->info[i].utf16_index()]];
- *p = MIN (*p, buffer->info[i].cluster);
- }
- if (!backward) {
- for (unsigned int i = 1; i < glyphs_len; i++)
- if (vis_clusters[i] == -1)
- vis_clusters[i] = vis_clusters[i - 1];
- } else {
- for (int i = glyphs_len - 2; i >= 0; i--)
- if (vis_clusters[i] == -1)
- vis_clusters[i] = vis_clusters[i + 1];
- }
#undef utf16_index
- buffer->ensure (glyphs_len);
- if (buffer->in_error)
- FAIL ("Buffer in error");
#undef FAIL
- /* Set glyph infos */
- buffer->len = 0;
- for (unsigned int i = 0; i < glyphs_len; i++)
- {
- hb_glyph_info_t *info = &buffer->info[buffer->len++];
-
- info->codepoint = glyphs[i];
- info->cluster = vis_clusters[i];
-
- /* The rest is crap. Let's store position info there for now. */
- info->mask = advances[i];
- info->var1.u32 = offsets[i].du;
- info->var2.u32 = offsets[i].dv;
- }
-
- /* Set glyph positions */
- buffer->clear_positions ();
- for (unsigned int i = 0; i < glyphs_len; i++)
- {
- hb_glyph_info_t *info = &buffer->info[i];
- hb_glyph_position_t *pos = &buffer->pos[i];
-
- /* TODO vertical */
- pos->x_advance = info->mask;
- pos->x_offset = info->var1.u32;
- pos->y_offset = info->var2.u32;
- }
/* Wow, done! */
return true;
--
1.8.2.2
From 037957b837680df02fc0776f19e8b4d9bdc8b876 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sun, 12 May 2013 13:17:30 +1000
Subject: [PATCH 2/2] add libs for static linking
Subject: [PATCH] add libs for static linking
diff --git a/harfbuzz.pc.in b/harfbuzz.pc.in
index e92319e..2a49f2e 100644
--- a/harfbuzz.pc.in
+++ b/harfbuzz.pc.in
--- a/src/harfbuzz.pc.in
+++ b/src/harfbuzz.pc.in
@@ -8,4 +8,6 @@ Description: Text shaping library
Version: @VERSION@

2
src/harfbuzz.mk
View File

@ -3,7 +3,7 @@
PKG := harfbuzz
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 7021db9d4522480a0902f8a9d8eedae20353bc10
$(PKG)_CHECKSUM := 621943fa0cadbc5514d8c8cdf985b7158baebc2d
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)

2
src/imagemagick.mk
View File

@ -3,7 +3,7 @@
PKG := imagemagick
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 4d961c8cf86611eb88ba8be616229101ceb3e7ff
$(PKG)_CHECKSUM := 0b175bf5bb7165ed3e677b4df3094e952ba3043e
$(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION)
$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://www.imagemagick.org/download/$($(PKG)_FILE)

2
src/pango.mk
View File

@ -3,7 +3,7 @@
PKG := pango
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := a6c224424eb3f0dcc231a8000591c05a85df689c
$(PKG)_CHECKSUM := 13f10192b6dcbb0f0f5f95eecedd8fa392d964b1
$(PKG)_SUBDIR := pango-$($(PKG)_VERSION)
$(PKG)_FILE := pango-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)