From 242c69dc2e5eda9f9570c9c74208e765c804297c Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: May 23 2011 11:07:25 +0000 Subject: update latest git snapshot --- diff --git a/.gitignore b/.gitignore index 15c3f6d..dcffb91 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ evolution-rss-0.2.1-20100721.tar.gz /evolution-rss-0.2.9-20110306.tar.gz /evolution-rss-0.2.90-20110307.tar.gz /evolution-rss-0.2.90-20110323.tar.gz +/evolution-rss-0.2.90-20110523.tar.gz diff --git a/evolution-2.91.6-build.patch b/evolution-2.91.6-build.patch deleted file mode 100644 index d9b0487..0000000 --- a/evolution-2.91.6-build.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff -up evolution-rss-0.2.9/configure.ac.evo-gtk3 evolution-rss-0.2.9/configure.ac ---- evolution-rss-0.2.9/configure.ac.evo-gtk3 2010-12-25 19:16:21.000000000 +0100 -+++ evolution-rss-0.2.9/configure.ac 2011-02-04 10:23:09.980593000 +0100 -@@ -78,13 +78,20 @@ fi - - dnl base packages and versions - LIBGLIB_REQUIRED=2.16.2 -+LIBGTK_VERSION=2 - LIBGTK_REQUIRED=2.12.0 - EVOLUTION_REQUIRED=2.4.1 - LIBSOUP_REQUIRED=2.2 - -+if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then -+ LIBGTK_VERSION=3 -+ LIBGTK_REQUIRED=2.99.3 -+ EVOLUTION_REQUIRED=2.91.6 -+fi -+ - PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN, - [ glib-2.0 >= $LIBGLIB_REQUIRED dnl -- gtk+-2.0 >= $LIBGTK_REQUIRED dnl -+ gtk+-$LIBGTK_VERSION.0 >= $LIBGTK_REQUIRED dnl - libsoup$SOUP >= $LIBSOUP_REQUIRED dnl - evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl - evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl -@@ -95,11 +102,15 @@ GTKHTML_EDITOR_VERSION=`$PKG_CONFIG --mo - if test -n "$GTKHTML_EDITOR_VERSION"; then - PKG_CHECK_MODULES([GTKHTML_EDITOR], gtkhtml-editor, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no]) - else -- gtkhtml_api_versions='14 15' -+ if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then -+ gtkhtml_api_versions='4.0' -+ else -+ gtkhtml_api_versions='3.15 3.14' -+ fi - for i in $gtkhtml_api_versions; do -- GTKHTML_EDITOR_VERSION=`$PKG_CONFIG --modversion gtkhtml-editor-3.$i 2>/dev/null` -+ GTKHTML_EDITOR_VERSION=`$PKG_CONFIG --modversion gtkhtml-editor-$i 2>/dev/null` - if test -n "$GTKHTML_EDITOR_VERSION"; then -- PKG_CHECK_MODULES([GTKHTML_EDITOR], gtkhtml-editor-3.$i, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no]) -+ PKG_CHECK_MODULES([GTKHTML_EDITOR], gtkhtml-editor-$i, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no]) - AC_DEFINE_UNQUOTED(HAVE_GTKHTMLEDITOR, 1, [gthtml editor component present]) - AC_SUBST(HAVE_GTKHTMLEDITOR) - AC_SUBST(GTKHTML_EDITOR_CFLAGS) -diff -up evolution-rss-0.2.9/m4/evolution.m4.evo-gtk3 evolution-rss-0.2.9/m4/evolution.m4 ---- evolution-rss-0.2.9/m4/evolution.m4.evo-gtk3 2010-12-25 19:16:21.000000000 +0100 -+++ evolution-rss-0.2.9/m4/evolution.m4 2011-02-04 10:23:09.981593000 +0100 -@@ -24,11 +24,16 @@ AC_PROG_AWK - - AC_MSG_CHECKING(Evolution version) - dnl is this a reasonable thing to do ? --EVOLUTION_VERSION=`$PKG_CONFIG --modversion evolution-shell 2>/dev/null` -+EVOLUTION_VERSION=`$PKG_CONFIG --modversion evolution-shell-3.0 2>/dev/null` -+if test -n "$EVOLUTION_VERSION"; then -+ EVOLUTION_BASE_VERSION_S="-3.0" -+else -+ EVOLUTION_VERSION=`$PKG_CONFIG --modversion evolution-shell 2>/dev/null` -+ EVOLUTION_BASE_VERSION_S="" -+fi - if test -n "$EVOLUTION_VERSION"; then - EVOLUTION_BASE_VERSION=$EVOLUTION_VERSION -- EVOLUTION_BASE_VERSION_S="" -- EVOLUTION_EXEC_VERSION=`$PKG_CONFIG --variable=execversion evolution-shell 2>/dev/null` -+ EVOLUTION_EXEC_VERSION=`$PKG_CONFIG --variable=execversion evolution-shell$EVOLUTION_BASE_VERSION_S 2>/dev/null` - if test -n "$EVOLUTION_EXEC_VERSION"; then - break; - else -diff -up evolution-rss-0.2.9/src/rss.c.evo-gtk3 evolution-rss-0.2.9/src/rss.c ---- evolution-rss-0.2.9/src/rss.c.evo-gtk3 2011-02-04 10:23:09.978593000 +0100 -+++ evolution-rss-0.2.9/src/rss.c 2011-02-04 10:23:10.021592996 +0100 -@@ -297,12 +297,12 @@ rss_find_enabled(void) - /* hash table of ops->dialogue of active errors */ - static GHashTable *active_errors = NULL; - --void error_destroy(GtkObject *o, void *data) -+void error_destroy(GObject *o, void *data) - { - g_hash_table_remove(active_errors, data); - } - --void error_response(GtkObject *o, int button, void *data) -+void error_response(GObject *o, int button, void *data) - { - gtk_widget_destroy((GtkWidget *)o); - } -diff -up evolution-rss-0.2.9/src/rss-config-factory.c.evo-gtk3 evolution-rss-0.2.9/src/rss-config-factory.c ---- evolution-rss-0.2.9/src/rss-config-factory.c.evo-gtk3 2010-12-25 19:16:21.000000000 +0100 -+++ evolution-rss-0.2.9/src/rss-config-factory.c 2011-02-04 10:23:09.983593000 +0100 -@@ -677,14 +677,22 @@ build_dialog_add(gchar *url, gchar *feed - ok, - "activate", - accel_group, -+ #if GTK_CHECK_VERSION(2,99,0) -+ GDK_KEY_Return, -+ #else - GDK_Return, -+ #endif - (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - gtk_widget_add_accelerator ( - ok, - "activate", - accel_group, -+ #if GTK_CHECK_VERSION(2,99,0) -+ GDK_KEY_KP_Enter, -+ #else - GDK_KP_Enter, -+ #endif - (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - gtk_window_add_accel_group ( -@@ -3662,12 +3670,12 @@ rss_config_control_new (void) - - //make sure something (first row) is selected - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); -- gtk_tree_model_iter_nth_child( -+ if (gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(store), - &iter, - NULL, -- 0); -- gtk_tree_selection_select_iter(selection, &iter); -+ 0)) -+ gtk_tree_selection_select_iter(selection, &iter); - - gtk_tree_view_columns_autosize (treeview); - g_signal_connect((gpointer) treeview, -diff -up evolution-rss-0.2.9/src/rss.h.evo-gtk3 evolution-rss-0.2.9/src/rss.h ---- evolution-rss-0.2.9/src/rss.h.evo-gtk3 2010-12-25 19:16:21.000000000 +0100 -+++ evolution-rss-0.2.9/src/rss.h 2011-02-04 10:23:35.913593004 +0100 -@@ -341,9 +341,9 @@ void compare_enabled( - gpointer value, - guint *data); - guint rss_find_enabled(void); --void error_destroy(GtkObject *o, void *data); -+void error_destroy(GObject *o, void *data); - void error_response( -- GtkObject *o, -+ GObject *o, - int button, - void *data); - void cancel_active_op(gpointer key); diff --git a/evolution-rss.spec b/evolution-rss.spec index a2a771a..cee9ca8 100644 --- a/evolution-rss.spec +++ b/evolution-rss.spec @@ -2,15 +2,15 @@ # git clone git://git.gnome.org/evolution-rss # git archive --format=tar --prefix=evolution-rss-0.1.9/ %{git_version} | gzip > evolution-rss-0.1.9-%{gitdate}.tar.gz -%define gitdate 20110323 -%define git_version 01a9781 +%define gitdate 20110523 +%define git_version db1a0fe %define tarfile %{name}-%{version}-%{gitdate}.tar.gz %define snapshot %{gitdate}git Name: evolution-rss Summary: Evolution RSS Reader Version: 0.2.90 -Release: 20.%{snapshot}%{?dist} +Release: 21.%{snapshot}%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin @@ -91,6 +91,9 @@ fi %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so %changelog +* Mon May 23 2011 Lucian Langa - 0.2.90-21.20110523git +- update to latest git snapshot + * Wed Mar 23 2011 Lucian Langa - 0.2.90-20.20110323git - new upstream git snapshot diff --git a/sources b/sources index 514e62d..3022467 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -876d5cca50c6c563785ed9cc935dbf41 evolution-rss-0.2.90-20110323.tar.gz +f8b8d2e17f65c1152a229a966c31b49b evolution-rss-0.2.90-20110523.tar.gz diff --git a/webkit-1.3.10-includes.patch b/webkit-1.3.10-includes.patch deleted file mode 100644 index 1303837..0000000 --- a/webkit-1.3.10-includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/../evolution-rss/src/rss.c b/src/rss.c -index 828bc6d..8b9f5bc 100644 ---- a/../evolution-rss/src/rss.c -+++ b/src/rss.c -@@ -125,6 +125,9 @@ int rss_verbose_debug = 0; - #include - #else - #include -+#if (WEBKIT_VERSION >= 1003010) -+ #include -+#endif - #endif - #endif - #endif