rpms/google-gadgets/F-11 google-gadgets-0.11.0-sidebar_gtk.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 google-gadgets.spec, 1.14, 1.15 sources, 1.6, 1.7

Michel Alexandre Salim salimma at fedoraproject.org
Thu Jul 2 02:20:13 UTC 2009


Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15740/F-11

Modified Files:
	.cvsignore google-gadgets.spec sources 
Added Files:
	google-gadgets-0.11.0-sidebar_gtk.patch 
Log Message:
* Wed Jul  1 2009 Michel Salim <michel at erdos.localdomain> - 0.11.0-1
- Update to 0.11.0


google-gadgets-0.11.0-sidebar_gtk.patch:

--- NEW FILE google-gadgets-0.11.0-sidebar_gtk.patch ---
--- a/hosts/gtk/sidebar_gtk_host.cc
+++ b/hosts/gtk/sidebar_gtk_host.cc
@@ -800,8 +800,11 @@ class SideBarGtkHost::Impl {
                           reinterpret_cast<guchar *>(&struts), 12);
     } else {
       has_strut_ = false;
-      gdk_property_delete(sidebar_window_->window, net_wm_strut_);
-      gdk_property_delete(sidebar_window_->window, net_wm_strut_partial_);
+      if (net_wm_strut_ != GDK_NONE)
+        gdk_property_delete(sidebar_window_->window, net_wm_strut_);
+      if (net_wm_strut_partial_ != GDK_NONE)
+        gdk_property_delete(sidebar_window_->window, net_wm_strut_partial_);
+
       sidebar_host_->SetWindowType((flags_ & MATCHBOX_WORKAROUND) ?
                                    GDK_WINDOW_TYPE_HINT_DIALOG :
                                    GDK_WINDOW_TYPE_HINT_NORMAL);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 May 2009 21:04:52 -0000	1.6
+++ .cvsignore	2 Jul 2009 02:19:42 -0000	1.7
@@ -1 +1 @@
-google-gadgets-0.10.6-r1449.tar.bz2
+google-gadgets-for-linux-0.11.0.tar.bz2


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- google-gadgets.spec	30 Jun 2009 19:00:08 -0000	1.14
+++ google-gadgets.spec	2 Jul 2009 02:19:42 -0000	1.15
@@ -1,20 +1,24 @@
-%define svnrev   1449
-%define alphatag 20090430svn%{svnrev}
+#define svnrev   1449
+#define alphatag 20090430svn%{svnrev}
 
 Name:           google-gadgets
-Version:        0.10.6
-Release:        0.2.%{alphatag}%{?dist}
+Version:        0.11.0
+#Release:        0.1.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
 License:        ASL 2.0
 URL:            http://code.google.com/p/google-gadgets-for-linux/
-#Source0:        http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2
-Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
+Source0:        http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2
+# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=311
+# patch taken from svn r1239
+Patch0:         %{name}-0.11.0-sidebar_gtk.patch
+#Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # for SVN checkouts
-BuildRequires:  autoconf automake libtool
+#BuildRequires:  autoconf automake libtool
 
 BuildRequires:  libcurl-devel libxml2-devel zlib-devel libtool-ltdl-devel
 # still needed even if we're not buliding gtkmoz element, for JavaScript
@@ -75,13 +79,14 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
+%patch0 -p1 -b .sidebar_gtk
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
 
 
 %build
-autotools/bootstrap.sh
+#autotools/bootstrap.sh
 #ln -s %{_datadir}/automake-*/mkinstalldirs libltdl/
 
 %configure --disable-static \
@@ -124,8 +129,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/mime
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 # SVN checkout: remove ltdl cruft
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*ltdl*
-rm -rf $RPM_BUILD_ROOT%{_includedir}/*ltdl*
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/*ltdl*
+#rm -rf $RPM_BUILD_ROOT%{_includedir}/*ltdl*
                      
 
 %clean
@@ -203,8 +208,8 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
-* Tue Jun 30 2009 Christopher Aillon <caillon at redhat.com> - 0.10.6-0.2.20090430svn1449
-- Rebuild against newer gecko
+* Wed Jul  1 2009 Michel Salim <michel at erdos.localdomain> - 0.11.0-1
+- Update to 0.11.0
 
 * Sat May  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.6-0.1.20090430svn1449%{?dist}
 - Update to SVN checkout, for xulrunner 1.9.1 compatibility


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 May 2009 21:04:52 -0000	1.6
+++ sources	2 Jul 2009 02:19:42 -0000	1.7
@@ -1 +1 @@
-9692fe3234b768a452c5c147e9955701  google-gadgets-0.10.6-r1449.tar.bz2
+714b65738f4edeae361e2b164088c50d  google-gadgets-for-linux-0.11.0.tar.bz2




More information about the fedora-extras-commits mailing list