Update mac build files for Gtk 3

diff --git a/mac/Makefile b/mac/Makefile
index 9a29722395c40a815ead206c977439a8fefd423a..08b2e3001ffd17029daceb4f93c06da1e9459bca 100644 (file)
--- a/mac/Makefile
+++ b/mac/Makefile
@@ -13,6 +13,15 @@ clean:
        rm -rf $(PACKAGES) $(SRCDMG) \
                $(DESTDIR) $(MAC_AWEATHER)/AWeather.app
 
+$(PACKAGES): $(DESTDIR)
+       rm -f $(SRCDMG)
+       ln -sf /usr/bin/open $(GTKINST)/bin/xdg-open
+       rsync -uav $(DESTDIR)/ $(GTKINST)/
+       jhbuild run gtk-mac-bundler aweather.bundle
+       create-dmg --volname 'AWeather-$(VER_AWEATHER)' \
+               $(SRCDMG) $(MAC_AWEATHER)/AWeather.app
+       cp $(SRCDMG) $(FILES)
+
 $(DESTDIR): $(MAC_AWEATHER)/src/aweather \
             $(MAC_GRITS)/src/libgrits.la \
             $(MAC_RSL)/src/librsl.la
@@ -25,31 +34,22 @@ $(DESTDIR): $(MAC_AWEATHER)/src/aweather \
        rm -rf $(DESTDIR)/include
        touch $@
 
-$(MAC_AWEATHER)/src/aweather: \
+aweather-build $(MAC_AWEATHER)/src/aweather: \
                $(MAC_GRITS)/src/libgrits.la \
                $(MAC_RSL)/src/librsl.la
-       jhbuild run make -C $(MAC_AWEATHER) -j3
+       jhbuild run make -C $(MAC_AWEATHER) -j8
 
-$(MAC_GRITS)/src/libgrits.la:
-       jhbuild run make -C $(MAC_GRITS) -j3
+grits-build $(MAC_GRITS)/src/libgrits.la:
+       jhbuild run make -C $(MAC_GRITS) -j8
 
-$(MAC_RSL)/src/librsl.la:
+rsl-build $(MAC_RSL)/src/librsl.la:
        jhbuild run make -C $(MAC_RSL)
 
-$(PACKAGES): $(DESTDIR)
-       rm -f $(SRCDMG)
-       ln -sf /usr/bin/open $(GTKINST)/bin/xdg-open
-       rsync -uav $(DESTDIR)/ $(GTKINST)/
-       jhbuild run gtk-mac-bundler aweather.bundle
-       create-dmg --volname 'AWeather-$(VER_AWEATHER)' \
-               $(SRCDMG) $(MAC_AWEATHER)/AWeather.app
-       cp $(SRCDMG) $(FILES)
-
 aweather-gen:
        cd $(MAC_AWEATHER); \
        PKG_CONFIG_PATH="$(MAC_GRITS)/src" \
-       LDFLAGS="-L$(MAC_GRITS)/src/.libs" \
-       CPPFLAGS="-I$(MAC_GRITS)/include/grits" \
+       LDFLAGS="-L$(MAC_GRITS)/src/.libs -L$(MAC_RSL)/src/.libs" \
+       CPPFLAGS="-I$(MAC_GRITS)/include/grits -I$(MAC_RSL)/src" \
        jhbuild run ./autogen.sh \
                --enable-relative \
                --enable-shared \

diff --git a/mac/aweather.bundle b/mac/aweather.bundle
index 29289dd51da558b58d8430a215410ae62bd9ba81..204f021456a7dcea3dfcf2b6c042458002b156c5 100644 (file)
--- a/mac/aweather.bundle
+++ b/mac/aweather.bundle
@@ -6,12 +6,13 @@
                <image></image>
                <run-install-name-tool/>
                <launcher-script>${project}/aweather.launcher</launcher-script>
-               <gtk>gtk+-2.0</gtk>
+               <gtk>gtk+-3.0</gtk>
        </meta>
 
        <plist>${project}/aweather.plist</plist>
        <main-binary>${prefix}/bin/aweather</main-binary>
 
