[arch-commits] Commit in dbeaver/trunk (PKGBUILD dbeaver.desktop tycho_1.1.0.patch)

[Fabio Castelli]

    Date: Sunday, June 10, 2018 @ 19:28:17
  Author: muflone
Revision: 342273

upgpkg: dbeaver 5.0.6-1

Added:
  dbeaver/trunk/tycho_1.1.0.patch
Modified:
  dbeaver/trunk/PKGBUILD
  dbeaver/trunk/dbeaver.desktop

-------------------+
 PKGBUILD          |   14 +++++++++-----
 dbeaver.desktop   |    2 +-
 tycho_1.1.0.patch |   36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-10 17:16:34 UTC (rev 342272)
+++ PKGBUILD	2018-06-10 19:28:17 UTC (rev 342273)
@@ -3,23 +3,25 @@
 # Contributor: Arne Hoch <arne at derhoch.de>
 
 pkgname=dbeaver
-pkgver=5.0.5
+pkgver=5.0.6
 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')
+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"
+        "tycho_1.1.0.patch"
         "${pkgname}.desktop"
         "${pkgname}.profile.gz"
         "${pkgname}.hook"
         "dbeaver.install")
-sha256sums=('d61a26c52b6598d9be00c5b02623bd2a913468aaf51bc209bfcc234081441c67'
-            'd1365a1e1a9a7b3949fc1b9e9928e93b7d8b3d04b5d0eee7c37eaaa362466c47'
+sha256sums=('b36c3e8e1a816f0200cae0f1e3b3a4cc437ebdf6a540cd32d92b2d9063ea186c'
+            '399f3390510dd0571ef579d6042de16358876c2cddcd5b153ff4c61e563bfb4c'
+            '8d6311e85b33b65b9109fe54cc2bb811639bfd31af94be403d5112e09fafd40c'
             '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034'
             'b035ea82c5c349cf992a411f208d8c874c2844d2f8490e4ad21cafb5be3fbfba'
             'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab')
@@ -30,6 +32,8 @@
   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
+  patch -p0 -i "tycho_1.1.0.patch"
 }
 
 build() {

Modified: dbeaver.desktop
===================================================================
--- dbeaver.desktop	2018-06-10 17:16:34 UTC (rev 342272)
+++ dbeaver.desktop	2018-06-10 19:28:17 UTC (rev 342273)
@@ -5,5 +5,5 @@
 Terminal=false
 Type=Application
 Icon=dbeaver
-Categories=Development;Java;
+Categories=Development;Java;Database;
 StartupWMClass=SWT

Added: tycho_1.1.0.patch
===================================================================
--- tycho_1.1.0.patch	                        (rev 0)
+++ tycho_1.1.0.patch	2018-06-10 19:28:17 UTC (rev 342273)
@@ -0,0 +1,36 @@
+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>