Rebuild after vte and f34 branch update

Also changed the order of the patches being applied.
Please report any new errors. I haven't found any.

2 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43bbb2787182..21bd60b3a7f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-terminal-fedora
 	pkgdesc = The GNOME Terminal Emulator with Fedora patches
 	pkgver = 3.38.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://wiki.gnome.org/Apps/Terminal
 	arch = i686
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = gnome-terminal-fedora
 	makedepends = gconf
 	makedepends = vala
 	makedepends = yelp-tools
-	depends = vte3-notification>=0.62.1
+	depends = vte3-notification>=0.62.3
 	depends = gsettings-desktop-schemas
 	depends = dconf
 	optdepends = gconf: for gnome-terminal-migration
@@ -25,10 +25,10 @@ pkgbase = gnome-terminal-fedora
 	conflicts = gnome-terminal
 	options = !emptydirs
 	source = https://download.gnome.org/sources/gnome-terminal/3.38/gnome-terminal-3.38.1.tar.xz
-	source = 0001-build-Don-t-treat-warnings-as-errors.patch-347377a4ef5dee86237b52e9f70620e338c1fdc9::https://src.fedoraproject.org/rpms/gnome-terminal/raw/347377a4ef5dee86237b52e9f70620e338c1fdc9/f/0001-build-Don-t-treat-warnings-as-errors.patch
-	source = gnome-terminal-cntr-ntfy-autottl-ts.patch-347377a4ef5dee86237b52e9f70620e338c1fdc9::https://src.fedoraproject.org/rpms/gnome-terminal/raw/347377a4ef5dee86237b52e9f70620e338c1fdc9/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
-	source = gnome-terminal-backports-from-upstream.patch-347377a4ef5dee86237b52e9f70620e338c1fdc9::https://src.fedoraproject.org/rpms/gnome-terminal/raw/f33/f/gnome-terminal-backports-from-upstream.patch
-	source = org.gnome.Terminal.gschema.override-347377a4ef5dee86237b52e9f70620e338c1fdc9::https://src.fedoraproject.org/rpms/gnome-terminal/raw/347377a4ef5dee86237b52e9f70620e338c1fdc9/f/org.gnome.Terminal.gschema.override
+	source = 0001-build-Don-t-treat-warnings-as-errors.patch-9bd5071a07c839d3ab0571e361be1bcadea4a70a::https://src.fedoraproject.org/rpms/gnome-terminal/raw/9bd5071a07c839d3ab0571e361be1bcadea4a70a/f/0001-build-Don-t-treat-warnings-as-errors.patch
+	source = gnome-terminal-cntr-ntfy-autottl-ts.patch-9bd5071a07c839d3ab0571e361be1bcadea4a70a::https://src.fedoraproject.org/rpms/gnome-terminal/raw/9bd5071a07c839d3ab0571e361be1bcadea4a70a/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+	source = gnome-terminal-backports-from-upstream.patch-9bd5071a07c839d3ab0571e361be1bcadea4a70a::https://src.fedoraproject.org/rpms/gnome-terminal/raw/f33/f/gnome-terminal-backports-from-upstream.patch
+	source = org.gnome.Terminal.gschema.override-9bd5071a07c839d3ab0571e361be1bcadea4a70a::https://src.fedoraproject.org/rpms/gnome-terminal/raw/9bd5071a07c839d3ab0571e361be1bcadea4a70a/f/org.gnome.Terminal.gschema.override
 	sha256sums = d998d4824f38847fdd74bad6b5f09cc8e11b9de8e2a284a439af290714ddf3d1
 	sha256sums = 672615edf1f8e5ede72bdfa2e671ad35d355a1df64f349762899ad7bc7254769
 	sha256sums = 4ef6493b604505cb2005a851b152d7bfece167bb1262e1ea2bcbddda1cec977f
