Date: Friday, April 26, 2019 @ 14:21:47 Author: muflone Revision: 454231
archrelease: copy trunk to community-x86_64 Added: dbeaver/repos/community-x86_64/PKGBUILD (from rev 454230, dbeaver/trunk/PKGBUILD) dbeaver/repos/community-x86_64/dbeaver.desktop (from rev 454230, dbeaver/trunk/dbeaver.desktop) dbeaver/repos/community-x86_64/dbeaver.hook (from rev 454230, dbeaver/trunk/dbeaver.hook) dbeaver/repos/community-x86_64/dbeaver.install (from rev 454230, dbeaver/trunk/dbeaver.install) dbeaver/repos/community-x86_64/dbeaver.profile.gz (from rev 454230, dbeaver/trunk/dbeaver.profile.gz) Deleted: dbeaver/repos/community-x86_64/PKGBUILD dbeaver/repos/community-x86_64/dbeaver.desktop 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_DataTypeConverter.patch ---------------------------------+ PKGBUILD | 207 ++++++++++++++++++-------------------- dbeaver.desktop | 18 +-- dbeaver.hook | 24 ++-- dbeaver.install | 10 - dbeaver_DataTypeConverter.patch | 134 ------------------------ 5 files changed, 127 insertions(+), 266 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-04-26 14:21:30 UTC (rev 454230) +++ PKGBUILD 2019-04-26 14:21:47 UTC (rev 454231) @@ -1,106 +0,0 @@ -# Maintainer: Muflone http://www.muflone.com/contacts/english/ -# Contributor: Arne Hoch <a...@derhoch.de> - -pkgname=dbeaver -pkgver=6.0.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' 'libsecret') -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" - "${pkgname}.desktop" - "${pkgname}.profile.gz" - "${pkgname}.hook" - "${pkgname}.install" - "${pkgname}_DataTypeConverter.patch") -sha256sums=('39dd39b239fd78ce6d198def804767331d4e1fc1fdde99bc2d4c909f60cd34a3' - '8d6311e85b33b65b9109fe54cc2bb811639bfd31af94be403d5112e09fafd40c' - '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034' - 'b035ea82c5c349cf992a411f208d8c874c2844d2f8490e4ad21cafb5be3fbfba' - 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab' - 'f3eec152f885dfb85b3e09d263f5099c6946a1bc625bb91db4a885132e032712') -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" - # Install patches - cd "${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/${pkgname}_DataTypeConverter.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-x86_64/PKGBUILD (from rev 454230, dbeaver/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-04-26 14:21:47 UTC (rev 454231) @@ -0,0 +1,101 @@ +# Maintainer: Muflone http://www.muflone.com/contacts/english/ +# Contributor: Arne Hoch <a...@derhoch.de> + +pkgname=dbeaver +pkgver=6.0.3 +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' 'libsecret') +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" + "${pkgname}.desktop" + "${pkgname}.profile.gz" + "${pkgname}.hook" + "${pkgname}.install") +sha256sums=('d9cdaf470e913d84f549fce824dc86c5550ae31ee2b032301d4c87fe5b02babe' + '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" +} + +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 2019-04-26 14:21:30 UTC (rev 454230) +++ dbeaver.desktop 2019-04-26 14:21:47 UTC (rev 454231) @@ -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-x86_64/dbeaver.desktop (from rev 454230, dbeaver/trunk/dbeaver.desktop) =================================================================== --- dbeaver.desktop (rev 0) +++ dbeaver.desktop 2019-04-26 14:21:47 UTC (rev 454231) @@ -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 2019-04-26 14:21:30 UTC (rev 454230) +++ dbeaver.hook 2019-04-26 14:21:47 UTC (rev 454231) @@ -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-x86_64/dbeaver.hook (from rev 454230, dbeaver/trunk/dbeaver.hook) =================================================================== --- dbeaver.hook (rev 0) +++ dbeaver.hook 2019-04-26 14:21:47 UTC (rev 454231) @@ -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 2019-04-26 14:21:30 UTC (rev 454230) +++ dbeaver.install 2019-04-26 14:21:47 UTC (rev 454231) @@ -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 454230, dbeaver/trunk/dbeaver.install) =================================================================== --- dbeaver.install (rev 0) +++ dbeaver.install 2019-04-26 14:21:47 UTC (rev 454231) @@ -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 454230, dbeaver/trunk/dbeaver.profile.gz) =================================================================== (Binary files differ) Deleted: dbeaver_DataTypeConverter.patch =================================================================== --- dbeaver_DataTypeConverter.patch 2019-04-26 14:21:30 UTC (rev 454230) +++ dbeaver_DataTypeConverter.patch 2019-04-26 14:21:47 UTC (rev 454231) @@ -1,134 +0,0 @@ -diff -Naur dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java ---- dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java 1970-01-01 01:00:00.000000000 +0100 -+++ dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java 2018-11-10 18:27:06.771062501 +0100 -@@ -0,0 +1,119 @@ -+/* -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -+ * -+ * Copyright (c) 2007-2017 Oracle and/or its affiliates. All rights reserved. -+ * -+ * The contents of this file are subject to the terms of either the GNU -+ * General Public License Version 2 only ("GPL") or the Common Development -+ * and Distribution License("CDDL") (collectively, the "License"). You -+ * may not use this file except in compliance with the License. You can -+ * obtain a copy of the License at -+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1 -+ * or LICENSE.txt. See the License for the specific -+ * language governing permissions and limitations under the License. -+ * -+ * When distributing the software, include this License Header Notice in each -+ * file and include the License file at LICENSE.txt. -+ * -+ * GPL Classpath Exception: -+ * Oracle designates this particular file as subject to the "Classpath" -+ * exception as provided by Oracle in the GPL Version 2 section of the License -+ * file that accompanied this code. -+ * -+ * Modifications: -+ * If applicable, add the following below the License Header, with the fields -+ * enclosed by brackets [] replaced by your own identifying information: -+ * "Portions Copyright [year] [name of copyright owner]" -+ * -+ * Contributor(s): -+ * If you wish your version of this file to be governed by only the CDDL or -+ * only the GPL Version 2, indicate your decision by adding "[Contributor] -+ * elects to include this software in this distribution under the [CDDL or GPL -+ * Version 2] license." If you don't indicate a single choice of license, a -+ * recipient has the option to distribute your version of this file under -+ * either the CDDL, the GPL Version 2 or to extend the choice of license to -+ * its licensees as provided above. However, if you add GPL Version 2 code -+ * and therefore, elected the GPL Version 2 license, then the option applies -+ * only if the new code is made subject to such option by the copyright -+ * holder. -+ */ -+ -+package org.jkiss.dbeaver.ext.import_config.wizards.navicat; -+ -+/** -+ * Some methods copied from JAXB DatatypeConverterImpl -+ */ -+public class DatatypeConverter { -+ -+ private static final byte[] decodeMap = initDecodeMap(); -+ private static final byte PADDING = 127; -+ -+ private static byte[] initDecodeMap() { -+ byte[] map = new byte[128]; -+ int i; -+ for (i = 0; i < 128; i++) { -+ map[i] = -1; -+ } -+ -+ for (i = 'A'; i <= 'Z'; i++) { -+ map[i] = (byte) (i - 'A'); -+ } -+ for (i = 'a'; i <= 'z'; i++) { -+ map[i] = (byte) (i - 'a' + 26); -+ } -+ for (i = '0'; i <= '9'; i++) { -+ map[i] = (byte) (i - '0' + 52); -+ } -+ map['+'] = 62; -+ map['/'] = 63; -+ map['='] = PADDING; -+ -+ return map; -+ } -+ -+ public static byte[] parseHexBinary(String s) { -+ final int len = s.length(); -+ -+ // "111" is not a valid hex encoding. -+ if (len % 2 != 0) { -+ throw new IllegalArgumentException("hexBinary needs to be even-length: " + s); -+ } -+ -+ byte[] out = new byte[len / 2]; -+ -+ for (int i = 0; i < len; i += 2) { -+ int h = hexToBin(s.charAt(i)); -+ int l = hexToBin(s.charAt(i + 1)); -+ if (h == -1 || l == -1) { -+ throw new IllegalArgumentException("contains illegal character for hexBinary: " + s); -+ } -+ -+ out[i / 2] = (byte) (h * 16 + l); -+ } -+ -+ return out; -+ } -+ -+ private static int hexToBin(char ch) { -+ if ('0' <= ch && ch <= '9') { -+ return ch - '0'; -+ } -+ if ('A' <= ch && ch <= 'F') { -+ return ch - 'A' + 10; -+ } -+ if ('a' <= ch && ch <= 'f') { -+ return ch - 'a' + 10; -+ } -+ return -1; -+ } -+ private static final char[] hexCode = "0123456789ABCDEF".toCharArray(); -+ -+ public static String printHexBinary(byte[] data) { -+ StringBuilder r = new StringBuilder(data.length * 2); -+ for (byte b : data) { -+ r.append(hexCode[(b >> 4) & 0xF]); -+ r.append(hexCode[(b & 0xF)]); -+ } -+ return r.toString(); -+ } -+} -diff -Naur dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java ---- dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java 2018-10-21 20:04:06.000000000 +0200 -+++ dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java 2018-11-10 18:10:06.649829232 +0100 -@@ -14,7 +14,6 @@ - import java.security.MessageDigest; - import java.util.Arrays; - import javax.crypto.spec.SecretKeySpec; --import javax.xml.bind.DatatypeConverter; - - public class NavicatEncrypt { - private static final String NAVICAT_CODE = "3DC5CA39";