Package: grcompiler
Version: 5.2-2
Severity: normal
Tags: patch pending
Dear maintainer,
Bastian Germann has prepared an NMU [1] for
grcompiler
(versioned as 5.2-2.1) and uploaded it to DELAYED/5. Please feel free to tell
me if I should delay it longer.
Regards.
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=969910
--
tobi
diff -Nru grcompiler-5.2/debian/changelog grcompiler-5.2/debian/changelog
--- grcompiler-5.2/debian/changelog 2020-08-16 11:41:30.0 +0200
+++ grcompiler-5.2/debian/changelog 2020-09-08 17:44:40.0 +0200
@@ -1,3 +1,12 @@
+grcompiler (5.2-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream patches for big endian (Closes: #961445)
+ * Add upstream patch for font names (Closes: #961438)
+ * d/copyright: Add missing Upstream-Contact
+
+ -- Bastian Germann Tue, 08 Sep 2020 17:44:40 +0200
+
grcompiler (5.2-2) unstable; urgency=medium
* Team upload
diff -Nru grcompiler-5.2/debian/copyright grcompiler-5.2/debian/copyright
--- grcompiler-5.2/debian/copyright 2020-08-16 11:41:30.0 +0200
+++ grcompiler-5.2/debian/copyright 2020-09-08 17:44:22.0 +0200
@@ -1,5 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: GrCompiler
+Upstream-Contact: silgraphite-de...@lists.sourceforge.net
Source: https://github.com/silnrsi/grcompiler
License: LGPL-2.1+ or CPL-0.5+
diff -Nru grcompiler-5.2/debian/patches/0001-Build-with-system-s-LZ4.patch grcompiler-5.2/debian/patches/0001-Build-with-system-s-LZ4.patch
--- grcompiler-5.2/debian/patches/0001-Build-with-system-s-LZ4.patch 2020-08-16 11:41:30.0 +0200
+++ grcompiler-5.2/debian/patches/0001-Build-with-system-s-LZ4.patch 1970-01-01 01:00:00.0 +0100
@@ -1,59 +0,0 @@
-From: Bastian Germann
-Date: Thu, 21 May 2020 11:32:59 +0200
-Description: Build with system's LZ4
-diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
-index dcc7f2d..deb50c7 100644
a/compiler/CMakeLists.txt
-+++ b/compiler/CMakeLists.txt
-@@ -22,9 +22,8 @@ message(STATUS "ICU Libraries: " ${ICU_VERSION})
-
- add_subdirectory(Generic)
- add_subdirectory(Grammar)
--add_subdirectory(LZ4)
-
--include_directories(Generic Grammar LZ4 ${ICU_INCLUDE_DIR})
-+include_directories(Generic Grammar ${ICU_INCLUDE_DIR})
-
- add_library(TtfUtil OBJECT TtfUtil.cpp)
-
-diff --git a/compiler/Makefile.am b/compiler/Makefile.am
-index 2cf0fea..3bd2242 100644
a/compiler/Makefile.am
-+++ b/compiler/Makefile.am
-@@ -1,7 +1,7 @@
--AM_CPPFLAGS = -I@srcdir@/Generic -I@srcdir@/Grammar -I@srcdir@/LZ4
-+AM_CPPFLAGS = -I@srcdir@/Generic -I@srcdir@/Grammar
-
--SUBDIRS = Generic Grammar LZ4
--LIBS = @LIBS@ @LIBICONV@ -LGeneric -LGrammar -LLZ4 -lgeneric -lparser -llz4
-+SUBDIRS = Generic Grammar
-+LIBS = @LIBS@ @LIBICONV@ -LGeneric -LGrammar -lgeneric -lparser -llz4
- EXTRA_DIST = resource.h GrCompiler.rc GrpParser.g GrpParser_readme.txt GrpParserTokenTypes.txt stddef.gdh
-
- bin_PROGRAMS = grcompiler
-diff --git a/compiler/OutputToFont.cpp b/compiler/OutputToFont.cpp
-index 677a04a..a462fed 100644
a/compiler/OutputToFont.cpp
-+++ b/compiler/OutputToFont.cpp
-@@ -16,7 +16,7 @@ Description:
- Include files
- ***/
- #include "main.h"
--#include "LZ4/lz4hc.h"
-+#include
-
- #include
- #include
-diff --git a/configure.ac b/configure.ac
-index f9439c3..22cf145 100644
a/configure.ac
-+++ b/configure.ac
-@@ -139,7 +139,6 @@ AC_CONFIG_FILES(Makefile \
- compiler/Makefile \
- compiler/Generic/Makefile \
- compiler/Grammar/Makefile \
-- compiler/LZ4/Makefile \
- test/Makefile)
-
- AC_CONFIG_SUBDIRS([test/GrcRegressionTest])
diff -Nru grcompiler-5.2/debian/patches/0001-Reimplement-BuildFontNames-using-std-lib.patch grcompiler-5.2/debian/patches/0001-Reimplement-BuildFontNames-using-std-lib.patch
--- grcompiler-5.2/debian/patches/0001-Reimplement-BuildFontNames-using-std-lib.patch 1970-01-01 01:00:00.0 +0100
+++ grcompiler-5.2/debian/patches/0001-Reimplement-BuildFontNames-using-std-lib.patch 2020-09-08 17:40:48.0 +0200
@@ -0,0 +1,312 @@
+Origin: https://github.com/silnrsi/grcompiler/commit/a9e6dec71cbc11c5d637fa342e51867330001862
+From: Tim Eves
+Date: Mon, 17 Aug 2020 16:20:01 +0700
+Subject: Fix #32 Reimplement BuildFontNames using std lib
+
+Since C++11 utf version of std::string are available, reimplement
+GrcMnager::BuildFontNames() using these instead of lots of memcpy calls
+and buffer allocations to perform the require string manipulations. This
+also makes the logic of the function more apparent.
+---
+diff --git a/compiler/GrcManager.h b/compiler/GrcManager.h
+index df40f5f..2e86e03 100644
+--- a/compiler/GrcManager.h
b/compiler/GrcManager.h
+@@ -32,12 +32,9 @@ struct PlatEncChange
+ uint16 encodingID;
+ uint16 engLangID;
+ bool fChangeName;
+- utf16 * pchwFullName;
+- utf16 * pchwUniqueName;
+- utf16 *
