From: Dan Breslau <dbreslau@painless-security.com>
Date: Thu, 28 Apr 2016 20:22:20 +0000 (-0400)
Subject: Merge branch 'dbreslau-lib-upgrades'
X-Git-Tag: v0.9.6~17
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=86f3901d8353fa6a36c6f04fe2d4a047faf95b61

Merge branch 'dbreslau-lib-upgrades'

https://bugs.launchpad.net/moonshot-ui/+bug/1351342 (We need to support GTK 3.0)
and
https://bugs.launchpad.net/moonshot-ui/+bug/1351342 (Need to support gee-0.8)

Moonshot now builds with Gtk+-3.0 if it's available, and gee-0.8 if it's available. Otherwise, it falls back to the older Gtk+-2.0 and/or gee-0.8.
---

86f3901d8353fa6a36c6f04fe2d4a047faf95b61
diff --cc Makefile.am
index bdb3b7c,6bf2e8d..7345b96
--- a/Makefile.am
+++ b/Makefile.am
@@@ -74,19 -74,17 +74,19 @@@ src_moonshot_SOURCES = 
  src_moonshot_webp_SOURCES = \
          src/moonshot-webp-parser.vala \
          src/moonshot-provisioning-common.vala \
 -        src/moonshot-id.vala
 +        src/moonshot-id.vala \
 +        src/moonshot-logger.vala
 +
  
- src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-1.0   $(AM_VALAFLAGS)
+ src_moonshot_VALAFLAGS = --pkg $(GTK_VERSION) --pkg $(GEE_VERSION)   $(AM_VALAFLAGS)
  src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)  
  src_moonshot_LDADD = $(moonshot_LIBS)
  src_moonshot_LDFLAGS = -g -O0 $(MOONSHOT_LOG_LIBS)
  
- src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot  --pkg gtk+-2.0 --pkg gdk-2.0 --pkg libmoonshot $(AM_VALAFLAGS)
+ src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg libmoonshot $(AM_VALAFLAGS)
  src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
  src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonshot.la
 -src_moonshot_webp_LDFLAGS =
 +src_moonshot_webp_LDFLAGS = $(MOONSHOT_LOG_LIBS)
  
  if OS_WIN32