[mame] 07/12: Remove avoid_linenoise patch.

[Jordi Mallach]

This is an automated email from the git hooks/post-receive script.

jordi pushed a commit to branch master
in repository mame.

commit 66500ad16abcf203eae348127ac2c54b93be70c9
Author: Jordi Mallach <jordi at debian.org>
Date:   Fri Mar 16 12:54:11 2018 +0100

    Remove avoid_linenoise patch.
    
    MAME has switched to a linenoise fork that has no code
    that is GPL incompatible.
---
 debian/changelog                     |  2 +
 debian/patches/avoid_linenoise.patch | 79 ------------------------------------
 debian/patches/series                |  1 -
 debian/rules                         |  1 -
 4 files changed, 2 insertions(+), 81 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2eb94c5..e9f3771 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ mame (0.195+dfsg.1-1) UNRELEASED; urgency=medium
     been fixed.
   * Use system libglm, rapidjson and utf8proc. Drop definitions for system
     libuv which is no longer used.
+  * Drop avoid_linenoise.patch and build definitions, as the bundled
+    linenoise fork no longer has GPL-incompatible material.
 
  -- Cesare Falco <c.falco at ubuntu.com>  Wed, 31 Jan 2018 12:08:01 +0100
 
diff --git a/debian/patches/avoid_linenoise.patch b/debian/patches/avoid_linenoise.patch
deleted file mode 100644
index c281d28..0000000
--- a/debian/patches/avoid_linenoise.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Author: Jordi Mallach <jordi at debian.org>
-Description: avoid compiling linenoise, that includes the non-free file
- ConvertUTF.cpp.
-
-Index: mame/makefile
-===================================================================
---- mame.orig/makefile
-+++ mame/makefile
-@@ -788,6 +788,10 @@ endif
- ifdef SANITIZE
- PARAMS += --SANITIZE='$(SANITIZE)'
- endif
-+
-+ifdef NO_USE_LINENOISE
-+PARAMS += --NO_USE_LINENOISE=1
-+endif
- #-------------------------------------------------
- # All scripts
- #-------------------------------------------------
-Index: mame/scripts/genie.lua
-===================================================================
---- mame.orig/scripts/genie.lua
-+++ mame/scripts/genie.lua
-@@ -393,6 +393,11 @@ newoption {
- }
- 
- newoption {
-+	trigger = "NO_USE_LINENOISE",
-+	description = "Avoid using linenoise for licensing reasons.",
-+}
-+
-+newoption {
- 	trigger = "PROJECT",
- 	description = "Select projects to be built. Will look into project folder for files.",
- }
-Index: mame/scripts/src/3rdparty.lua
-===================================================================
---- mame.orig/scripts/src/3rdparty.lua
-+++ mame/scripts/src/3rdparty.lua
-@@ -572,7 +572,7 @@ project "lualibs"
- 	includedirs {
- 		MAME_DIR .. "3rdparty",
- 	}
--if (_OPTIONS["osd"] ~= "uwp") then
-+if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then
- 	includedirs {
- 		MAME_DIR .. "3rdparty/linenoise",
- 	}
-@@ -595,7 +595,7 @@ end
- 		MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c",
- 		MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c",
- 	}
--if (_OPTIONS["osd"] == "uwp") then
-+if (_OPTIONS["osd"] == "uwp") or (_OPTIONS["NO_USE_LINENOISE"]) then
- 	files {
- 		MAME_DIR .. "3rdparty/lua-linenoise/linenoise_none.c",
- 	}
-@@ -1696,7 +1696,7 @@ end
- --------------------------------------------------
- -- linenoise library
- --------------------------------------------------
--if (_OPTIONS["osd"] ~= "uwp") then
-+if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then
- project "linenoise"
- 	uuid "7320ffc8-2748-4add-8864-ae29b72a8511"
- 	kind (LIBTYPE)
-Index: mame/scripts/src/main.lua
-===================================================================
---- mame.orig/scripts/src/main.lua
-+++ mame/scripts/src/main.lua
-@@ -262,7 +262,7 @@ if (STANDALONE~=true) then
- 		ext_lib("lua"),
- 		"lualibs",
- 	}
--if (_OPTIONS["osd"] ~= "uwp") then
-+if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then
- 	links {
- 		"linenoise",
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index 412a423..aefffe1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ hurd.patch
 sphinx_mathjax_location.patch
 m68000_archopts.patch
 kfreebsd_dirent.h_path.patch
-avoid_linenoise.patch
diff --git a/debian/rules b/debian/rules
index 9b72ae8..006fbd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,6 @@ DEB_OPTS = \
     PTR64= \
     BIGENDIAN= \
     NOASM=1 \
-    NO_USE_LINENOISE=1 \
     QT_HOME=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \
     USE_SYSTEM_LIB_EXPAT=1 \
     USE_SYSTEM_LIB_ZLIB=1 \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git