summaryrefslogtreecommitdiff
path: root/packages/duma
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-12-02 20:44:39 (GMT)
committerAlexey Neyman <stilor@att.net>2017-12-02 20:44:39 (GMT)
commit98bc4decdeab1361bdc585c86591718fb08c8ffb (patch)
tree4e048ed57988306696efa3c5b81a80d48030e913 /packages/duma
parent2a1935f3ad41d360dd3d96a1b0486083293651dd (diff)
Run all patches through renumbering and update
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/duma')
-rw-r--r--packages/duma/2_5_15/0000-cross-compile.patch (renamed from packages/duma/2_5_15/100-cross-compile.patch)9
-rw-r--r--packages/duma/2_5_15/0001-separate_cpp.patch (renamed from packages/duma/2_5_15/110-separate_cpp.patch)9
-rw-r--r--packages/duma/2_5_15/0002-cpp11-new-operator.patch (renamed from packages/duma/2_5_15/200-cpp11-new-operator.patch)17
3 files changed, 21 insertions, 14 deletions
diff --git a/packages/duma/2_5_15/100-cross-compile.patch b/packages/duma/2_5_15/0000-cross-compile.patch
index cc95160..6978eba 100644
--- a/packages/duma/2_5_15/100-cross-compile.patch
+++ b/packages/duma/2_5_15/0000-cross-compile.patch
@@ -1,6 +1,9 @@
-diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
---- duma_2_5_15.orig/GNUmakefile 2008-08-03 21:22:38.000000000 +0200
-+++ duma_2_5_15/GNUmakefile 2009-06-19 15:32:23.000000000 +0200
+---
+ GNUmakefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/GNUmakefile
++++ b/GNUmakefile
@@ -93,10 +93,6 @@
# also define 'WIN32'
diff --git a/packages/duma/2_5_15/110-separate_cpp.patch b/packages/duma/2_5_15/0001-separate_cpp.patch
index 4bbccc7..bd6c6ee 100644
--- a/packages/duma/2_5_15/110-separate_cpp.patch
+++ b/packages/duma/2_5_15/0001-separate_cpp.patch
@@ -1,6 +1,9 @@
-diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
---- duma_2_5_15.orig/GNUmakefile 2009-06-19 16:41:53.000000000 +0200
-+++ duma_2_5_15/GNUmakefile 2009-06-19 16:43:53.000000000 +0200
+---
+ GNUmakefile | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/GNUmakefile
++++ b/GNUmakefile
@@ -289,9 +289,13 @@
dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
createconf.c
diff --git a/packages/duma/2_5_15/200-cpp11-new-operator.patch b/packages/duma/2_5_15/0002-cpp11-new-operator.patch
index 900333e..4504cd7 100644
--- a/packages/duma/2_5_15/200-cpp11-new-operator.patch
+++ b/packages/duma/2_5_15/0002-cpp11-new-operator.patch
@@ -1,8 +1,11 @@
-diff --git a/dumapp.cpp b/dumapp.cpp
-index dbddf66..b5e9ba3 100644
+---
+ dumapp.cpp | 12 ++++--------
+ dumapp.h | 13 +++++++++----
+ 2 files changed, 13 insertions(+), 12 deletions(-)
+
--- a/dumapp.cpp
+++ b/dumapp.cpp
-@@ -189,8 +189,7 @@ void * duma_new_operator(DUMA_SIZE_T userSize, enum _DUMA_Allocator allocator, b
+@@ -189,8 +189,7 @@
* Single object form, no debug information
* (11) = (a) ; ASW
*/
@@ -12,7 +15,7 @@ index dbddf66..b5e9ba3 100644
{
return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_UK);
}
-@@ -253,8 +252,7 @@ throw()
+@@ -253,8 +252,7 @@
* Array object form, no debug information
* (21) = (a) ; AAW
*/
@@ -22,7 +25,7 @@ index dbddf66..b5e9ba3 100644
{
return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_UK);
}
-@@ -320,8 +318,7 @@ throw()
+@@ -320,8 +318,7 @@
* Single object form with debug information
* (31) = (a) ; ASW
*/
@@ -32,7 +35,7 @@ index dbddf66..b5e9ba3 100644
{
return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_FILELINE);
}
-@@ -373,8 +370,7 @@ throw()
+@@ -373,8 +370,7 @@
* Array object form with debug information
* (41) = (a) ; AAW
*/
@@ -42,8 +45,6 @@ index dbddf66..b5e9ba3 100644
{
return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_FILELINE);
}
-diff --git a/dumapp.h b/dumapp.h
-index fc40d9a..7175359 100644
--- a/dumapp.h
+++ b/dumapp.h
@@ -64,6 +64,11 @@