Date: Friday, October 8, 2021 @ 22:05:20
Author: muflone
Revision: 1028068
archrelease: copy trunk to community-x86_64
Added:
dbeaver/repos/community-x86_64/PKGBUILD
(from rev 1028067, dbeaver/trunk/PKGBUILD)
dbeaver/repos/community-x86_64/dbeaver.hook
(from rev 1028067, dbeaver/trunk/dbeaver.hook)
dbeaver/repos/community-x86_64/dbeaver.install
(from rev 1028067, dbeaver/trunk/dbeaver.install)
dbeaver/repos/community-x86_64/dbeaver.profile.gz
(from rev 1028067, dbeaver/trunk/dbeaver.profile.gz)
dbeaver/repos/community-x86_64/dbeaver.sh
(from rev 1028067, dbeaver/trunk/dbeaver.sh)
dbeaver/repos/community-x86_64/io.dbeaver.DBeaver.desktop
(from rev 1028067, dbeaver/trunk/io.dbeaver.DBeaver.desktop)
dbeaver/repos/community-x86_64/tycho_source_11.patch
(from rev 1028067, dbeaver/trunk/tycho_source_11.patch)
Deleted:
dbeaver/repos/community-x86_64/PKGBUILD
dbeaver/repos/community-x86_64/dbeaver.hook
dbeaver/repos/community-x86_64/dbeaver.install
dbeaver/repos/community-x86_64/dbeaver.profile.gz
dbeaver/repos/community-x86_64/dbeaver.sh
dbeaver/repos/community-x86_64/io.dbeaver.DBeaver.desktop
----------------------------+
PKGBUILD | 228 +++++++++++++++++++++----------------------
dbeaver.hook | 24 ++--
dbeaver.install | 10 -
dbeaver.sh | 12 +-
io.dbeaver.DBeaver.desktop | 32 +++---
tycho_source_11.patch | 15 ++
6 files changed, 170 insertions(+), 151 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-08 22:04:46 UTC (rev 1028067)
+++ PKGBUILD 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -1,112 +0,0 @@
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Arne Hoch <a...@derhoch.de>
-
-pkgname=dbeaver
-pkgver=21.2.0
-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>=11' 'gtk3' 'gtk-update-icon-cache' 'libsecret')
-makedepends=('maven' 'java-runtime<15')
-optdepends=('dbeaver-plugin-office: export data in Microsoft Office Excel
format'
- 'dbeaver-plugin-svg-format: save diagrams in SVG format')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/dbeaver/dbeaver/archive/${pkgver}.tar.gz";
- "io.${pkgname}.DBeaver.desktop"
- "${pkgname}.sh"
- "${pkgname}.profile.gz"
- "${pkgname}.hook"
- "${pkgname}.install")
-sha256sums=('da1aefdb5b98bec0fad11524cc7860e257037770daa5f5b263b82609db2668bd'
- '9480a7d08f680e10c399db070c5a04cbabf282442602a2ef83d1159fe7c3e88b'
- '406a2980806c394670e88b1ae70134900be376c2ea4a4216610591cc8b557526'
- '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034'
- 'f8b763ca210bfa4d9a4e407b656ba4f5d1bf2f3f54c67044f7a4dd0c3625fc22'
- 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab')
-install="${pkgname}.install"
-
-prepare() {
- # Fix version number in profile file
- gzip --decompress --keep --stdout "${pkgname}.profile.gz" |
- sed "s/DBEAVER_VERSION/${pkgver}/g" |
- gzip -9 > "${pkgname}.profile-${pkgver}.gz"
-
- # Avoid the use of any Java 15/16, actually incompatible with the build
- export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort |
cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '15-|16-' -m 1)"
-
- cd "${pkgname}-${pkgver}"
-
- # Download dependencies during prepare FS#55873
- # https://bugs.archlinux.org/task/55873
- export MAVEN_OPTS="-Xmx2048m"
- mvn --batch-mode validate
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- mvn --batch-mode package
-}
-
-package() {
- cd "${pkgname}-${pkgver}/product/community"
- # Install icons into /usr/share/icons/hicolor
- for _size in 16 32 48 64 128 256 512
- do
- install -m 644 -D "icons-sources/icon_${_size}x${_size}.png" \
- "${pkgdir}/usr/share/icons/hicolor/${_size}x${_size}/apps/dbeaver.png"
- done
-
- # Move into the target directory
- cd "target/products/org.jkiss.dbeaver.core.product/linux/gtk/${CARCH}"
-
- # Initially install everything into /usr/lib/dbeaver
- install -m 755 -d "${pkgdir}/usr/lib"
- cp -r "dbeaver" "${pkgdir}/usr/lib/${pkgname}"
-
- # Move shared data to /usr/share/dbeaver
- cd "${pkgdir}/usr/lib/${pkgname}"
- install -m 755 -d "${pkgdir}/usr/share/${pkgname}"
- for _file in configuration features p2 .eclipseproduct artifacts.xml
dbeaver.ini readme.txt
- do
- mv "${_file}" "${pkgdir}/usr/share/${pkgname}"
- ln -s "/usr/share/${pkgname}/${_file}" .
- done
-
- # Install additional licenses
- install -m 755 -d "${pkgdir}/usr/share/licenses"
- mv licenses "${pkgdir}/usr/share/licenses/${pkgname}"
-
- # Install icons
- install -m 755 -d "${pkgdir}/usr/share/pixmaps"
- mv dbeaver.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
- mv icon.xpm "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm"
-
- # Install executable script into /usr/bin
- install -m 755 -d "${pkgdir}/usr/bin"
- install -m 755 "${srcdir}/dbeaver.sh" "${pkgdir}/usr/bin/${pkgname}"
-
- # Install application launcher into /usr/share/applications
- install -m 755 -d "${pkgdir}/usr/share/applications"
- install -m 755 -t "${pkgdir}/usr/share/applications"
"${srcdir}/io.${pkgname}.DBeaver.desktop"
-
- # Clean up and install new profile
- rm -rf "${pkgdir}/usr/share/${pkgname}/p2/org.eclipse.equinox.p2.core"
- cd
"${pkgdir}/usr/share/${pkgname}/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile"
- find . -name "*.profile.gz" -delete
- install -m 644 "${srcdir}/${pkgname}.profile-${pkgver}.gz"
"1502633007017.profile.gz"
- cd "${pkgdir}/usr/share/${pkgname}/p2/org.eclipse.equinox.p2.engine"
- rm -f ".settings/org.eclipse.equinox.p2.artifact.repository.prefs"
- rm ".settings/org.eclipse.equinox.p2.metadata.repository.prefs"
- rmdir ".settings"
-
- # Install system hook
- install -m 755 -d "${pkgdir}/usr/share/libalpm/hooks"
- install -m 644 "${srcdir}/${pkgname}.hook"
"${pkgdir}/usr/share/libalpm/hooks"
-
- # Create configuration file (handled by the hook)
- cd
"${pkgdir}/usr/share/dbeaver/configuration/org.eclipse.equinox.simpleconfigurator"
- install -m 755 -d "${pkgdir}/etc/${pkgname}/bundles.d"
- mv "bundles.info" "${pkgdir}/etc/${pkgname}/bundles.d/00-${pkgname}.info"
- ln -s "/etc/${pkgname}/bundles.info" .
-}
Copied: dbeaver/repos/community-x86_64/PKGBUILD (from rev 1028067,
dbeaver/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -0,0 +1,116 @@
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Arne Hoch <a...@derhoch.de>
+
+pkgname=dbeaver
+pkgver=21.2.2
+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>=11' 'gtk3' 'gtk-update-icon-cache' 'libsecret')
+makedepends=('maven' 'java-runtime<15')
+optdepends=('dbeaver-plugin-office: export data in Microsoft Office Excel
format'
+ 'dbeaver-plugin-svg-format: save diagrams in SVG format')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/dbeaver/dbeaver/archive/${pkgver}.tar.gz";
+ "io.${pkgname}.DBeaver.desktop"
+ "${pkgname}.sh"
+ "${pkgname}.profile.gz"
+ "${pkgname}.hook"
+ "${pkgname}.install"
+ "tycho_source_11.patch")
+sha256sums=('955046eec4a77085b74ac40e40c1754fad8642dd8b8cb99896d10d3b81731e52'
+ '9480a7d08f680e10c399db070c5a04cbabf282442602a2ef83d1159fe7c3e88b'
+ '406a2980806c394670e88b1ae70134900be376c2ea4a4216610591cc8b557526'
+ '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034'
+ 'f8b763ca210bfa4d9a4e407b656ba4f5d1bf2f3f54c67044f7a4dd0c3625fc22'
+ 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab'
+ '2b5259a22ecd17c7fe501fe161aa866652c6c87f0435d94bf16d3447fc0cfd1c')
+install="${pkgname}.install"
+
+prepare() {
+ # Fix version number in profile file
+ gzip --decompress --keep --stdout "${pkgname}.profile.gz" |
+ sed "s/DBEAVER_VERSION/${pkgver}/g" |
+ gzip -9 > "${pkgname}.profile-${pkgver}.gz"
+
+ # Fix for Java >= 11
+ patch -Np0 -i "${srcdir}/tycho_source_11.patch"
+
+ # Avoid the use of any Java 15/16/17, actually incompatible with the build
+ export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort |
cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '15-|16-|17-' -m 1)"
+ cd "${pkgname}-${pkgver}"
+
+ # Download dependencies during prepare FS#55873
+ # https://bugs.archlinux.org/task/55873
+ export MAVEN_OPTS="-Xmx2048m"
+ mvn --batch-mode validate
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ mvn --batch-mode package
+}
+
+package() {
+ cd "${pkgname}-${pkgver}/product/community"
+ # Install icons into /usr/share/icons/hicolor
+ for _size in 16 32 48 64 128 256 512
+ do
+ install -m 644 -D "icons-sources/icon_${_size}x${_size}.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${_size}x${_size}/apps/dbeaver.png"
+ done
+
+ # Move into the target directory
+ cd "target/products/org.jkiss.dbeaver.core.product/linux/gtk/${CARCH}"
+
+ # Initially install everything into /usr/lib/dbeaver
+ install -m 755 -d "${pkgdir}/usr/lib"
+ cp -r "dbeaver" "${pkgdir}/usr/lib/${pkgname}"
+
+ # Move shared data to /usr/share/dbeaver
+ cd "${pkgdir}/usr/lib/${pkgname}"
+ install -m 755 -d "${pkgdir}/usr/share/${pkgname}"
+ for _file in configuration features p2 .eclipseproduct artifacts.xml
dbeaver.ini readme.txt
+ do
+ mv "${_file}" "${pkgdir}/usr/share/${pkgname}"
+ ln -s "/usr/share/${pkgname}/${_file}" .
+ done
+
+ # Install additional licenses
+ install -m 755 -d "${pkgdir}/usr/share/licenses"
+ mv licenses "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ # Install icons
+ install -m 755 -d "${pkgdir}/usr/share/pixmaps"
+ mv dbeaver.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ mv icon.xpm "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm"
+
+ # Install executable script into /usr/bin
+ install -m 755 -d "${pkgdir}/usr/bin"
+ install -m 755 "${srcdir}/dbeaver.sh" "${pkgdir}/usr/bin/${pkgname}"
+
+ # Install application launcher into /usr/share/applications
+ install -m 755 -d "${pkgdir}/usr/share/applications"
+ install -m 755 -t "${pkgdir}/usr/share/applications"
"${srcdir}/io.${pkgname}.DBeaver.desktop"
+
+ # Clean up and install new profile
+ rm -rf "${pkgdir}/usr/share/${pkgname}/p2/org.eclipse.equinox.p2.core"
+ cd
"${pkgdir}/usr/share/${pkgname}/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile"
+ find . -name "*.profile.gz" -delete
+ install -m 644 "${srcdir}/${pkgname}.profile-${pkgver}.gz"
"1502633007017.profile.gz"
+ cd "${pkgdir}/usr/share/${pkgname}/p2/org.eclipse.equinox.p2.engine"
+ rm -f ".settings/org.eclipse.equinox.p2.artifact.repository.prefs"
+ rm ".settings/org.eclipse.equinox.p2.metadata.repository.prefs"
+ rmdir ".settings"
+
+ # Install system hook
+ install -m 755 -d "${pkgdir}/usr/share/libalpm/hooks"
+ install -m 644 "${srcdir}/${pkgname}.hook"
"${pkgdir}/usr/share/libalpm/hooks"
+
+ # Create configuration file (handled by the hook)
+ cd
"${pkgdir}/usr/share/dbeaver/configuration/org.eclipse.equinox.simpleconfigurator"
+ install -m 755 -d "${pkgdir}/etc/${pkgname}/bundles.d"
+ mv "bundles.info" "${pkgdir}/etc/${pkgname}/bundles.d/00-${pkgname}.info"
+ ln -s "/etc/${pkgname}/bundles.info" .
+}
Deleted: dbeaver.hook
===================================================================
--- dbeaver.hook 2021-10-08 22:04:46 UTC (rev 1028067)
+++ dbeaver.hook 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -1,12 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = etc/dbeaver/bundles.d/*.info
-
-[Action]
-Description = Updating the DBeaver bundles.info database...
-When = PostTransaction
-Exec = /bin/sh -c '> /etc/dbeaver/bundles.info; cat
/etc/dbeaver/bundles.d/*.info > /etc/dbeaver/bundles.info'
-
Copied: dbeaver/repos/community-x86_64/dbeaver.hook (from rev 1028067,
dbeaver/trunk/dbeaver.hook)
===================================================================
--- dbeaver.hook (rev 0)
+++ dbeaver.hook 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = etc/dbeaver/bundles.d/*.info
+
+[Action]
+Description = Updating the DBeaver bundles.info database...
+When = PostTransaction
+Exec = /bin/sh -c '> /etc/dbeaver/bundles.info; cat
/etc/dbeaver/bundles.d/*.info > /etc/dbeaver/bundles.info'
+
Deleted: dbeaver.install
===================================================================
--- dbeaver.install 2021-10-08 22:04:46 UTC (rev 1028067)
+++ dbeaver.install 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -1,5 +0,0 @@
-pre_remove() {
- # Remove bundles.info managed from the hook
- rm /etc/dbeaver/bundles.info
-}
-
Copied: dbeaver/repos/community-x86_64/dbeaver.install (from rev 1028067,
dbeaver/trunk/dbeaver.install)
===================================================================
--- dbeaver.install (rev 0)
+++ dbeaver.install 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -0,0 +1,5 @@
+pre_remove() {
+ # Remove bundles.info managed from the hook
+ rm /etc/dbeaver/bundles.info
+}
+
Deleted: dbeaver.profile.gz
===================================================================
(Binary files differ)
Copied: dbeaver/repos/community-x86_64/dbeaver.profile.gz (from rev 1028067,
dbeaver/trunk/dbeaver.profile.gz)
===================================================================
(Binary files differ)
Deleted: dbeaver.sh
===================================================================
--- dbeaver.sh 2021-10-08 22:04:46 UTC (rev 1028067)
+++ dbeaver.sh 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Disable GTK+ Overlay scrolling
-# https://bugs.archlinux.org/task/63338
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=519728
-export GTK_OVERLAY_SCROLLING=0
-/usr/lib/dbeaver/dbeaver $@
Copied: dbeaver/repos/community-x86_64/dbeaver.sh (from rev 1028067,
dbeaver/trunk/dbeaver.sh)
===================================================================
--- dbeaver.sh (rev 0)
+++ dbeaver.sh 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Disable GTK+ Overlay scrolling
+# https://bugs.archlinux.org/task/63338
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=519728
+export GTK_OVERLAY_SCROLLING=0
+/usr/lib/dbeaver/dbeaver $@
Deleted: io.dbeaver.DBeaver.desktop
===================================================================
--- io.dbeaver.DBeaver.desktop 2021-10-08 22:04:46 UTC (rev 1028067)
+++ io.dbeaver.DBeaver.desktop 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Name=DBeaver Community
-GenericName=UniversaL Database Manager
-GenericName[fr]=Gestionnaire de bases de données universel
-Comment=Universal Database Manager and SQL Client.
-Comment[fr]=Gestionnaire de bases de données universel et Client SQL.
-Exec=dbeaver
-Icon=dbeaver
-Categories=IDE;Development
-StartupWMClass=DBeaver
-StartupNotify=true
-Keywords=Database;SQL;IDE;JDBC;ODBC;MySQL;PostgreSQL
-MimeType=application/sql
Copied: dbeaver/repos/community-x86_64/io.dbeaver.DBeaver.desktop (from rev
1028067, dbeaver/trunk/io.dbeaver.DBeaver.desktop)
===================================================================
--- io.dbeaver.DBeaver.desktop (rev 0)
+++ io.dbeaver.DBeaver.desktop 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Name=DBeaver Community
+GenericName=UniversaL Database Manager
+GenericName[fr]=Gestionnaire de bases de données universel
+Comment=Universal Database Manager and SQL Client.
+Comment[fr]=Gestionnaire de bases de données universel et Client SQL.
+Exec=dbeaver
+Icon=dbeaver
+Categories=IDE;Development
+StartupWMClass=DBeaver
+StartupNotify=true
+Keywords=Database;SQL;IDE;JDBC;ODBC;MySQL;PostgreSQL
+MimeType=application/sql
Copied: dbeaver/repos/community-x86_64/tycho_source_11.patch (from rev 1028067,
dbeaver/trunk/tycho_source_11.patch)
===================================================================
--- tycho_source_11.patch (rev 0)
+++ tycho_source_11.patch 2021-10-08 22:05:20 UTC (rev 1028068)
@@ -0,0 +1,15 @@
+diff -Naur dbeaver-21.2.2.orig/pom.xml dbeaver-21.2.2/pom.xml
+--- dbeaver-21.2.2.orig/pom.xml 2021-10-01 13:29:29.000000000 +0200
++++ dbeaver-21.2.2/pom.xml 2021-10-08 23:05:18.730932087 +0200
+@@ -97,9 +97,9 @@
+ <version>${tycho-version}</version>
+ <configuration>
+ <useProjectSettings>false</useProjectSettings>
+- <source>1.8</source>
++ <source>11</source>
+ <target>11</target>
+- <compilerVersion>1.8</compilerVersion>
++ <compilerVersion>11</compilerVersion>
+ <compilerArgs>
+ <!--
+ Java 11-compatibility options.
