Browse Source

macdeploy: Use rsvg-convert rather than cairosvg

0.13
Luke Dashjr 9 years ago
parent
commit
e611b6e329
  1. 4
      .travis.yml
  2. 2
      Makefile.am
  3. 2
      configure.ac
  4. 6
      contrib/gitian-descriptors/gitian-osx.yml

4
.travis.yml

@ -41,7 +41,7 @@ matrix: @@ -41,7 +41,7 @@ matrix:
- compiler: ": No wallet"
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
- compiler: ": Cross-Mac"
env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev libz-dev libbz2-dev libffi-dev libtiff-tools python-dev python-pip" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python-pip" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
exclude:
- compiler: gcc
install:
@ -49,7 +49,7 @@ install: @@ -49,7 +49,7 @@ install:
- if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
- if [[ "$HOST" =~ apple ]]; then pip install --user cairosvg mac_alias ds_store; export PATH="$HOME/.local/bin:$PATH"; ( wget 'https://bitbucket.org/al45tair/ds_store/get/c80c23706eae.tar.gz' && tar -xzvpf c80c23706eae.tar.gz && cd al45tair-ds_store-c80c23706eae/ && python setup.py install --user; ) fi
- if [[ "$HOST" =~ apple ]]; then pip install --user mac_alias ds_store; export PATH="$HOME/.local/bin:$PATH"; ( wget 'https://bitbucket.org/al45tair/ds_store/get/c80c23706eae.tar.gz' && tar -xzvpf c80c23706eae.tar.gz && cd al45tair-ds_store-c80c23706eae/ && python setup.py install --user; ) fi
before_script:
- unset CC; unset CXX
- mkdir -p depends/SDKs depends/sdk-sources

2
Makefile.am

@ -123,7 +123,7 @@ $(OSX_DMG): $(APP_DIST_EXTRAS) @@ -123,7 +123,7 @@ $(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
dpi%.$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_SVG)
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(CAIROSVG) -fpng -d$* - | $(IMAGEMAGICK_CONVERT) - $@
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d $* -p $* | $(IMAGEMAGICK_CONVERT) - $@
OSX_BACKGROUND_IMAGE_DPIFILES := $(foreach dpi,$(OSX_BACKGROUND_IMAGE_DPIS),dpi$(dpi).$(OSX_BACKGROUND_IMAGE))
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIFILES)
$(MKDIR_P) $(@D)

2
configure.ac

@ -314,7 +314,7 @@ case $host in @@ -314,7 +314,7 @@ case $host in
AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
AC_PATH_TOOL([OTOOL], [otool], otool)
AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage)
AC_PATH_PROGS([CAIROSVG], [cairosvg cairosvg-py3 cairosvg-py2],cairosvg)
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
AC_PATH_PROGS([TIFFCP], [tiffcp],tiffcp)

6
contrib/gitian-descriptors/gitian-osx.yml

@ -10,7 +10,7 @@ packages: @@ -10,7 +10,7 @@ packages:
- "git-core"
- "pkg-config"
- "autoconf"
- "libffi-dev"
- "librsvg2-bin"
- "libtiff-tools"
- "libtool"
- "automake"
@ -19,10 +19,8 @@ packages: @@ -19,10 +19,8 @@ packages:
- "cmake"
- "imagemagick"
- "libcap-dev"
- "libxslt-dev"
- "libz-dev"
- "libbz2-dev"
- "python-cairo"
- "python-dev"
- "python-pip"
- "fonts-tuffy"
@ -34,7 +32,7 @@ files: @@ -34,7 +32,7 @@ files:
- "MacOSX10.9.sdk.tar.gz"
script: |
# FIXME: We should probably install these in some other (cachable) way, but the depends system doesn't appear to make native packages available to Core's build system itself?
pip install --user mac_alias ds_store cairosvg cssselect tinycss lxml
pip install --user mac_alias ds_store
export PATH="$HOME/.local/bin:$PATH"
WRAP_DIR=$HOME/wrapped

Loading…
Cancel
Save