From fc7db58e6717bd09ec47dd4e4da7b8801a6467be Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Aug 23 2016 11:12:01 +0000
Subject: Update to 3.21.90


---

diff --git a/.gitignore b/.gitignore
index 877706b..c5bc163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /gnome-builder-3.20.0.tar.xz
 /gnome-builder-3.20.2.tar.xz
 /gnome-builder-3.21.1.tar.xz
+/gnome-builder-3.21.90.tar.xz
diff --git a/0001-gstyle-Fix-the-build-on-32-bit-architectures.patch b/0001-gstyle-Fix-the-build-on-32-bit-architectures.patch
new file mode 100644
index 0000000..400d4dc
--- /dev/null
+++ b/0001-gstyle-Fix-the-build-on-32-bit-architectures.patch
@@ -0,0 +1,25 @@
+From 6c03682fb9d7a3fa088f943ab5dc05c51bd3c6d2 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Tue, 23 Aug 2016 12:51:02 +0200
+Subject: [PATCH] gstyle: Fix the build on 32 bit architectures
+
+---
+ contrib/gstyle/gstyle-palette.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/gstyle/gstyle-palette.c b/contrib/gstyle/gstyle-palette.c
+index 98fa593..23b1728 100644
+--- a/contrib/gstyle/gstyle-palette.c
++++ b/contrib/gstyle/gstyle-palette.c
+@@ -996,7 +996,7 @@ gstyle_palette_set_id (GstylePalette *self,
+   if (gstyle_str_empty0 (id))
+     {
+       num_id = g_get_real_time ();
+-      self->id = g_strdup_printf ("gb-cp-%lu", num_id);
++      self->id = g_strdup_printf ("gb-cp-%"G_GINT64_FORMAT, num_id);
+       gstyle_palette_set_changed (self, TRUE);
+     }
+   else if (g_strcmp0 (self->id, id) != 0)
+-- 
+2.7.4
+
diff --git a/gnome-builder.spec b/gnome-builder.spec
index 2003b03..9d4230e 100644
--- a/gnome-builder.spec
+++ b/gnome-builder.spec
@@ -1,8 +1,8 @@
 %global shortver %(v=%{version}; echo ${v%.*})
 
 Name:    gnome-builder
-Version: 3.21.1
-Release: 2%{?dist}
+Version: 3.21.90
+Release: 1%{?dist}
 Summary: IDE for writing GNOME-based software
 
 Group:   Applications/Editors
@@ -26,16 +26,21 @@ License: GPLv3+ and GPLv2+ and LGPLv3+ and LGPLv2+ and MIT and CC-BY-SA and CC0
 URL:     https://wiki.gnome.org/Apps/Builder
 #VCS:    git:git://git.gnome.org/gnome-builder
 Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+Patch0:  0001-gstyle-Fix-the-build-on-32-bit-architectures.patch
 
 BuildRequires: vala-devel /usr/bin/vapigen
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
+BuildRequires: pkgconfig(glibmm-2.4)
 BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtkmm-3.0)
 BuildRequires: pkgconfig(gtksourceview-3.0)
 BuildRequires: pkgconfig(libdevhelp-3.0)
 BuildRequires: pkgconfig(libgit2-glib-1.0)
 BuildRequires: pkgconfig(libpeas-1.0)
+BuildRequires: pkgconfig(mm-common-util)
 BuildRequires: pkgconfig(pygobject-3.0) >= 3.19.2
+BuildRequires: pkgconfig(sysprof-ui-2)
 BuildRequires: pkgconfig(vte-2.91)
 BuildRequires: /usr/bin/appstream-util
 BuildRequires: llvm-devel
@@ -90,11 +95,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc NEWS README
 %license COPYING
 %{_bindir}/%{name}
-%{_bindir}/%{name}-worker
-%{_bindir}/ide
+%{_bindir}/gnome-builder-cli
 %exclude %{_libdir}/%{name}/pkgconfig/
 %{_libdir}/%{name}/
 %{_libexecdir}/%{name}/
+%{_libexecdir}/gnome-builder-worker
 %{python3_sitearch}/gi/
 # AppData is CC0.
 %{_datadir}/appdata/org.gnome.Builder.appdata.xml
@@ -107,7 +112,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/help/*/%{name}
 %{_datadir}/gtksourceview-3.0/styles/builder*.xml
 # CC-BY-SA.
-%{_datadir}/icons/hicolor/*/apps/builder.png
+%{_datadir}/icons/hicolor/*/apps/org.gnome.Builder.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg
 
 %files devel
@@ -116,8 +121,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/vapi/
 %{_datadir}/gtk-doc/html/libide/
 %{_includedir}/%{name}-%{version}
+%{_includedir}/idemm/
 
 %changelog
+* Tue Aug 23 2016 Kalev Lember <klember@redhat.com> - 3.21.90-1
+- Update to 3.21.90
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.21.1-2
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index 587fb1d..9b157d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bba97d37fac37e837e313fc6d66e6d9  gnome-builder-3.21.1.tar.xz
+ab0a63d1acdb31aadd68cd9f921aecc9  gnome-builder-3.21.90.tar.xz