Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update berkelium to use chromium-11 branch: no need to patch berkeliu…

…m project anymore.

TODO: found a way to use berkelium released binaries directly, without recompilation (but the download are 1 to 2 years old...)
  • Loading branch information...
commit 76967c6deab5fcf3601ebe7abf17a25e62edd21b 1 parent bceb4ca
@tito tito authored
View
4 Makefile
@@ -1,4 +1,4 @@
-version=1.0
+version=1.2
data=berkelium/data
.PHONY: all clean copy build
@@ -12,7 +12,7 @@ copy:
cp -r ../locales $(data)
cp ../build/chromium/src/out/Release/libffmpegsumo.so $(data)
# Patches data
- chrpath -r '$$ORIGIN' $(data)/berkelium $(data)/liblibberkelium.so
+ -chrpath -r '$$ORIGIN' $(data)/berkelium $(data)/liblibberkelium.so
build:
# Now create package
View
50 README
@@ -1,50 +0,0 @@
-Berkelium extension for Kivy
-============================
-
-Berkelium is a BSD licensed library for offscreen rendering via Chromium
-project. Check http://berkelium.org/ for more information about it. We are using
-a patched version of Berkelium, available at https://github.com/tito/berkelium
-(branch chromium8-alternate-bin)
-
-
-Notes
------
-
- - This extension require Kivy 1.0.7 !
- - This extension is under development. It's actually working and tested
- only for Linux 64 bits.
- - MacOSX can't be supported at the moment, since Kivy require Python
- 64bits, and Chromium can't be built under 64bits on MacOSX.
-
-
-How to install
---------------
-
- 1. Download .kex https://github.com/tito/kivy-berkelium/archives/master
- 2. Copy the .kex to ~/.kivy/extensions
-
-
-How to test
------------
-
- 1. Download https://github.com/tito/kivy-berkelium/raw/master/demo/main.py
- 2. Run with "python main.py"
-
-
-How to recompile
-----------------
-
-Note: this method have been tested only on Linux 64bits.
-
- #. sudo apt-get install chrpath libcurl4-nss-dev libgtk2-dev libgconf2-dev libgnome-keyring-dev dbus-glib-1-dev flex bison libjpeg62-dev
- #. git clone git://github.com/tito/berkelium
- #. git checkout chromium8-alternate-bin
- #. util/build-chromium.sh
- #. cmake . -DCMAKE_BUILD_TYPE=Release
- #. make
- #. git clone git://github.com/tito/kivy-berkelium
- #. cd kivy-berkelium
- #. make
- #. mv dist/berkelium-1.0.linux-x86_64.zip dist/berkelium-1.0.linux-x86_64.kex
-
-And you can copy the berkelium-1.0.linux-x86_64.kex into your ~/.kivy/extensions
View
52 README.rst
@@ -0,0 +1,52 @@
+Berkelium extension for Kivy
+============================
+
+Berkelium is a BSD licensed library for offscreen rendering via Chromium
+project. Check http://berkelium.org/ for more information about it. We are using
+a patched version of Berkelium, available at https://github.com/tito/berkelium
+(branch chromium8-alternate-bin)
+
+
+Notes
+-----
+
+- This extension require Kivy 1.0.7 minimum !
+- This extension is under development. It's actually working and tested
+ only for Linux 64 bits.
+- MacOSX can't be supported at the moment, since Kivy require Python
+ 64bits, and Chromium can't be built under 64bits on MacOSX.
+
+
+How to install
+--------------
+
+1. Download .kex https://github.com/kivy/kivy-berkelium/archives/master
+2. Copy the .kex to ~/.kivy/extensions
+
+
+How to test
+-----------
+
+1. Download https://github.com/kivy/kivy-berkelium/raw/master/demo/main.py
+2. Run with "python main.py"
+
+
+How to recompile
+----------------
+
+.. note::
+ This method have been tested only on Linux (Ubuntu 11.10 and 12.04) 64bits.
+
+#. sudo apt-get install chrpath libcurl4-nss-dev libgtk2-dev libgconf2-dev libgnome-keyring-dev dbus-glib-1-dev flex bison libjpeg62-dev
+#. sudo apt-get install binutils-gold chrpath
+#. git clone git://github.com/kivy/berkelium
+#. git checkout chromium11
+#. util/build-chromium.sh --deps
+#. cmake . -DCMAKE_BUILD_TYPE=Release
+#. make
+#. git clone git://github.com/kivy/kivy-berkelium
+#. cd kivy-berkelium
+#. make
+#. mv dist/berkelium-1.2.linux-x86_64.zip dist/berkelium-1.2.linux-x86_64.kex
+
+And you can copy the berkelium-1.2.linux-x86_64.kex into your ~/.kivy/extensions
View
10 berkelium/__init__.py
@@ -9,10 +9,8 @@
About berkelium
---------------
-Berkelium is actually patched to be able to load his binary from another
-directory than the current executable in memory (aka Python.)
-The patch is available at
-https://github.com/tito/berkelium/commit/c407a023f386e05fc873113e65935e2497e0980e
+Berkelium is now used without any patch.
+https://github.com/sirikata/berkelium/tree/
Usage of Webbrowser
-------------------
@@ -349,7 +347,7 @@ def get_bk(self):
#AW
last_console_message = ObjectProperty( None )
- '''Stores the last console message sent by the webpage. A 'on_console_message' event is fired when
+ '''Stores the last console message sent by the webpage. A 'on_console_message' event is fired when
a new console message happens. It enables the app to get backward triggers coming from the webpage.
Composed of (message, source_id, line_no)
@@ -734,7 +732,7 @@ class WebbrowserChildWidget(Widget):
#
# Privates
#
-
+
def __init__(self, **kwargs):
# Before doing anything, ensure the windows exist.
View
15 berkelium/_berkelium.pyx
@@ -1,4 +1,3 @@
-#
# Wrapper to berkelium. All the internal work is done inside berkelium, except
# the rendering. He's changed to match our Kivy graphics class, and OpenGL ES
# 2.0 requirement.
@@ -29,7 +28,7 @@ cdef extern from "berkelium/WeakString.hpp":
cdef void *berkelium_filestring_point_to "Berkelium::FileString::point_to"(char *, int)
cdef extern from "berkelium/Berkelium.hpp":
- cdef void berkelium_init "Berkelium::initEx"(void *, char *)
+ cdef bool berkelium_init "Berkelium::init"(void *, void *, unsigned int, char **)
cdef void berkelium_destroy "Berkelium::destroy"()
cdef void berkelium_update "Berkelium::update"()
@@ -154,8 +153,10 @@ cdef extern from "berkelium_wrapper.h":
def init(bytes berkelium_path):
- berkelium_init(berkelium_filestring_point_to(
- berkelium_path, len(berkelium_path)), <char *>berkelium_path)
+ berkelium_init(
+ berkelium_filestring_point_to(berkelium_path, len(berkelium_path)),
+ berkelium_filestring_point_to(berkelium_path, len(berkelium_path)),
+ 0, NULL)
def destroy():
berkelium_destroy()
@@ -488,12 +489,12 @@ cdef class WindowDelegate:
&cancelDefaultAction):
cdef py_url = PyString_FromStringAndSize(newURL, newURL_length)
cdef py_referrer = PyString_FromStringAndSize(referrer, referrer_length)
- cdef int default_action = int(not ret)
ret = self.onNavigationRequested(py_url, py_referrer, isNewWindow)
+ cdef int default_action = int(not ret)
try:
- print 'cancel default action', ret
+ #print 'cancel default action', ret
cancelDefaultAction = default_action
- print 'cancel default action OK', ret
+ #print 'cancel default action OK', ret
except:
pass
View
6 demo/main.py
@@ -2,8 +2,8 @@
Berkelium extension demo
========================
-Check http://github.com/tito/kivy-berkelium for more information.
-You must have berkelium-1.0 extension installed before running the demo
+Check http://github.com/kivy/kivy-berkelium for more information.
+You must have berkelium-1.2 extension installed before running the demo
'''
from kivy.uix.scatter import Scatter
@@ -11,7 +11,7 @@
from kivy.app import App
from kivy.ext import load
-berkelium = load('berkelium', (1, 1))
+berkelium = load('berkelium', (1, 2))
urls = (
'http://kivy.org',
View
2  setup.py
@@ -49,7 +49,7 @@ def finalize_options(self):
setup(
name='berkelium',
- version='1.1',
+ version='1.2',
author='Mathieu Virbel',
author_email='mat@kivy.org',
url='http://txzone.net/',
Please sign in to comment.
Something went wrong with that request. Please try again.