The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Switch back to webkit2gtk-3.0

These changes was commited to the Birdfont repository Mon, 20 Jun 2016 20:42:10 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Mon, 20 Jun 2016 20:42:10 +0000]

Updated Files

.travis.yml
configure
dodo.py
--- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,8 @@ - sudo apt-get install -qq libnotify-dev - sudo apt-get install -qq valac-0.30 - sudo apt-get install -qq python3 - - sudo add-apt-repository "deb http://se.archive.ubuntu.com/ubuntu/ xenial main restricted" - - sudo apt-get update -qq - - sudo apt-get --only-upgrade install -qq libwebkit2gtk-4.0-dev - + - sudo apt-get install -qq libwebkit2gtk-3.0-dev - python3 ./configure --nonnull - python3 ./scripts/linux_build.py
--- a/configure +++ b/configure @@ -78,7 +78,7 @@ 'gio-2.0', 'glib-2.0', 'gtk+-3.0', - 'webkit2gtk-4.0', + 'webkit2gtk-3.0', 'libsoup-2.4', 'libnotify', 'sqlite3',
diff --git a/dodo.py b/dodo.py
--- a/dodo.py +++ b/dodo.py @@ -75,7 +75,7 @@ --pkg cairo \ --pkg libsoup-2.4 \ --pkg gdk-pixbuf-2.0 \ - --pkg webkit2gtk-4.0 \ + --pkg webkit2gtk-3.0 \ --pkg libnotify \ --pkg xmlbird \ --pkg libbirdfont @@ -91,7 +91,7 @@ $(pkg-config --cflags cairo) \ $(pkg-config --cflags glib-2.0) \ $(pkg-config --cflags gdk-pixbuf-2.0) \ - $(pkg-config --cflags webkit2gtk-4.0) \ + $(pkg-config --cflags webkit2gtk-3.0) \ $(pkg-config --cflags libnotify) \ -o OBJECT_FILE""" @@ -104,7 +104,7 @@ $(pkg-config --libs cairo) \ $(pkg-config --libs glib-2.0) \ $(pkg-config --libs gdk-pixbuf-2.0) \ - $(pkg-config --libs webkit2gtk-4.0) \ + $(pkg-config --libs webkit2gtk-3.0) \ $(pkg-config --libs xmlbird) \ $(pkg-config --libs libnotify) \ -L./build -L./build/bin -l birdgems\