Permalink
Browse files

Make cl-webkit build with libwebkit 1.6.1

Addresses these changes from older versions of libwebkit:
- New .so location for libwebkit
- WEBKIT_CACHE_MODEL_* moved to webkitglobals.h
  • Loading branch information...
1 parent 75b9d7d commit ab9b92bf06484f71f7ac8fd86c646f4741cf97c9 @joachifm committed Oct 10, 2011
Showing with 13 additions and 8 deletions.
  1. +1 −1 foreign.lisp
  2. +12 −7 grovel.lisp
View
@@ -33,7 +33,7 @@
;;; Load foreign library
(define-foreign-library libwebkit
- (:unix (:or "libwebkit-1.0.so")))
+ (:unix (:or "libwebkitgtk-1.0.so")))
(use-foreign-library libwebkit)
View
@@ -200,13 +200,6 @@ if you want to know precisely what kind of error occurred."))
((:webkit-navigation-response-download "WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD")
:documentation "Download response"))
-;; The cache model determines the memory and disk space to use for caching content.
-(cenum webkit-cache-model
- ((:webkit-cache-model-document-viewer "WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER")
- :documentation "Use this for applications without a browsing inteface.")
- ((:webkit-cache-model-web-browser "WEBKIT_CACHE_MODEL_WEB_BROWSER")
- :documentation "Use this for web browser applications."))
-
(cenum webkit-web-view-target-info
((:webkit-web-view-target-info-html "WEBKIT_WEB_VIEW_TARGET_INFO_HTML")
:documentation "?")
@@ -218,3 +211,15 @@ if you want to know precisely what kind of error occurred."))
:documentation "?")
((:webkit-web-view-target-info-netscape-url "WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL")
:documentation "?"))
+
+
+;;; webkitglobals.h
+
+(include "webkit/webkitglobals.h")
+
+;; The cache model determines the memory and disk space to use for caching content.
+(cenum webkit-cache-model
+ ((:webkit-cache-model-document-viewer "WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER")
+ :documentation "Use this for applications without a browsing inteface.")
+ ((:webkit-cache-model-web-browser "WEBKIT_CACHE_MODEL_WEB_BROWSER")
+ :documentation "Use this for web browser applications."))

0 comments on commit ab9b92b

Please sign in to comment.