community/boinc to 7.6.33-4

community/boinc/PKGBUILD

@@ -11,11 +11,11 @@ pkgbase=boinc
 pkgname=(boinc boinc-nox)
 pkgver=7.6.33
 _tag="client_release/7.6/$pkgver"
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://boinc.berkeley.edu/"
 license=('LGPL')
-makedepends=('libxslt' 'perl-xml-sax' 'git' 'libxss' 'libnotify' 'wxgtk' 'webkitgtk2' 'sqlite3'
+makedepends=('libxslt' 'perl-xml-sax' 'git' 'libxss' 'libnotify' 'wxgtk3' 'webkit2gtk' 'sqlite3'
              'curl' 'inetutils' 'libxmu' 'freeglut' 'glu' 'mesa')
 install=$pkgbase.install
 options=('!staticlibs')
@@ -39,13 +39,18 @@ prepare() {
   patch -Np1 -i "$srcdir"/boinc-AM_CONDITIONAL.patch
   # Fix build with openssl 1.1
   patch -p1 -i ../boinc-openssl-1.1.patch
-
-  ./_autosetup
+  # Build with gtk3
+  sed -i 's/^PKG_CHECK_MODULES(\[GTK2\], \[gtk+-2.0\])$/PKG_CHECK_MODULES([GTK3], [gtk+-3.0])/' configure.ac
 
   cp -r "$srcdir"/${pkgbase}{,-nox}
 
+  ./_autosetup
+
+  # Prepare boinc-nox
+  cd "$srcdir"/$pkgbase-nox
   # Don't force xss
-  sed -i 's/^  enable_xss="yes"$/  enable_xss="no"/' "$srcdir"/boinc-nox/configure
+  sed -i 's/^  enable_xss="yes"$/  enable_xss="no"/' configure.ac
+  ./_autosetup
 }
 
 build() {
@@ -69,7 +74,7 @@ build() {
     --with-ssl \
     --with-x \
     --with-wxdir=/usr/lib \
-    --with-wx-config=$(which wx-config) \
+    --with-wx-config=$(which wx-config-gtk3) \
     ${CONFIG}
   make
 
@@ -94,7 +99,7 @@ build() {
 
 package_boinc() {
   pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop"
-  depends=("libxss" "libnotify" "wxgtk" "webkitgtk2" "curl" "sqlite3")
+  depends=("libxss" "libnotify" "wxgtk3" "webkit2gtk" "curl" "sqlite3")
 
   cd $pkgbase
 

community/boinc/boinc.install

@@ -1,4 +1,7 @@
 post_install() {
+  # We need to know uid and gid to create /var/lib/boinc with proper
+  # permissions. So keep systemd-sysusers invocation here despite having
+  # pacman hooks.
   systemd-sysusers boinc.conf
   mkdir -p var/lib/boinc
   chown -R boinc:boinc var/lib/boinc