[gimagereader/f19: 3/3] Rebase patch

Sandro Mani smani at fedoraproject.org
Wed Mar 19 21:12:31 UTC 2014


commit 4485253d531b843768ca091b824f0f408ecc5543
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed Mar 19 22:12:15 2014 +0100

    Rebase patch

 gimagereader_no_spawn_default.patch |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gimagereader_no_spawn_default.patch b/gimagereader_no_spawn_default.patch
index ad9d775..759d9a2 100644
--- a/gimagereader_no_spawn_default.patch
+++ b/gimagereader_no_spawn_default.patch
@@ -1,7 +1,7 @@
-diff -rupN gimagereader-2.91/src/FileDialogs.cc gimagereader-2.91-new/src/FileDialogs.cc
---- gimagereader-2.91/src/FileDialogs.cc	2014-02-20 14:18:57.000000000 +0100
-+++ gimagereader-2.91-new/src/FileDialogs.cc	2014-02-20 16:55:43.313743278 +0100
-@@ -209,7 +209,7 @@ static std::vector<Glib::RefPtr<Gio::Fil
+diff -rupN gimagereader-2.92/src/FileDialogs.cc gimagereader-2.92-new/src/FileDialogs.cc
+--- gimagereader-2.92/src/FileDialogs.cc	2014-03-16 21:27:44.000000000 +0100
++++ gimagereader-2.92-new/src/FileDialogs.cc	2014-03-19 22:11:25.091881686 +0100
+@@ -229,7 +229,7 @@ static std::vector<Glib::RefPtr<Gio::Fil
  	// Spawn process
  	std::string stdout;
  	int exit_status = -1;
@@ -10,7 +10,7 @@ diff -rupN gimagereader-2.91/src/FileDialogs.cc gimagereader-2.91-new/src/FileDi
  	std::vector<Glib::RefPtr<Gio::File>> files;
  	if(exit_status == 0) {
  		std::istringstream iss(stdout);
-@@ -234,7 +234,7 @@ static std::string kde_save_dialog(const
+@@ -268,7 +268,7 @@ static std::string kde_save_dialog(const
  		};
  		int exit_status = -1;
  		std::string stdout;
@@ -19,7 +19,7 @@ diff -rupN gimagereader-2.91/src/FileDialogs.cc gimagereader-2.91-new/src/FileDi
  		if(exit_status != 0) {
  			break;
  		}
-@@ -248,7 +248,7 @@ static std::string kde_save_dialog(const
+@@ -282,7 +282,7 @@ static std::string kde_save_dialog(const
  				"--title", _("Overwrite File?"),
  				"--caption", PACKAGE_NAME
  			};


More information about the scm-commits mailing list