[arch-commits] Commit in distcc/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Wednesday, January 13, 2021 @ 15:34:59
  Author: arodseth
Revision: 820506

add gtk3 patch for distccmon

Modified:
  distcc/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-13 15:33:27 UTC (rev 820505)
+++ PKGBUILD	2021-01-13 15:34:59 UTC (rev 820506)
@@ -6,7 +6,7 @@
 
 pkgname=distcc
 pkgver=3.3.5
-pkgrel=1
+pkgrel=2
 _gccver=10.2.0 # Current GCC version, used for symlinks. See FS#69044
 pkgdesc='Distributed compilation service for C, C++ and Objective-C'
 arch=(x86_64)
@@ -13,21 +13,25 @@
 url='https://github.com/distcc/distcc'
 license=(GPL)
 depends=(avahi popt python)
-makedepends=(git)
-optdepends=("gcc=$_gccver")
+makedepends=(git gtk3)
+optdepends=("gcc=$_gccver"
+            'gtk3: for distccmon')
 backup=(etc/conf.d/distccd
         etc/distcc/hosts)
 source=("git+$url#commit=8d2a5709d249949e8177dcf08b56dbe7857daa7f" # tag: v3.3.5
         distccd.conf.d
         distccd.service
-        sysusers.conf)
+        sysusers.conf
+        gtk3.patch::https://github.com/distcc/distcc/commit/ff0a09f9e335d26265d8955176df1009ce40f518.patch)
 sha256sums=('SKIP'
             '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
             '360493245590d8c1480ff93cd30c9e81cb86efebacd78e45f37e7d6cdbcc2136'
-            '4e037a6225f498b51d6902d117be979454ac78ec5fd2f65f1d5a38e10859612a')
+            '4e037a6225f498b51d6902d117be979454ac78ec5fd2f65f1d5a38e10859612a'
+            'fa931b9e0356878469a10c647573d8b20ce45a21d77cffbdd56a36983923bcb5')
 
 prepare() {
   cd $pkgname
+  patch -p1 -i "$srcdir/gtk3.patch"
   ./autogen.sh
   sed -i 's/ install-gnome-data//g' Makefile.in
   # FS#66418, support Python 3.9
@@ -43,7 +47,7 @@
     --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
-    --without-gtk
+    --with-gtk
   make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python
 }
 
@@ -52,11 +56,12 @@
     DESTDIR="$pkgdir" \
     INCLUDESERVER_PYTHON=/usr/bin/python \
     install
-  # Configuration
+
   install -Dm644 distccd.conf.d "$pkgdir/etc/conf.d/distccd"
   install -Dm644 distccd.service \
     "$pkgdir/usr/lib/systemd/system/distccd.service"
-  # Symlinks
+
+  # Package symlinks
   _targets=(c++ c89 c99 cc clang clang++ cpp g++ gcc $CARCH-pc-linux-gnu-g++
             $CARCH-pc-linux-gnu-gcc $CARCH-pc-linux-gnu-gcc-$_gccver)
   install -d "$pkgdir/usr/lib/$pkgname/bin"
@@ -66,6 +71,7 @@
     # Needed for makepkg to work
     ln -sf ../../../bin/$pkgname "$pkgdir/usr/lib/$pkgname/bin/$bin"
   done
+
   # FS#67629
   install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd.conf"
 }