mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
www/webkit-gtk[23]: update to 2.4.11
- update to 2.4.11 - fix build with Ruby 2.2 default version (ruby symlink doesn't exist anymore) - replace CPPFLAGS and LDFLAGS by USES= localbase - fix couple of whitespace bugs PR: 208961 PR: 208192 Submitted by: olivierd Reviewed by: kwm With hat: gnome MFH: 2016Q2 (along with r414478) - fix build of webkit-gtk2 on ARM platforms PR: 208569 Reported by: otacilio.neto@bsd.com.br Submitted by: mikael.urankar@gmail.com - fix build of webkit-gtk[23] when GNU binutils is installed PR: 195500 PR: 196333 Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net>
This commit is contained in:
Ruslan Makhmatkhanov
parent
bc8dc724f8
commit
bb3e2777da
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=414649
7 changed files with 38 additions and 23 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= webkit
|
||||
PORTVERSION= 2.4.10
|
||||
PORTVERSION= 2.4.11
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://webkitgtk.org/releases/
|
||||
PKGNAMESUFFIX= -gtk2
|
||||
|
|
@ -27,7 +27,7 @@ PORTSCOUT= limit:1.4.*$$
|
|||
|
||||
USE_GSTREAMER1= yes
|
||||
USE_XORG= xt xdamage xcomposite
|
||||
USES= bison compiler:c++11-lib gettext gmake gperf libtool \
|
||||
USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \
|
||||
perl5 pkgconfig shebangfix sqlite tar:xz
|
||||
USE_RUBY= yes
|
||||
RUBY_NO_RUN_DEPENDS=yes
|
||||
|
|
@ -36,9 +36,8 @@ USE_GL= gl
|
|||
USE_PERL5= build
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ENV= ac_cv_path_DOLT_BASH=""
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ENV= AR=/usr/bin/ar \
|
||||
ac_cv_path_DOLT_BASH=""
|
||||
INSTALL_TARGET= install-strip
|
||||
CONFIGURE_ARGS= --with-gtk=2.0 \
|
||||
--enable-svg-fonts \
|
||||
|
|
@ -51,7 +50,7 @@ MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
|
|||
|
||||
CONFIGURE_ARGS+=--disable-egl \
|
||||
--disable-gles2
|
||||
SHEBANG_FILES= \
|
||||
SHEBANG_FILES= \
|
||||
Source/JavaScriptCore/create_hash_table \
|
||||
Source/JavaScriptCore/inspector/scripts/xxd.pl \
|
||||
Source/WebCore/css/*.pl \
|
||||
|
|
@ -63,7 +62,7 @@ SHEBANG_FILES= \
|
|||
Source/WebCore/bindings/scripts/*.p[lm] \
|
||||
Source/JavaScriptCore/create_hash_table
|
||||
|
||||
BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
|
||||
BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
|
||||
#_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
|
||||
|
||||
OPTIONS_DEFINE= DEBUG FULLDEBUG
|
||||
|
|
@ -92,10 +91,12 @@ CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam
|
|||
CXXFLAGS+= -Qunused-arguments
|
||||
.endif
|
||||
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
|
||||
${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
|
||||
# Since ruby 2.2 there is no ruby symlink
|
||||
@${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \
|
||||
${WRKSRC}/configure
|
||||
@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (webkitgtk-2.4.10.tar.xz) = 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614
|
||||
SIZE (webkitgtk-2.4.10.tar.xz) = 9867504
|
||||
SHA256 (webkitgtk-2.4.11.tar.xz) = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
|
||||
SIZE (webkitgtk-2.4.11.tar.xz) = 9869100
|
||||
|
|
|
|||
12
www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h
Normal file
12
www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
This patch reportedly fixes build for ARM. See PR 208569
|
||||
|
||||
--- Source/WTF/wtf/Platform.h.orig 2016-04-10 06:48:36 UTC
|
||||
+++ Source/WTF/wtf/Platform.h
|
||||
@@ -218,6 +218,7 @@
|
||||
#elif defined(__ARM_ARCH_6__) \
|
||||
|| defined(__ARM_ARCH_6J__) \
|
||||
|| defined(__ARM_ARCH_6K__) \
|
||||
+ || defined(__ARM_ARCH_6KZ__) \
|
||||
|| defined(__ARM_ARCH_6Z__) \
|
||||
|| defined(__ARM_ARCH_6ZK__) \
|
||||
|| defined(__ARM_ARCH_6T2__) \
|
||||
|
|
@ -255,10 +255,10 @@ lib/girepository-1.0/JavaScriptCore-1.0.typelib
|
|||
lib/girepository-1.0/WebKit-1.0.typelib
|
||||
lib/libjavascriptcoregtk-1.0.so
|
||||
lib/libjavascriptcoregtk-1.0.so.0
|
||||
lib/libjavascriptcoregtk-1.0.so.0.16.18
|
||||
lib/libjavascriptcoregtk-1.0.so.0.16.19
|
||||
lib/libwebkitgtk-1.0.so
|
||||
lib/libwebkitgtk-1.0.so.0
|
||||
lib/libwebkitgtk-1.0.so.0.22.16
|
||||
lib/libwebkitgtk-1.0.so.0.22.17
|
||||
libdata/pkgconfig/javascriptcoregtk-1.0.pc
|
||||
libdata/pkgconfig/webkit-1.0.pc
|
||||
share/gir-1.0/JavaScriptCore-1.0.gir
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= webkit
|
||||
PORTVERSION= 2.4.10
|
||||
PORTVERSION= 2.4.11
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://webkitgtk.org/releases/
|
||||
PKGNAMESUFFIX= -gtk3
|
||||
|
|
@ -27,8 +27,8 @@ PORTSCOUT= limit:1.4.*$$
|
|||
|
||||
USE_GSTREAMER1= yes
|
||||
USE_XORG= xt xdamage xcomposite
|
||||
USES= bison compiler:c++11-lib gettext gmake gperf libtool perl5 \
|
||||
pkgconfig shebangfix sqlite tar:xz
|
||||
USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \
|
||||
perl5 pkgconfig shebangfix sqlite tar:xz
|
||||
USE_RUBY= yes
|
||||
RUBY_NO_RUN_DEPENDS=yes
|
||||
USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt
|
||||
|
|
@ -36,9 +36,8 @@ USE_GL= gl
|
|||
USE_PERL5= build
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ENV= ac_cv_path_DOLT_BASH=""
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ENV= AR=/usr/bin/ar \
|
||||
ac_cv_path_DOLT_BASH=""
|
||||
INSTALL_TARGET= install-strip
|
||||
CONFIGURE_ARGS= --with-gtk=3.0 \
|
||||
--enable-svg-fonts \
|
||||
|
|
@ -103,6 +102,9 @@ CXXFLAGS+= -Qunused-arguments
|
|||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
|
||||
${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
|
||||
# Since ruby 2.2 there is no ruby symlink
|
||||
@${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \
|
||||
${WRKSRC}/configure
|
||||
@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (webkitgtk-2.4.10.tar.xz) = 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614
|
||||
SIZE (webkitgtk-2.4.10.tar.xz) = 9867504
|
||||
SHA256 (webkitgtk-2.4.11.tar.xz) = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
|
||||
SIZE (webkitgtk-2.4.11.tar.xz) = 9869100
|
||||
|
|
|
|||
|
|
@ -258,13 +258,13 @@ lib/girepository-1.0/WebKit2-3.0.typelib
|
|||
lib/girepository-1.0/WebKit2WebExtension-3.0.typelib
|
||||
lib/libjavascriptcoregtk-3.0.so
|
||||
lib/libjavascriptcoregtk-3.0.so.0
|
||||
lib/libjavascriptcoregtk-3.0.so.0.16.18
|
||||
lib/libjavascriptcoregtk-3.0.so.0.16.19
|
||||
lib/libwebkit2gtk-3.0.so
|
||||
lib/libwebkit2gtk-3.0.so.25
|
||||
lib/libwebkit2gtk-3.0.so.25.10.13
|
||||
lib/libwebkit2gtk-3.0.so.25.10.14
|
||||
lib/libwebkitgtk-3.0.so
|
||||
lib/libwebkitgtk-3.0.so.0
|
||||
lib/libwebkitgtk-3.0.so.0.22.16
|
||||
lib/libwebkitgtk-3.0.so.0.22.17
|
||||
lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
|
||||
libdata/pkgconfig/javascriptcoregtk-3.0.pc
|
||||
libdata/pkgconfig/webkit2gtk-3.0.pc
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue