Ubuntu

Merge lp:~vibhavp/ubuntu/raring/thoggen/fix-format-string-warning into lp:ubuntu/raring/thoggen

Proposed by Vibhav Pant on 2013-02-28
Status: Work in progress
Proposed branch: lp:~vibhavp/ubuntu/raring/thoggen/fix-format-string-warning
Merge into: lp:ubuntu/raring/thoggen
Diff against target: 41 lines (+18/-0) 3 files modified
To merge this branch: bzr merge lp:~vibhavp/ubuntu/raring/thoggen/fix-format-string-warning
Reviewer Review Type Date Requested Status
Martin Pitt 2013-02-28 Needs Fixing on 2013-03-25
Marc Deslauriers Needs Fixing on 2013-03-19
Review via email: mp+150969@code.launchpad.net
To post a comment you must log in.
Marc Deslauriers (mdeslaur) wrote :

NACK on the merge request. The thoggen package in Raring using a patch system. Please resubmit this change as a proper patch, instead of doing the change inline.

Thanks!

review: Needs Fixing
Martin Pitt (pitti) wrote :

Looks good now, thanks!

review: Approve
Martin Pitt (pitti) wrote :

Actually, applying the patch inline is wrong (as this isn't using quilt), and the patch doesn't apply as it's not -p1 and doesn't even specify a path. Please test this with an actual package build first.

review: Needs Fixing
Martin Pitt (pitti) wrote :

When you are done, please set back the status to "needs review". Thanks!

Martin Pitt (pitti) wrote :

For the record, I removed thoggen from raring:

Comment: does not build against current glib, hal, and dbus, dead upstream, uses old gstreamer, removed from Debian testing, long-standing RC bugs

If you ever manage to get this to actually build, we can reintroduce it into Ubuntu.

Unmerged revisions

14. By Vibhav Pant on 2013-03-21

Add correct patch

13. By Vibhav Pant on 2013-03-21

* debian/patches/02_fomat_string.patch
  - Fix format string warning leading to FTBFS.

12. By Vibhav Pant on 2013-02-28

* src/th-app-window.c:
  - Fix compiler warning due to incorrect usage of format string.

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2009-02-19 12:09:33 +0000
3+++ debian/changelog 2013-03-21 16:13:27 +0000
4@@ -1,3 +1,10 @@
5+thoggen (0.7.1-1ubuntu2) raring; urgency=low
6+
7+ * debian/patches/02_fomat_string.patch
8+ - Fix format string warning leading to FTBFS.
9+
10+ -- Vibhav Pant <vibhavp@ubuntu.com> Thu, 28 Feb 2013 14:07:41 +0530
11+
12 thoggen (0.7.1-1ubuntu1) jaunty; urgency=low
13
14 * No change rebuild to build with latest libdvdread. (LP: #330684)
15
16=== added file 'debian/patches/02_format_string.patch'
17--- debian/patches/02_format_string.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/02_format_string.patch 2013-03-21 16:13:27 +0000
19@@ -0,0 +1,10 @@
20+--- th-app-window.c.old 2013-03-21 21:38:34.701211644 +0530
21++++ th-app-window.c 2013-03-21 21:39:23.249211183 +0530
22+@@ -1137,6 +1137,7 @@
23+ GTK_DIALOG_MODAL,
24+ GTK_MESSAGE_WARNING,
25+ GTK_BUTTONS_YES_NO,
26++ "%s"
27+ errmsg->str);
28+
29+ gtk_window_set_title (GTK_WINDOW (dlg), _("Not enough disk space - continue anyway?"));
30
31=== modified file 'src/th-app-window.c'
32--- src/th-app-window.c 2008-06-13 12:09:15 +0000
33+++ src/th-app-window.c 2013-03-21 16:13:27 +0000
34@@ -1137,6 +1137,7 @@
35 GTK_DIALOG_MODAL,
36 GTK_MESSAGE_WARNING,
37 GTK_BUTTONS_YES_NO,
38+ "%s"
39 errmsg->str);
40
41 gtk_window_set_title (GTK_WINDOW (dlg), _("Not enough disk space - continue anyway?"));

Subscribers

People subscribed via source and target branches

to all changes: