Opened 11 years ago

Closed 11 years ago

#19346 closed update (fixed)

webkit-gtk out of date

Reported by: lee@… Owned by: myschizobuddy@…
Priority: Normal Milestone:
Component: ports Version: 1.7.1
Keywords: Cc: jeremyhu (Jeremy Huddleston Sequoia), dbevans (David B. Evans), vinc17@…
Port: webkit-gtk

Description

I saw that libXt was holding you up from using a more recent version of webkit. It looks like it builds now, so is there any chance of us getting a more recent version of webkit-gtk? It would be great, because the svn repo is about 1.5 gigs to check out.

Thanks

Attachments (3)

patch-webkit-gtk.diff (1.2 KB) - added by dbevans (David B. Evans) 11 years ago.
Draft patch for Portfile (work in progress)
webkit.patch (3.4 KB) - added by mtalexander (Mike Alexander) 11 years ago.
Update webkit-gtk and libsoup
corefoundation.patch (625 bytes) - added by mtalexander (Mike Alexander) 11 years ago.
Patch to not include CoreFoundation headers if PLATFORM(CF) is false

Download all attachments as: .zip

Change History (15)

comment:1 Changed 11 years ago by mf2k (Frank Schima)

Milestone: Port BugsPort Updates
Owner: changed from macports-tickets@… to myschizobuddy@…
Port: webkit-gtk added

comment:2 Changed 11 years ago by dbevans (David B. Evans)

Cc: jeremyhu@… added

