summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD136
2 files changed, 68 insertions, 86 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 37d8fcc603c9..a78889e518d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = transmission-cli-git
pkgdesc = Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)
- pkgver = 4.0.0.beta.1.r6.gaeaa6ca52
+ pkgver = 4.0.0.beta.3.r2.gcc4cbff04
pkgrel = 1
url = http://www.transmissionbt.com/
arch = x86_64
@@ -18,20 +18,19 @@ pkgbase = transmission-cli-git
depends = libnatpmp
depends = libdeflate
depends = libpsl
- depends = fmt
- depends = fast_float
depends = libutp
provides = transmission-cli
conflicts = transmission-cli
replaces = transmission-cli
- source = transmission::git+https://github.com/transmission/transmission.git
+ source = git+https://github.com/transmission/transmission.git
source = transmission-cli.sysusers
source = transmission-cli.tmpfiles
- source = arc4::git+https://github.com/transmission/arc4
- source = googletest::git+https://github.com/google/googletest.git
- source = utfcpp::git+https://github.com/transmission/utfcpp#branch=post-3.2.1-transmission
- source = libutp::git+https://github.com/transmission/libutp#branch=post-3.4-transmission
- source = wide-integer::git+https://github.com/transmission/wide-integer.git
+ source = git+https://github.com/google/googletest.git
+ source = git+https://github.com/transmission/utfcpp#branch=post-3.2.1-transmission
+ source = git+https://github.com/transmission/libutp#branch=post-3.4-transmission
+ source = git+https://github.com/transmission/fmt#branch=9-x-y
+ source = git+https://github.com/transmission/fast_float.git
+ source = git+https://github.com/transmission/wide-integer.git
sha256sums = SKIP
sha256sums = 641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2
sha256sums = 1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451
@@ -40,5 +39,6 @@ pkgbase = transmission-cli-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
+ sha256sums = SKIP
pkgname = transmission-cli-git
diff --git a/PKGBUILD b/PKGBUILD
index 22ea5dc34149..c721ac57951a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,110 +6,92 @@
_pkgbase=transmission
_pkgname=transmission-cli
pkgname=transmission-cli-git
-pkgver=4.0.0.beta.1.r6.gaeaa6ca52
+pkgver=4.0.0.beta.3.r2.gcc4cbff04
pkgrel=1
arch=(x86_64 armv7h)
url="http://www.transmissionbt.com/"
license=(MIT)
pkgdesc='Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)'
-depends=(curl libevent libsystemd miniupnpc dht libb64 libnatpmp libdeflate libpsl fmt fast_float libutp)
+depends=(curl libevent libsystemd miniupnpc dht libb64 libnatpmp libdeflate libpsl libutp)
makedepends=(cmake publicsuffix-list git)
conflicts=(transmission-cli)
replaces=(transmission-cli)
provides=(transmission-cli)
-source=(transmission::git+https://github.com/transmission/transmission.git
+source=("git+https://github.com/transmission/transmission.git"
transmission-cli.sysusers
transmission-cli.tmpfiles
- "arc4"::"git+https://github.com/transmission/arc4"
- "googletest"::"git+https://github.com/google/googletest.git"
- "utfcpp"::"git+https://github.com/transmission/utfcpp#branch=post-3.2.1-transmission"
- "libutp"::"git+https://github.com/transmission/libutp#branch=post-3.4-transmission"
- "wide-integer"::"git+https://github.com/transmission/wide-integer.git")
- #"$_pkgbase/third-party/libnatpmp"::"git+https://github.com/transmission/libnatpmp#branch=post-20151025-transmission"
- #"$_pkgbase/third-party/miniupnpc"::"git+https://github.com/transmission/miniupnpc#branch=post-2.0.20170509-transmission"
- #"$_pkgbase/third-party/libdeflate"::"git+https://github.com/transmission/libdeflate#branch=v1.11-plus-cmake"
- #"$_pkgbase/third-party/libpsl"::"git+https://github.com/transmission/libpsl.git#branch=post-3.0.0-transmission"
- #"$_pkgbase/third-party/fmt"::"git+https://github.com/transmission/fmt.git"
- #"$_pkgbase/third-party/fast_float"::"git+https://github.com/transmission/fast_float"
- #"$_pkgbase/third-party/dht"::"git+https://github.com/transmission/dht#branch=post-0.27-transmission"
- #"$_pkgbase/third-party/libb64"::"git+https://github.com/transmission/libb64#branch=post-1.2.1-transmission"
- #"$_pkgbase/third-party/libevent"::"git+https://github.com/transmission/libevent#branch=post-2.0.22-transmission"
+ "git+https://github.com/google/googletest.git"
+ "git+https://github.com/transmission/utfcpp#branch=post-3.2.1-transmission"
+ "git+https://github.com/transmission/libutp#branch=post-3.4-transmission"
+ "git+https://github.com/transmission/fmt#branch=9-x-y"
+ "git+https://github.com/transmission/fast_float.git"
+ "git+https://github.com/transmission/wide-integer.git")
sha256sums=('SKIP'
- '641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2'
- '1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP')
+ '641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2'
+ '1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
pkgver() {
- cd $_pkgbase
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ cd $_pkgbase
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
- cd $_pkgbase/third-party
- if [ -e arc4 ]; then
- rm -r arc4
- fi
- ln -s $srcdir/arc4 arc4
+ cd $_pkgbase
+ git submodule init
+ git config submodule.third-party/googletest.url "$srcdir/googletest"
+ git config submodule.third-party/utfcpp.url "$srcdir/utfcpp"
+ git config submodule.third-party/libutp.url "$srcdir/libutp"
+ git config submodule.third-party/fmt.url "$srcdir/fmt"
+ git config submodule.third-party/fast_float.url "$srcdir/fast_float"
+ git config submodule.third-party/wide-integer.url "$srcdir/wide-integer"
- if [ -e googletest ]; then
- rm -r googletest
- fi
- ln -s $srcdir/googletest googletest
-
- if [ -e utfcpp ]; then
- rm -r utfcpp
- fi
- ln -s $srcdir/utfcpp utfcpp
-
- if [ -e libutp ]; then
- rm -r libutp
- fi
- ln -s $srcdir/libutp libutp
-
- if [ -e wide-integer ]; then
- rm -r wide-integer
- fi
- ln -s $srcdir/wide-integer wide-integer
-
-# git submodule update --init
+ git -c protocol.file.allow=always submodule update \
+ third-party/googletest \
+ third-party/utfcpp \
+ third-party/libutp \
+ third-party/fmt \
+ third-party/fast_float \
+ third-party/wide-integer
}
build() {
- cd $_pkgbase
+ cd $_pkgbase
- mkdir -p build
- cd build
+ mkdir -p build
+ cd build
- cmake .. \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DENABLE_CLI=ON \
- -DENABLE_GTK=OFF \
- -DENABLE_QT=OFF \
- -DENABLE_WEB=OFF \
- -DINSTALL_LIB=ON \
- -DUSE_SYSTEM_UTP=OFF \
- -DUSE_SYSTEM_DHT=ON \
- -DUSE_SYSTEM_B64=ON \
- -DUSE_SYSTEM_NATPMP=ON
+ cmake .. \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DENABLE_CLI=ON \
+ -DENABLE_GTK=OFF \
+ -DENABLE_QT=OFF \
+ -DENABLE_WEB=OFF \
+ -DINSTALL_LIB=ON \
+ -DUSE_SYSTEM_UTP=OFF \
+ -DUSE_SYSTEM_DHT=ON \
+ -DUSE_SYSTEM_B64=ON \
+ -DUSE_SYSTEM_NATPMP=ON
- make
+ make
}
package() {
- cd $_pkgbase/build
- make DESTDIR="$pkgdir" install
+ cd $_pkgbase/build
+ make DESTDIR="$pkgdir" install
- install -Dm644 ../daemon/transmission-daemon.service \
- "$pkgdir/usr/lib/systemd/system/transmission.service"
- install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
+ install -Dm644 ../daemon/transmission-daemon.service \
+ "$pkgdir/usr/lib/systemd/system/transmission.service"
+ install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
- install -Dm644 "$srcdir/$_pkgname.sysusers" \
- "$pkgdir/usr/lib/sysusers.d/transmission.conf"
- install -Dm644 "$srcdir/$_pkgname.tmpfiles" \
- "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
+ install -Dm644 "$srcdir/$_pkgname.sysusers" \
+ "$pkgdir/usr/lib/sysusers.d/transmission.conf"
+ install -Dm644 "$srcdir/$_pkgname.tmpfiles" \
+ "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
}