From 39f16df92acb1025ecbef3c9f0dc750d7a925236 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 27 May 2013 15:09:15 +0200 Subject: [PATCH] Drop '.'-dir from patches such that git apply will accept them --- app-arch/gzip/patches/gzip-1.4.patch | 4 ++-- dev-util/scons/patches/scons-2.2.0.patch | 12 ++++++------ .../patches/transmission-2.73.patch | 18 +++++++++--------- .../patches/transmission-2.75.patch | 18 +++++++++--------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app-arch/gzip/patches/gzip-1.4.patch b/app-arch/gzip/patches/gzip-1.4.patch index 8b7051d87..d682f553e 100644 --- a/app-arch/gzip/patches/gzip-1.4.patch +++ b/app-arch/gzip/patches/gzip-1.4.patch @@ -1,5 +1,5 @@ ---- ./gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 -+++ ./gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 +--- gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 ++++ gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 @@ -588,6 +588,7 @@ /* do the copy */ do { diff --git a/dev-util/scons/patches/scons-2.2.0.patch b/dev-util/scons/patches/scons-2.2.0.patch index 15d06891d..233c252b3 100644 --- a/dev-util/scons/patches/scons-2.2.0.patch +++ b/dev-util/scons/patches/scons-2.2.0.patch @@ -1,6 +1,6 @@ -diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py ---- ./scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000 -+++ ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000 +diff -Naur scons-2.2.0/engine/SCons/Platform/__init__.py scons-2.2.0-haiku/engine/SCons/Platform/__init__.py +--- scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000 ++++ scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000 @@ -78,6 +78,8 @@ return 'aix' elif sys.platform.find('darwin') != -1: @@ -10,9 +10,9 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/e else: return 'posix' elif os.name == 'os2': -diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py ---- ./scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 -+++ ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000 +diff -Naur scons-2.2.0/engine/SCons/Platform/haiku.py scons-2.2.0-haiku/engine/SCons/Platform/haiku.py +--- scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 ++++ scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000 @@ -0,0 +1,54 @@ +"""SCons.Platform.haiku + diff --git a/net-p2p/transmission/patches/transmission-2.73.patch b/net-p2p/transmission/patches/transmission-2.73.patch index b719e158a..80d694fa4 100644 --- a/net-p2p/transmission/patches/transmission-2.73.patch +++ b/net-p2p/transmission/patches/transmission-2.73.patch @@ -1,6 +1,6 @@ -diff -Naur ./transmission-2.73/third-party/miniupnp/connecthostport.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c ---- ./transmission-2.73/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/connecthostport.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c +--- transmission-2.73/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 ++++ transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 @@ -24,6 +24,7 @@ #else /* #ifdef _WIN32 */ #include @@ -9,9 +9,9 @@ diff -Naur ./transmission-2.73/third-party/miniupnp/connecthostport.c ./transmis #include #define closesocket close #include -diff -Naur ./transmission-2.73/third-party/miniupnp/miniupnpc.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c ---- ./transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/miniupnpc.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c +--- transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 ++++ transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 @@ -17,7 +17,7 @@ #endif #endif @@ -21,9 +21,9 @@ diff -Naur ./transmission-2.73/third-party/miniupnp/miniupnpc.c ./transmission-2 #define HAS_IP_MREQN #endif -diff -Naur ./transmission-2.73/third-party/miniupnp/portlistingparse.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c ---- ./transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/portlistingparse.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c +--- transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 ++++ transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 @@ -28,7 +28,7 @@ /* Helper function */ diff --git a/net-p2p/transmission/patches/transmission-2.75.patch b/net-p2p/transmission/patches/transmission-2.75.patch index 074c85751..91a47f0a3 100644 --- a/net-p2p/transmission/patches/transmission-2.75.patch +++ b/net-p2p/transmission/patches/transmission-2.75.patch @@ -1,6 +1,6 @@ -diff -Naur ./transmission-2.75/third-party/miniupnp/connecthostport.c ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c ---- ./transmission-2.75/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 -+++ ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 +diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c +--- transmission-2.75/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 ++++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 @@ -24,6 +24,7 @@ #else /* #ifdef _WIN32 */ #include @@ -9,9 +9,9 @@ diff -Naur ./transmission-2.75/third-party/miniupnp/connecthostport.c ./transmis #include #define closesocket close #include -diff -Naur ./transmission-2.75/third-party/miniupnp/miniupnpc.c ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c ---- ./transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 -+++ ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 +diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c +--- transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 ++++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 @@ -17,7 +17,7 @@ #endif #endif @@ -21,9 +21,9 @@ diff -Naur ./transmission-2.75/third-party/miniupnp/miniupnpc.c ./transmission-2 #define HAS_IP_MREQN #endif -diff -Naur ./transmission-2.75/third-party/miniupnp/portlistingparse.c ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c ---- ./transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 -+++ ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 +diff -Naur transmission-2.75/third-party/miniupnp/portlistingparse.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c +--- transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 ++++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 @@ -28,7 +28,7 @@ /* Helper function */