Update PKGBUILD and force a rebuild

2 files changed, 44 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21bd60b3a7f2..cc8fe757d54b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = gnome-terminal-fedora
 	pkgdesc = The GNOME Terminal Emulator with Fedora patches
 	pkgver = 3.38.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://wiki.gnome.org/Apps/Terminal
 	arch = i686
 	arch = x86_64
 	groups = gnome
 	license = GPL
+	depends = vte3-notification>=0.62.3
+	depends = gsettings-desktop-schemas
+	makedepends = git
+	makedepends = appstream-glib
+	makedepends = docbook-xsl
 	makedepends = intltool
 	makedepends = itstool
-	makedepends = docbook-xsl
 	makedepends = libnautilus-extension
-	makedepends = appdata-tools
 	makedepends = gnome-shell
-	makedepends = gconf
 	makedepends = vala
 	makedepends = yelp-tools
-	depends = vte3-notification>=0.62.3
-	depends = gsettings-desktop-schemas
-	depends = dconf
 	optdepends = gconf: for gnome-terminal-migration
 	optdepends = libnautilus-extension: for "Open Terminal Here" in GNOME Files
 	provides = gnome-terminal=3.38.1
diff --git a/PKGBUILD b/PKGBUILD
index 88bf5fb652b0..4bfac25c7135 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,20 +7,30 @@
 _pkgname='gnome-terminal'
 pkgname="${_pkgname}-fedora"
 pkgver=3.38.1
-pkgrel=4
+pkgrel=5
 pkgdesc='The GNOME Terminal Emulator with Fedora patches'
-arch=('i686' 'x86_64')
+arch=('i686'
+      'x86_64')
 url='https://wiki.gnome.org/Apps/Terminal'
 license=('GPL')
-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')
+depends=('vte3-notification>=0.62.3'
+         'gsettings-desktop-schemas')
+makedepends=('git'
+             'appstream-glib'
+             'docbook-xsl'
+             'intltool'
+             'itstool'
+             'libnautilus-extension'
+             'gnome-shell'
+             'vala'
+             'yelp-tools')
 optdepends=('gconf: for gnome-terminal-migration'
-			'libnautilus-extension: for "Open Terminal Here" in GNOME Files')
+            'libnautilus-extension: for "Open Terminal Here" in GNOME Files')
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
 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='f34'
@@ -29,6 +39,7 @@ _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"
 	"${_fpatchfile100}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile100}"
@@ -43,38 +54,37 @@ sha256sums=('d998d4824f38847fdd74bad6b5f09cc8e11b9de8e2a284a439af290714ddf3d1'
             'a4a22834d6524fb697a8edf91c9489617d5ab2e513413fc84c6b8575320938f9')
 
 prepare () {
-	cd "${_pkgname}-${pkgver}"
+    cd "${_pkgname}-${pkgver}"
 
-	patch -p1 -i "../${_fpatchfile000}-${_fcommit}"
-	patch -p1 -i "../${_fpatchfile101}-${_fcommit}"
-	patch -p1 -i "../${_fpatchfile100}-${_fcommit}"
+    patch -p1 -i "../${_fpatchfile000}-${_fcommit}"
+    patch -p1 -i "../${_fpatchfile101}-${_fcommit}"
+    patch -p1 -i "../${_fpatchfile100}-${_fcommit}"
 
-	autoreconf -fvi
+    NOCONFIGURE=1 autoreconf -fvi
 }
 
 build() {
-	cd "${_pkgname}-${pkgver}"
-	LDFLAGS+=" -pthread" ./configure --prefix='/usr' \
-	            --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
+    cd "${_pkgname}-${pkgver}"
+    ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --localstatedir=/var \
+                --libexecdir=/usr/lib/${_pkgname} \
+                --disable-silent-rules \
+                --disable-static \
+                --with-nautilus-extension
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+    make
 }
 
 check() {
-	cd "${_pkgname}-${pkgver}"
-	make check
+    cd "${_pkgname}-${pkgver}"
+    make check
 }
 
 package() {
-	cd "${_pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+    cd "${_pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
 
-	install -Dm644 "../${_fgsoverridefile}-${_fcommit}" \
-		"${pkgdir}/usr/share/glib-2.0/schemas/${_fgsoverridefile}"
+    install -Dm644 "../${_fgsoverridefile}-${_fcommit}" \
+    "${pkgdir}/usr/share/glib-2.0/schemas/${_fgsoverridefile}"
 }