+       <!-- AWeather files -->
        <binary>${prefix}/bin/wsr88ddec</binary>
        <binary>${prefix}/bin/grits-demo</binary>
        <binary>${prefix}/bin/xdg-open</binary>
@@ -30,14 +31,24 @@
        <data>${prefix}/share/icons/hicolor/scalable/apps/aweather.svg</data>
        <data dest="${bundle}/Contents/Resources">${project}/aweather.icns</data>
 
-       <binary>${prefix}/lib/${gtkdir}/modules/*.so</binary>
-       <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so</binary>
+       <!-- GTK files -->
+       <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/theming-engines/*.so</binary>
        <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so</binary>
-       <binary>${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so</binary>
+       <binary>${prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so</binary>
 
-       <data>${prefix}/share/themes/Clearlooks</data>
-       <data>${prefix}/share/themes/Default</data>
+       <!-- Themes -->
+       <data>${prefix}/share/themes/Adwaita</data>
+       <!-- <data>${prefix}/share/themes/Clearlooks</data> -->
+       <!-- <data>${prefix}/share/themes/Default</data> -->
        <!-- <data>${prefix}/share/themes/Mac</data> -->
        <!-- <data>${prefix}/share/themes/Quartz</data> -->
+
+       <!-- This fixes pango -->
+       <!-- The bundler tries to put files in /etc/pango/*, but it fails, so we use our own path -->
+       <data dest="${bundle}/Contents/Resources/etc/pango.modules">${project}/aweather.pangomodules</data>
+       <data dest="${bundle}/Contents/Resources/etc/pangorc">${project}/aweather.pangorc</data>
+       <binary dest="${bundle}/Contents/Resources/lib/">${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so</binary>
+
+       <!-- Custom stuff -->
        <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">${project}/aweather.gtkrc</data>
 </app-bundle>

diff --git a/mac/aweather.gtkrc b/mac/aweather.gtkrc
index e032c5952dcea896ed6768f2b24d32f360ddf475..ba5477caef2fb979c173c58257896aca166bf92b 100644 (file)
--- a/mac/aweather.gtkrc
+++ b/mac/aweather.gtkrc
@@ -1,3 +1,2 @@
-include "../../share/themes/Clearlooks/gtk-2.0/gtkrc"
 gtk-icon-theme-name = "Tango"
 gtk-enable-mnemonics = 0

diff --git a/mac/aweather.launcher b/mac/aweather.launcher
index 816cda2eb4d7221a0ae1b03a6765e3ad5e735064..d1d6b26ce068cd285241d7fb6155392ef60dbafb 100755 (executable)
--- a/mac/aweather.launcher
+++ b/mac/aweather.launcher
@@ -11,10 +11,10 @@ export GTK_DATA_PREFIX="$PREFIX"
 export GTK_EXE_PREFIX="$PREFIX"
 export GTK_PATH="$PREFIX"
 
-export GTK2_RC_FILES="$PREFIX/etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$PREFIX/etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$PREFIX/etc/gtk-2.0/gdk-pixbuf.loaders"
-#export PANGO_RC_FILE="$PREFIX/etc/pango/pangorc"
+export GTK3_RC_FILES="$PREFIX/etc/gtk-3.0/gtkrc"
+export GTK_IM_MODULE_FILE="$PREFIX/etc/gtk-3.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$PREFIX/etc/gtk-3.0/gdk-pixbuf.loaders"
+export PANGO_RC_FILE="$PREFIX/etc/pangorc"
 
 export PATH="$PATH:$PREFIX/bin"
 

diff --git a/mac/aweather.modules b/mac/aweather.modules
index fc11b3b7be21673d868c99a3c1084951fa951f93..3fc8bb95645beca610662f8223953b49667a98da 100644 (file)
--- a/mac/aweather.modules
+++ b/mac/aweather.modules
@@ -3,19 +3,19 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
        <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
-       <repository type="git" name="lug.rose-hulman.edu" default="yes" href="git://lug.rose-hulman.edu/"/>
+       <repository type="git" name="pileus.org" default="yes" href="git://pileus.org/"/>
        <autotools id="rsl">
-               <branch module="~spenceal/rsl" checkoutdir="rsl" revision="aweather" />
+               <branch module="~andy/rsl" checkoutdir="rsl" revision="aweather" />
        </autotools>
        <autotools id="grits" autogenargs="--enable-relative" makeinstallargs="DESTDIR=${PREFIX}">
-               <branch module="proj/grits" checkoutdir="grits" revision="mac" />
+               <branch module="grits" checkoutdir="grits" revision="mac" />
                <dependencies>
                        <dep package="gtk+"/>
                        <dep package="libsoup"/>
                </dependencies>
        </autotools>
        <autotools id="aweather" autogenargs="--enable-relative" makeinstallargs="DESTDIR=${PREFIX}">
-               <branch module="proj/aweather" checkoutdir="aweather" revision="mac" />
+               <branch module="aweather" checkoutdir="aweather" revision="mac" />
                <dependencies>
                        <dep package="rsl"/>
                        <dep package="grits"/>

diff --git a/mac/aweather.pangomodules b/mac/aweather.pangomodules
new file mode 100644 (file)
index 0000000..5eccf47
--- /dev/null
+++ b/mac/aweather.pangomodules
@@ -0,0 +1 @@
+pango-basic-coretext.so BasicScriptEngineCoreText PangoEngineShape PangoRenderCoreText common:

diff --git a/mac/aweather.pangorc b/mac/aweather.pangorc
new file mode 100644 (file)
index 0000000..8b0ebe4
--- /dev/null
+++ b/mac/aweather.pangorc
@@ -0,0 +1,2 @@
+[Pango]
+ModuleFiles = ../etc/pango.modules

diff --git a/mac/aweather.plist b/mac/aweather.plist
index 85e4abdc2f7f01c622cb33eee16b0ec45b693eee..cdb1d9d6cd5290623a7ad0404959b75449b98744 100644 (file)
--- a/mac/aweather.plist
+++ b/mac/aweather.plist
@@ -9,7 +9,7 @@
                <string>AWeather</string>
 
                <key>CFBundleGetInfoString</key>
-               <string>0.6.3, (C) 2011 Andy Spencer</string>
+               <string>0.8, (C) 2012 Andy Spencer</string>
 
                <key>CFBundleIconFile</key>
                <string>aweather.icns</string>
@@ -24,16 +24,16 @@
                <string>APPL</string>
 
                <key>CFBundleShortVersionString</key>
-               <string>0.6.3</string>
+               <string>0.8</string>
 
                <key>CFBundleSignature</key>
                <string>????</string>
 
                <key>CFBundleVersion</key>
-               <string>0.6.3</string>
+               <string>0.8</string>
 
                <key>NSHumanReadableCopyright</key>
-               <string>Copyright 2011 Andy Spencer, GNU General Public License.</string>
+               <string>Copyright 2012 Andy Spencer, GNU General Public License.</string>
 
                <key>LSMinimumSystemVersion</key>
                <string>10.4</string>

diff --git a/mac/readme.txt b/mac/readme.txt
new file mode 100644 (file)
index 0000000..2208d85
--- /dev/null
+++ b/mac/readme.txt
@@ -0,0 +1,34 @@
+1. Install XCode and XCode command line tools
+
+2. Install jhbuild:
+
+   $ sh gtk-osx-build-setup.sh
+
+3. Install gtk+ and dependencies
+
+   $ jhbuild bootstrap
+   $ jhbuild build meta-gtk-osx-bootstrap
+   $ jhbuild build meta-gtk-osx-gtk3
+   $ jhbuild build gtk-mac-integration
+   $ jhbuild build libsoup
+
+   $ jhbuild build meta-gtk-osx-themes   ??? doens't build, gtk2 dep
+
+   $ jhbuild build librsvg               ??? for gtk-css-engine
+   $ jhbuild build libccss               ??? for gtk-css-engine
+   $ jhbuild build gtk-css-engine        ??? doesn't build, gtk2 dep
+
+   $ jhbuild build gnome-themes-standard ??? after copying into gtk-osx.modules, and editing..
+
+4. Instlal gtk-mac-bundler
+
+   $ git://git.gnome.org/gtk-mac-bundler
+   $ make install
+
+5. Install create-dmg
+
+   ???
+
+References:
+
+   https://live.gnome.org/GTK+/OSX/Building