Index: head/www/webkit-gtk2/Makefile =================================================================== --- head/www/webkit-gtk2/Makefile (revision 449648) +++ head/www/webkit-gtk2/Makefile (revision 449649) @@ -1,114 +1,114 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.4.11 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk2 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 2 toolkit BUILD_DEPENDS= gtkdoc-rebase:textproc/gtk-doc \ p5-Switch>0:lang/p5-Switch \ python:lang/python \ geoclue>=0:net/geoclue LIB_DEPENDS= libenchant.so:textproc/enchant \ libsecret-1.so:security/libsecret \ libicutu.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng16.so:graphics/png \ libwebp.so:graphics/webp \ libcurl.so:ftp/curl \ libsoup-2.4.so:devel/libsoup \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgstbase-1.0.so:multimedia/gstreamer1 \ libgstreamer-1.0.so:multimedia/gstreamer1 RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limit:^2\.4\. USE_GSTREAMER1= yes USE_XORG= x11 xcomposite xdamage xfixes xrender xt USES= bison compiler:c++11-lib gettext gmake gperf jpeg libtool \ localbase pathfix perl5 pkgconfig shebangfix sqlite tar:xz PATHFIX_MAKEFILEIN= GNUmakefile.in USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gdkpixbuf2 gtk20 introspection:build libxslt USE_GL= gl USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= AR=/usr/bin/ar \ ac_cv_path_DOLT_BASH="" INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-gtk=2.0 \ --enable-svg-fonts \ --enable-geolocation \ --enable-introspection \ --disable-webkit2 \ --with-html-dir=${PREFIX}/share/gtk-doc/html/webkit1 MAKEFILE= GNUmakefile MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} CONFIGURE_ARGS+=--disable-egl \ --disable-gles2 SHEBANG_FILES= \ Source/JavaScriptCore/create_hash_table \ Source/JavaScriptCore/inspector/scripts/xxd.pl \ Source/WebCore/css/*.pl \ Source/WebCore/dom/*.pl \ Source/WebCore/make-hash-tools.pl \ Source/WebCore/page/make_settings.pl \ Source/WebCore/platform/text/mac/make-charset-table.pl \ Source/WebKit2/Scripts/generate-forwarding-headers.pl \ Source/WebCore/bindings/scripts/*.p[lm] \ Source/JavaScriptCore/create_hash_table BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= DEBUG FULLDEBUG DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_ON= --enable-debug-symbols=yes DEBUG_CONFIGURE_OFF= --disable-debug-symbols .include .if ${ARCH} == powerpc64 || ${ARCH} == powerpc || ${ARCH} == sparc64 CONFIGURE_ARGS+= --disable-jit CFLAGS+= -DENABLE_YARR_JIT=0 .endif .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .include .if ${CHOSEN_COMPILER_TYPE} == clang 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 post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \ ${STAGEDIR}${PREFIX}/bin/GtkLauncher-1 .include Index: head/www/webkit-gtk2/files/patch-icu59 =================================================================== --- head/www/webkit-gtk2/files/patch-icu59 (nonexistent) +++ head/www/webkit-gtk2/files/patch-icu59 (revision 449649) @@ -0,0 +1,64 @@ +------------------------------------------------------------------------ +r216187 | annulen@yandex.ru | 2017-05-05 00:33:41 +0900 (Fri, 05 May 2017) | 28 lines + +Fix compilation with ICU 59.1 +https://bugs.webkit.org/show_bug.cgi?id=171612 + +Reviewed by Mark Lam. + +ICU 59.1 has broken source compatibility. Now it defines UChar as +char16_t, which does not allow automatic type conversion from unsigned +short in C++ code. + +--- Source/JavaScriptCore/API/JSStringRef.cpp.orig 2016-04-10 06:48:36 UTC ++++ Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +--- Source/JavaScriptCore/runtime/DateConversion.cpp.orig 2013-08-03 16:10:38 UTC ++++ Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, Date + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +--- Source/WebKit2/Shared/API/c/WKString.cpp.orig 2016-04-10 06:48:37 UTC ++++ Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) Property changes on: head/www/webkit-gtk2/files/patch-icu59 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-gtk3/Makefile =================================================================== --- head/www/webkit-gtk3/Makefile (revision 449648) +++ head/www/webkit-gtk3/Makefile (revision 449649) @@ -1,115 +1,115 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.4.11 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk3 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit BUILD_DEPENDS= gtkdoc-rebase:textproc/gtk-doc \ p5-Switch>0:lang/p5-Switch \ python:lang/python \ geoclue>=0:net/geoclue LIB_DEPENDS= libenchant.so:textproc/enchant \ libsecret-1.so:security/libsecret \ libicutu.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libwebp.so:graphics/webp \ libcurl.so:ftp/curl \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limit:^2\.4\. USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \ pathfix perl5 pkgconfig shebangfix sqlite tar:xz PATHFIX_MAKEFILEIN= GNUmakefile.in USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt USE_GL= gl USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= AR=/usr/bin/ar \ ac_cv_path_DOLT_BASH="" INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-gtk=3.0 \ --enable-svg-fonts \ --enable-geolocation \ --enable-webkit2 \ --enable-introspection MAKEFILE= GNUmakefile MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} BROKEN_sparc64= fails to detect working compiler CONFIGURE_ARGS+=--disable-egl \ --disable-gles2 # --with-acceleration-backend=opengl # clutter broken? # opengl, clutter, none (clutter unsupported) SHEBANG_FILES= \ Source/JavaScriptCore/create_hash_table \ Source/JavaScriptCore/inspector/scripts/xxd.pl \ Source/WebCore/css/*.pl \ Source/WebCore/dom/*.pl \ Source/WebCore/make-hash-tools.pl \ Source/WebCore/page/make_settings.pl \ Source/WebCore/platform/text/mac/make-charset-table.pl \ Source/WebKit2/Scripts/generate-forwarding-headers.pl \ Source/WebCore/bindings/scripts/*.p[lm] \ Source/JavaScriptCore/create_hash_table BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= DEBUG FULLDEBUG DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_ON= --enable-debug-symbols=yes DEBUG_CONFIGURE_OFF= --disable-debug-symbols .include .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .include .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 CFLAGS+= -march=i586 .endif .if ${CHOSEN_COMPILER_TYPE} == clang 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 post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \ ${STAGEDIR}${PREFIX}/bin/GtkLauncher-3 ${INSTALL_PROGRAM} ${WRKSRC}/Programs/MiniBrowser \ ${STAGEDIR}${PREFIX}/bin/MiniBrowser-3 .include Index: head/www/webkit-gtk3/files/patch-icu59 =================================================================== --- head/www/webkit-gtk3/files/patch-icu59 (nonexistent) +++ head/www/webkit-gtk3/files/patch-icu59 (revision 449649) @@ -0,0 +1,64 @@ +------------------------------------------------------------------------ +r216187 | annulen@yandex.ru | 2017-05-05 00:33:41 +0900 (Fri, 05 May 2017) | 28 lines + +Fix compilation with ICU 59.1 +https://bugs.webkit.org/show_bug.cgi?id=171612 + +Reviewed by Mark Lam. + +ICU 59.1 has broken source compatibility. Now it defines UChar as +char16_t, which does not allow automatic type conversion from unsigned +short in C++ code. + +--- Source/JavaScriptCore/API/JSStringRef.cpp.orig 2016-04-10 06:48:36 UTC ++++ Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +--- Source/JavaScriptCore/runtime/DateConversion.cpp.orig 2013-08-03 16:10:38 UTC ++++ Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, Date + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +--- Source/WebKit2/Shared/API/c/WKString.cpp.orig 2016-04-10 06:48:37 UTC ++++ Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) Property changes on: head/www/webkit-gtk3/files/patch-icu59 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property