Yes, but the latest nightly build (svn 42583) won't build yet because it requires

  • gtk2 >= 2.16.0 (see #19334 for patch to update to 2.16.1)
  • libsoup >= 2.26.0 (updated to 2.26.1 in r49761)
  • new port libproxy (required by libsoup 2.26, committed in r49756)

Getting by this, the build still fails because of a conflict in typedefs (for Boolean) between X11 and the Carbon framework.

libtool: compile:  /usr/bin/g++-4.0 -DHAVE_CONFIG_H -I. -DWTF_USE_ICU_UNICODE=1 -DBUILDING_CAIRO__=1 -DBUILDING_GTK__=1 -DWTF_CHANGES -DPACKAGE_LOCALE_DIR=\"/opt/local/share/locale\" -DXP_UNIX -DNDEBUG -I./WebCore -I./WebCore/bindings/js -I./WebCore/bridge -I./WebCore/bridge/c -I./WebCore/css -I./WebCore/dom -I./WebCore/editing -I./WebCore/history -I./WebCore/html -I./WebCore/inspector -I./WebCore/loader -I./WebCore/loader/appcache -I./WebCore/loader/archive -I./WebCore/loader/icon -I./WebCore/page -I./WebCore/page/animation -I./WebCore/platform -I./WebCore/platform/animation -I./WebCore/platform/graphics -I./WebCore/platform/graphics/filters -I./WebCore/platform/graphics/transforms -I./WebCore/platform/image-decoders -I./WebCore/platform/image-decoders/bmp -I./WebCore/platform/image-decoders/gif -I./WebCore/platform/image-decoders/ico -I./WebCore/platform/image-decoders/jpeg -I./WebCore/platform/image-decoders/png -I./WebCore/platform/image-decoders/xbm -I./WebCore/platform/network -I./WebCore/platform/text -I./WebCore/plugins -I./WebCore/rendering -I./WebCore/rendering/style -I./WebCore/workers -I./WebCore/xml -I./WebCore/bindings/js -DWTF_USE_SOUP=1 -I./WebCore/platform/network/soup -DENABLE_OFFLINE_WEB_APPLICATIONS=1 -DENABLE_DASHBOARD_SUPPORT=1 -DENABLE_DATABASE=1 -I./WebCore/platform/sql -I./WebCore/storage -DENABLE_DOM_STORAGE=1 -I./WebCore/storage -DENABLE_ICONDATABASE=1 -DENABLE_VIDEO=1 -DENABLE_XPATH=1 -DENABLE_XSLT=1 -DENABLE_WORKERS=1 -DENABLE_SVG=1 -I./WebCore/svg -I./WebCore/svg/animation -I./WebCore/svg/graphics -I./WebCore/svg/graphics/filters -DENABLE_SVG_USE=1 -DENABLE_SVG_FOREIGN_OBJECT=1 -DENABLE_SVG_FONTS=1 -DENABLE_SVG_AS_IMAGE=1 -DENABLE_SVG_ANIMATION=1 -DDATA_DIR=\"/opt/local/share\" -I./JavaScriptCore -I./JavaScriptCore/ForwardingHeaders -I./JavaScriptCore/parser -I./JavaScriptCore/wtf -I./DerivedSources -I./JavaScriptCore/API -I./JavaScriptCore/ForwardingHeaders -I./JavaScriptCore/interpreter -I./JavaScriptCore/bytecode -I./JavaScriptCore/bytecompiler -I./JavaScriptCore/debugger -I./JavaScriptCore/jit -I./JavaScriptCore/pcre -I./JavaScriptCore/profiler -I./JavaScriptCore/runtime -I./JavaScriptCore/wrec -I./JavaScriptCore/jit -I./JavaScriptCore/assembler -I./JavaScriptCore/wtf/unicode -I./JavaScriptCore/yarr -I./JavaScriptCore/pcre -I./JavaScriptCore/parser -I./JavaScriptCore/runtime -I./WebCore/loader/gtk -I./WebCore/page/gtk -I./WebCore/platform/graphics/cairo -I./WebCore/platform/graphics/gtk -I./WebCore/platform/gtk -DUSE_FREETYPE=1 -I./WebCore/svg/graphics/cairo -I/opt/local/include -fvisibility-inlines-hidden -fno-rtti -fno-strict-aliasing -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type -Wformat -Wformat-security -Wno-format-y2k -Wundef -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-unused-parameter -Wno-parentheses -fno-exceptions -fvisibility=hidden -D_REENTRANT -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include -I./JavaScriptCore/icu -I./WebCore/icu -I/opt/local/include/libxml2 -I/opt/local/include/cairo -I/opt/local/include/pixman-1 -I/opt/local/include/freetype2 -I/opt/local/include -I/opt/local/include/libpng12 -I/opt/local/include/pango-1.0 -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include -I/opt/local/include/freetype2 -I/opt/local/include/gtk-2.0 -I/opt/local/lib/gtk-2.0/include -I/opt/local/include/atk-1.0 -I/opt/local/include/cairo -I/opt/local/include/pango-1.0 -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include -I/opt/local/include/pixman-1 -I/opt/local/include/freetype2 -I/opt/local/include/libpng12 -I/opt/local/include -I/opt/local/include/libsoup-2.4 -I/opt/local/include/libxml2 -I/opt/local/include -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include/cairo -I/opt/local/include/freetype2 -I/opt/local/include -I/opt/local/include/pixman-1 -I/opt/local/include/libpng12 -I/opt/local/include -D_REENTRANT -I/opt/local/include/gstreamer-0.10 -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include -I/opt/local/include/libxml2 -I/opt/local/include -I/opt/local/include/libxml2 -O2 -O2 -MT WebCore/plugins/gtk/libWebCore_la-PluginViewGtk.lo -MD -MP -MF WebCore/plugins/gtk/.deps/libWebCore_la-PluginViewGtk.Tpo -c WebCore/plugins/gtk/PluginViewGtk.cpp  -fno-common -DPIC -o WebCore/plugins/gtk/.libs/libWebCore_la-PluginViewGtk.o
/opt/local/include/X11/Intrinsic.h:158: error: conflicting declaration 'typedef char Boolean'
/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h:288: error: 'Boolean' has a previous declaration as 'typedef unsigned char Boolean'
make[1]: *** [WebCore/plugins/gtk/libWebCore_la-PluginViewGtk.lo] Error 1
make: *** [all] Error 2

Not sure whether this is something to fix in webkit-gtk upstream or in X11 but investigating.

Attached is my current draft of a patch to update the webkit-gtk Portfile (last problem still not addressed).

Changed 11 years ago by dbevans (David B. Evans)

Attachment: patch-webkit-gtk.diff added

Draft patch for Portfile (work in progress)

comment:3 Changed 11 years ago by dbevans (David B. Evans)

Cc: devans@… added

Cc Me!

comment:4 Changed 11 years ago by jeremyhu (Jeremy Huddleston Sequoia)

comment:5 Changed 11 years ago by mtalexander (Mike Alexander)

I wanted to build GnuCash with the new code to use Webkit for report formatting. This required a newer version of Webkit so I created a portfile to build one (before I found this ticket). I think the conflict mentioned above is really a bug in the configure file. It is assuming that it must use the WebCore icu library on Darwin even if pkg_config knows about another one. Assuming I'm correct in my assumption about the icu library, this probably should be fixed upstream. The patch I'll attach also updates libsoup although that may have already been taken care of.

Changed 11 years ago by mtalexander (Mike Alexander)

Attachment: webkit.patch added

Update webkit-gtk and libsoup

comment:6 Changed 11 years ago by mtalexander (Mike Alexander)

Oops, I had two patches to webkit and got them confused. The icu library patch is correct, but it doesn't solve the problem with CoreFoundation. That's a different patch to a couple of files (JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp and WebCore/platform/FileSystem.h). They should be checking the PLATFORM(CF) flag before including CoreFoundation headers. Apparently webkit wasn't tested on a non-CF Darwin build. I'll attach that patch too.

Changed 11 years ago by mtalexander (Mike Alexander)

Attachment: corefoundation.patch added

Patch to not include CoreFoundation headers if PLATFORM(CF) is false

comment:7 Changed 11 years ago by jmroot (Joshua Root)

Type: enhancementupdate

comment:8 Changed 11 years ago by (none)

Milestone: Port Updates

Milestone Port Updates deleted

comment:9 Changed 11 years ago by vinc17@…

Cc: vinc17@… added

Cc Me!

comment:10 Changed 11 years ago by vinc17@…

Any news? Liferea 1.6.0 (that should be released later this month) needs a more recent version of webkit and I can't test the release candidate.

comment:11 Changed 11 years ago by dbevans (David B. Evans)

See #19754 for proposed upgrade.

comment:12 Changed 11 years ago by dbevans (David B. Evans)

Resolution: fixed
Status: newclosed

Updated to release version 1.1.7 in r51453.

Note: See TracTickets for help on using tickets.