diff options
| -rw-r--r-- | .SRCINFO | 50 | ||||
| -rw-r--r-- | PKGBUILD | 98 |
2 files changed, 104 insertions, 44 deletions
@@ -1,10 +1,10 @@ # Generated by mksrcinfo v8 -# Fri Sep 1 20:55:25 UTC 2017 +# Tue Oct 10 20:30:39 UTC 2017 pkgbase = eiskaltdcpp-git pkgdesc = EiskaltDC++: DC and ADC client based on dcpp core. (GIT Version) - pkgver = 2.2.10.167.geca99308 + pkgver = 2.2.10.180.g4c9cbf20 pkgrel = 1 - url = http://code.google.com/p/eiskaltdc + url = https://github.com/eiskaltdcpp/eiskaltdcpp arch = i686 arch = x86_64 arch = arm @@ -19,11 +19,14 @@ pkgbase = eiskaltdcpp-git makedepends = attr makedepends = wget makedepends = boost + makedepends = pcre + makedepends = bash makedepends = miniupnpc makedepends = jsoncpp makedepends = qt5-multimedia makedepends = qt5-tools makedepends = qt5-script + makedepends = qt5-quick1 makedepends = gtk3 makedepends = libnotify makedepends = perl-json @@ -31,11 +34,27 @@ pkgbase = eiskaltdcpp-git conflicts = eiskaltdcpp options = !emptydirs source = git+https://github.com/eiskaltdcpp/eiskaltdcpp.git + source = git+https://github.com/eiskaltdcpp/eiskaltdcpp-web source = esee.patch - source = https://patch-diff.githubusercontent.com/raw/eiskaltdcpp/eiskaltdcpp/pull/367.patch + source = jquery.js::https://code.jquery.com/jquery-1.12.4.js + source = jquery.easytabs.js::https://raw.github.com/JangoSteve/jQuery-EasyTabs/v3.2.0/lib/jquery.easytabs.js + source = jquery.hashchange.js::https://raw.github.com/pandell/jquery-hashchange/v1.3c/jquery.ba-hashchange.js + source = jquery.jsonrpc.js::http://raw.github.com/datagraph/jquery-jsonrpc/0.1.1/jquery.jsonrpc.js + source = jquery.plugin.js::http://raw.github.com/Cyntax/jquery-timer/0.1.1/jquery.plugin.js + source = jquery.timer.js::http://raw.github.com/Cyntax/jquery-timer/0.1.1/jquery.timer.js + source = jquery.tablesorter.js::https://raw.github.com/Mottie/tablesorter/v2.29.0/dist/js/jquery.tablesorter.js + source = require.js::http://requirejs.org/docs/release/2.3.5/comments/require.js + sha256sums = SKIP sha256sums = SKIP sha256sums = b68a4def7204214d418efabfe130393e6b8481a3b348defeb9050bbb2693fa54 - sha256sums = 57d4278e9670cff5c01231bcc727d6fe12018f80d74750aaa34e636f77a7c04f + sha256sums = 430f36f9b5f21aae8cc9dca6a81c4d3d84da5175eaedcf2fdc2c226302cb3575 + sha256sums = 5e0da05d396bc6e39c82e524b19aa8357125f68dd2553d453099498572044f10 + sha256sums = 35a7d71dfcd3f699145ae40b2521f1650052376ddd4126e4234dd98483e0ef8b + sha256sums = 54afeb1872a56d9057655b1f7276048d225751b24b95bbc2e68827ba3d6c87f9 + sha256sums = 39ff6a891680714e2e33453246d22ccd42d364fb6cbb5d11c5ec7360259e6ed3 + sha256sums = b3b14d084610ee20a770f30e6379872cc05c00b0df6260a4627aff7430253db6 + sha256sums = b1ead7be16de10a75021f4c5483df0a4d086371dbeffda72ed55dfc0b8584df9 + sha256sums = baf9f8d5534f43c695340e9a4b56637361543e42aaed9800e92cc5887915831b pkgname = eiskaltdcpp-core-git pkgdesc = EiskaltDC++ Core. (GIT Version) @@ -45,16 +64,17 @@ pkgname = eiskaltdcpp-core-git depends = attr depends = boost-libs depends = miniupnpc - provides = eiskaltdcpp-core=2.2.10.167.geca99308 + depends = pcre + provides = eiskaltdcpp-core=2.2.10.180.g4c9cbf20 conflicts = eiskaltdcpp-core pkgname = eiskaltdcpp-qt-git pkgdesc = Qt5-based DC and ADC client for EiskaltDC++ core. (GIT Version) - depends = eiskaltdcpp-core-git=2.2.10.167.geca99308 - depends = eiskaltdcpp-data-git=2.2.10.167.geca99308 + depends = eiskaltdcpp-core-git=2.2.10.180.g4c9cbf20 + depends = eiskaltdcpp-data-git=2.2.10.180.g4c9cbf20 depends = aspell depends = qt5-multimedia - depends = qt5-script + depends = qt5-quick1 depends = desktop-file-utils optdepends = php: needed for some scripts provides = eiskaltdcpp-qt @@ -64,11 +84,10 @@ pkgname = eiskaltdcpp-qt-git pkgname = eiskaltdcpp-gtk-git pkgdesc = Gtk-based DC and ADC client for EiskaltDC++ core. (GIT Version) - depends = eiskaltdcpp-core-git=2.2.10.167.geca99308 - depends = eiskaltdcpp-data-git=2.2.10.167.geca99308 + depends = eiskaltdcpp-core-git=2.2.10.180.g4c9cbf20 + depends = eiskaltdcpp-data-git=2.2.10.180.g4c9cbf20 depends = gtk3 depends = libnotify - depends = desktop-file-utils provides = eiskaltdcpp-gtk conflicts = eiskaltdcpp-gtk conflicts = eiskaltdcpp-gtk2 @@ -76,7 +95,7 @@ pkgname = eiskaltdcpp-gtk-git pkgname = eiskaltdcpp-daemon-git pkgdesc = DC and ADC daemon for EiskaltDC++ core. (GIT Version) - depends = eiskaltdcpp-core-git=2.2.10.167.geca99308 + depends = eiskaltdcpp-core-git=2.2.10.180.g4c9cbf20 depends = jsoncpp provides = eiskaltdcpp-daemon conflicts = eiskaltdcpp-daemon @@ -84,7 +103,7 @@ pkgname = eiskaltdcpp-daemon-git pkgname = eiskaltdcpp-cli-git pkgdesc = CLI interface for EiskaltDC++ Daemon. (GIT Version) arch = any - depends = eiskaltdcpp-daemon-git=2.2.10.167.geca99308 + depends = eiskaltdcpp-daemon-git=2.2.10.180.g4c9cbf20 depends = perl-json depends = perl-json-rpc provides = eiskaltdcpp-cli @@ -93,7 +112,8 @@ pkgname = eiskaltdcpp-cli-git pkgname = eiskaltdcpp-web-git pkgdesc = Web interface for EiskaltDC++ Daemon. (GIT Version) arch = any - depends = eiskaltdcpp-daemon-git=2.2.10.167.geca99308 + depends = eiskaltdcpp-daemon-git=2.2.10.180.g4c9cbf20 + depends = bash provides = eiskaltdcpp-web conflicts = eiskaltdcpp-web @@ -10,21 +10,38 @@ pkgname=('eiskaltdcpp-core-git' 'eiskaltdcpp-web-git' 'eiskaltdcpp-data-git' ) -pkgver=2.2.10.167.geca99308 +pkgver=2.2.10.180.g4c9cbf20 pkgrel=1 pkgdesc="EiskaltDC++: DC and ADC client based on dcpp core. (GIT Version)" license=('GPL3') arch=('i686' 'x86_64' 'arm' 'armv7h' 'armv6h') -url='http://code.google.com/p/eiskaltdc' +url='https://github.com/eiskaltdcpp/eiskaltdcpp' conflicts=('eiskaltdcpp') options=('!emptydirs') source=('git+https://github.com/eiskaltdcpp/eiskaltdcpp.git' + 'git+https://github.com/eiskaltdcpp/eiskaltdcpp-web' 'esee.patch' - 'https://patch-diff.githubusercontent.com/raw/eiskaltdcpp/eiskaltdcpp/pull/367.patch' + 'jquery.js::https://code.jquery.com/jquery-1.12.4.js' + 'jquery.easytabs.js::https://raw.github.com/JangoSteve/jQuery-EasyTabs/v3.2.0/lib/jquery.easytabs.js' + 'jquery.hashchange.js::https://raw.github.com/pandell/jquery-hashchange/v1.3c/jquery.ba-hashchange.js' + 'jquery.jsonrpc.js::http://raw.github.com/datagraph/jquery-jsonrpc/0.1.1/jquery.jsonrpc.js' + 'jquery.plugin.js::http://raw.github.com/Cyntax/jquery-timer/0.1.1/jquery.plugin.js' + 'jquery.timer.js::http://raw.github.com/Cyntax/jquery-timer/0.1.1/jquery.timer.js' + 'jquery.tablesorter.js::https://raw.github.com/Mottie/tablesorter/v2.29.0/dist/js/jquery.tablesorter.js' + 'require.js::http://requirejs.org/docs/release/2.3.5/comments/require.js' + ) sha256sums=('SKIP' + 'SKIP' 'b68a4def7204214d418efabfe130393e6b8481a3b348defeb9050bbb2693fa54' - '57d4278e9670cff5c01231bcc727d6fe12018f80d74750aaa34e636f77a7c04f' + '430f36f9b5f21aae8cc9dca6a81c4d3d84da5175eaedcf2fdc2c226302cb3575' + '5e0da05d396bc6e39c82e524b19aa8357125f68dd2553d453099498572044f10' + '35a7d71dfcd3f699145ae40b2521f1650052376ddd4126e4234dd98483e0ef8b' + '54afeb1872a56d9057655b1f7276048d225751b24b95bbc2e68827ba3d6c87f9' + '39ff6a891680714e2e33453246d22ccd42d364fb6cbb5d11c5ec7360259e6ed3' + 'b3b14d084610ee20a770f30e6379872cc05c00b0df6260a4627aff7430253db6' + 'b1ead7be16de10a75021f4c5483df0a4d086371dbeffda72ed55dfc0b8584df9' + 'baf9f8d5534f43c695340e9a4b56637361543e42aaed9800e92cc5887915831b' ) makedepends=('git' 'cmake' @@ -34,11 +51,14 @@ makedepends=('git' 'attr' 'wget' 'boost' + 'pcre' + 'bash' 'miniupnpc' 'jsoncpp' 'qt5-multimedia' 'qt5-tools' 'qt5-script' + 'qt5-quick1' 'gtk3' 'libnotify' 'perl-json' @@ -61,8 +81,6 @@ prepare() { cd eiskaltdcpp # Bleh patch for set right version patch -p1 -i "${srcdir}/esee.patch" - # Fix Close the Qt GUI - patch -p1 -i "${srcdir}/367.patch" } build() { @@ -71,40 +89,41 @@ build() { cmake ../eiskaltdcpp \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DPERL_REGEX=ON \ - -DLOCAL_BOOST=OFF \ - -DLOCAL_JSONCPP=OFF \ - -DLOCAL_MINIUPNP=OFF \ - -DUSE_MINIUPNP=ON \ + -DUSE_QT5=ON \ + -DUSE_QT_QML=ON \ + -DUSE_QT_SQLITE=ON \ + -DUSE_GTK3=ON \ -DLUA_SCRIPT=ON \ - -DWITH_LUASCRIPTS=ON \ - -DUSE_JS=ON \ + -DUSE_MINIUPNP=ON \ + -DLOCAL_MINIUPNP=OFF \ -DUSE_ASPELL=ON \ - -DWITH_DHT=ON \ + -DUSE_LIBNOTIFY=ON \ + -DWITH_LUASCRIPTS=ON \ -DWITH_SOUNDS=ON \ - -DUSE_QT=OFF \ - -DUSE_QT5=ON \ - -DUSE_QT_QML=OFF \ - -DUSE_GTK=OFF \ - -DUSE_GTK3=ON \ - -DJSONRPC_DAEMON=ON \ + -DWITH_DEV_FILES=ON \ + -DUSE_JS=ON \ -DXMLRPC_DAEMON=OFF \ - -DUSE_CLI_JSONRPC=ON \ - -DUSE_CLI_XMLRPC=OFF \ + -DPERL_REGEX=ON \ -DENABLE_STACKTRACE=ON \ - -DWITH_DEV_FILES=ON + -DJSONRPC_DAEMON=ON \ + -DUSE_CLI_XMLRPC=OFF \ + -DUSE_CLI_JSONRPC=ON \ + -DLOCAL_JSONCPP=OFF \ + -DLOCAL_BOOST=OFF make } package_eiskaltdcpp-core-git() { pkgdesc="EiskaltDC++ Core. (GIT Version)" + pkgver="$(cd eiskaltdcpp; echo "$(git describe --long --tags | tr - . | tr -d v)")" depends=('openssl' 'lua' 'libidn' 'attr' 'boost-libs' 'miniupnpc' + 'pcre' ) provides=("eiskaltdcpp-core=${pkgver}") conflicts=('eiskaltdcpp-core') @@ -119,11 +138,12 @@ package_eiskaltdcpp-core-git() { package_eiskaltdcpp-qt-git() { pkgdesc="Qt5-based DC and ADC client for EiskaltDC++ core. (GIT Version)" + pkgver="$(cd eiskaltdcpp; echo "$(git describe --long --tags | tr - . | tr -d v)")" depends=("eiskaltdcpp-core-git=${pkgver}" "eiskaltdcpp-data-git=${pkgver}" 'aspell' 'qt5-multimedia' - 'qt5-script' + 'qt5-quick1' 'desktop-file-utils' ) optdepends=('php: needed for some scripts') @@ -138,11 +158,11 @@ package_eiskaltdcpp-qt-git() { package_eiskaltdcpp-gtk-git() { pkgdesc="Gtk-based DC and ADC client for EiskaltDC++ core. (GIT Version)" + pkgver="$(cd eiskaltdcpp; echo "$(git describe --long --tags | tr - . | tr -d v)")" depends=("eiskaltdcpp-core-git=${pkgver}" "eiskaltdcpp-data-git=${pkgver}" 'gtk3' 'libnotify' - 'desktop-file-utils' ) provides=('eiskaltdcpp-gtk') conflicts=('eiskaltdcpp-gtk' @@ -155,6 +175,7 @@ package_eiskaltdcpp-gtk-git() { package_eiskaltdcpp-daemon-git() { pkgdesc="DC and ADC daemon for EiskaltDC++ core. (GIT Version)" + pkgver="$(cd eiskaltdcpp; echo "$(git describe --long --tags | tr - . | tr -d v)")" depends=("eiskaltdcpp-core-git=${pkgver}" 'jsoncpp' ) @@ -167,6 +188,7 @@ package_eiskaltdcpp-daemon-git() { package_eiskaltdcpp-cli-git() { arch=('any') pkgdesc="CLI interface for EiskaltDC++ Daemon. (GIT Version)" + pkgver="$(cd eiskaltdcpp; echo "$(git describe --long --tags | tr - . | tr -d v)")" depends=("eiskaltdcpp-daemon-git=${pkgver}" 'perl-json' 'perl-json-rpc' @@ -181,19 +203,37 @@ package_eiskaltdcpp-cli-git() { package_eiskaltdcpp-web-git() { arch=('any') - depends=("eiskaltdcpp-daemon-git=${pkgver}") pkgdesc="Web interface for EiskaltDC++ Daemon. (GIT Version)" + pkgver="$(cd eiskaltdcpp-web; echo "1.0-$(git rev-list --count HEAD).$(git rev-parse --short HEAD)")" + depends=("eiskaltdcpp-daemon-git=${pkgver}" + 'bash' + ) provides=('eiskaltdcpp-web') conflicts=('eiskaltdcpp-web') + backcup=('usr/share/webapps/Eiskaltdcpp-web/config.js') + + _lib=('jquery.js' + 'jquery.easytabs.js' + 'jquery.hashchange.js' + 'jquery.jsonrpc.js' + 'jquery.plugin.js' + 'jquery.timer.js' + 'jquery.tablesorter.js' + 'require.js' + ) + for i in "${_lib[@]}"; do + install -Dm644 "${i}" "${pkgdir}/usr/share/webapps/Eiskaltdcpp-web/js/lib/${i}" + done + cd eiskaltdcpp-web + + find . -type f ! -name 'get-js-dependecies.sh' -exec install -Dm644 {} "${pkgdir}/usr/share/webapps/Eiskaltdcpp-web/"{} \; - cd eiskaltdcpp/eiskaltdcpp-web - sh get-js-dependecies local - find . -type f ! -name get-js-dependecies -exec install -Dm644 {} "${pkgdir}/usr/share/webapps/Eiskaltdcpp-web/"{} \; } package_eiskaltdcpp-data-git() { arch=('any') pkgdesc="EiskaltDC++ common data files. (GIT Version)" + pkgver="$(cd eiskaltdcpp; echo "$(git describe --long --tags | tr - . | tr -d v)")" depends=('bash' 'hicolor-icon-theme' ) |