From 9e5b397f3aabe882dd7bf9a783c229836f43417f Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sun, 30 Dec 2012 06:58:32 +0000 Subject: [PATCH] Update mac build files for Gtk 3 --- mac/Makefile | 32 ++++++++++++++++---------------- mac/aweather.bundle | 23 +++++++++++++++++------ mac/aweather.gtkrc | 1 - mac/aweather.launcher | 8 ++++---- mac/aweather.modules | 8 ++++---- mac/aweather.pangomodules | 1 + mac/aweather.pangorc | 2 ++ mac/aweather.plist | 8 ++++---- mac/readme.txt | 34 ++++++++++++++++++++++++++++++++++ 9 files changed, 82 insertions(+), 35 deletions(-) create mode 100644 mac/aweather.pangomodules create mode 100644 mac/aweather.pangorc create mode 100644 mac/readme.txt diff --git a/mac/Makefile b/mac/Makefile index 9a29722..08b2e30 100644 --- 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 29289dd..204f021 100644 --- a/mac/aweather.bundle +++ b/mac/aweather.bundle @@ -6,12 +6,13 @@ ${project}/aweather.launcher - gtk+-2.0 + gtk+-3.0 ${project}/aweather.plist ${prefix}/bin/aweather + ${prefix}/bin/wsr88ddec ${prefix}/bin/grits-demo ${prefix}/bin/xdg-open @@ -30,14 +31,24 @@ ${prefix}/share/icons/hicolor/scalable/apps/aweather.svg ${project}/aweather.icns - ${prefix}/lib/${gtkdir}/modules/*.so - ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so + + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/theming-engines/*.so ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so - ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so + ${prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so - ${prefix}/share/themes/Clearlooks - ${prefix}/share/themes/Default + + ${prefix}/share/themes/Adwaita + + + + + + ${project}/aweather.pangomodules + ${project}/aweather.pangorc + ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so + + ${project}/aweather.gtkrc diff --git a/mac/aweather.gtkrc b/mac/aweather.gtkrc index e032c59..ba5477c 100644 --- 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 816cda2..d1d6b26 100755 --- 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 fc11b3b..3fc8bb9 100644 --- a/mac/aweather.modules +++ b/mac/aweather.modules @@ -3,19 +3,19 @@ - + - + - + - + diff --git a/mac/aweather.pangomodules b/mac/aweather.pangomodules new file mode 100644 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 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 85e4abd..cdb1d9d 100644 --- a/mac/aweather.plist +++ b/mac/aweather.plist @@ -9,7 +9,7 @@ AWeather CFBundleGetInfoString - 0.6.3, (C) 2011 Andy Spencer + 0.8, (C) 2012 Andy Spencer CFBundleIconFile aweather.icns @@ -24,16 +24,16 @@ APPL CFBundleShortVersionString - 0.6.3 + 0.8 CFBundleSignature ???? CFBundleVersion - 0.6.3 + 0.8 NSHumanReadableCopyright - Copyright 2011 Andy Spencer, GNU General Public License. + Copyright 2012 Andy Spencer, GNU General Public License. LSMinimumSystemVersion 10.4 diff --git a/mac/readme.txt b/mac/readme.txt new file mode 100644 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 -- 2.43.2