[pcsxr] 14/18: Refresh patches

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository pcsxr.

commit 391763cbdea6a90eadf13c43a9354425ac8eea26
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Wed Mar 30 23:25:17 2016 +0100

    Refresh patches
---
 debian/patches/disable-ppc-auto-dynarec.patch |  4 +---
 debian/patches/fix-i386-exec-stack.patch      |  8 ++++----
 debian/patches/format-security.patch          | 10 ++++------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/debian/patches/disable-ppc-auto-dynarec.patch b/debian/patches/disable-ppc-auto-dynarec.patch
index e247a1e..f421847 100644
--- a/debian/patches/disable-ppc-auto-dynarec.patch
+++ b/debian/patches/disable-ppc-auto-dynarec.patch
@@ -4,11 +4,9 @@ Author: Andrey Rahmatullin <wrar at wrar.name>
 Forwarded: not-needed
 Last-Update: 2012-03-03
 
-diff --git a/configure.ac b/configure.ac
-index 93fe88c..a4ba5eb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -195,8 +195,6 @@ if test "x$DYNARECSEL" = xauto; then
+@@ -220,8 +220,6 @@ if test "x$DYNARECSEL" = xauto; then
  		DYNARECSEL="x86"
  	elif expr x"$build_cpu" : 'xx86_64' > /dev/null; then
  		DYNARECSEL="x86_64"
diff --git a/debian/patches/fix-i386-exec-stack.patch b/debian/patches/fix-i386-exec-stack.patch
index ec56d1e..6f5a8fe 100644
--- a/debian/patches/fix-i386-exec-stack.patch
+++ b/debian/patches/fix-i386-exec-stack.patch
@@ -6,18 +6,18 @@ Last-Update: 2011-01-15
 
 --- a/plugins/dfxvideo/Makefile.am
 +++ b/plugins/dfxvideo/Makefile.am
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,7 @@ SUFFIXES = .asm
  
  .asm.lo:
  	$(LIBTOOL) --tag=CC --mode=compile \
 -	$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
 +	$(STRIP_FPIC) $(NASM) -f elf32 -d ELF -I${srcdir}/ $<
  
- INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
- 	-DLOCALE_DIR=\"${datadir}/locale/\" \
+ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
+ 	-DDATADIR=\"${datadir}/psemu/\" \
 --- a/plugins/dfxvideo/i386.asm
 +++ b/plugins/dfxvideo/i386.asm
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ NEWSYM i386_shl10idiv
  	mov esp, ebp
  	pop ebp
  	ret
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
index 031370f..11f08c5 100644
--- a/debian/patches/format-security.patch
+++ b/debian/patches/format-security.patch
@@ -3,24 +3,22 @@ Author: Andrey Rahmatullin <wrar at wrar.name>
 Forwarded: no
 Last-Update: 2012-06-15
 
-diff --git a/gui/GtkGui.c b/gui/GtkGui.c
-index 89da504..2e556c7 100644
 --- a/gui/GtkGui.c
 +++ b/gui/GtkGui.c
-@@ -917,7 +917,7 @@ void SysErrorMessage(gchar *primary, gchar *secondary) {
+@@ -1114,7 +1114,7 @@ void SysErrorMessage(gchar *primary, gch
  				primary,
  				NULL);
  		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
--				secondary);
+-				"s", secondary);
 +				"%s", secondary);
  
  		gtk_dialog_run(GTK_DIALOG(message_dialog));
  		gtk_widget_destroy(message_dialog);
-@@ -936,7 +936,7 @@ void SysInfoMessage(gchar *primary, gchar *secondary) {
+@@ -1133,7 +1133,7 @@ void SysInfoMessage(gchar *primary, gcha
  				primary,
  				NULL);
  		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
--				secondary);
+-				"s", secondary);
 +				"%s", secondary);
  
  		gtk_dialog_run(GTK_DIALOG(message_dialog));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/pcsxr.git