evolution-rss r159 - in trunk: . src
- From: lucilanga svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-rss r159 - in trunk: . src
- Date: Sun, 17 Feb 2008 19:54:20 +0000 (GMT)
Author: lucilanga
Date: Sun Feb 17 19:54:20 2008
New Revision: 159
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=159&view=rev
Log:
misc cleanups
Modified:
trunk/ChangeLog
trunk/evolution-rss.spec.in
trunk/src/rss.c
Modified: trunk/evolution-rss.spec.in
==============================================================================
--- trunk/evolution-rss.spec.in (original)
+++ trunk/evolution-rss.spec.in Sun Feb 17 19:54:20 2008
@@ -1,13 +1,15 @@
Summary: Evolution RSS Reader
Name: evolution-rss
Version: @VERSION@
-Release: 1%{?dist}
+Release: 6%{?dist}
Group: Applications/Internet
-License: GPLv2+
+License: GPLv2 and GPLv2+
Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
-#Patch: evolution-rss-%{version}.patch
+Patch0: evolution-rss-0.0.7-fix-detect.patch
+Patch1: evolution-rss-0.0.7-libsoup-2.4.patch
+Patch2: evolution-rss-0.0.7-autoreconf.patch
Requires: evolution
Requires(pre): GConf2
@@ -18,24 +20,28 @@
BuildRequires: evolution-devel
BuildRequires: evolution-data-server-devel
BuildRequires: dbus-glib-devel
-#BuildRequires: firefox-devel
+#BuildRequires: gecko-devel
BuildRequires: perl(XML::Parser)
+BuildRequires: libtool
%description
This is an evolution plugin which enables evolution to read rss feeds.
%prep
%setup -q -n evolution-rss-%{version}
-#%patch
+%patch0 -p1 -b fixdetect
+%patch1 -p1 -b libsoup24
+%patch2 -p1 -b autoreconf
%build
-%configure --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}" --libdir=%{_libdir} --disable-webkit --disable-gecko
+autoreconf -i -f
+%configure --disable-webkit --disable-gecko
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR="%{buildroot}"
+make install DESTDIR="%{buildroot}" INSTALL="install -p"
find %{buildroot} -name \*\.la -print | xargs rm -f
%find_lang %{name}
@@ -61,14 +67,15 @@
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi
-/sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
+# Only the following binaries is under GPLv2. Other
+# parts are under GPLv2+.
%{_bindir}/evolution-import-rss
-%{_sysconfdir}/gconf/schemas/evolution-rss.schemas
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_datadir}/evolution/*/errors/org-gnome-evolution-rss.error
%{_datadir}/evolution/*/glade/rss-ui.glade
%{_datadir}/evolution/*/images/rss.png
@@ -85,21 +92,29 @@
%doc TODO
%changelog
-* Sat Feb 16 2008 Lucian Langa <cooly gnome eu org>
+* Sat Feb 16 2008 Lucian Langa <cooly gnome eu org> - 0.0.7-6
+- Misc cleanup
- Drop gecko requirements till xulrunner is fixed
-* Tue Feb 12 2008 Lucian Langa <lucilanga gnome org>
+
+* Tue Feb 12 2008 Lucian Langa <lucilanga gnome org> - 0.0.7-5
- buildroot fixes
-* Wed Feb 06 2008 Lucian Langa <lucilanga gnome org>
+
+* Wed Feb 06 2008 Lucian Langa <lucilanga gnome org> - 0.0.7-4
- Modified firefox-devel requirement for build
-* Wed Jan 30 2008 Lucian Langa <lucilanga gnome org>
+
+* Wed Jan 30 2008 Lucian Langa <lucilanga gnome org> - 0.0.7-1
- Updates and sanitize
-* Thu Jan 24 2008 Lucian Langa <lucilanga gnome org>
+
+* Thu Jan 24 2008 Lucian Langa <lucilanga gnome org> - 0.0.7-1
- Fixed rpmlint warnings
- Updated to Fedora Packaging Guidelines
-* Thu Nov 22 2007 Lucian Langa <lucilanga gnome org>
+
+* Thu Nov 22 2007 Lucian Langa <lucilanga gnome org> - 0.0.6-1
- Added gconf schemas
- Added evolution-import-rss
-* Tue Sep 04 2007 Lucian Langa <lucilanga gnome org>
+
+* Tue Sep 04 2007 Lucian Langa <lucilanga gnome org> - 0.0.5
- Updated installed files
+
* Mon Apr 23 2007 root <root mayday>
- Initial spec file created by autospec ver. 0.8 with rpm 3 compatibility
Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c (original)
+++ trunk/src/rss.c Sun Feb 17 19:54:20 2008
@@ -1535,11 +1535,11 @@
// g_print("size:%d\n", wheight);
// height = req.height - 200;// - 16 - 194;
// g_print("my cal %d w:%d h:%d\n", GTK_IS_WIDGET(data), width, height);
- g_print("data:%p\n", data);
+/* g_print("data:%p\n", data);
g_print("is_widget:%d\n", GTK_IS_WIDGET(widget));
g_print("is_data:%p\n", data);
g_print("is_is_data:%d\n", GTK_IS_WIDGET(gtk_bin_get_child(data)));
- g_print("is_is_data:%d\n", GTK_IS_WIDGET(data));
+ g_print("is_is_data:%d\n", GTK_IS_WIDGET(data));*/
// if (GTK_IS_MOZ_EMBED(data))
// {
// g_print("is mozembed\n");
@@ -1689,10 +1689,14 @@
static gboolean
org_gnome_rss_controls (EMFormatHTML *efh, void *eb, EMFormatHTMLPObject *pobject)
{
+ g_print("controls\n");
struct _org_gnome_rss_controls_pobject *po = (struct _org_gnome_rss_controls_pobject *) pobject;
- GtkRequisition req;
- gtk_widget_size_request(eb, &req);
- g_print("ww:%d,hh%d\n", req.width, req.height);
+ if (GTK_IS_WIDGET(eb))
+ {
+ GtkRequisition req;
+ gtk_widget_size_request(eb, &req);
+ g_print("ww:%d,hh%d\n", req.width, req.height);
+ }
GtkWidget *vbox = gtk_vbox_new (TRUE, 1);
gtk_widget_show (vbox);
@@ -1739,7 +1743,8 @@
int width = vbox->allocation.width;
int height = vbox->allocation.height;
- gtk_container_add ((GtkContainer *) eb, vbox);
+ if (GTK_IS_WIDGET(eb))
+ gtk_container_add ((GtkContainer *) eb, vbox);
// GtkHTMLEmbedded *myeb = eb;
// gtk_widget_size_request(myeb->widget, &req);
// g_print("BOX ww:%d,hh%d\n", myeb->width, myeb->height);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]