v1.3.4

3 files changed, 18 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d8bb6edebfba..d8341e04b134 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lua-format
 	pkgdesc = LuaFormatter - Code formatter for Lua
-	pkgver = 1.3.3
-	pkgrel = 2
+	pkgver = 1.3.4
+	pkgrel = 1
 	url = https://github.com/Koihik/LuaFormatter
 	arch = x86_64
 	license = Apache2
@@ -12,12 +12,12 @@ pkgbase = lua-format
 	provides = LuaFormatter
 	conflicts = lua-format
 	conflicts = LuaFormatter
-	source = lua-format-1.3.3::https://github.com/Koihik/LuaFormatter/archive/1.3.3.tar.gz
+	source = lua-format-1.3.4::https://github.com/Koihik/LuaFormatter/archive/1.3.4.tar.gz
 	source = args-6.2.2::https://github.com/Taywee/args/archive/6.2.2.tar.gz
 	source = lib.patch
-	sha512sums = e9dc1ae7f05aac99af66dd61f71c00f2511db96cc65219a9ac9f777196cd688b093f867a0565627cf47f3c0416b1475cd4ecdd2ffcc88048842a5f93bbe5bbdb
+	sha512sums = 520c787b0b44abd3ff31ef6e745d3ef59d2b3d62e53d8221b3c00d687c1f5c5bf5299012487c542dfe3063f9121e2a11eeb63072f698f0e0176af8b791024ae3
 	sha512sums = 29b0f53316fe35f65ab92c807180c1e6cc6084dfed9f635aa2e3e848137ee8e5d24ec6831cf19189c6432335f73d1466564e0bc9bc259c98f3f0de264637f971
-	sha512sums = ccc16949cceb6bb6a0961694921105e80fba3b478cc34d522d57277d5bbedfafeeb2d9638225fcbe9ae8d87cf01696eb22872e88cce078bdcc600bbef3c5efbd
+	sha512sums = 0c75d3df60ecb77c08eb86cf6a16e69d12286652ec454e237ad8ac76afce110302bd023bde76d2a53a71d681081023fb3cf3e1bd5c72d23a74a3c5a135f869d3
 
 pkgname = lua-format
 
diff --git a/PKGBUILD b/PKGBUILD
index 3a54e84b16a3..dbc40aa7c5b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: bilabila <bilabila@qq.com>
 _src=LuaFormatter
 _pkg=lua-format
-_pkgver=1.3.3
+_pkgver=1.3.4
 _lib=args
 _libver=6.2.2
 _patch=lib.patch
 pkgname=$_pkg
 pkgver=$_pkgver
-pkgrel=2
+pkgrel=1
 pkgdesc='LuaFormatter - Code formatter for Lua'
 arch=(x86_64)
 url=https://github.com/Koihik/LuaFormatter
@@ -20,9 +20,9 @@ source=($_pkg-$pkgver::https://github.com/Koihik/$_src/archive/$_pkgver.tar.gz
   $_lib-$_libver::https://github.com/Taywee/$_lib/archive/$_libver.tar.gz
   $_patch
 )
-sha512sums=(e9dc1ae7f05aac99af66dd61f71c00f2511db96cc65219a9ac9f777196cd688b093f867a0565627cf47f3c0416b1475cd4ecdd2ffcc88048842a5f93bbe5bbdb
+sha512sums=(520c787b0b44abd3ff31ef6e745d3ef59d2b3d62e53d8221b3c00d687c1f5c5bf5299012487c542dfe3063f9121e2a11eeb63072f698f0e0176af8b791024ae3
   29b0f53316fe35f65ab92c807180c1e6cc6084dfed9f635aa2e3e848137ee8e5d24ec6831cf19189c6432335f73d1466564e0bc9bc259c98f3f0de264637f971
-  ccc16949cceb6bb6a0961694921105e80fba3b478cc34d522d57277d5bbedfafeeb2d9638225fcbe9ae8d87cf01696eb22872e88cce078bdcc600bbef3c5efbd
+  0c75d3df60ecb77c08eb86cf6a16e69d12286652ec454e237ad8ac76afce110302bd023bde76d2a53a71d681081023fb3cf3e1bd5c72d23a74a3c5a135f869d3
 )
 _src=$_src-$pkgver
 prepare() {
diff --git a/lib.patch b/lib.patch
index b73a33d87199..c88e389eaf67 100644
--- a/lib.patch
+++ b/lib.patch
@@ -1,41 +1,32 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71ac4a5..d4a3727 100644
+index 09c11a9..1211935 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -44,9 +44,7 @@ endif()
- include_directories(
+@@ -54,8 +54,7 @@ include_directories(
    ${PROJECT_SOURCE_DIR}/generated/
    ${PROJECT_SOURCE_DIR}/third_party/
--  ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include
+   ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include
 -  ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include
 -  ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src
 +  /usr/include/antlr4-runtime
    ${PROJECT_SOURCE_DIR}/src/
    )
  
-@@ -60,16 +58,6 @@ set(src_dir
-   ${PROJECT_SOURCE_DIR}/generated/LuaBaseVisitor.cpp
- )
+@@ -77,8 +76,6 @@ file(GLOB_RECURSE yaml-cpp-src
+   ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp
+   )
  
--file(GLOB_RECURSE antlr4-cpp-src
--   ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src/*.cpp
--)
--
--file(GLOB_RECURSE yaml-cpp-src
--   ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp
--)
--
 -add_library (antlr4-cpp-runtime ${antlr4-cpp-src})
 -add_library (yaml-cpp ${yaml-cpp-src})
  
  add_executable(lua-format ${src_dir} src/main.cpp)
  
-@@ -80,7 +68,7 @@ endif()
+@@ -89,7 +86,7 @@ endif()
  
  set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX)
  
--target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime)
-+target_link_libraries(lua-format yaml-cpp antlr4-runtime)
+-target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime ${extra-libs})
++target_link_libraries(lua-format yaml-cpp antlr4-runtime ${extra-libs})
  
  install(TARGETS lua-format
    RUNTIME DESTINATION bin