Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package freemarker for openSUSE:Factory
checked in at 2022-05-10 15:11:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freemarker (Old)
and /work/SRC/openSUSE:Factory/.freemarker.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freemarker"
Tue May 10 15:11:45 2022 rev:4 rq:975896 version:2.3.31
Changes:
--------
--- /work/SRC/openSUSE:Factory/freemarker/freemarker.changes 2022-02-11
23:08:51.478850259 +0100
+++ /work/SRC/openSUSE:Factory/.freemarker.new.1538/freemarker.changes
2022-05-10 15:11:54.931568914 +0200
@@ -1,0 +2,7 @@
+Sat Apr 30 06:38:13 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * javacc-7.patch
+ + fix build with javacc 7.0.11
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javacc-7.patch ++++++
--- /var/tmp/diff_new_pack.AavkLs/_old 2022-05-10 15:11:55.783569988 +0200
+++ /var/tmp/diff_new_pack.AavkLs/_new 2022-05-10 15:11:55.787569993 +0200
@@ -1,18 +1,6 @@
-From c119c7d20b46c91f2c661e4f3789194041c4ba16 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msima...@redhat.com>
-Date: Tue, 4 Apr 2017 16:56:33 +0200
-Subject: [PATCH] Fix compatibility with javacc 7
-
----
- build.xml | 16 +++++++++++++++-
- src/main/java/freemarker/core/TokenMgrError.java | 5 +++++
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-Index: freemarker-2.3.31/build.xml
-===================================================================
---- freemarker-2.3.31.orig/build.xml
-+++ freemarker-2.3.31/build.xml
-@@ -146,13 +146,26 @@
+--- freemarker-2.3.31/build.xml 2022-04-30 08:33:06.203800972 +0200
++++ freemarker-2.3.31/build.xml 2022-04-30 08:33:37.727960663 +0200
+@@ -146,18 +146,26 @@
<mkdir dir="${_javaccOutputDir}" />
<ivy:retrieve conf="parser"
pattern="build/javacc-home.tmp/[artifact].[ext]" />
@@ -32,13 +20,16 @@
<delete dir="build/javacc-home.tmp" />
-
+ <!-- undo template keyword replacement -->
-+ <replace
+ <replace
+- file="${_javaccOutputDir}/FMParser.java"
+- token="private final LookaheadSuccess"
+- value="private static final LookaheadSuccess"
+ dir="${_javaccOutputDir}"
+ token="xtemplate"
+ value="template"
-+ />
+ />
+
<replace
- file="${_javaccOutputDir}/FMParser.java"
- token="private final LookaheadSuccess"
+ file="${_javaccOutputDir}/FMParserConstants.java"
+ token="public interface FMParserConstants"
