Skip to content

Commit

Permalink
packages cairo fontconfig freetype harbuzz: bootstrap build for mutua…
Browse files Browse the repository at this point in the history
…l dependencies
  • Loading branch information
tonytheodore committed Jun 17, 2014
1 parent e91c983 commit d53a3a4
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 4 deletions.
4 changes: 4 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,10 @@ <h2 id="packages">List of Packages</h2>
<td class="package">freetype</td>
<td class="website"><a href="http://www.freetype.org/">freetype</a></td>
</tr>
<tr>
<td class="package">freetype-bootstrap</td>
<td class="website"><a href="http://www.freetype.org/">freetype (without harfbuzz)</a></td>
</tr>
<tr>
<td class="package">fribidi</td>
<td class="website"><a href="http://fribidi.org/">FriBidi</a></td>
Expand Down
2 changes: 1 addition & 1 deletion src/cairo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 4f6e337d5d3edd7ea79d1426f575331552b003ec
$(PKG)_SUBDIR := cairo-$($(PKG)_VERSION)
$(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE)
$(PKG)_DEPS := gcc fontconfig freetype libpng lzo pixman zlib
$(PKG)_DEPS := gcc fontconfig freetype-bootstrap libpng lzo pixman zlib

define $(PKG)_UPDATE
$(WGET) -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \
Expand Down
2 changes: 1 addition & 1 deletion src/fontconfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 08565feea5a4e6375f9d8a7435dac04e52620ff2
$(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION)
$(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE)
$(PKG)_DEPS := gcc freetype expat
$(PKG)_DEPS := gcc freetype-bootstrap expat

define $(PKG)_UPDATE
$(WGET) -q -O- 'http://fontconfig.org/release/' | \
Expand Down
19 changes: 19 additions & 0 deletions src/freetype-bootstrap.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file is part of MXE.
# See index.html for further information.

PKG := freetype-bootstrap
$(PKG)_IGNORE = $(freetype_IGNORE)
$(PKG)_VERSION = $(freetype_VERSION)
$(PKG)_CHECKSUM = $(freetype_CHECKSUM)
$(PKG)_SUBDIR = $(freetype_SUBDIR)
$(PKG)_FILE = $(freetype_FILE)
$(PKG)_URL = $(freetype_URL)
$(PKG)_DEPS := gcc bzip2 libpng zlib

define $(PKG)_UPDATE
echo $(freetype_VERSION)
endef

define $(PKG)_BUILD
$(freetype_BUILD)
endef
2 changes: 1 addition & 1 deletion src/freetype.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46
$(PKG)_SUBDIR := freetype-$($(PKG)_VERSION)
$(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(shell echo '$($(PKG)_VERSION)' | cut -d . -f 1,2,3)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc bzip2 libpng zlib
$(PKG)_DEPS := gcc bzip2 harfbuzz libpng zlib

define $(PKG)_UPDATE
$(WGET) -q -O- 'http://sourceforge.net/projects/freetype/files/freetype2/' | \
Expand Down
2 changes: 1 addition & 1 deletion src/harfbuzz.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := e5bb66040c201895d72f717e0f1fd3fea5544053
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)
$(PKG)_DEPS := gcc glib cairo freetype icu4c
$(PKG)_DEPS := gcc glib cairo freetype-bootstrap icu4c

define $(PKG)_UPDATE
$(WGET) -q -O- 'http://cgit.freedesktop.org/harfbuzz/refs/tags' | \
Expand Down

1 comment on commit d53a3a4

@mabrand
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The circular dependency between harfbuzz and freetype causes trouble for qtbase. I pushed 016a8f4 to solve this.

Please sign in to comment.