From b59c04f207942f69995740c81ab0cdad951d86e1 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 22 Sep 2011 10:33:00 +0000 Subject: [PATCH] start making this a bit happier with gtk3, still needs others fixes --- mail/evolution-rss/Makefile | 6 +-- .../patches/patch-src_rss-config-factory_c | 38 +++++++++++++++++ mail/evolution-rss/patches/patch-src_rss_c | 41 +++++++++++++++++++ 3 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 mail/evolution-rss/patches/patch-src_rss-config-factory_c create mode 100644 mail/evolution-rss/patches/patch-src_rss_c diff --git a/mail/evolution-rss/Makefile b/mail/evolution-rss/Makefile index 978b71ffb3d..0a93eaa45e0 100644 --- a/mail/evolution-rss/Makefile +++ b/mail/evolution-rss/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2011/09/19 07:39:05 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2011/09/22 10:33:00 jasper Exp $ SHARED_ONLY= Yes @@ -8,11 +8,11 @@ GNOME_PROJECT= evolution-rss GNOME_VERSION= 0.2.90-20110621 PKGNAME= evolution-rss-${GNOME_VERSION:S/-/./} -REVISION= 3 +REVISION= 4 CATEGORIES= mail -EVO_VERSION= 3.0 +EVO_VERSION= 3.2 SUBST_VARS= EVO_VERSION HOMEPAGE= http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin diff --git a/mail/evolution-rss/patches/patch-src_rss-config-factory_c b/mail/evolution-rss/patches/patch-src_rss-config-factory_c new file mode 100644 index 00000000000..f29a7c0f554 --- /dev/null +++ b/mail/evolution-rss/patches/patch-src_rss-config-factory_c @@ -0,0 +1,38 @@ +$OpenBSD: patch-src_rss-config-factory_c,v 1.3 2011/09/22 10:33:00 jasper Exp $ + +From 780e196eb0e7cbeda56413bfdb9654c83372eae3 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Mon, 22 Aug 2011 21:28:38 +0000 +Subject: Bug 656126 - evolution-rss uses deprecated tk_[hv]box_new + +--- src/rss-config-factory.c.orig Sun Jun 19 17:27:29 2011 ++++ src/rss-config-factory.c Thu Sep 22 12:25:07 2011 +@@ -1488,7 +1488,8 @@ remove_feed_dialog(gchar *msg) + #endif + gtk_widget_show (dialog_vbox1); + +- vbox1 = gtk_vbox_new (FALSE, 10); ++ vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); ++ + gtk_widget_show (vbox1); + gtk_box_pack_start ( + GTK_BOX (dialog_vbox1), +@@ -2244,7 +2245,8 @@ decorate_import_fs (gpointer data) + gtk_file_filter_add_pattern (filter, "*.xml"); + gtk_file_chooser_set_filter(data, filter); + +- vbox1 = gtk_vbox_new (FALSE, 0); ++ vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++ + checkbutton1 = gtk_check_button_new_with_mnemonic ( + _("Show article's summary")); + gtk_widget_show (checkbutton1); +@@ -3522,7 +3524,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) + G_CALLBACK(start_check_cb), + (gpointer)GCONF_KEY_FEED_ICON); + +- hbox = gtk_vbox_new (FALSE, 0); ++ hbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + + gtk_box_pack_start ( + GTK_BOX (hbox), diff --git a/mail/evolution-rss/patches/patch-src_rss_c b/mail/evolution-rss/patches/patch-src_rss_c new file mode 100644 index 00000000000..cc007b6b35e --- /dev/null +++ b/mail/evolution-rss/patches/patch-src_rss_c @@ -0,0 +1,41 @@ +$OpenBSD: patch-src_rss_c,v 1.3 2011/09/22 10:33:00 jasper Exp $ + +From 780e196eb0e7cbeda56413bfdb9654c83372eae3 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Mon, 22 Aug 2011 21:28:38 +0000 +Subject: Bug 656126 - evolution-rss uses deprecated tk_[hv]box_new + +--- src/rss.c.orig Sun Jun 19 17:27:29 2011 ++++ src/rss.c Thu Sep 22 12:25:51 2011 +@@ -1387,11 +1387,7 @@ webkit_net_status (WebKitWebView *view, + if (resize_pane_hsize+14 > width && width != 1) { + gtk_widget_set_size_request(rf->mozembed, + -1, -1); +-#if GTK_MAJOR_VERSION < 3 +- gtk_widget_size_request(rf->mozembed, &req); +-#else + gtk_widget_get_preferred_size(rf->mozembed, &req, NULL); +-#endif + + if (req.width < resize_pane_hsize+14) + w = resize_pane_hsize-14; +@@ -1908,7 +1904,7 @@ org_gnome_rss_rfrcomm (EMFormatHTML *efh, void *eb, + { + struct _org_gnome_rss_controls_pobject *po = + (struct _org_gnome_rss_controls_pobject *) pobject; +- GtkWidget *hbox = gtk_hbox_new (FALSE, 0); ++ GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + GtkWidget *button; + + gchar *mem = g_strdup_printf("%s(%d):", _("Comments"), po->counter); +@@ -1931,8 +1927,8 @@ org_gnome_rss_controls (EMFormatHTML *efh, void *eb, E + { + struct _org_gnome_rss_controls_pobject *po = + (struct _org_gnome_rss_controls_pobject *) pobject; +- GtkWidget *vbox = gtk_vbox_new (TRUE, 1); +- GtkWidget *hbox2 = gtk_hbox_new (FALSE, 0); ++ GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1); ++ GtkWidget *hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + GtkWidget *label3 = gtk_label_new (""); + GtkWidget *button, *button2, *button3, *button4, *button5; + gchar *mem = g_strdup_printf(" %s: ", _("Feed view"));