r2087 - in /unstable/evolution-webcal/debian: changelog control patches/ patches/01_gtk3_gtkobject.patch patches/02_gtk3_port.patch patches/series rules source/ source/format
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Dec 16 20:04:29 UTC 2011
Author: joss
Date: Fri Dec 16 20:04:29 2011
New Revision: 2087
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2087
Log:
* Switch to 3.0 quilt format.
* 01_gtk3_gtkobject.patch, 02_gtk3_port.patch: from upstream git. Port
to GTK+ 3.
* Update build-dependencies accordingly.
Added:
unstable/evolution-webcal/debian/patches/
unstable/evolution-webcal/debian/patches/01_gtk3_gtkobject.patch
unstable/evolution-webcal/debian/patches/02_gtk3_port.patch
unstable/evolution-webcal/debian/patches/series
unstable/evolution-webcal/debian/source/
unstable/evolution-webcal/debian/source/format
Modified:
unstable/evolution-webcal/debian/changelog
unstable/evolution-webcal/debian/control
unstable/evolution-webcal/debian/rules
Modified: unstable/evolution-webcal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-webcal/debian/changelog?rev=2087&op=diff
==============================================================================
--- unstable/evolution-webcal/debian/changelog (original)
+++ unstable/evolution-webcal/debian/changelog Fri Dec 16 20:04:29 2011
@@ -1,3 +1,12 @@
+evolution-webcal (2.32.0-2) unstable; urgency=low
+
+ * Switch to 3.0 quilt format.
+ * 01_gtk3_gtkobject.patch, 02_gtk3_port.patch: from upstream git. Port
+ to GTK+ 3.
+ * Update build-dependencies accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 16 Dec 2011 21:03:39 +0100
+
evolution-webcal (2.32.0-1) unstable; urgency=low
* New upstream release.
Modified: unstable/evolution-webcal/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-webcal/debian/control?rev=2087&op=diff
==============================================================================
--- unstable/evolution-webcal/debian/control (original)
+++ unstable/evolution-webcal/debian/control Fri Dec 16 20:04:29 2011
@@ -15,7 +15,7 @@
intltool (>= 0.40.0),
libgconf2-dev,
libglib2.0-dev (>= 2.8),
- libgtk2.0-dev (>= 2.18),
+ libgtk-3-dev (>= 3.0),
libecal1.2-dev (>= 1.10.0),
libsoup2.4-dev (>= 2.3.0)
Added: unstable/evolution-webcal/debian/patches/01_gtk3_gtkobject.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-webcal/debian/patches/01_gtk3_gtkobject.patch?rev=2087&op=file
==============================================================================
--- unstable/evolution-webcal/debian/patches/01_gtk3_gtkobject.patch (added)
+++ unstable/evolution-webcal/debian/patches/01_gtk3_gtkobject.patch Fri Dec 16 20:04:29 2011
@@ -1,0 +1,25 @@
+From bc5f333a125db5bae616562f2e84888d684987b3 Mon Sep 17 00:00:00 2001
+From: Javier Jardón <jjardon at gnome.org>
+Date: Wed, 06 Oct 2010 22:13:54 +0000
+Subject: GtkObject is gone from GTK+3
+
+gtk_adjustment_new() returns now a Gtkdjustment*
+---
+diff --git a/src/evolution-webcal-notify.c b/src/evolution-webcal-notify.c
+index fa23481..450982a 100644
+--- a/src/evolution-webcal-notify.c
++++ b/src/evolution-webcal-notify.c
+@@ -217,7 +217,11 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
+ const gchar * caluri,
+ gboolean has_events, gboolean has_tasks) {
+ EIcalShareDialog * dialog;
++#if GTK_CHECK_VERSION (2,91,0)
++ GtkAdjustment * spinadj;
++#else
+ GtkObject * spinadj;
++#endif
+ GtkWidget * tspinb, * combo;
+ GtkWidget * vbox, * hbox;
+ GtkWidget * lbox, * wbox, * xbox;
+--
+cgit v0.9.0.2
Added: unstable/evolution-webcal/debian/patches/02_gtk3_port.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-webcal/debian/patches/02_gtk3_port.patch?rev=2087&op=file
==============================================================================
--- unstable/evolution-webcal/debian/patches/02_gtk3_port.patch (added)
+++ unstable/evolution-webcal/debian/patches/02_gtk3_port.patch Fri Dec 16 20:04:29 2011
@@ -1,0 +1,95 @@
+From 506b6a0014074cc654d5e8990fc33b0b7cbcc5f4 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Mon, 14 Feb 2011 09:23:40 +0000
+Subject: Bug #632642 - Port to Gtk3
+
+---
+diff --git a/configure.ac b/configure.ac
+index dcf6616..9ad131c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ AM_GCONF_SOURCE_2
+ # EDS's libical now has an #ifndef and warns about memory management
+ AC_DEFINE_UNQUOTED(HANDLE_LIBICAL_MEMORY,, [Handle libical memory])
+
+-PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-2.0 >= 2.18 libecal-1.2 >= 1.10.0 libsoup-2.4 >= 2.3.0)
++PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-3.0 >= 3.0 libecal-1.2 >= 1.10.0 libsoup-2.4 >= 2.3.0)
+ AC_SUBST(EVOLUTION_WEBCAL_CFLAGS)
+ AC_SUBST(EVOLUTION_WEBCAL_LIBS)
+
+diff --git a/src/evolution-webcal-main.c b/src/evolution-webcal-main.c
+index 80b1f39..f675686 100644
+--- a/src/evolution-webcal-main.c
++++ b/src/evolution-webcal-main.c
+@@ -80,9 +80,9 @@ static void e_webcal_load (const gchar * body, const gchar * uri)
+
+ if (propname != NULL) {
+ if (!strcmp (propname, "X-WR-CALNAME")) {
+- name = icalproperty_get_value_as_string (prop);
++ name = icalproperty_get_value_as_string_r (prop);
+ } else if (!strcmp (propname, "X-WR-CALDESC")) {
+- desc = icalproperty_get_value_as_string (prop);
++ desc = icalproperty_get_value_as_string_r (prop);
+ }
+ }
+ icalproperty_free (prop);
+@@ -96,10 +96,8 @@ static void e_webcal_load (const gchar * body, const gchar * uri)
+
+ e_webcal_query_user (name, desc, uri, has_events, has_tasks);
+
+-#if LIBICAL_MEMFIXES
+ g_free (name);
+ g_free (desc);
+-#endif
+
+ gtk_main_quit ();
+ }
+diff --git a/src/evolution-webcal-notify.c b/src/evolution-webcal-notify.c
+index 450982a..8ad8eed 100644
+--- a/src/evolution-webcal-notify.c
++++ b/src/evolution-webcal-notify.c
+@@ -134,13 +134,11 @@ void e_webcal_display_error (const gchar * title, const gchar * message,
+
+ gtk_widget_realize (dialog);
+
+- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
+
+- pixbuf = gtk_widget_render_icon (dialog, GTK_STOCK_DIALOG_ERROR,
+- GTK_ICON_SIZE_DIALOG, "error-dialog");
++ pixbuf = gtk_widget_render_icon_pixbuf (dialog, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
+ gtk_window_set_icon (GTK_WINDOW (dialog), pixbuf);
+ g_object_unref (pixbuf);
+
+@@ -339,7 +337,6 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
+ dialog->dialog = gtk_dialog_new ();
+ gtk_window_set_title (GTK_WINDOW (dialog->dialog),
+ _("Subscribe to Calendar"));
+- gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
+ gtk_window_set_default_size (GTK_WINDOW (dialog->dialog), 376, 144);
+
+ gtk_window_set_default_icon_name ("x-office-calendar");
+@@ -466,14 +463,14 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
+
+ gtk_label_set_mnemonic_widget (GTK_LABEL (rlabel), tspinb);
+
+- combo = gtk_combo_box_new_text ();
++ combo = gtk_combo_box_text_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
+ gtk_widget_show (combo);
+
+- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Days"));
+- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Hours"));
+- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Minutes"));
+- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Weeks"));
++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Days"));
++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Hours"));
++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Minutes"));
++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Weeks"));
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (combo),
+ E_ICALSHARE_TIMEOUT_HOURS);
+--
+cgit v0.9.0.2
Added: unstable/evolution-webcal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-webcal/debian/patches/series?rev=2087&op=file
==============================================================================
--- unstable/evolution-webcal/debian/patches/series (added)
+++ unstable/evolution-webcal/debian/patches/series Fri Dec 16 20:04:29 2011
@@ -1,0 +1,2 @@
+01_gtk3_gtkobject.patch
+02_gtk3_port.patch
Modified: unstable/evolution-webcal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-webcal/debian/rules?rev=2087&op=diff
==============================================================================
--- unstable/evolution-webcal/debian/rules (original)
+++ unstable/evolution-webcal/debian/rules Fri Dec 16 20:04:29 2011
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed"
Added: unstable/evolution-webcal/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-webcal/debian/source/format?rev=2087&op=file
==============================================================================
--- unstable/evolution-webcal/debian/source/format (added)
+++ unstable/evolution-webcal/debian/source/format Fri Dec 16 20:04:29 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-evolution-commits
mailing list