Fix line hunks: 011_nxcomp_sa-restorer.patch.

91ae4d4e · Mike Gabriel · b494b528 · 91ae4d4e · 91ae4d4e
Commit 91ae4d4e authored Dec 31, 2011 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

changelog debian/changelog +1 -0

011_nxcomp_sa-restorer.patch debian/patches/011_nxcomp_sa-restorer.patch +4 -4

No files found.
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low
    in /debian/man.
  * Add patch: 011_nxcomp_sa-restorer.patch.
  * Add/insert patch: 005_nxcomp_gcc43.patch.
+  * Fix line hunks: 011_nxcomp_sa-restorer.patch.

 -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100


--- a/debian/patches/011_nxcomp_sa-restorer.patch
+++ b/debian/patches/011_nxcomp_sa-restorer.patch
@@ -3,9 +3,9 @@ Description: sa_restorer vs. memset
 Forwarded: not-yet
 Author: Stéphane Graber <stgraber@ubuntu.com>
 Last-Update: 2011-12-31
--- a/Loop.cpp
-+++ b/Loop.cpp
-@@ -5895,7 +5895,7 @@ void InstallSignal(int signal, int action)
+--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
+@@ -5895,7 +5895,7 @@
 
   #if defined(__linux__)
 
@@ -14,7 +14,7 @@ Last-Update: 2011-12-31
 
   #endif
 
-@@ -6513,7 +6513,7 @@ void SetTimer(int value)
+@@ -6513,7 +6513,7 @@
 
   #if defined(__linux__)