[moblin-app-installer] fix build against clutter-gtk-1.0, fix widget calls
Tom Callaway
spot at fedoraproject.org
Fri Oct 1 20:50:44 UTC 2010
commit 4a568ba2d4f8f9c705288437c97f9c944d7b9bb2
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Fri Oct 1 16:50:40 2010 -0400
fix build against clutter-gtk-1.0, fix widget calls
moblin-app-installer-0.4.0-fix-widget.patch | 28 +++++++++++++++++++++++++++
moblin-app-installer.spec | 10 ++++++++-
2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/moblin-app-installer-0.4.0-fix-widget.patch b/moblin-app-installer-0.4.0-fix-widget.patch
new file mode 100644
index 0000000..c4912c1
--- /dev/null
+++ b/moblin-app-installer-0.4.0-fix-widget.patch
@@ -0,0 +1,28 @@
+diff -up moblin-app-installer-0.4.0/src/mai-application.c.BAD moblin-app-installer-0.4.0/src/mai-application.c
+--- moblin-app-installer-0.4.0/src/mai-application.c.BAD 2010-10-01 16:36:56.178923612 -0400
++++ moblin-app-installer-0.4.0/src/mai-application.c 2010-10-01 16:40:04.861923987 -0400
+@@ -195,10 +195,13 @@ _embed_configure_cb (GtkWidget
+ {
+ MaiApplicationPrivate *priv = GET_PRIVATE (self);
+
++ GtkAllocation allocation;
++ gtk_widget_get_allocation (widget, &allocation);
++
+ if (priv->shell)
+ clutter_actor_set_size (priv->shell,
+- widget->allocation.width,
+- widget->allocation.height);
++ allocation.width,
++ allocation.height);
+
+ return FALSE;
+ }
+@@ -325,7 +328,7 @@ _constructor (GType typ
+ GdkRectangle rect;
+
+ gtk_widget_realize (priv->window);
+- monitor = gdk_screen_get_monitor_at_window (screen, priv->window->window);
++ monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (priv->window));
+
+ gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+ gtk_window_set_default_size (GTK_WINDOW (priv->window), rect.width, rect.height);
diff --git a/moblin-app-installer.spec b/moblin-app-installer.spec
index 204a066..6bc80ad 100644
--- a/moblin-app-installer.spec
+++ b/moblin-app-installer.spec
@@ -11,7 +11,7 @@
Name: moblin-app-installer
Version: 0.4.0
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
Summary: Moblin Application Installer
Group: Applications/System
@@ -22,6 +22,7 @@ Source0: %{tarfile}
Patch0: mai-applist.patch
Patch1: 0001-Fix-build-when-not-using-PackageKit-glib-such-as-wit.patch
Patch2: mai-fixPK.patch
+Patch3: moblin-app-installer-0.4.0-fix-widget.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: clutter-gtk-devel
@@ -48,6 +49,9 @@ a logically categorized list of applications that you can choose to install.
%patch0 -p1 -b .applist
%patch1 -p1 -b .newPK
%patch2 -p1 -b .fixPK
+%patch3 -p1 -b .fix-widget
+
+sed -i 's|clutter-gtk-0.10|clutter-gtk-1.0|g' configure.ac
# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh
@@ -81,6 +85,10 @@ rm -rf %{buildroot}
%{_datadir}/moblin-app-installer
%changelog
+* Fri Oct 1 2010 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-0.10
+- rebuild against clutter-gtk-1.0
+- fix widget calls
+
* Sat Mar 27 2010 Peter Robinson <pbrobinson at gmail.com> 0.4.0-0.9
- bump build for new package kit
More information about the scm-commits
mailing list