Skip to content

Commit

Permalink
add the wayland config and changge at-spi2-core writting
Browse files Browse the repository at this point in the history
  • Loading branch information
hahahahbenny committed Sep 11, 2024
1 parent 0d3dc27 commit 5c3152a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions packages/a/at-spi2-core/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package("at-spi2-core")
local configs = {}
table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
import("package.tools.meson").install(package, configs, {packagedeps = {"glib", "libiconv", "libx11", "libxtst", "libxi", "dbus"}})
local atspi_pkgconfig_dir = package:installdir() .. "/lib/pkgconfig/atspi-2.pc"
io.replace(atspi_pkgconfig_dir, "-DG_LOG_DOMAIN=\"dbind\"", "-DG_LOG_DOMAIN=\\\"dbind\\\"")
local atspi_pkgconfig_dir = package:installdir("lib/pkgconfig/atspi-2.pc")
io.replace(atspi_pkgconfig_dir, [[-DG_LOG_DOMAIN="dbind"]], [[-DG_LOG_DOMAIN=\"dbind\"]])
end)

on_test(function (package)
Expand Down
8 changes: 7 additions & 1 deletion packages/g/gtk+3/xmake.lua → packages/g/gtk3/xmake.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package("gtk+3")
package("gtk3")

set_homepage("https://gtk.org/")
set_description("Toolkit for creating graphical user interfaces")
Expand All @@ -13,6 +13,8 @@ package("gtk+3")
end
end)

add_configs("wayland", {description = "build the gtk with wayland backend", default = false, type = "boolean"})

if is_plat("linux") then
add_syslinks("rt")
end
Expand All @@ -27,6 +29,10 @@ package("gtk+3")

on_install("linux", function (package)
local configs = {"-Dintrospection=false", "-Ddemos=false", "-Dexamples=false", "-Dtests=false"}

--Disable the Wayland option temporarily, as there is currently a problem with meson https://github.com/xmake-io/xmake/pull/5484
table.insert(configs, "-Dwayland_backend=" .. (package:config("wayland") and "true" or "false"))

table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
import("package.tools.meson").install(package, configs, {packagedeps = {"libx11", "libxext", "libxi", "at-spi2-core", "libthai", "libdatrie", "gdk-pixbuf"}})
end)
Expand Down

0 comments on commit 5c3152a

Please sign in to comment.