Merge ../birdfont-2.x

Changed files (3)

• modified configure
• modified dodo.py
• modified scripts/version.py

Diff

diff --git a/configure b/configureindex 073cdff..03f969a 100755--- a/configure+++ b/configure@@ -92,7 +92,7 @@ def configure(gtk, libbgee, valac): 				'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.pyindex 6b9c8a1..94d9c23 100644--- a/dodo.py+++ b/dodo.py@@ -84,7 +84,7 @@ def make_birdfont(target_binary, deps): 		--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 @@ def make_birdfont(target_binary, deps): 		$(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 @@ def make_birdfont(target_binary, deps): 		$(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 \diff --git a/scripts/version.py b/scripts/version.pyindex c18c578..cffb24e 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 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