Hello community,
here is the log from the commit of package antlr4 for openSUSE:Factory checked
in at 2020-04-04 12:24:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/antlr4 (Old)
and /work/SRC/openSUSE:Factory/.antlr4.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "antlr4"
Sat Apr 4 12:24:29 2020 rev:3 rq:791022 version:4.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/antlr4/antlr4.changes 2019-11-07
23:19:51.320750620 +0100
+++ /work/SRC/openSUSE:Factory/.antlr4.new.3248/antlr4.changes 2020-04-04
12:25:26.551934454 +0200
@@ -1,0 +2,19 @@
+Thu Apr 2 21:41:40 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 4.8
+- Removed patch:
+ * antlr4-install-path.patch
+ + replaced by antlr4-install-path.patch.in which allows us to
+ patch the right library version with a new release
+- Added patch:
+ * unicodedata.patch
+ + The UnicodeData.java generated from unicodedata.st with newer
+ icu versions hits the limit of 64k for the size of a bytecode
+ function. It is due to increase in number of unicode codes.
+ This prevents upgrades of icu4j. So, we take the
+ UnicodeData.java generated using icu4j 63.1 and patch it into
+ the source tree instead of generating the file during the
+ build. This is a temporary solution before we find a proper
+ solution in the template itself.
+
+-------------------------------------------------------------------
Old:
----
antlr4-4.7.2.tar.gz
antlr4-install-path.patch
New:
----
antlr4-4.8.tar.gz
antlr4-install-path.patch.in
unicodedata.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ antlr4.spec ++++++
--- /var/tmp/diff_new_pack.02T8rL/_old 2020-04-04 12:25:27.131934953 +0200
+++ /var/tmp/diff_new_pack.02T8rL/_new 2020-04-04 12:25:27.135934956 +0200
@@ -1,7 +1,7 @@
#
# spec file for package antlr4
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,27 +16,26 @@
#
-%define libver 4_7_2
+%define libver 4_8
%define runtime_cpp_lib libantlr4-runtime
%define runtime_cpp_libver %{runtime_cpp_lib}%{libver}
-
Name: antlr4
-Version: 4.7.2
+Version: 4.8
Release: 0
Summary: Java parser generator
# C# runtime is MIT-licensed, but currently it is not used in this package
License: BSD-3-Clause
URL: https://www.antlr.org/
Source0:
https://github.com/antlr/antlr4/archive/%{version}.tar.gz#/antlr4-%{version}.tar.gz
-Patch0: antlr4-install-path.patch
+Source100: antlr4-install-path.patch.in
+Patch0: unicodedata.patch
BuildRequires: cmake >= 3.3.0
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
BuildRequires: maven-local
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: mvn(com.ibm.icu:icu4j)
-BuildRequires: mvn(com.webguys:string-template-maven-plugin)
BuildRequires: mvn(org.abego.treelayout:org.abego.treelayout.core)
BuildRequires: mvn(org.antlr:ST4)
BuildRequires: mvn(org.antlr:antlr-runtime)
@@ -53,7 +52,6 @@
BuildRequires: mvn(org.glassfish:javax.json)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
-BuildRequires: mvn(org.twdata.maven:mojo-executor)
BuildRequires: pkgconfig(uuid)
#!BuildRequires: stringtemplate4 antlr3-tool
@@ -128,11 +126,15 @@
%prep
%setup -q
-%patch0 -p1
+cat %{SOURCE100} | sed 's#@LIBVER@#%{libver}#g' | patch -p1 -u
find -name \*.jar -delete
perl -pi -e 's#\\>#>#g'
tool/resources/org/antlr/v4/tool/templates/unicodedata.st
+# Temporary solution to a proble of code too big when generated with newer
ICU4J versions
+%pom_remove_plugin :string-template-maven-plugin tool
+%patch0
+
# Missing test deps: org.seleniumhq.selenium:selenium-java
%pom_disable_module runtime-testsuite
%pom_disable_module runtime-testsuite/annotations
@@ -153,7 +155,7 @@
pushd runtime/Cpp
%cmake -DWITH_DEMO=False
-make %{?_smp_mflags}
+%make_build
popd
%install
@@ -166,10 +168,9 @@
%cmake_install
popd
# drop static library as unused
-rm %{buildroot}/%{_libdir}/lib%{name}-runtime.a
+rm -f %{buildroot}/%{_libdir}/lib%{name}-runtime.a
%post -n %{runtime_cpp_libver} -p /sbin/ldconfig
-
%postun -n %{runtime_cpp_libver} -p /sbin/ldconfig
%files tool -f .mfiles-antlr4
++++++ antlr4-4.7.2.tar.gz -> antlr4-4.8.tar.gz ++++++
++++ 11908 lines of diff (skipped)
++++++ antlr4-install-path.patch.in ++++++
diff -uNr antlr4-4.7.2.org/runtime/Cpp/CMakeLists.txt
antlr4-4.7.2/runtime/Cpp/CMakeLists.txt
--- antlr4-4.7.2.org/runtime/Cpp/CMakeLists.txt 2018-12-18 20:35:24.000000000
+0200
+++ antlr4-4.7.2/runtime/Cpp/CMakeLists.txt 2019-02-16 12:41:11.057797150
+0200
@@ -187,14 +187,14 @@
if(EXISTS LICENSE.txt)
install(FILES LICENSE.txt
- DESTINATION "share/doc/libantlr4")
+ DESTINATION "share/doc/packages/libantlr4-runtime@LIBVER@")
elseif(EXISTS ../../LICENSE.txt)
install(FILES ../../LICENSE.txt
- DESTINATION "share/doc/libantlr4")
+ DESTINATION "share/doc/packages/libantlr4-runtime@LIBVER@")
endif()
install(FILES README.md VERSION
- DESTINATION "share/doc/libantlr4")
+ DESTINATION "share/doc/packages/libantlr4-runtime@LIBVER@")
set(CPACK_PACKAGE_CONTACT "antlr-discuss...@googlegroups.com")
set(CPACK_PACKAGE_VERSION ${ANTLR_VERSION})
diff -uNr antlr4-4.7.2.org/runtime/Cpp/runtime/CMakeLists.txt
antlr4-4.7.2/runtime/Cpp/runtime/CMakeLists.txt
--- antlr4-4.7.2.org/runtime/Cpp/runtime/CMakeLists.txt 2018-12-18
20:35:24.000000000 +0200
+++ antlr4-4.7.2/runtime/Cpp/runtime/CMakeLists.txt 2019-02-16
12:41:56.249460074 +0200
@@ -102,10 +102,10 @@
COMPILE_FLAGS "${disabled_compile_warnings}
${extra_static_compile_flags}")
install(TARGETS antlr4_shared
- DESTINATION lib
+ DESTINATION ${LIB_INSTALL_DIR}
EXPORT antlr4-targets)
install(TARGETS antlr4_static
- DESTINATION lib
+ DESTINATION ${LIB_INSTALL_DIR}
EXPORT antlr4-targets)
install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
++++++ unicodedata.patch ++++++
++++ 59321 lines (skipped)
