The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Merge ../birdfont-2.x

These changes was commited to the Birdfont repository Sat, 01 Oct 2016 13:56:47 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 01 Oct 2016 13:56:47 +0000 (15:56 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 01 Oct 2016 13:56:47 +0000 (15:56 +0200)
commit 6db42bb5069306d1e3ae0ca6b6e25242f4b5a17f
tree 6b03cd0be8e290d961cd8b1ad6bc67522d652df6
parent f61153b2c8c9b901c1bf173a609e6693260665ea
parent 3b5ccfb188b97b8ee1a8a1b4fda71a69c27f404c
Merge ../birdfont-2.x

configure
dodo.py
scripts/version.py
--- a/configure +++ b/configure @@ -92,7 +92,7 @@ 'gio-2.0', 'glib-2.0', 'gtk+-3.0', - 'webkit2gtk-3.0', + 'webkit2gtk-4.0', 'libsoup-2.4', 'libnotify', 'sqlite3',
diff --git a/dodo.py b/dodo.py
--- a/dodo.py +++ b/dodo.py @@ -84,7 +84,7 @@ --pkg cairo \ --pkg libsoup-2.4 \ --pkg gdk-pixbuf-2.0 \ - --pkg webkit2gtk-3.0 \ + --pkg webkit2gtk-4.0 \ --pkg libnotify \ --pkg xmlbird \ --pkg libbirdfont \ @@ -102,7 +102,7 @@ $(pkg-config --cflags cairo) \ $(pkg-config --cflags glib-2.0) \ $(pkg-config --cflags gdk-pixbuf-2.0) \ - $(pkg-config --cflags webkit2gtk-3.0) \ + $(pkg-config --cflags webkit2gtk-4.0) \ $(pkg-config --cflags libnotify) \ -o OBJECT_FILE""" @@ -115,7 +115,7 @@ $(pkg-config --libs cairo) \ $(pkg-config --libs glib-2.0) \ $(pkg-config --libs gdk-pixbuf-2.0) \ - $(pkg-config --libs webkit2gtk-3.0) \ + $(pkg-config --libs webkit2gtk-4.0) \ $(pkg-config --libs xmlbird) \ $(pkg-config --libs libnotify) \ -L./build -L./build/bin -l birdgems -l svgbird \
--- a/scripts/version.py +++ b/scripts/version.py @@ -13,7 +13,7 @@ Lesser General Public License for more details. """ - VERSION = '2.16.9' + VERSION = '2.16.10' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR