George Rawlinson pushed to branch main at Arch Linux / Packaging / Packages / 
astyle


Commits:
293bdd7b by George Rawlinson at 2024-07-24T17:31:50+12:00
upgpkg: 3.5.2-1

* New upstream release.
* Update license to use SPDX reference.
* Fix FTBFS with C++ standard.

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + ftbfs-update-cxx-standard.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,18 +1,23 @@
 pkgbase = astyle
        pkgdesc = A free, fast and small automatic formatter for C, C++, C#, 
and Java source code.
-       pkgver = 3.4.13
+       pkgver = 3.5.2
        pkgrel = 1
        url = http://astyle.sourceforge.net/
        arch = x86_64
-       license = LGPL
+       license = LGPL-3.0-only
        makedepends = git
        makedepends = jdk8-openjdk
        depends = glibc
        depends = gcc-libs
        optdepends = java-environment-openjdk
-       source = astyle::git+https://gitlab.com/saalen/astyle.git#tag=3.4.13
+       source = astyle::git+https://gitlab.com/saalen/astyle.git#tag=3.5.2
        source = simplify-makefile.patch
-       b2sums = 
5527d4bb47b02dd5a38f9fa0cfba9c6688796a86bd6bf47c731374cb6fa6232ea22a52a620a9d29c149e37f80d2913fd1dcee9a64edc816fc34e2d872744d39d
+       source = ftbfs-update-cxx-standard.patch
+       sha512sums = 
6b00bdec3473d1b1c62a3a235cd52f24e8c88f4592d092a3cf4cc861e915cfbf586e2e4ee6d9fa6e75e62cec5aef7f7d8b2c5663faba9a462565894269003714
+       sha512sums = 
4a533c6b073a55206ea2c8351d6631ba6e056d59823c8988eae63a47a762e920ad852442b57ed1860a648199c34fbc08c31bb553f0dc3f1ed145c2c702ad0290
+       sha512sums = 
403390b9e2e49ccec5b9d56f7e4a6b51488cdd39cefb15b27fd6eac4ccf2c71e0e7b9a63b41a9079cbcbed4444625f325eaff51158fc49ccb492bf6e26e7300d
+       b2sums = 
83c30947f2ba756076527e5f4dc1587d423e59347924d33454e9c0aca7a0132e5360662093bd08536a38a4ec443ec59ce77b5b716edca7f3f8e7d720a19114c7
        b2sums = 
155dca3520e1669713efbf42431e4ba2c9c05006dcd2a14f58252d9e6913aab799af7b64c9040201e99ff8d12f953918124c83845fcf64ec025fc131e7acdf1f
+       b2sums = 
6ddbba4662da28cef2defcb9e5e6c6cacbf71322201b2ca0d2e7a61bf7d23c7389b692d14140acdc68b00fe3c8b0ca167d2adf8c2d4f7c6128e86268aa6c378b
 
 pkgname = astyle


=====================================
PKGBUILD
=====================================
@@ -6,27 +6,33 @@
 # Contributor: tardo <[email protected]>
 
 pkgname=astyle
-pkgver=3.4.13
+pkgver=3.5.2
 pkgrel=1
 pkgdesc='A free, fast and small automatic formatter for C, C++, C#, and Java 
source code.'
 arch=('x86_64')
 url='http://astyle.sourceforge.net/'
-license=('LGPL')
+license=('LGPL-3.0-only')
 depends=('glibc' 'gcc-libs')
 makedepends=('git' 'jdk8-openjdk')
 optdepends=('java-environment-openjdk')
-_commit='824d4b799173ec4dd2b3c4021a2f29d75b705f75'
 source=(
   "$pkgname::git+https://gitlab.com/saalen/astyle.git#tag=$pkgver";
   'simplify-makefile.patch'
+  'ftbfs-update-cxx-standard.patch'
 )
-b2sums=('5527d4bb47b02dd5a38f9fa0cfba9c6688796a86bd6bf47c731374cb6fa6232ea22a52a620a9d29c149e37f80d2913fd1dcee9a64edc816fc34e2d872744d39d'
-        
'155dca3520e1669713efbf42431e4ba2c9c05006dcd2a14f58252d9e6913aab799af7b64c9040201e99ff8d12f953918124c83845fcf64ec025fc131e7acdf1f')
+sha512sums=('6b00bdec3473d1b1c62a3a235cd52f24e8c88f4592d092a3cf4cc861e915cfbf586e2e4ee6d9fa6e75e62cec5aef7f7d8b2c5663faba9a462565894269003714'
+            
'4a533c6b073a55206ea2c8351d6631ba6e056d59823c8988eae63a47a762e920ad852442b57ed1860a648199c34fbc08c31bb553f0dc3f1ed145c2c702ad0290'
+            
'403390b9e2e49ccec5b9d56f7e4a6b51488cdd39cefb15b27fd6eac4ccf2c71e0e7b9a63b41a9079cbcbed4444625f325eaff51158fc49ccb492bf6e26e7300d')
+b2sums=('83c30947f2ba756076527e5f4dc1587d423e59347924d33454e9c0aca7a0132e5360662093bd08536a38a4ec443ec59ce77b5b716edca7f3f8e7d720a19114c7'
+        
'155dca3520e1669713efbf42431e4ba2c9c05006dcd2a14f58252d9e6913aab799af7b64c9040201e99ff8d12f953918124c83845fcf64ec025fc131e7acdf1f'
+        
'6ddbba4662da28cef2defcb9e5e6c6cacbf71322201b2ca0d2e7a61bf7d23c7389b692d14140acdc68b00fe3c8b0ca167d2adf8c2d4f7c6128e86268aa6c378b')
 
 prepare() {
   cd "$pkgname"
 
   patch -p1 -i "$srcdir/simplify-makefile.patch"
+
+  patch -p1 -i "$srcdir/ftbfs-update-cxx-standard.patch"
 }
 
 build() {


=====================================
ftbfs-update-cxx-standard.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/AStyle/build/gcc/Makefile
++++ b/AStyle/build/gcc/Makefile
+@@ -36,7 +36,7 @@ SYSCONF_PATH=$(prefix)/share/doc/astyle
+ bindir = bin
+ objdir = obj
+ ipath=$(prefix)/bin
+-CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++11
++CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++17
+ JAVAINCS   = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+ INSTALL=install -o $(USER) -g $(USER)
+ 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/astyle/-/commit/293bdd7baaee5a29a1de1e3a0aa739a4d0edb9a1

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/astyle/-/commit/293bdd7baaee5a29a1de1e3a0aa739a4d0edb9a1
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to