[packages/shotwell] Pass a formating string when GTK expects it
jajcus
jajcus at pld-linux.org
Mon Oct 8 12:30:32 CEST 2012
commit 23007e2278f00df3d8c54c5f0e23266883b62ed1
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Mon Oct 8 12:22:28 2012 +0200
Pass a formating string when GTK expects it
attempt to fix building on the PLD builders
shotwell-format_string.patch | 13 +++++++++++++
shotwell.spec | 2 ++
2 files changed, 15 insertions(+)
---
diff --git a/shotwell.spec b/shotwell.spec
index a4b535e..ce460c2 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -8,6 +8,7 @@ Source0: http://yorba.org/download/shotwell/0.13/%{name}-%{version}.tar.xz
# Source0-md5: 71eb1346093705ca2b37c12a21994d14
Patch0: %{name}-cflags.patch
Patch1: %{name}-libexec.patch
+Patch2: %{name}-format_string.patch
URL: http://yorba.org/shotwell/
# The dependencies are listed in Makefile
BuildRequires: bash
@@ -52,6 +53,7 @@ mode, and export them to share with others.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
# this is not autoconf generated
diff --git a/shotwell-format_string.patch b/shotwell-format_string.patch
new file mode 100644
index 0000000..f653d35
--- /dev/null
+++ b/shotwell-format_string.patch
@@ -0,0 +1,13 @@
+--- shotwell-0.13.1.orig/src/Dialogs.vala 2012-10-05 19:58:13.000000000 +0200
++++ shotwell-0.13.1/src/Dialogs.vala 2012-10-08 12:20:20.000000000 +0200
+@@ -32,8 +32,8 @@
+ public bool confirm_warn_developer_changed(int number) {
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog.with_markup(AppWindow.get_instance(),
+ Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,
+- "<span weight=\"bold\" size=\"larger\">%s</span>".printf(ngettext("Switching developers will undo all changes you have made to this photo in Shotwell",
+- "Switching developers will undo all changes you have made to these photos in Shotwell", number)));
++ "<span weight=\"bold\" size=\"larger\">%s</span>", ngettext("Switching developers will undo all changes you have made to this photo in Shotwell",
++ "Switching developers will undo all changes you have made to these photos in Shotwell", number));
+
+ dialog.add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
+ dialog.add_buttons(_("_Switch Developer"), Gtk.ResponseType.YES);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/shotwell.git/commitdiff/23007e2278f00df3d8c54c5f0e23266883b62ed1
More information about the pld-cvs-commit
mailing list