Switch to master branch

2 files changed, 9 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e522d6065907..17e96612d418 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qutebrowser-qt6-git
 	pkgdesc = A keyboard-driven, vim-like browser based on PyQt5 (Qt 6 branch)
-	pkgver = 2.5.1.r258.g64e8c7132
+	pkgver = 2.5.4.r929.gcb9f3fa14
 	pkgrel = 1
 	url = https://www.qutebrowser.org/
 	arch = any
@@ -19,7 +19,7 @@ pkgbase = qutebrowser-qt6-git
 	conflicts = qutebrowser
 	conflicts = qutebrowser-git
 	options = !emptydirs
-	source = git+https://github.com/qutebrowser/qutebrowser.git#branch=qt6-v2
+	source = git+https://github.com/qutebrowser/qutebrowser.git
 	sha256sums = SKIP
 
 pkgname = qutebrowser-qt6-git
diff --git a/PKGBUILD b/PKGBUILD
index 64b287fe14c2..1637ea1acc35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # vim: set ts=4 sw=4 et ft=sh:
 
 pkgname=qutebrowser-qt6-git
-pkgver=2.5.1.r258.g64e8c7132
+pkgver=2.5.4.r929.gcb9f3fa14
 pkgrel=1
 pkgdesc="A keyboard-driven, vim-like browser based on PyQt5 (Qt 6 branch)"
 arch=("any")
@@ -17,7 +17,7 @@ optdepends=("python-adblock: ABP-style adblocking"
 options=(!emptydirs)
 conflicts=('qutebrowser' 'qutebrowser-git')
 provides=('qutebrowser')
-source=('git+https://github.com/qutebrowser/qutebrowser.git#branch=qt6-v2')
+source=('git+https://github.com/qutebrowser/qutebrowser.git')
 sha256sums=('SKIP')
 
 pkgver() {
@@ -27,6 +27,11 @@ pkgver() {
     printf '%s.r%s.g%s' "${_tag#v}" "$(git rev-list "$_tag"..HEAD --count)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+    cd "$srcdir/qutebrowser"
+    sed -i 's/_DEFAULT_WRAPPER = "PyQt5"/_DEFAULT_WRAPPER = "PyQt6"/' qutebrowser/qt/machinery.py
+}
+
 build() {
     cd "$srcdir/qutebrowser"
     python scripts/asciidoc2html.py