Thursday, June 01, 2017

www/ruby-capybara-webkit fix

This should fix www/ruby-capybara-webkit. It makes it build for me on
amd64. OKs?

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-capybara-webkit/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 26 May 2017 15:43:18 -0000 1.17
+++ Makefile 1 Jun 2017 16:32:28 -0000
@@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2017/05/26 15:43:18 ajacoutot Exp $

-BROKEN = unrecognized command line option "-std=gnu++0x"
-
COMMENT = capybara driver that uses WebKit

DISTNAME = capybara-webkit-1.11.1
-REVISION = 2
+REVISION = 3
CATEGORIES = www

HOMEPAGE= https://github.com/thoughtbot/capybara-webkit
@@ -13,8 +11,11 @@ HOMEPAGE= https://github.com/thoughtbot/
# MIT
PERMIT_PACKAGE_CDROM = Yes

-MODULES = lang/ruby
+MODULES = lang/ruby gcc4
CONFIGURE_STYLE = ruby gem ext
+
+MODGCC4_ARCHS = amd64 i386
+MODGCC4_LANGS = c++

USE_WXNEEDED = Yes
MAKE_ENV = QMAKE=qmake-qt5 LDFLAGS="-Wl,-z,wxneeded"
Index: patches/patch-src_webkit_server_pro
===================================================================
RCS file: /cvs/ports/www/ruby-capybara-webkit/patches/patch-src_webkit_server_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_webkit_server_pro
--- patches/patch-src_webkit_server_pro 23 Sep 2016 15:25:23 -0000 1.1
+++ patches/patch-src_webkit_server_pro 24 Mar 2017 06:01:33 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_webkit_server_pro,v 1.1 2016/09/23 15:25:23 jeremy Exp $
--- src/webkit_server.pro.orig Wed May 4 06:52:17 2016
-+++ src/webkit_server.pro Tue Sep 20 15:03:47 2016
++++ src/webkit_server.pro Thu Mar 23 23:01:28 2017
@@ -1,6 +1,9 @@
TEMPLATE = app
TARGET = webkit_server
@@ -11,3 +11,12 @@ $OpenBSD: patch-src_webkit_server_pro,v
PROJECT_DIR = $$_PRO_FILE_PWD_
BUILD_DIR = $${PROJECT_DIR}/build
PRECOMPILED_DIR = $${BUILD_DIR}
+@@ -189,7 +192,7 @@ lessThan(QT_MAJOR_VERSION, 5) {
+ error(At least Qt 4.8.0 is required to run capybara-webkit.)
+ }
+ }
+-CONFIG += console precompile_header
++CONFIG += console
+ CONFIG -= app_bundle
+ PRECOMPILED_HEADER = stable.h
+

No comments:

Post a Comment