fix for libsoup3

This commit is contained in:
Stefan Salewski 2021-10-20 10:56:29 +02:00
commit 7ef13ff676

View file

@ -1,6 +1,6 @@
# High level gobject-introspection based GTK4/GTK3 bindings for the Nim programming language # High level gobject-introspection based GTK4/GTK3 bindings for the Nim programming language
# nimpretty --maxLineLen:130 gen.nim # nimpretty --maxLineLen:130 gen.nim
# v 0.9.5 2021-OCT-01 # v 0.9.6 2021-OCT-20
# (c) S. Salewski 2018, 2019, 2020, 2021 # (c) S. Salewski 2018, 2019, 2020, 2021
# usefull for finding death code: # usefull for finding death code:
@ -400,6 +400,8 @@ proc fixedModName(s: string): string =
result &= "5" result &= "5"
if not ISGTK3 and (s == "gtksource"): if not ISGTK3 and (s == "gtksource"):
result &= "5" result &= "5"
if not ISGTK3 and (s == "libsoup"):
result &= "3"
proc gBaseInfoGetName(info: GIBaseInfo): string = proc gBaseInfoGetName(info: GIBaseInfo): string =
result = $(gir.gBaseInfoGetName(info)) result = $(gir.gBaseInfoGetName(info))
@ -4288,6 +4290,12 @@ proc cairo_gobject_rectangle_get_type*(): GType {.importc, libprag.}
if version == "5.0": if version == "5.0":
suff = "5" suff = "5"
if namespace == "Soup":
if version == "2.4":
suff = ""
if version == "3.0":
suff = "3"
var o = open("nim_gi" / (namespace.toLowerAscii) & suff & ".nim", fmWrite) var o = open("nim_gi" / (namespace.toLowerAscii) & suff & ".nim", fmWrite)
o.write(output.data) o.write(output.data)
o.close() o.close()
@ -4345,11 +4353,12 @@ proc launch() =
main("Vte") main("Vte")
main("Notify") main("Notify")
main("Handy") main("Handy")
main("Soup", "2.4") # process Soup before Nice, preventing the load of not matching libsoup version
main("Nice") main("Nice")
main("cairo") main("cairo")
main("WebKit2", "4.0") main("WebKit2", "4.0")
main("JavaScriptCore", "4.0") main("JavaScriptCore", "4.0")
main("Soup") #main("Soup", "2.4")
main("WebKit2WebExtension", "4.0") main("WebKit2WebExtension", "4.0")
main("Gst") main("Gst")
main("GstBase") main("GstBase")
@ -4399,11 +4408,12 @@ proc launch() =
main("Notify") main("Notify")
# main("Handy") # not yet available for GTK4 # main("Handy") # not yet available for GTK4
main("Adw") # replaces libhandy for GTK4 main("Adw") # replaces libhandy for GTK4
main("Nice") main("Soup", "3.0") # process Soup before Nice, preventing the load of not matching libsoup version
main("Nice") # https://discourse.gnome.org/t/some-libsoup-3-issue/7807/14
main("cairo") main("cairo")
main("WebKit2", "5.0") main("WebKit2", "5.0")
main("JavaScriptCore", "5.0") main("JavaScriptCore", "5.0")
main("Soup") #main("Soup", "3.0")
main("WebKit2WebExtension", "5.0") main("WebKit2WebExtension", "5.0")
main("Gst") main("Gst")
main("GstBase") main("GstBase")
@ -4464,7 +4474,7 @@ launch()
# if not xcallerAlloc.contains(el): # if not xcallerAlloc.contains(el):
# echo el # echo el
# 4467 lines # 4477 lines
# gtk_icon_view_get_tooltip_context bug Candidate # gtk_icon_view_get_tooltip_context bug Candidate
# gtk_tree_view_get_cursor bug # gtk_tree_view_get_cursor bug
# #