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

[Balló György]

    Date: Monday, June 19, 2017 @ 18:54:16
  Author: bgyorgy
Revision: 238739

upgpkg: boinc 7.6.33-4

Use wxgtk3 and webkit2gtk (removes insecure webkitgtk2 dependency)

Modified:
  boinc/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-19 18:53:45 UTC (rev 238738)
+++ PKGBUILD	2017-06-19 18:54:16 UTC (rev 238739)
@@ -7,11 +7,11 @@
 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')
@@ -35,13 +35,18 @@
   patch -Np1 -i "$srcdir"/boinc-AM_CONDITIONAL.patch
   # Fix build with openssl 1.1
   patch -p1 -i ../boinc-openssl-1.1.patch
+  # 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
 
-  cp -r "$srcdir"/${pkgbase}{,-nox}
-
+  # 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() {
@@ -59,7 +64,7 @@
     --with-ssl \
     --with-x \
     --with-wxdir=/usr/lib \
-    --with-wx-config=$(which wx-config)
+    --with-wx-config=$(which wx-config-gtk3)
   make
 
   # Build boinc-nox
@@ -82,7 +87,7 @@
 
 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