4.00beta.3

4 files changed, 23 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 950384a7545a..dced79f98228 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = transmission4
-	pkgver = 4.00beta.2
+	pkgver = 4.00beta.3
 	pkgrel = 1
 	url = http://www.transmissionbt.com/
 	arch = x86_64
@@ -21,14 +21,14 @@ pkgbase = transmission4
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = yarn
-	source = https://github.com/transmission/transmission-releases/raw/master/transmission-4.0.0-beta.2+rbceb368f1b.tar.xz
+	source = https://github.com/transmission/transmission/releases/download/4.0.0-beta.3/transmission-4.0.0-beta.3+r634b1e8fc1.tar.xz
 	source = transmission-cli.sysusers
 	source = transmission-cli.tmpfiles
-	source = cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch
-	sha256sums = 7731d62cbf33326ff759abd9ee7b603a3f74c7c0c0669e0fc9822a37d288623f
+	source = web-outoftree.patch
+	sha256sums = c54b1f7962268995c829a97df801161853582e84eeb608da644258cf0055d5e3
 	sha256sums = 641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2
 	sha256sums = 1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451
-	sha256sums = 0a0afb9a3fb6c7477728b4e13031909c4df937efe16f7051c710ce89ff0d45dc
+	sha256sums = a919f06f2dd51d197ea4c15a3b2c350f8202d62eb34efc219e5ed319ce79513f
 
 pkgname = transmission4-cli
 	pkgdesc = Fast, easy, and free BitTorrent client (CLI tools, daemon and web client) (version 4)
diff --git a/PKGBUILD b/PKGBUILD
index 183911084a68..d09b0dac3b0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 pkgbase=transmission4
 _pkgbase=transmission
 pkgname=(transmission4-cli transmission4-gtk transmission4-qt libtransmission4)
-pkgver=4.00beta.2
-_pkgver=4.0.0-beta.2+rbceb368f1b
+pkgver=4.00beta.3
+_pkgver=4.0.0-beta.3+r634b1e8fc1
 pkgrel=1
 arch=(x86_64)
 url="http://www.transmissionbt.com/"
@@ -30,20 +30,21 @@ makedepends=(
 	ninja
 	yarn
 )
-source=(https://github.com/transmission/transmission-releases/raw/master/transmission-${_pkgver}.tar.xz
+source=(https://github.com/transmission/transmission/releases/download/${_pkgver%+*}/transmission-${_pkgver}.tar.xz
         transmission-cli.sysusers
         transmission-cli.tmpfiles
-        cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch # https://github.com/transmission/transmission/issues/4088
+        web-outoftree.patch # https://github.com/transmission/transmission/issues/4088
 )
-sha256sums=('7731d62cbf33326ff759abd9ee7b603a3f74c7c0c0669e0fc9822a37d288623f'
+sha256sums=('c54b1f7962268995c829a97df801161853582e84eeb608da644258cf0055d5e3'
             '641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2'
             '1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451'
-            '0a0afb9a3fb6c7477728b4e13031909c4df937efe16f7051c710ce89ff0d45dc')
+            'a919f06f2dd51d197ea4c15a3b2c350f8202d62eb34efc219e5ed319ce79513f')
 
 prepare() {
   cd $_pkgbase-$_pkgver
+pwd
 
-  patch -p1 < "$srcdir"/cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch
+  patch -p1 < "$srcdir"/web-outoftree.patch
 }
 
 build() {
diff --git a/cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch b/cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch
deleted file mode 100644
index c60a4e79ef34..000000000000
--- a/cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From cdc7bd2f15c89fdc58bed2208392dd857cd479d5 Mon Sep 17 00:00:00 2001
-From: Andrey Pavlenko <andrey.a.pavlenko@gmail.com>
-Date: Thu, 27 May 2021 03:07:54 +0300
-Subject: [PATCH] Fixed web module build
-
----
- web/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt
-index 71136967cf..bc2e6e742d 100644
---- a/web/CMakeLists.txt
-+++ b/web/CMakeLists.txt
-@@ -68,6 +68,7 @@ add_custom_target(
-   trweb ALL
-   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/package.json" "${CMAKE_CURRENT_BINARY_DIR}/package.json"
-   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/yarn.lock" "${CMAKE_CURRENT_BINARY_DIR}/yarn.lock"
-+  COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/node_modules" "${CMAKE_CURRENT_SOURCE_DIR}/node_modules"
-   COMMAND yarn install
-   COMMAND yarn webpack --config "${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js" --context "${CMAKE_CURRENT_SOURCE_DIR}"
-   BYPRODUCTS
diff --git a/web-outoftree.patch b/web-outoftree.patch
new file mode 100644
index 000000000000..17b3cac74f4e
--- /dev/null
+++ b/web-outoftree.patch
@@ -0,0 +1,10 @@
+--- a/web/CMakeLists.txt	2023-01-05 15:03:34.747159196 +0000
++++ b/web/CMakeLists.txt	2023-01-05 15:22:29.062551182 +0000
+@@ -50,6 +50,7 @@
+ add_custom_target(trweb ALL
+     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/package.json" "${CMAKE_CURRENT_BINARY_DIR}/package.json"
+     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/yarn.lock" "${CMAKE_CURRENT_BINARY_DIR}/yarn.lock"
++    COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/node_modules" "${CMAKE_CURRENT_SOURCE_DIR}/node_modules"
+     COMMAND yarn install
+     COMMAND yarn webpack --config "${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js" --context "${CMAKE_CURRENT_SOURCE_DIR}"
+     BYPRODUCTS