X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=mac%2Faweather.bundle;h=204f021456a7dcea3dfcf2b6c042458002b156c5;hb=9e5b397f3aabe882dd7bf9a783c229836f43417f;hp=64d5f9de37fb272492e479590fd0dc1a6de0be80;hpb=1569b5962f4a9f301d16070c4b1ae19cfb3c0c10;p=~andy%2Faweather-pkg

diff --git a/mac/aweather.bundle b/mac/aweather.bundle
index 64d5f9d..204f021 100644
--- a/mac/aweather.bundle
+++ b/mac/aweather.bundle
@@ -6,20 +6,23 @@
 		<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>
 	<binary>${prefix}/lib/aweather/*.so</binary>
-	<binary>${prefix}/lib/grits2/*.so</binary>
+	<binary>${prefix}/lib/grits4/*.so</binary>
+	<binary>${prefix}/lib/libgrits*</binary>
+	<binary>${prefix}/lib/librsl*</binary>
 	<data>${prefix}/share/aweather</data>
 	<data>${prefix}/share/doc/aweather</data>
-	<data>${prefix}/share/rsl/*.dat</data>
+	<data>${prefix}/share/rsl1/*.dat</data>
 	<data>${prefix}/share/icons/hicolor/16x16/apps/aweather.png</data>
 	<data>${prefix}/share/icons/hicolor/22x22/apps/aweather.png</data>
 	<data>${prefix}/share/icons/hicolor/24x24/apps/aweather.png</data>
@@ -28,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>
-	<data>${prefix}/share/themes/Mac</data>
-	<data>${prefix}/share/themes/Quartz</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>