diff --git a/PKGBUILD b/PKGBUILD
index e9ec83a9f64f..88bf5fb652b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@
 _pkgname='gnome-terminal'
 pkgname="${_pkgname}-fedora"
 pkgver=3.38.1
-pkgrel=3
+pkgrel=4
 pkgdesc='The GNOME Terminal Emulator with Fedora patches'
 arch=('i686' 'x86_64')
 url='https://wiki.gnome.org/Apps/Terminal'
 license=('GPL')
-depends=('vte3-notification>=0.62.1' 'gsettings-desktop-schemas' 'dconf')
+depends=('vte3-notification>=0.62.3' 'gsettings-desktop-schemas' 'dconf')
 makedepends=('intltool' 'itstool' 'docbook-xsl' 'libnautilus-extension' 
              'appdata-tools' 'gnome-shell' 'gconf' 'vala' 'yelp-tools')
 optdepends=('gconf: for gnome-terminal-migration'
@@ -23,17 +23,17 @@ options=('!emptydirs')
 groups=('gnome')
 # Fedora patches: https://src.fedoraproject.org/cgit/rpms/gnome-terminal.git/tree/
 _frepourl='https://src.fedoraproject.org/rpms/gnome-terminal'
-_frepobranch='f33'
-_fcommit='347377a4ef5dee86237b52e9f70620e338c1fdc9'
-_fpatchfile1='0001-build-Don-t-treat-warnings-as-errors.patch'
-_fpatchfile2='gnome-terminal-cntr-ntfy-autottl-ts.patch'
-_fpatchfile3='gnome-terminal-backports-from-upstream.patch'
+_frepobranch='f34'
+_fcommit='9bd5071a07c839d3ab0571e361be1bcadea4a70a'
+_fpatchfile100='0001-build-Don-t-treat-warnings-as-errors.patch'
+_fpatchfile101='gnome-terminal-cntr-ntfy-autottl-ts.patch'
+_fpatchfile000='gnome-terminal-backports-from-upstream.patch'
 _fgsoverridefile='org.gnome.Terminal.gschema.override'
 source=(
 	"https://download.gnome.org/sources/${_pkgname}/${pkgver::4}/${_pkgname}-${pkgver}.tar.xz"
-	"${_fpatchfile1}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile1}"
-	"${_fpatchfile2}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile2}"
-	"${_fpatchfile3}-${_fcommit}::${_frepourl}/raw/${_frepobranch}/f/${_fpatchfile3}"
+	"${_fpatchfile100}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile100}"
+	"${_fpatchfile101}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile101}"
+	"${_fpatchfile000}-${_fcommit}::${_frepourl}/raw/${_frepobranch}/f/${_fpatchfile000}"
 	"${_fgsoverridefile}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fgsoverridefile}"
 )
 sha256sums=('d998d4824f38847fdd74bad6b5f09cc8e11b9de8e2a284a439af290714ddf3d1'
@@ -45,9 +45,9 @@ sha256sums=('d998d4824f38847fdd74bad6b5f09cc8e11b9de8e2a284a439af290714ddf3d1'
 prepare () {
 	cd "${_pkgname}-${pkgver}"
 
-	patch -p1 -i "../${_fpatchfile3}-${_fcommit}"
-	patch -p1 -i "../${_fpatchfile1}-${_fcommit}"
-	patch -p1 -i "../${_fpatchfile2}-${_fcommit}"
+	patch -p1 -i "../${_fpatchfile000}-${_fcommit}"
+	patch -p1 -i "../${_fpatchfile101}-${_fcommit}"
+	patch -p1 -i "../${_fpatchfile100}-${_fcommit}"
 
 	autoreconf -fvi
 }
@@ -58,7 +58,9 @@ build() {
 	            --sysconfdir='/etc' \
 	            --localstatedir='/var' \
 	            --libexecdir="/usr/lib/${_pkgname}" \
+	            --disable-silent-rules \
 	            --disable-static \
+	            --with-gtk=3.0 \
 	            --with-nautilus-extension
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 	make