Menu
▾
▴
[Gtk2hs-commit] (main branch): Fix compile error of Webkit patch.
|
From: Andy S. <And...@co...> - 2010-03-18 16:47:13
|
Thu Mar 18 12:12:17 EDT 2010 Andy Stewart <laz...@gm...>
* Fix compile error of Webkit patch.
Ignore-this: 2a53ca7d0b84edf5ad6a7bc375d88cc0
hunk ./Makefile.am 79
+if ENABLE_WEBKIT
+pkglib_LIBRARIES += libHSwebkit.a
+endif
hunk ./Makefile.am 103
-if ENABLE_WEBKIT
-pkglib_LIBRARIES += libHSwebkit.a
-endif
hunk ./Makefile.am 990
-endif
+endif #ENABLE_GTK
hunk ./Makefile.am 1141
- [_$_]
+
hunk ./Makefile.am 1152
-libHSvte_a_LIBADD = \
- vte/Graphics/UI/Gtk/Vte/Vte_stub.o
-
hunk ./Makefile.am 1156
-[_^I_][_^I_][_^I_][_$_]
hunk ./Makefile.am 1251
+#
+## webkit package
+#
+##################################################################################
+
+if ENABLE_WEBKIT
+
+webkit_PKGNAME = libHSwebkit_a
+
+libHSwebkit_a_NAME = webkit
+libHSwebkit_a_CONFIG = webkit/webkit.package.conf
+libHSwebkit_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
+libHSwebkit_a_INTERNALDEPS = gtk glib
+libHSwebkit_a_HEADER = webkit/hswebkit.h
+libHSwebkit_a_PRECOMP = webkit/webkit.precomp
+libHSwebkit_a_LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(WEBKIT_LIBS)
+libHSwebkit_a_HCFLAGS = $(FFI)
+libHSwebkit_a_CFLAGS = $(filter-out -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(WEBKIT_CFLAGS)) [_$_]
+libHSwebkit_a_CPPFLAGS = $(filter -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(WEBKIT_CFLAGS))
+
+
+libHSwebkit_a_SOURCESDIRS = webkit
+
+libHSwebkit_a_GENERATEDSOURCES = \
+ webkit/Graphics/UI/Gtk/WebKit/Types.chs
+
+nodist_libHSwebkit_a_SOURCES = $(libHSwebkit_a_GENERATEDSOURCES)
+
+libHSwebkit_a_SOURCES = \
+ webkit/Graphics/UI/Gtk/WebKit/WebView.chs \
+ webkit/Graphics/UI/Gtk/WebKit/WebFrame.chs \
+ webkit/Graphics/UI/Gtk/WebKit/WebSettings.chs \
+ webkit/Graphics/UI/Gtk/WebKit/WebHistoryItem.chs \
+ webkit/Graphics/UI/Gtk/WebKit/WebBackForwardList.chs \
+ webkit/Graphics/UI/Gtk/WebKit/WebInspector.chs \
+ webkit/Graphics/UI/Gtk/WebKit/Download.chs \
+ webkit/Graphics/UI/Gtk/WebKit/NetworkRequest.chs \
+ webkit/Graphics/UI/Gtk/WebKit/NetworkResponse.chs [_$_]
+
+htmldoc_HSFILES_HIDDEN += $(libHSwebkit_a_GENERATEDSOURCES:.chs=.hs)
+
+webkit_Graphics_UI_Gtk_Webkit_Types_hs_HCFLAGS = -fglasgow-exts [_$_]
+
+webkit/Graphics/UI/Gtk/WebKit/Types.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \
+ $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \
+ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template
+ $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \
+ $(srcdir)/tools/hierarchyGen/hierarchy.list \
+ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
+ $@ --tag=webkit --lib=webkit --prefix=webkit \
+ --modname=Graphics.UI.Gtk.WebKit.Types \
+ --forward=*System.Glib.GObject \
+ --destructor=objectUnrefFromMainloop \
+ --forward=*Graphics.UI.Gtk.Types)
+
+libHSwebkit_a_ALLSOURCES = $(libHSwebkit_a_SOURCES) $(nodist_libHSwebkit_a_SOURCES)
+
+am_libHSwebkit_a_OBJECTS = \
+ $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSwebkit_a_ALLSOURCES))))
+
+libHSwebkit_a_HSPPFILES = $(filter %.hs.pp, $(libHSwebkit_a_ALLSOURCES))
+libHSwebkit_a_CHSPPFILES = $(filter %.chs.pp,$(libHSwebkit_a_ALLSOURCES))
+libHSwebkit_a_CHSFILES = \
+ $(filter %.chs,$(libHSwebkit_a_ALLSOURCES:.chs.pp=.chs))
+libHSwebkit_a_CHSFILES_HS = $(libHSwebkit_a_CHSFILES:.chs=.hs)
+libHSwebkit_a_HSCFILES = $(filter %.hsc, $(libHSwebkit_a_ALLSOURCES))
+libHSwebkit_a_HSCFILES_HS = $(libHSwebkit_a_HSCFILES:.hsc=.hs)
+libHSwebkit_a_BUILDSOURCES = \
+ $(libHSwebkit_a_HSPPFILES:.hs.pp=.hs) \
+ $(libHSwebkit_a_CHSPPFILES:.chs.pp=.chs) \
+ $(libHSwebkit_a_CHSFILES_HS) \
+ $(libHSwebkit_a_HSCFILES_HS) \
+ $(libHSwebkit_a_GENERATEDSOURCES)
+libHSwebkit_a_HSFILES = \
+ $(filter %.hs,$(libHSwebkit_a_BUILDSOURCES)) \
+ $(filter %.hs,$(libHSwebkit_a_ALLSOURCES))
+
+nobase_hi_DATA += $(libHSwebkit_a_HSFILES:.hs=.hi)
+
+webkit_MOSTLYCLEANFILES = $(am_libHSwebkit_a_OBJECTS)
+webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_HSFILES:.hs=.hi)
+webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_CHSFILES:.chs=.chi)
+webkit_CLEANFILES = $(libHSwebkit_a_BUILDSOURCES)
+webkit_CLEANFILES += $(libHSwebkit_a_CHSFILES_HS:.hs=.dep)
+webkit_CLEANFILES += \
+ $(libHSwebkit_a_HSCFILES:.hsc=_hsc_make$(EXEEXT)) \
+ $(libHSwebkit_a_HSCFILES:.hsc=_hsc_make.c) \
+ $(libHSwebkit_a_HSCFILES:.hsc=_hsc_make.o)
+
+webkit/libHSwebkit_a.deps: $(libHSwebkit_a_HSFILES) | \
+ $(foreach pkg,$(libHSwebkit_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps)
+$(libHSwebkit_a_CHSFILES:.chs=.dep): \
+ $(foreach pkg,webkit $(libHSglib_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES))
+$(libHSwebkit_a_CHSFILES_HS): $(libHSwebkit_a_PRECOMP)
+$(libHSwebkit_a_OBJECTS) : \
+ $(foreach pkg,$(libHSwebkit_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS))
+
+EARLY_DEPS += $(libHSwebkit_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
+-include $(libHSwebkit_a_CHSFILES:.chs=.dep) webkit/libHSwebkit_a.deps
+ endif
+
+if ENABLE_SPLITOBJS
+libHSwebkit_a_AR = $(srcdir)/mk/link-splitobjs.sh
+webkit_CLEANFILES_SPLIT = $(libHSwebkit_a_HSFILES:.hs=_split/)
+else
+libHSwebkit_a_AR = $(AR) $(ARFLAGS)
+endif
+
+libHSwebkit_a_DEPENDENCIES = HSwebkit.o
+pkglib_DATA += HSwebkit.o
+HSwebkit.o : $(libHSwebkit_a_OBJECTS)
+ $(LD) -r $(LD_X) -o $@ $(libHSwebkit_a_OBJECTS) $(libHSwebkit_a_LIBADD)
+
+if ENABLE_PROFILING
+libHSwebkit_a_DEPENDENCIES += libHSwebkit_p.a
+pkglib_DATA += libHSwebkit_p.a
+libHSwebkit_p.a : $(libHSwebkit_a_HSFILES:.hs=.p_o) \
+ $(libHSwebkit_a_LIBADD:.o=.p_o)
+ $(AR) $(ARFLAGS) $@ $^
+
+ifeq (,$(DONT_USE_DEPS))
+-include webkit/libHSwebkit_a.p_deps
+ endif
+
+nobase_hi_DATA += $(libHSwebkit_a_HSFILES:.hs=.p_hi)
+webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_HSFILES:.hs=.p_hi)
+webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_HSFILES:.hs=.p_o)
+webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_LIBADD:.o=.p_o)
+endif
+
+endif #ENABLE_WEBKIT
+
hunk ./Makefile.am 2841
-endif
-
-
-#
-# webkit package
-#
-#################################################################################
-
-if ENABLE_WEBKIT
-
-webkit_PKGNAME = libHSwebkit_a
-
-libHSwebkit_a_NAME = webkit
-libHSwebkit_a_CONFIG = webkit/webkit.package.conf
-libHSwebkit_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
-libHSwebkit_a_INTERNALDEPS = gtk glib
-libHSwebkit_a_HEADER = webkit/hswebkit.h
-libHSwebkit_a_PRECOMP = webkit/webkit.precomp
-libHSwebkit_a_LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(WEBKIT_LIBS)
-libHSwebkit_a_HCFLAGS = $(FFI)
-libHSwebkit_a_CFLAGS = $(filter-out -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(WEBKIT_CFLAGS)) [_$_]
-libHSwebkit_a_CPPFLAGS = $(filter -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(WEBKIT_CFLAGS))
-
-
-libHSwebkit_a_SOURCESDIRS = webkit
-
-libHSwebkit_a_GENERATEDSOURCES = \
- webkit/Graphics/UI/Gtk/WebKit/Types.chs
-
-nodist_libHSwebkit_a_SOURCES = $(libHSwebkit_a_GENERATEDSOURCES)
-
-libHSwebkit_a_SOURCES = \
- webkit/Graphics/UI/Gtk/WebKit/WebView.chs \
- webkit/Graphics/UI/Gtk/WebKit/WebFrame.chs \
- webkit/Graphics/UI/Gtk/WebKit/WebSettings.chs \
- webkit/Graphics/UI/Gtk/WebKit/WebHistoryItem.chs \
- webkit/Graphics/UI/Gtk/WebKit/WebBackForwardList.chs \
- webkit/Graphics/UI/Gtk/WebKit/WebInspector.chs \
- webkit/Graphics/UI/Gtk/WebKit/Download.chs \
- webkit/Graphics/UI/Gtk/WebKit/NetworkRequest.chs \
- webkit/Graphics/UI/Gtk/WebKit/NetworkResponse.chs [_$_]
-
-htmldoc_HSFILES_HIDDEN += $(libHSwebkit_a_GENERATEDSOURCES:.chs=.hs)
-
-webkit_Graphics_UI_Gtk_WebKit_Types_hs_HCFLAGS = -fglasgow-exts
-
-webkit/Graphics/UI/Gtk/WebKit/Types.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \
- $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \
- $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template
- $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \
- $(srcdir)/tools/hierarchyGen/hierarchy.list \
- $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
- $@ --tag=webkit --lib=webkit --prefix=webkit \
- --modname=Graphics.UI.Gtk.WebKit.Types \
- --parentname=Graphics.UI.Gtk.Types)
-
-libHSwebkit_a_ALLSOURCES = $(libHSwebkit_a_SOURCES) $(nodist_libHSwebkit_a_SOURCES)
-
-am_libHSwebkit_a_OBJECTS = \
- $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSwebkit_a_ALLSOURCES))))
-
-libHSwebkit_a_HSPPFILES = $(filter %.hs.pp, $(libHSwebkit_a_ALLSOURCES))
-libHSwebkit_a_CHSPPFILES = $(filter %.chs.pp,$(libHSwebkit_a_ALLSOURCES))
-libHSwebkit_a_CHSFILES = \
- $(filter %.chs,$(libHSwebkit_a_ALLSOURCES:.chs.pp=.chs))
-libHSwebkit_a_CHSFILES_HS = $(libHSwebkit_a_CHSFILES:.chs=.hs)
-libHSwebkit_a_HSCFILES = $(filter %.hsc, $(libHSwebkit_a_ALLSOURCES))
-libHSwebkit_a_HSCFILES_HS = $(libHSwebkit_a_HSCFILES:.hsc=.hs)
-libHSwebkit_a_BUILDSOURCES = \
- $(libHSwebkit_a_HSPPFILES:.hs.pp=.hs) \
- $(libHSwebkit_a_CHSPPFILES:.chs.pp=.chs) \
- $(libHSwebkit_a_CHSFILES_HS) \
- $(libHSwebkit_a_HSCFILES_HS) \
- $(libHSwebkit_a_GENERATEDSOURCES)
-libHSwebkit_a_HSFILES = \
- $(filter %.hs,$(libHSwebkit_a_BUILDSOURCES)) \
- $(filter %.hs,$(libHSwebkit_a_ALLSOURCES))
-
-nobase_hi_DATA += $(libHSwebkit_a_HSFILES:.hs=.hi)
-
-webkit_MOSTLYCLEANFILES = $(am_libHSwebkit_a_OBJECTS)
-webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_HSFILES:.hs=.hi)
-webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_CHSFILES:.chs=.chi)
-webkit_CLEANFILES = $(libHSwebkit_a_BUILDSOURCES)
-webkit_CLEANFILES += $(libHSwebkit_a_CHSFILES_HS:.hs=.dep)
-webkit_CLEANFILES += \
- $(libHSwebkit_a_HSCFILES:.hsc=_hsc_make$(EXEEXT)) \
- $(libHSwebkit_a_HSCFILES:.hsc=_hsc_make.c) \
- $(libHSwebkit_a_HSCFILES:.hsc=_hsc_make.o)
-
-webkit/libHSwebkit_a.deps: $(libHSwebkit_a_HSFILES) | \
- $(foreach pkg,$(libHSwebkit_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps)
-$(libHSwebkit_a_CHSFILES:.chs=.dep): \
- $(foreach pkg,webkit $(libHSglib_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES))
-$(libHSwebkit_a_CHSFILES_HS): $(libHSwebkit_a_PRECOMP)
-$(libHSwebkit_a_OBJECTS) : \
- $(foreach pkg,$(libHSwebkit_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS))
-
-EARLY_DEPS += $(libHSwebkit_a_CHSFILES:.chs=.dep)
-
-ifeq (,$(DONT_USE_DEPS))
--include $(libHSwebkit_a_CHSFILES:.chs=.dep) webkit/libHSwebkit_a.deps
- endif
-
-if ENABLE_SPLITOBJS
-libHSwebkit_a_AR = $(srcdir)/mk/link-splitobjs.sh
-webkit_CLEANFILES_SPLIT = $(libHSwebkit_a_HSFILES:.hs=_split/)
-else
-libHSwebkit_a_AR = $(AR) $(ARFLAGS)
-endif
-
-libHSwebkit_a_DEPENDENCIES = HSwebkit.o
-pkglib_DATA += HSwebkit.o
-HSwebkit.o : $(libHSwebkit_a_OBJECTS)
- $(LD) -r $(LD_X) -o $@ $(libHSwebkit_a_OBJECTS) $(libHSwebkit_a_LIBADD)
-
-if ENABLE_PROFILING
-libHSwebkit_a_DEPENDENCIES += libHSwebkit_p.a
-pkglib_DATA += libHSwebkit_p.a
-libHSwebkit_p.a : $(libHSwebkit_a_HSFILES:.hs=.p_o) \
- $(libHSwebkit_a_LIBADD:.o=.p_o)
- $(AR) $(ARFLAGS) $@ $^
-
-ifeq (,$(DONT_USE_DEPS))
--include webkit/libHSwebkit_a.p_deps
- endif
-
-nobase_hi_DATA += $(libHSwebkit_a_HSFILES:.hs=.p_hi)
-webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_HSFILES:.hs=.p_hi)
-webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_HSFILES:.hs=.p_o)
-webkit_MOSTLYCLEANFILES += $(libHSwebkit_a_LIBADD:.o=.p_o)
-endif
-
-endif #ENABLE_WEBKIT
+endif #ENABLE_GSTREAMER
hunk ./tools/hierarchyGen/hierarchy.list 60
+ WebkitWebView as WebView if webkit [_$_]
hunk ./tools/hierarchyGen/hierarchy.list 106
- WebkitWebView as WebView if webkit [_$_]
- WebkitWebFrame as WebFrame if webkit [_$_]
- WebkitWebSettings as WebSettings if webkit
- WebkitNetworkRequest as NetworkRequest if webkit
- WebkitNetworkResponse as NetworkResponse if webkit
- WebkitDownload as Download if webkit
- WebkitWebBackForwardList as WebBackForwardList if webkit
- WebkitWebHistoryItem as WebHistoryItem if webkit
- WebkitWebInspector as WebInspector if webkit
- WebkitWebNavigationAction as WebNavigationAction if webkit [_$_]
- WebkitWebPolicyDecision as WebPolicyDecision if webkit
- WebkitWebWindowFeatures as WebWindowFeatures if webkit
- WebkitWebDatabase as WebDatabase if webkit
- WebkitWebDataSource as WebDataSource if webkit
- WebkitWebResource as WebResource if webkit
- WebkitSecurityOrigin as SecurityOrigin if webkit
hunk ./tools/hierarchyGen/hierarchy.list 169
-
+[_^I_][_^I_][_^I_][_$_]
hunk ./tools/hierarchyGen/hierarchy.list 318
+
+ WebkitWebFrame as WebFrame if webkit [_$_]
+ WebkitWebSettings as WebSettings if webkit
+ WebkitNetworkRequest as NetworkRequest if webkit
+ WebkitNetworkResponse as NetworkResponse if webkit
+ WebkitDownload as Download if webkit
+ WebkitWebBackForwardList as WebBackForwardList if webkit
+ WebkitWebHistoryItem as WebHistoryItem if webkit
+ WebkitWebInspector as WebInspector if webkit
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs.pp 129
- onHoveringOverLink,
+ -- onHoveringOverLink,
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs.pp 131
- onCreateWebView,
+ -- onCreateWebView,
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs.pp 143
+-- import Data.IORef
+
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs.pp 802
-onHoveringOverLink :: WebViewClass self => self -> (Maybe String -> Maybe String -> IO()) -> IO(ConnectId self)
-onHoveringOverLink =
- connect_BOXED_BOXED__NONE "hovering-over-link" readMString True
- where
- readMString strPtr | strPtr==nullPtr = return Nothing
- | otherwise = liftM Just $ peekUTFString strPtr
+-- onHoveringOverLink :: WebViewClass self => self -> (Maybe String -> Maybe String -> IO()) -> IO(ConnectId self)
+-- onHoveringOverLink =
+-- connect_BOXED_BOXED__NONE "hovering-over-link" readMString True
+-- where
+-- readMString strPtr | strPtr==nullPtr = return Nothing
+-- | otherwise = liftM Just $ peekUTFString strPtr
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs.pp 855
-onCreateWebView :: WebViewClass self => self -> (WebFrame -> IO WebView) -> IO (ConnectId self)
-onCreateWebView = \vw act
- connect_OBJECT__PTR "create-web-view" True vw act'
- where
- act' wf = do
- wv <- act wf
- -- We need to return a Ptr WebView to the caller of this signal. To
- -- prevent the garbage collector from freeing the WebView before this
- -- signal returns, we increment the reference count of the object and
- -- decrement it as soon as the 'webViewReady' signal is emitted which
- -- always happens after this signal returns.
- gObjectRef wv
- sidRef <- newIORef undefined
- sid <- onWebViewReady wv $ do
- gObjectUnref wv
- sid <- readIORef sidRef
- signalDisconnect wv sid
- return False
- writeIORef sidRef sid
- return unsafeForeignPtrToPtr (unWebView wv)
-
+-- onCreateWebView :: WebViewClass self => self -> (WebFrame -> IO WebView) -> IO (ConnectId self)
+-- -- onCreateWebView = \vw act
+-- onCreateWebView vw act =
+-- connect_OBJECT__PTR "create-web-view" True vw act'
+-- where
+-- act' wf = do
+-- wv <- act wf
+-- -- We need to return a Ptr WebView to the caller of this signal. To
+-- -- prevent the garbage collector from freeing the WebView before this
+-- -- signal returns, we increment the reference count of the object and
+-- -- decrement it as soon as the 'webViewReady' signal is emitted which
+-- -- always happens after this signal returns.
+-- gObjectRef wv
+-- sidRef <- newIORef undefined
+-- sid <- onWebViewReady wv $ do
+-- gObjectUnref wv
+-- sid <- readIORef sidRef
+-- signalDisconnect wv sid
+-- return False
+-- writeIORef sidRef sid
+-- return unsafeForeignPtrToPtr (unWebView wv)
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs.pp 899
- [_$_]
-
hunk ./webkit/webkit.package.conf.in 3
+id: webkit-@PACKAGE_VERSION@
hunk ./webkit/webkit.package.conf.in 17
-depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@
+depends: @PKG_BASE_ID@ gtk-@PACKAGE_VERSION@
|
