[arch-commits] Commit in dbeaver/repos/community-testing-x86_64 (12 files)
Fabio Castelli
muflone at archlinux.org
Sun Jul 15 19:23:44 UTC 2018
Date: Sunday, July 15, 2018 @ 19:23:44
Author: muflone
Revision: 359589
archrelease: copy trunk to community-testing-x86_64
Added:
dbeaver/repos/community-testing-x86_64/CustomExpression.java.patch
(from rev 359588, dbeaver/trunk/CustomExpression.java.patch)
dbeaver/repos/community-testing-x86_64/PKGBUILD
(from rev 359588, dbeaver/trunk/PKGBUILD)
dbeaver/repos/community-testing-x86_64/dbeaver.desktop
(from rev 359588, dbeaver/trunk/dbeaver.desktop)
dbeaver/repos/community-testing-x86_64/dbeaver.hook
(from rev 359588, dbeaver/trunk/dbeaver.hook)
dbeaver/repos/community-testing-x86_64/dbeaver.install
(from rev 359588, dbeaver/trunk/dbeaver.install)
dbeaver/repos/community-testing-x86_64/dbeaver.profile.gz
(from rev 359588, dbeaver/trunk/dbeaver.profile.gz)
Deleted:
dbeaver/repos/community-testing-x86_64/CustomExpression.java.patch
dbeaver/repos/community-testing-x86_64/PKGBUILD
dbeaver/repos/community-testing-x86_64/dbeaver.desktop
dbeaver/repos/community-testing-x86_64/dbeaver.hook
dbeaver/repos/community-testing-x86_64/dbeaver.install
dbeaver/repos/community-testing-x86_64/dbeaver.profile.gz
-----------------------------+
CustomExpression.java.patch | 70 ++++++-------
PKGBUILD | 214 +++++++++++++++++++++---------------------
dbeaver.desktop | 18 +--
dbeaver.hook | 24 ++--
dbeaver.install | 10 -
5 files changed, 168 insertions(+), 168 deletions(-)
Deleted: CustomExpression.java.patch
===================================================================
--- CustomExpression.java.patch 2018-07-15 19:23:16 UTC (rev 359588)
+++ CustomExpression.java.patch 2018-07-15 19:23:44 UTC (rev 359589)
@@ -1,35 +0,0 @@
-diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java
-index 4be4e00a96..1e0cc8d840 100644
---- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java
-+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java
-@@ -19,6 +19,7 @@
- import net.sf.jsqlparser.expression.Expression;
- import net.sf.jsqlparser.expression.ExpressionVisitor;
- import net.sf.jsqlparser.expression.StringValue;
-+import net.sf.jsqlparser.parser.SimpleNode;
-
- /**
- * CustomExpression
-@@ -26,6 +27,7 @@
- public class CustomExpression implements Expression {
-
- private final String expression;
-+ private SimpleNode simpleNode;
-
- public CustomExpression(String expression) {
- this.expression = expression;
-@@ -40,4 +42,14 @@ public void accept(ExpressionVisitor expressionVisitor) {
- public String toString() {
- return expression;
- }
-+
-+ @Override
-+ public SimpleNode getASTNode() {
-+ return simpleNode;
-+ }
-+
-+ @Override
-+ public void setASTNode(SimpleNode simpleNode) {
-+ this.simpleNode = simpleNode;
-+ }
- }
Copied: dbeaver/repos/community-testing-x86_64/CustomExpression.java.patch (from rev 359588, dbeaver/trunk/CustomExpression.java.patch)
===================================================================
--- CustomExpression.java.patch (rev 0)
+++ CustomExpression.java.patch 2018-07-15 19:23:44 UTC (rev 359589)
@@ -0,0 +1,35 @@
+diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java
+index 4be4e00a96..1e0cc8d840 100644
+--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java
++++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/CustomExpression.java
+@@ -19,6 +19,7 @@
+ import net.sf.jsqlparser.expression.Expression;
+ import net.sf.jsqlparser.expression.ExpressionVisitor;
+ import net.sf.jsqlparser.expression.StringValue;
++import net.sf.jsqlparser.parser.SimpleNode;
+
+ /**
+ * CustomExpression
+@@ -26,6 +27,7 @@
+ public class CustomExpression implements Expression {
+
+ private final String expression;
++ private SimpleNode simpleNode;
+
+ public CustomExpression(String expression) {
+ this.expression = expression;
+@@ -40,4 +42,14 @@ public void accept(ExpressionVisitor expressionVisitor) {
+ public String toString() {
+ return expression;
+ }
++
++ @Override
++ public SimpleNode getASTNode() {
++ return simpleNode;
++ }
++
++ @Override
++ public void setASTNode(SimpleNode simpleNode) {
++ this.simpleNode = simpleNode;
++ }
+ }
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-15 19:23:16 UTC (rev 359588)
+++ PKGBUILD 2018-07-15 19:23:44 UTC (rev 359589)
@@ -1,107 +0,0 @@
-# $Id$
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Arne Hoch <arne at derhoch.de>
-
-pkgname=dbeaver
-pkgver=5.1.1
-pkgrel=1
-pkgdesc="Free universal SQL Client for developers and database administrators (community edition)"
-arch=('x86_64')
-url="http://dbeaver.jkiss.org/"
-license=("Apache")
-depends=('java-runtime>=8' 'gtk2' 'gtk-update-icon-cache')
-makedepends=('maven' 'java-environment>=8')
-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/serge-rider/dbeaver/archive/${pkgver}.tar.gz"
- "CustomExpression.java.patch"
- "${pkgname}.desktop"
- "${pkgname}.profile.gz"
- "${pkgname}.hook"
- "dbeaver.install")
-sha256sums=('3d1693f9e705a7b94d0466f8461696b9cd0e79accf9d0435d9bb5eaf74ded020'
- '3a04f9e8a4842f3de93c8009ece8197b009e5a4e13ecaab0854f5eaa014f699b'
- '8d6311e85b33b65b9109fe54cc2bb811639bfd31af94be403d5112e09fafd40c'
- '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034'
- 'b035ea82c5c349cf992a411f208d8c874c2844d2f8490e4ad21cafb5be3fbfba'
- '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"
- # Fix for Type CustomExpression must implement inherited abstract methods from ASTNodeAccess
- cd "${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/CustomExpression.java.patch"
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- export MAVEN_OPTS="-Xmx2048m"
- mvn --batch-mode package
-}
-
-package() {
- cd "${pkgname}-${pkgver}/product/standalone"
- # 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 files into /usr/bin
- install -m 755 -d "${pkgdir}/usr/bin"
- ln -s "/usr/lib/${pkgname}/${pkgname}" "${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}/${pkgname}.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-testing-x86_64/PKGBUILD (from rev 359588, dbeaver/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-07-15 19:23:44 UTC (rev 359589)
@@ -0,0 +1,107 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Arne Hoch <arne at derhoch.de>
+
+pkgname=dbeaver
+pkgver=5.1.2
+pkgrel=1
+pkgdesc="Free universal SQL Client for developers and database administrators (community edition)"
+arch=('x86_64')
+url="http://dbeaver.jkiss.org/"
+license=("Apache")
+depends=('java-runtime>=8' 'gtk2' 'gtk-update-icon-cache')
+makedepends=('maven' 'java-environment>=8')
+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/serge-rider/dbeaver/archive/${pkgver}.tar.gz"
+ "CustomExpression.java.patch"
+ "${pkgname}.desktop"
+ "${pkgname}.profile.gz"
+ "${pkgname}.hook"
+ "dbeaver.install")
+sha256sums=('f419b47f9e432e3b396e86d46797d0ebe8c900872ee88edf9c8363215559e01b'
+ '3a04f9e8a4842f3de93c8009ece8197b009e5a4e13ecaab0854f5eaa014f699b'
+ '8d6311e85b33b65b9109fe54cc2bb811639bfd31af94be403d5112e09fafd40c'
+ '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034'
+ 'b035ea82c5c349cf992a411f208d8c874c2844d2f8490e4ad21cafb5be3fbfba'
+ '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"
+ # Fix for Type CustomExpression must implement inherited abstract methods from ASTNodeAccess
+ cd "${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/CustomExpression.java.patch"
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ export MAVEN_OPTS="-Xmx2048m"
+ mvn --batch-mode package
+}
+
+package() {
+ cd "${pkgname}-${pkgver}/product/standalone"
+ # 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 files into /usr/bin
+ install -m 755 -d "${pkgdir}/usr/bin"
+ ln -s "/usr/lib/${pkgname}/${pkgname}" "${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}/${pkgname}.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.desktop
===================================================================
--- dbeaver.desktop 2018-07-15 19:23:16 UTC (rev 359588)
+++ dbeaver.desktop 2018-07-15 19:23:44 UTC (rev 359589)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=DBeaver
-GenericName=Free universal SQL Client for developers and database administrators
-Exec=dbeaver
-Terminal=false
-Type=Application
-Icon=dbeaver
-Categories=Development;Java;Database;
-StartupWMClass=SWT
Copied: dbeaver/repos/community-testing-x86_64/dbeaver.desktop (from rev 359588, dbeaver/trunk/dbeaver.desktop)
===================================================================
--- dbeaver.desktop (rev 0)
+++ dbeaver.desktop 2018-07-15 19:23:44 UTC (rev 359589)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=DBeaver
+GenericName=Free universal SQL Client for developers and database administrators
+Exec=dbeaver
+Terminal=false
+Type=Application
+Icon=dbeaver
+Categories=Development;Java;Database;
+StartupWMClass=SWT
Deleted: dbeaver.hook
===================================================================
--- dbeaver.hook 2018-07-15 19:23:16 UTC (rev 359588)
+++ dbeaver.hook 2018-07-15 19:23:44 UTC (rev 359589)
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-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-testing-x86_64/dbeaver.hook (from rev 359588, dbeaver/trunk/dbeaver.hook)
===================================================================
--- dbeaver.hook (rev 0)
+++ dbeaver.hook 2018-07-15 19:23:44 UTC (rev 359589)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+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 2018-07-15 19:23:16 UTC (rev 359588)
+++ dbeaver.install 2018-07-15 19:23:44 UTC (rev 359589)
@@ -1,5 +0,0 @@
-pre_remove() {
- # Remove bundles.info managed from the hook
- rm /etc/dbeaver/bundles.info
-}
-
Copied: dbeaver/repos/community-testing-x86_64/dbeaver.install (from rev 359588, dbeaver/trunk/dbeaver.install)
===================================================================
--- dbeaver.install (rev 0)
+++ dbeaver.install 2018-07-15 19:23:44 UTC (rev 359589)
@@ -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-testing-x86_64/dbeaver.profile.gz (from rev 359588, dbeaver/trunk/dbeaver.profile.gz)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list