diff options
-rw-r--r-- | .SRCINFO | 29 | ||||
-rw-r--r-- | PKGBUILD | 54 |
2 files changed, 35 insertions, 48 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Fri Mar 15 15:43:41 UTC 2019 pkgbase = eiskaltdcpp-git - pkgdesc = EiskaltDC++: DC and ADC client based on dcpp core. (GIT Version) - pkgver = v2.2.10.394.g3c85c56c + pkgdesc = EiskaltDC++: DC and ADC client based on dcpp core. (GIT version) + pkgver = 2.4.2.15.g10b1a9b6 pkgrel = 1 url = https://github.com/eiskaltdcpp/eiskaltdcpp arch = x86_64 @@ -10,7 +8,7 @@ pkgbase = eiskaltdcpp-git makedepends = git makedepends = cmake makedepends = lua - makedepends = libidn + makedepends = libidn2 makedepends = aspell makedepends = attr makedepends = wget @@ -22,13 +20,12 @@ pkgbase = eiskaltdcpp-git makedepends = qt5-multimedia makedepends = qt5-tools makedepends = qt5-script - makedepends = qt5-quick1 makedepends = qt5-xmlpatterns makedepends = gtk3 makedepends = libnotify makedepends = perl-json-rpc conflicts = eiskaltdcpp - options = !emptydirs + options = debug source = git+https://github.com/eiskaltdcpp/eiskaltdcpp.git sha256sums = SKIP @@ -36,22 +33,21 @@ pkgname = eiskaltdcpp-core-git pkgdesc = EiskaltDC++ Core. (GIT Version) depends = openssl depends = lua - depends = libidn + depends = libidn2 depends = attr depends = boost-libs depends = miniupnpc depends = pcre - provides = eiskaltdcpp-core=v2.2.10.394.g3c85c56c + provides = eiskaltdcpp-core=2.4.2.15.g10b1a9b6 provides = eiskaltdcpp-git conflicts = eiskaltdcpp-core pkgname = eiskaltdcpp-qt-git pkgdesc = Qt5-based DC and ADC client for EiskaltDC++ core. (GIT Version) - depends = eiskaltdcpp-core-git=v2.2.10.394.g3c85c56c - depends = eiskaltdcpp-data-git=v2.2.10.394.g3c85c56c + depends = eiskaltdcpp-core-git=2.4.2.15.g10b1a9b6 + depends = eiskaltdcpp-data-git=2.4.2.15.g10b1a9b6 depends = aspell depends = qt5-multimedia - depends = qt5-quick1 depends = desktop-file-utils optdepends = php: needed for some scripts provides = eiskaltdcpp-qt @@ -61,8 +57,8 @@ pkgname = eiskaltdcpp-qt-git pkgname = eiskaltdcpp-gtk-git pkgdesc = Gtk-based DC and ADC client for EiskaltDC++ core. (GIT Version) - depends = eiskaltdcpp-core-git=v2.2.10.394.g3c85c56c - depends = eiskaltdcpp-data-git=v2.2.10.394.g3c85c56c + depends = eiskaltdcpp-core-git=2.4.2.15.g10b1a9b6 + depends = eiskaltdcpp-data-git=2.4.2.15.g10b1a9b6 depends = gtk3 depends = libnotify provides = eiskaltdcpp-gtk @@ -72,7 +68,7 @@ pkgname = eiskaltdcpp-gtk-git pkgname = eiskaltdcpp-daemon-git pkgdesc = DC and ADC daemon for EiskaltDC++ core. (GIT Version) - depends = eiskaltdcpp-core-git=v2.2.10.394.g3c85c56c + depends = eiskaltdcpp-core-git=2.4.2.15.g10b1a9b6 depends = jsoncpp provides = eiskaltdcpp-daemon conflicts = eiskaltdcpp-daemon @@ -80,7 +76,7 @@ pkgname = eiskaltdcpp-daemon-git pkgname = eiskaltdcpp-cli-git pkgdesc = CLI interface for EiskaltDC++ Daemon. (GIT Version) arch = any - depends = eiskaltdcpp-daemon-git=v2.2.10.394.g3c85c56c + depends = eiskaltdcpp-daemon-git=2.4.2.15.g10b1a9b6 depends = perl-json depends = perl-json-rpc provides = eiskaltdcpp-cli @@ -95,4 +91,3 @@ pkgname = eiskaltdcpp-data-git optdepends = python: test http server provides = eiskaltdcpp-data conflicts = eiskaltdcpp-data - @@ -9,20 +9,18 @@ pkgname=('eiskaltdcpp-core-git' 'eiskaltdcpp-cli-git' 'eiskaltdcpp-data-git' ) -pkgver=v2.2.10.394.g3c85c56c +pkgver=2.4.2.15.g10b1a9b6 pkgrel=1 -pkgdesc="EiskaltDC++: DC and ADC client based on dcpp core. (GIT Version)" +pkgdesc="EiskaltDC++: DC and ADC client based on dcpp core. (GIT version)" license=('GPL3') arch=('x86_64') url='https://github.com/eiskaltdcpp/eiskaltdcpp' conflicts=('eiskaltdcpp') options=('!emptydirs') -source=('git+https://github.com/eiskaltdcpp/eiskaltdcpp.git') -sha256sums=('SKIP') makedepends=('git' 'cmake' 'lua' - 'libidn' + 'libidn2' 'aspell' 'attr' 'wget' @@ -34,7 +32,7 @@ makedepends=('git' 'qt5-multimedia' 'qt5-tools' 'qt5-script' - 'qt5-quick1' +# 'qt5-quick1' 'qt5-xmlpatterns' 'gtk3' 'libnotify' @@ -42,55 +40,49 @@ makedepends=('git' # 'perl-rpc-xml' # 'perl-term-shellui' ) +source=('git+https://github.com/eiskaltdcpp/eiskaltdcpp.git') +sha256sums=('SKIP') +options=('debug') pkgver() { cd eiskaltdcpp - echo "$(git describe --long --tags | tr - .)" -} - -prepare() { - mkdir -p build - - # Fix php dependency - find . -type f -name '*.php' -exec sed 's|php5|php|g' -i '{}' \; + echo "$(git describe --long --tags | tr - . | tr -d v)" } build() { - cd build - cmake ../eiskaltdcpp \ + cmake -S eiskaltdcpp -B build \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUA_SCRIPT=ON \ -DUSE_QT5=ON \ - -DUSE_QT_QML=ON \ + -DUSE_QT_QML=OFF \ -DUSE_QT_SQLITE=ON \ -DUSE_GTK3=ON \ - -DLUA_SCRIPT=ON \ -DUSE_MINIUPNP=ON \ - -DLOCAL_MINIUPNP=OFF \ -DUSE_ASPELL=ON \ -DUSE_LIBNOTIFY=ON \ + -DUSE_JS=ON \ + -DUSE_CLI_XMLRPC=OFF \ + -DUSE_CLI_JSONRPC=ON \ -DWITH_LUASCRIPTS=ON \ -DWITH_SOUNDS=ON \ -DWITH_DEV_FILES=ON \ - -DUSE_JS=ON \ -DXMLRPC_DAEMON=OFF \ -DPERL_REGEX=ON \ -DENABLE_STACKTRACE=ON \ -DJSONRPC_DAEMON=ON \ - -DUSE_CLI_XMLRPC=OFF \ - -DUSE_CLI_JSONRPC=ON \ -DLOCAL_JSONCPP=OFF \ - -DLOCAL_BOOST=OFF + -DINSTALL_QT_TRANSLATIONS=ON - make + cmake --build build } package_eiskaltdcpp-core-git() { pkgdesc="EiskaltDC++ Core. (GIT Version)" depends=('openssl' 'lua' - 'libidn' + 'libidn2' 'attr' 'boost-libs' 'miniupnpc' @@ -106,7 +98,7 @@ package_eiskaltdcpp-core-git() { 'eiskaltdcpp-daemon-git: EiskaltDC++ Daemon' ) - make -C build/dcpp DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --build build/dcpp --target install } package_eiskaltdcpp-qt-git() { @@ -115,7 +107,7 @@ package_eiskaltdcpp-qt-git() { "eiskaltdcpp-data-git=${pkgver}" 'aspell' 'qt5-multimedia' - 'qt5-quick1' +# 'qt5-quick1' 'desktop-file-utils' ) optdepends=('php: needed for some scripts') @@ -125,7 +117,7 @@ package_eiskaltdcpp-qt-git() { 'eiskaltdcpp-qt5' ) - make -C build/eiskaltdcpp-qt DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --build build/eiskaltdcpp-qt --target install } package_eiskaltdcpp-gtk-git() { @@ -141,7 +133,7 @@ package_eiskaltdcpp-gtk-git() { 'eiskaltdcpp-gtk3' ) - make -C build/eiskaltdcpp-gtk DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --build build/eiskaltdcpp-gtk --target install } package_eiskaltdcpp-daemon-git() { @@ -152,7 +144,7 @@ package_eiskaltdcpp-daemon-git() { provides=('eiskaltdcpp-daemon') conflicts=('eiskaltdcpp-daemon') - make -C build/eiskaltdcpp-daemon DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --build build/eiskaltdcpp-daemon --target install } package_eiskaltdcpp-cli-git() { @@ -167,7 +159,7 @@ package_eiskaltdcpp-cli-git() { provides=('eiskaltdcpp-cli') conflicts=('eiskaltdcpp-cli') - make -C build/eiskaltdcpp-cli DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --build build/eiskaltdcpp-cli --target install } package_eiskaltdcpp-data-git() { |