From ef60b6dc1c8f1819d9fe591ae0e4796e9b453f1a Mon Sep 17 00:00:00 2001
From: wawa <wawa@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Mon, 17 Sep 2018 16:04:30 +0000
Subject: [PATCH] updated to new version. the content of the previous patch has
 been implemented upstream.

git-svn-id: https://svn.aros.org/svn/aros/trunk/ports@55443 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 graphics/zunepaint/ZunePaint_v0.13-aros.diff | 61 ----------------------------
 graphics/zunepaint/mmakefile.src             |  7 ++--
 2 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 graphics/zunepaint/ZunePaint_v0.13-aros.diff

diff --git a/graphics/zunepaint/ZunePaint_v0.13-aros.diff b/graphics/zunepaint/ZunePaint_v0.13-aros.diff
deleted file mode 100644
index 84e60fa..0000000
--- a/graphics/zunepaint/ZunePaint_v0.13-aros.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ruN ZunePaint/src/Quant_Octree.c ZunePaint.aros/src/Quant_Octree.c
---- ZunePaint/src/Quant_Octree.c	2017-03-25 17:20:22.000000000 +0000
-+++ ZunePaint.aros/src/Quant_Octree.c	2018-08-31 18:31:19.059242387 +0100
-@@ -19,9 +19,9 @@
- } node_heap;
- 
- /* memory pool used for node storage */
--APTR pool = NULL;
-+static APTR nodepool = NULL;
-  
--inline int cmp_node(oct_node a, oct_node b)
-+static inline int cmp_node(oct_node a, oct_node b)
- {
- 	if (a->n_kids < b->n_kids) return -1;
- 	if (a->n_kids > b->n_kids) return 1;
-@@ -114,7 +114,7 @@
- {
-     int i;
- 
--    oct_node x = (oct_node)AllocPooled(pool, sizeof(oct_node_t));
-+    oct_node x = (oct_node)AllocPooled(nodepool, sizeof(oct_node_t));
-     
-     /* init node */
- 	x->r = 0;
-@@ -136,8 +136,8 @@
- void node_free()
- {
-     /* Free everything at once */
--    DeletePool(pool);
--    pool = NULL;
-+    DeletePool(nodepool);
-+    nodepool = NULL;
- }
-  
- oct_node node_insert(oct_node root, ULONG pixel)
-@@ -187,9 +187,9 @@
- 	oct_node root = NULL; 
-     oct_node got;
-     
--    pool = CreatePool(MEMF_ANY, sizeof(oct_node_t) * 2048, sizeof(oct_node_t) * 2);
-+    nodepool = CreatePool(MEMF_ANY, sizeof(oct_node_t) * 2048, sizeof(oct_node_t) * 2);
-     
--    if (pool != NULL)
-+    if (nodepool != NULL)
-     {
-         root = node_new(0, 0, 0);
-         
-diff -ruN ZunePaint/src/ZunePaint.c ZunePaint.aros/src/ZunePaint.c
---- ZunePaint/src/ZunePaint.c	2018-07-22 16:30:12.000000000 +0100
-+++ ZunePaint.aros/src/ZunePaint.c	2018-08-31 18:26:11.018225417 +0100
-@@ -594,8 +594,8 @@
-     /* Fill in NewMenu structure */
-     for (i=0; i<NUM_MENU_ENTRIES; i++)
-     {
--        if ((LONG)Menu[i].nm_UserData != -1)
--            Menu[i].nm_Label = _((LONG)Menu[i].nm_UserData);
-+        if (Menu[i].nm_UserData != (APTR)-1)
-+            Menu[i].nm_Label = _((IPTR)Menu[i].nm_UserData);
-         else
-             Menu[i].nm_Label = NM_BARLABEL;
-     }
diff --git a/graphics/zunepaint/mmakefile.src b/graphics/zunepaint/mmakefile.src
index 76cdc8e..1581d21 100644
--- a/graphics/zunepaint/mmakefile.src
+++ b/graphics/zunepaint/mmakefile.src
@@ -17,7 +17,7 @@ include $(SRCDIR)/config/aros-contrib.cfg
 #MM  ports-graphics-zunepaint-quick : ports-graphics-zunepaint-fetch
 
 REPOSITORIES := sf://zunetools
-ARCHBASE     := ZunePaint_v0.13
+ARCHBASE     := ZunePaint_v0.14
 TARGETDIR    := $(AROS_CONTRIB)/MultiMedia/Gfx/ZunePaint
 
 NOWARN_FLAGS :=
@@ -70,14 +70,15 @@ FILES := \
 
 FILES := $(addprefix $(PORTSDIR)/zunepaint/$(ARCHBASE)/ZunePaint/src/,$(FILES))
 
-ZUNEPAINT_PATCHSPECS := $(ARCHBASE)-aros.diff:ZunePaint:-f,-p1
+##DISABLED ZUNEPAINT_PATCHSPECS := $(ARCHBASE)-aros.diff:ZunePaint:-f,-p1
 
 %build_prog mmake=ports-graphics-zunepaint progname=ZunePaint \
     files=$(FILES) targetdir=$(TARGETDIR) \
     uselibs="jpeg png z mui"
 
 %fetch mmake=ports-graphics-zunepaint-fetch archive=$(ARCHBASE) destination=$(PORTSDIR)/zunepaint/$(ARCHBASE) \
-    location=$(PORTSSOURCEDIR) archive_origins=$(REPOSITORIES) suffixes="zip" patches_specs=$(ZUNEPAINT_PATCHSPECS)
+    location=$(PORTSSOURCEDIR) archive_origins=$(REPOSITORIES) suffixes="zip"
+##DISABLED patches_specs=$(ZUNEPAINT_PATCHSPECS)
 
 %create_patch mmake=ports-graphics-zunepaint-create-patch archive=$(ARCHBASE) srcdir=ZunePaint suffixes="zip" destination=$(PORTSDIR)/zunepaint/$(ARCHBASE)
 
-- 
2.11.4.GIT