updated icons/desktop

5 files changed, 43 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87f672ef945a..049dda187a42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,24 @@
 pkgbase = dbeaver-ce
-	pkgdesc = An universal database tool for developers and database administrators. Community Edition
+	pkgdesc = DBeaver Community Edition
 	pkgver = 6.3.0
-	pkgrel = 4
+	pkgrel = 6
 	url = https://github.com/dbeaver/dbeaver
-	install = dbeaver-ce.install
 	arch = x86_64
 	license = GPL
-	depends = java-runtime>=1.6
+	depends = java-runtime>=1.8
 	depends = gtk2
 	depends = gtk-update-icon-cache
+	depends = libsecret
+	optdepends = dbeaver-plugin-office: export data in Microsoft Office Excel format
+	optdepends = dbeaver-plugin-svg-format: save diagrams in SVG format
 	conflicts = dbeaver
 	conflicts = dbeaver-ee
 	source = dbeaver-ce-6.3.0-linux.gtk.x86_64.tar.gz::https://github.com/dbeaver/dbeaver/releases/download/6.3.0/dbeaver-ce-6.3.0-linux.gtk.x86_64.tar.gz
+	source = dbeaver-ce-6.3.0-git::git+https://github.com/dbeaver/dbeaver.git#tag=6.3.0
 	source = dbeaver-ce.desktop
-	source = dbeaver-ce.install
 	sha256sums = 4a086f0182d349bbcc8d9c927e293d7b937eef90b8dcffff47db41e9a6c8421e
-	sha256sums = f100de471b371c729262611f87ef3f5ad21b8f555758c679302dabd524ebf997
-	sha256sums = 0c2a75baa39459fa56159e982d9f28c966837561bd52dffd24bac87b8d65555f
+	sha256sums = SKIP
+	sha256sums = e73e524d2ce9ff9750d805ed2ef9f9bd4058910db05d5095aef275b71e4001e8
 
 pkgname = dbeaver-ce
 
diff --git a/.gitignore b/.gitignore
index c0222efcd81d..0dcb65a68590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.tar.gz
 *.tar.xz
+*-git/
 src/
 pkg/
 *.sha256
diff --git a/PKGBUILD b/PKGBUILD
index 0409d122e182..96bd947b06b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,39 @@
 
 pkgname=dbeaver-ce
 pkgver=6.3.0
-pkgrel=4
-pkgdesc="An universal database tool for developers and database administrators. Community Edition"
+pkgrel=6
+pkgdesc="DBeaver Community Edition"
 arch=('x86_64')
 url="https://github.com/dbeaver/dbeaver"
 license=("GPL")
-depends=('java-runtime>=1.6' 'gtk2' 'gtk-update-icon-cache')
-install=dbeaver-ce.install
+depends=('java-runtime>=1.8' 'gtk2' 'gtk-update-icon-cache' 'libsecret')
 conflicts=(dbeaver dbeaver-ee)
+optdepends=('dbeaver-plugin-office: export data in Microsoft Office Excel format'
+			'dbeaver-plugin-svg-format: save diagrams in SVG format')
 
 source=("$pkgname-$pkgver-linux.gtk.x86_64.tar.gz::https://github.com/dbeaver/dbeaver/releases/download/$pkgver/$pkgname-$pkgver-linux.gtk.x86_64.tar.gz"
-		dbeaver-ce.desktop dbeaver-ce.install)
+		"$pkgname-$pkgver-git::git+https://github.com/dbeaver/dbeaver.git#tag=$pkgver"
+		dbeaver-ce.desktop)
 sha256sums=('4a086f0182d349bbcc8d9c927e293d7b937eef90b8dcffff47db41e9a6c8421e'
-            'f100de471b371c729262611f87ef3f5ad21b8f555758c679302dabd524ebf997'
-            '0c2a75baa39459fa56159e982d9f28c966837561bd52dffd24bac87b8d65555f')
+            'SKIP'
+            'e73e524d2ce9ff9750d805ed2ef9f9bd4058910db05d5095aef275b71e4001e8')
 
 package() {
-    mkdir -p $pkgdir/usr/{bin,share/{applications,icons/hicolor/48x48/apps}}
+	pushd $srcdir/$pkgname-$pkgver-git/product/standalone
+	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/$pkgname.png
+	done
+	for _type in xpm png; do
+		install -m 644 -D icons/dbeaver.$_type \
+			$pkgdir/usr/share/pixmaps/$pkgname.$_type
+	done
+	popd
 
+    mkdir -p $pkgdir/usr/bin
+    ln -s /usr/share/$pkgname/dbeaver $pkgdir/usr/bin/$pkgname
     cp -a $srcdir/dbeaver $pkgdir/usr/share/$pkgname
     chmod +x $pkgdir/usr/share/$pkgname/dbeaver
-    cp -a $pkgdir/usr/share/$pkgname/icon.xpm $pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.xpm
-    ln -s /usr/share/$pkgname/dbeaver $pkgdir/usr/bin/dbeaver-ce
-    install -m 644 $srcdir/dbeaver-ce.desktop $pkgdir/usr/share/applications/
+    install -m 644 -D $srcdir/dbeaver-ce.desktop $pkgdir/usr/share/applications/$pkgname.desktop
 }
 
diff --git a/dbeaver-ce.desktop b/dbeaver-ce.desktop
index 2e13910d71ed..96e16823daa2 100644
--- a/dbeaver-ce.desktop
+++ b/dbeaver-ce.desktop
@@ -1,10 +1,15 @@
 [Desktop Entry]
-Exec=/usr/share/dbeaver-ce/dbeaver
+Version=1.0
+Exec=GTK_OVERLAY_SCROLLING=0 /usr/share/dbeaver-ce/dbeaver
 Type=Application
 Terminal=false
 Icon=dbeaver-ce
-Categories=Development;Java;Database;
-
-Name=DBeaver Community Edition
-GenericName=Database Client
-
+Categories=IDE;Development
+Name=DBeaver Community
+GenericName=UniversaL Database Manager
+Comment=Universal Database Manager and SQL Client.
+WM_CLASS=DBeaver
+StartupWMClass=DBeaver
+StartupNotify=true
+Keywords=Database;SQL;IDE;JDBC;ODBC;MySQL;PostgreSQL;Oracle;DB2;MariaDB
+MimeType=application/sql
diff --git a/dbeaver-ce.install b/dbeaver-ce.install
deleted file mode 100644
index d641c9a2c2de..000000000000
--- a/dbeaver-ce.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
-