Package: gpe-calendar
Version: 0.92-4
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
*** /tmp/tmp4_vouR/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
* d/patches/dbus-glib-lowlevel: Include dbus-glib-lowlevel.h to get rid of
warning about dbus_connection_setup_with_g_main() being undeclared
* d/patches/format_string: Add format string to fix FTBFS with
-Werror=format-security
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise
APT policy: (500, 'precise')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-15-generic (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBAgAGBQJPN8jUAAoJEGHzRCZ03mYkGh4P/jUT/VsOJ5DldbONKglHCggy
9WkPP2Ol30WpdhTwV5fxqZ8mNHU91W8/qYQwIfJORzeg0XmyfvOgWLBQT70lrGTk
eWydudGq6yhr1+Yo5ALVTZ7CHEeJs6whSM6xixUqlV1HICHymADjSZufzYbhBa1V
O7ERZgmcCjKx3nW26pZlOVuvUK0J0uDT+TXOuPp0O94eTT+69r9bZAC/m8Gts/sU
z/wqL044BRBrEEvCi5OxtR3dKtJivP+wkW1FP6cNJDRq7P4/JB7bAYcaj/Jc6U+7
FvTKE+12RgKwVKUwiyAph7aRhwCjpuk9MGsOC9YZdSq5aOraVvCkEhWzYnUgri1w
ExKbDXe3NacbjCg5unFcH9x3bFO+w1v/9LBiMWXvYRhZ+6j+ORz/8J/MVHq6nFJe
wzXYAGuf3unU8aiLBTOnPERcqEtJHU7KQmUKhpzmMFZia19PXu+1EcXwh/MhJMZh
N+rHtDnaO783r1g94y4s/mv7p8oQUwxdB7Gen+iMMmwOvft0+cgkMV55fu8Ow9dK
zRIwStdS1mM71OyNIE4P5xaW5w6iZgoF4z1pUtBiEehedEeyO98pvYeObDHG4GjG
pd2nerjEmUDLhPUgtQpXcl2jKWtwg+1AMaKEbsFWpIxoySncVF30CIddIxlu0svS
ny9XeF+4vHsE92KMC3Z1
=TdcR
-----END PGP SIGNATURE-----
diff -Nru gpe-calendar-0.92/debian/patches/dbus-glib-lowlevel.patch gpe-calendar-0.92/debian/patches/dbus-glib-lowlevel.patch
--- gpe-calendar-0.92/debian/patches/dbus-glib-lowlevel.patch 1970-01-01 01:00:00.000000000 +0100
+++ gpe-calendar-0.92/debian/patches/dbus-glib-lowlevel.patch 2012-02-12 14:57:40.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Include dbus-glib-lowlevel to get rid of warning
+ about dbus_connection_setup_with_g_main() being undeclared
+Author: Andreas Moog <am...@ubuntu.com>
+
+Index: gpe-calendar-0.92/import-export.c
+===================================================================
+--- gpe-calendar-0.92.orig/import-export.c 2012-02-12 14:50:56.000000000 +0100
++++ gpe-calendar-0.92/import-export.c 2012-02-12 14:56:12.411746070 +0100
+@@ -42,6 +42,7 @@
+ #ifdef USE_DBUS
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
+
+ static DBusConnection *connection;
+
+
diff -Nru gpe-calendar-0.92/debian/patches/series gpe-calendar-0.92/debian/patches/series
--- gpe-calendar-0.92/debian/patches/series 2009-12-12 08:08:40.000000000 +0100
+++ gpe-calendar-0.92/debian/patches/series 2012-02-12 14:59:13.000000000 +0100
@@ -2,3 +2,5 @@
desktop-validity
add-lgthread-linkage
migrate-to-soup_2.4
+dbus-glib-lowlevel.patch
+string_formats.patch
diff -Nru gpe-calendar-0.92/debian/patches/string_formats.patch gpe-calendar-0.92/debian/patches/string_formats.patch
--- gpe-calendar-0.92/debian/patches/string_formats.patch 1970-01-01 01:00:00.000000000 +0100
+++ gpe-calendar-0.92/debian/patches/string_formats.patch 2012-02-12 15:00:01.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Add format string to feedbackdlg
+Author: Andreas Moog <am...@ubuntu.com>
+
+--- gpe-calendar-0.92.orig/import-export.c
++++ gpe-calendar-0.92/import-export.c
+@@ -238,7 +238,7 @@ cal_import_dialog (EventCalendar *ec, co
+ GtkWidget *feedbackdlg = gtk_message_dialog_new
+ (GTK_WINDOW (main_window),
+ GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
+- GTK_BUTTONS_OK, error ? error->message : _("Import successful"));
++ GTK_BUTTONS_OK, "%s", error ? error->message : _("Import successful"));
+
+ if (error)
+ g_error_free (error);
