[arch-commits] Commit in dbeaver/trunk (3 files)
Fabio Castelli
muflone at archlinux.org
Sun Jul 15 19:01:51 UTC 2018
Date: Sunday, July 15, 2018 @ 19:01:50
Author: muflone
Revision: 359576
upgpkg: dbeaver 5.1.1-1
Added:
dbeaver/trunk/CustomExpression.java.patch
Modified:
dbeaver/trunk/PKGBUILD
Deleted:
dbeaver/trunk/tycho_1.1.0.patch
-----------------------------+
CustomExpression.java.patch | 35 +++++++++++++++++++++++++++++++++++
PKGBUILD | 12 ++++++------
tycho_1.1.0.patch | 36 ------------------------------------
3 files changed, 41 insertions(+), 42 deletions(-)
Added: CustomExpression.java.patch
===================================================================
--- CustomExpression.java.patch (rev 0)
+++ CustomExpression.java.patch 2018-07-15 19:01:50 UTC (rev 359576)
@@ -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;
++ }
+ }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-15 19:00:03 UTC (rev 359575)
+++ PKGBUILD 2018-07-15 19:01:50 UTC (rev 359576)
@@ -3,7 +3,7 @@
# Contributor: Arne Hoch <arne at derhoch.de>
pkgname=dbeaver
-pkgver=5.1.0
+pkgver=5.1.1
pkgrel=1
pkgdesc="Free universal SQL Client for developers and database administrators (community edition)"
arch=('x86_64')
@@ -14,13 +14,13 @@
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"
- "tycho_1.1.0.patch"
+ "CustomExpression.java.patch"
"${pkgname}.desktop"
"${pkgname}.profile.gz"
"${pkgname}.hook"
"dbeaver.install")
-sha256sums=('73851f8a3fc320e23dc664ad56dfa80740b70a60c2b1b5809e7bb9c09d626ac0'
- '399f3390510dd0571ef579d6042de16358876c2cddcd5b153ff4c61e563bfb4c'
+sha256sums=('3d1693f9e705a7b94d0466f8461696b9cd0e79accf9d0435d9bb5eaf74ded020'
+ '3a04f9e8a4842f3de93c8009ece8197b009e5a4e13ecaab0854f5eaa014f699b'
'8d6311e85b33b65b9109fe54cc2bb811639bfd31af94be403d5112e09fafd40c'
'1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034'
'b035ea82c5c349cf992a411f208d8c874c2844d2f8490e4ad21cafb5be3fbfba'
@@ -32,9 +32,9 @@
gzip --decompress --keep --stdout "${pkgname}.profile.gz" |
sed "s/DBEAVER_VERSION/${pkgver}/g" |
gzip -9 > "${pkgname}.profile-${pkgver}.gz"
- # Fix tycho version to 1.1.0 to build against Java >= 9
+ # Fix for Type CustomExpression must implement inherited abstract methods from ASTNodeAccess
cd "${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/tycho_1.1.0.patch"
+ patch -p1 -i "${srcdir}/CustomExpression.java.patch"
}
build() {
Deleted: tycho_1.1.0.patch
===================================================================
--- tycho_1.1.0.patch 2018-07-15 19:00:03 UTC (rev 359575)
+++ tycho_1.1.0.patch 2018-07-15 19:01:50 UTC (rev 359576)
@@ -1,36 +0,0 @@
-diff -Naur dbeaver-5.0.6.orig/plugins/org.jkiss.dbeaver.model/pom.xml dbeaver-5.0.6/plugins/org.jkiss.dbeaver.model/pom.xml
---- dbeaver-5.0.6.orig/plugins/org.jkiss.dbeaver.model/pom.xml 2018-05-27 23:07:37.000000000 +0200
-+++ dbeaver-5.0.6/plugins/org.jkiss.dbeaver.model/pom.xml 2018-06-10 20:52:45.798485991 +0200
-@@ -20,7 +20,7 @@
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
-- <version>0.22.0</version>
-+ <version>1.1.0</version>
- <configuration>
- <compilerArgument>-warn:none</compilerArgument>
- <compilerArgument>-err:none</compilerArgument>
-diff -Naur dbeaver-5.0.6.orig/pom.xml dbeaver-5.0.6/pom.xml
---- dbeaver-5.0.6.orig/pom.xml 2018-05-27 23:07:37.000000000 +0200
-+++ dbeaver-5.0.6/pom.xml 2018-06-10 20:47:02.790246900 +0200
-@@ -11,7 +11,7 @@
- <properties>
- <dbeaver-version>5.0.6</dbeaver-version>
- <dbeaver-product>DBeaver</dbeaver-product>
-- <tycho-version>1.0.0</tycho-version>
-+ <tycho-version>1.1.0</tycho-version>
- <tycho-versions-version>0.26.0</tycho-versions-version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
-diff -Naur dbeaver-5.0.6.orig/product/localRepository/pom.xml dbeaver-5.0.6/product/localRepository/pom.xml
---- dbeaver-5.0.6.orig/product/localRepository/pom.xml 2018-05-27 23:07:37.000000000 +0200
-+++ dbeaver-5.0.6/product/localRepository/pom.xml 2018-06-10 20:47:37.026082791 +0200
-@@ -9,7 +9,7 @@
- <name>DBeaver - 3rd party dependencies</name>
-
- <properties>
-- <tycho-version>1.0.0</tycho-version>
-+ <tycho-version>1.1.0</tycho-version>
- <reficio-p2-version>1.2.0-SNAPSHOT</reficio-p2-version>
- <repo-name>DBeaver CE dependencies</repo-name>
- </properties>
More information about the arch-commits
mailing list