From: Jeffery To <redacted>
Date: Tue, 24 Mar 2020 07:51:55 +0000 (+0800)
Subject: newt: Remove python_init_once.patch
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=cf1579a75c8057c5138cae3c9c7f0fb5c3112b10;p=openwrt-packages.git

newt: Remove python_init_once.patch

It was pointed out in #11504 that the code in python_init_once.patch is
incorrect; the patch does not prevent newtInit() from being called more
than once (in fact it is called twice the first time initScreen() is
called).

Testing without the patch, using the example code from the corresponding
Debian bug report[1], did not result in any segfaults.

This removes the patch from the package build.

Supersedes #11504.

[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557960#5

Signed-off-by: Jeffery To <redacted>
---

diff --git a/libs/newt/Makefile b/libs/newt/Makefile
index 3f10fb0c1..10abe55f4 100644
--- a/libs/newt/Makefile
+++ b/libs/newt/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=newt
 PKG_VERSION:=0.52.21
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://releases.pagure.org/newt
diff --git a/libs/newt/patches/python_init_once.patch b/libs/newt/patches/python_init_once.patch
deleted file mode 100644
index 3d52b4486..000000000
--- a/libs/newt/patches/python_init_once.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: newtInit() should only be called once
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557960
-Forwarded: no
-Last-Updated: 2014-06-11
-
---- a/snack.c
-+++ b/snack.c
-@@ -377,10 +377,15 @@ static snackWidget * snackWidgetNew (voi
- }
- 
- static PyObject * initScreen(PyObject * s, PyObject * args) {
-+    static int init_newt = 1;
-     suspend.cb = NULL;
-     suspend.data = NULL;
-     
-     newtInit();
-+    if (init_newt) { 
-+	newtInit();
-+	init_newt = 0;
-+    }
-     newtCls();
- 
-     Py_INCREF(Py_None);