commit 53a73a3e64d8ca22154c0b09823b86f3fde03a46
parent 833c0e71c345d19026ec500ba4efe83e9ebe0777
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Wed, 20 Apr 2011 20:58:56 +0800
osx: Bundle fixes
Diffstat:
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/dist/osx/README b/dist/osx/README
@@ -12,6 +12,7 @@ Add this line to ~/.jhbuildrc-custom:
Run:
$ jhbuild build spek
+ $ jhbuild shell
$ dist/osx/bundle.sh
[1]: http://sourceforge.net/apps/trac/gtk-osx/wiki/Build
diff --git a/dist/osx/bundle.sh b/dist/osx/bundle.sh
@@ -1,6 +1,5 @@
#!/bin/sh
-cd $(dirname $0)/../..
case "$(uname)" in
Darwin) profile_name=darwin ;;
*)
@@ -9,13 +8,7 @@ case "$(uname)" in
;;
esac
-rm -fr dist/osx/bin
-./autogen.sh --prefix=$(pwd)/dist/osx/bin
-gmake
-gmake install
-
-cd dist/osx
-mv bin/lib/locale bin/share/
+cd $(dirname $0)
ige-mac-bundler spek.bundle
diff --git a/dist/osx/spek.bundle b/dist/osx/spek.bundle
@@ -1,25 +1,26 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<app-bundle>
<meta>
- <prefix name="default">/opt/local</prefix>
+ <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
<destination overwrite="yes">${project}</destination>
<run-install-name-tool/>
<launcher-script>${project}/launcher.sh</launcher-script >
<gtk>gtk+-2.0</gtk>
</meta>
<plist>${project}/Info.plist</plist>
- <main-binary dest="${bundle}/Contents/Resources/bin">
- ${project}/bin/bin/spek
- </main-binary>
+ <main-binary>${prefix}/bin/spek</main-binary>
<binary>
- ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so
+ ${prefix}/lib/${gtkdir}/modules/*.so
</binary>
<binary>
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
</binary>
- <!-- binary>
+ <binary>
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
- </binary -->
+ </binary>
+ <binary>
+ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so
+ </binary>
<binary>
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
</binary>
@@ -28,12 +29,9 @@
${prefix}/share/locale
</translations>
- <data dest="${bundle}/Contents/Resources/share">
- ${project}/bin/share
- </data>
- <data>
- ${prefix}/share/themes/Quartz
- </data>
+ <data>${prefix}/share/icons</data>
+ <data>${prefix}/share/locale</data>
+ <data>${prefix}/share/themes/Quartz</data>
<data dest="${bundle}/Contents/Resources">
${project}/Spek.icns
</data>
diff --git a/dist/osx/spek.modules b/dist/osx/spek.modules
@@ -7,6 +7,7 @@
<repository type="tarball" name="spek" default="yes" href="http://spek.googlecode.com/files/"/>
<repository type="tarball" name="libav" href="http://libav.org/releases/"/>
<repository type="tarball" name="cairographics-dev" href="http://cairographics.org/snapshots/"/>
+ <repository type="git" name="github.com" href="git://github.com/"/>
<autotools id="cairo" autogen-sh="configure" autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
<branch module="cairo-1.11.2.tar.gz" version="1.11.2" repo="cairographics-dev"/>
@@ -20,6 +21,13 @@
</after>
</autotools>
+ <autotools id="gtk-quartz-engine">
+ <branch module="jralls/gtk-quartz-engine" repo="github.com"/>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </autotools>
+
<autotools id="libav" autogenargs="--disable-static --enable-shared --enable-gpl --enable-version3 --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-swscale --enable-pthreads --disable-encoders --disable-muxers --disable-devices --disable-filters" autogen-sh="configure" autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s">
<branch module="libav-0.6.2.tar.bz2" version="0.6.2" repo="libav" hash="sha1:b79dc56a08f4ef07b41d1a78b2251f21fde8b81d"/>
</autotools>
@@ -30,6 +38,7 @@
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
<dep package="cairo"/>
+ <dep package="gtk-quartz-engine"/>
<dep package="libav"/>
</dependencies>
</autotools>
