Fabio Castelli pushed to branch main at Arch Linux / Packaging / Packages /
dbeaver
Commits:
4b4e0984 by Fabio Castelli (Muflone) at 2023-12-26T20:52:56+01:00
upgpkg: 23.3.1-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + tycho_3_0_5.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,13 +1,13 @@
pkgbase = dbeaver
pkgdesc = Free universal SQL Client for developers and database
administrators (community edition)
- pkgver = 23.3.0
+ pkgver = 23.3.1
pkgrel = 1
url = https://dbeaver.io/
install = dbeaver.install
arch = x86_64
license = Apache
makedepends = maven
- makedepends = java-runtime=17
+ makedepends = java-environment=17
depends = java-runtime>=17
depends = gtk3
depends = gtk-update-icon-cache
@@ -16,17 +16,19 @@ pkgbase = dbeaver
optdepends = dbeaver-plugin-svg-format: save diagrams in SVG format
conflicts = dbeaver-plugin-sshj-lib
replaces = dbeaver-plugin-sshj-lib
- source =
dbeaver-23.3.0.tar.gz::https://github.com/dbeaver/dbeaver/archive/23.3.0.tar.gz
+ source =
dbeaver-23.3.1.tar.gz::https://github.com/dbeaver/dbeaver/archive/23.3.1.tar.gz
source = io.dbeaver.DBeaver.desktop
source = dbeaver.sh
source = dbeaver.profile.gz
source = dbeaver.hook
source = dbeaver.install
- sha256sums =
617ea555269bdc0a1d4c9a59c653713df8e3404d676ee055258e9a16903e29ec
+ source = tycho_3_0_5.patch
+ sha256sums =
8e8671ff30d2eae8eb759f0c56673a07aefb669da21e6ba03294098868ce6e3d
sha256sums =
9480a7d08f680e10c399db070c5a04cbabf282442602a2ef83d1159fe7c3e88b
sha256sums =
406a2980806c394670e88b1ae70134900be376c2ea4a4216610591cc8b557526
sha256sums =
1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034
sha256sums =
f8b763ca210bfa4d9a4e407b656ba4f5d1bf2f3f54c67044f7a4dd0c3625fc22
sha256sums =
f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab
+ sha256sums =
1d5af2a9be9453f8279b2862fd579d82271b882515d8b69fc9fddb80e318bd78
pkgname = dbeaver
=====================================
PKGBUILD
=====================================
@@ -2,14 +2,14 @@
# Contributor: Arne Hoch <a...@derhoch.de>
pkgname=dbeaver
-pkgver=23.3.0
+pkgver=23.3.1
pkgrel=1
pkgdesc="Free universal SQL Client for developers and database administrators
(community edition)"
arch=('x86_64')
url="https://dbeaver.io/";
license=("Apache")
depends=('java-runtime>=17' 'gtk3' 'gtk-update-icon-cache' 'libsecret')
-makedepends=('maven' 'java-runtime=17')
+makedepends=('maven' 'java-environment=17')
optdepends=('dbeaver-plugin-office: export data in Microsoft Office Excel
format'
'dbeaver-plugin-svg-format: save diagrams in SVG format')
conflicts=('dbeaver-plugin-sshj-lib')
@@ -19,13 +19,15 @@
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/dbeaver/dbeaver/archi
"${pkgname}.sh"
"${pkgname}.profile.gz"
"${pkgname}.hook"
- "${pkgname}.install")
-sha256sums=('617ea555269bdc0a1d4c9a59c653713df8e3404d676ee055258e9a16903e29ec'
+ "${pkgname}.install"
+ "tycho_3_0_5.patch")
+sha256sums=('8e8671ff30d2eae8eb759f0c56673a07aefb669da21e6ba03294098868ce6e3d'
'9480a7d08f680e10c399db070c5a04cbabf282442602a2ef83d1159fe7c3e88b'
'406a2980806c394670e88b1ae70134900be376c2ea4a4216610591cc8b557526'
'1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034'
'f8b763ca210bfa4d9a4e407b656ba4f5d1bf2f3f54c67044f7a4dd0c3625fc22'
- 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab')
+ 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab'
+ '1d5af2a9be9453f8279b2862fd579d82271b882515d8b69fc9fddb80e318bd78')
install="${pkgname}.install"
prepare() {
@@ -38,6 +40,9 @@ prepare() {
export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort |
cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '18-|19-|20-' -m 1)"
cd "${pkgname}-${pkgver}"
+ # Fix for tycho which actually requires maven 3.9 not yet released in extra
+ patch -Np1 -i "${srcdir}/tycho_3_0_5.patch"
+
# Download dependencies during prepare FS#55873
# https://bugs.archlinux.org/task/55873
export MAVEN_OPTS="-Xmx2048m"
=====================================
tycho_3_0_5.patch
=====================================
@@ -0,0 +1,12 @@
+diff -Naur dbeaver-23.3.1.orig/pom.xml dbeaver-23.3.1/pom.xml
+--- dbeaver-23.3.1.orig/pom.xml 2023-12-22 11:01:46.000000000 +0100
++++ dbeaver-23.3.1/pom.xml 2023-12-26 20:19:12.578436942 +0100
+@@ -11,7 +11,7 @@
+ <properties>
+ <dbeaver-version>23.3.1</dbeaver-version>
+ <dbeaver-product>DBeaver</dbeaver-product>
+- <tycho-version>4.0.4</tycho-version>
++ <tycho-version>3.0.5</tycho-version>
+ <eclipse-version>2023-12</eclipse-version>
+
<eclipse-repo-url>https://download.eclipse.org/releases</eclipse-repo-url>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/dbeaver/-/commit/4b4e09848f0a04a7dd93f99d2ae067b580cba638
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/dbeaver/-/commit/4b4e09848f0a04a7dd93f99d2ae067b580cba638
You're receiving this email because of your account on gitlab.archlinux.org.
