so, the easiest would be to commit patches 1/4 [1] and 4/4 [2] from bug 983821, then comment #36 [3] here, then comment #38 [4] here.
[1] https://bugs.launchpad.net/midori/+bug/983821/+attachment/3082658/+files/0001-Move-bookmarks-code-out-of-midori-main.c.patch
[2] https://bugs.launchpad.net/midori/+bug/983821/+attachment/3082678/+files/0004-Enable-sql-tracing-on-the-bookmarks-db.patch
[3] https://bugs.launchpad.net/midori/+bug/836707/+attachment/3116815/+files/Bookmarks_Database_structure_improved_on_top_of_983821.patch
[4] https://bugs.launchpad.net/midori/+bug/836707/+attachment/3120857/+files/0001-Rework-bookmarks-conversion-code.patch
so, the easiest would be to commit patches 1/4 [1] and 4/4 [2] from bug 983821, then comment #36 [3] here, then comment #38 [4] here.
[1] /bugs.launchpad .net/midori/ +bug/983821/ +attachment/ 3082658/ +files/ 0001-Move- bookmarks- code-out- of-midori- main.c. patch
https:/
[2] /bugs.launchpad .net/midori/ +bug/983821/ +attachment/ 3082678/ +files/ 0004-Enable- sql-tracing- on-the- bookmarks- db.patch
https:/
[3] /bugs.launchpad .net/midori/ +bug/836707/ +attachment/ 3116815/ +files/ Bookmarks_ Database_ structure_ improved_ on_top_ of_983821. patch
https:/
[4] /bugs.launchpad .net/midori/ +bug/836707/ +attachment/ 3120857/ +files/ 0001-Rework- bookmarks- conversion- code.patch
https:/