Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix wxwidgets with gtk3 #5247

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
+55 −19
Open

fix wxwidgets with gtk3 #5247

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a4685f5
fix wxwidgets with gtk3
hahahahbenny Sep 16, 2024
3a7110e
delete the linux condition in the on_load part of gdk-pixbuf
hahahahbenny Sep 16, 2024
4fc39a5
add bz version
hahahahbenny Sep 17, 2024
f1c39af
change the gz version to bz2 version
hahahahbenny Sep 17, 2024
d7b9a47
Merge branch 'fix_wxwidgets_gtk3' of https://github.com/hahahahbenny/…
hahahahbenny Sep 25, 2024
6967fbf
Merge branch 'dev' of https://github.com/xmake-io/xmake-repo into fix…
hahahahbenny Sep 25, 2024
be78124
change the gtk3 packagedeps to glib harfbuzz and cairo
hahahahbenny Sep 29, 2024
15c683a
delete packagedeps and add cmake version warning
hahahahbenny Oct 16, 2024
3e05be8
add gdk-pixbuf shared option
hahahahbenny Oct 16, 2024
051954b
Remove the manual addition of GTK3's includedir
hahahahbenny Oct 16, 2024
c614bd9
specify the cmake version
hahahahbenny Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/g/gdk-pixbuf/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,16 @@ package("gdk-pixbuf")
add_includedirs("include", "include/gdk-pixbuf-2.0")

add_deps("meson", "ninja")
add_deps("libpng", "libjpeg-turbo", "libtiff", "glib", "pcre2")
add_deps("libpng", "libjpeg-turbo", "glib", "pcre2")

on_load(function (package)
if package:config("shared") then
package:add("deps", "libtiff", {configs = {shared = true}})
else
package:add("deps", "libtiff")
end
end)

if is_plat("windows") then
add_syslinks("iphlpapi", "dnsapi")
add_deps("pkgconf", "libintl")
Expand Down
13 changes: 11 additions & 2 deletions packages/g/gtk3/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,17 @@ package("gtk3")

add_includedirs("include", "include/gtk-3.0")

on_load("linux", function (package)
if package:config("shared") then
package:add("deps", "gdk-pixbuf", {configs = {shared = true}})
else
package:add("deps", "gdk-pixbuf")
end
end)

add_deps("meson", "ninja")
add_deps("cairo", {configs = {glib = true}})
add_deps("glib", "gdk-pixbuf", "pango", "libepoxy", "graphene", "libxkbcommon", "libxext")
add_deps("glib", "pango", "libepoxy", "graphene", "libxkbcommon", "libxext")
add_deps("libx11", "libxfixes", "libxcursor", "libxi", "libxcomposite", "libxrandr", "libxdamage", "libxinerama", "at-spi2-core")
add_links("gtk-3", "gdk-3", "gailutil-3", "X11", "X11-cxb", "pangocairo-1.0", "pango", "rt")

Expand All @@ -31,7 +39,8 @@ package("gtk3")
io.replace("gdk/x11/gdkglcontext-x11.c", [[cairo/cairo-xlib.h]], [[cairo-xlib.h]], {plain = true})
import("package.tools.meson").install(package, configs, {packagedeps = {"libx11",
"libxext",
"libxi",
"libxi",
"pango",
"at-spi2-core",
"cairo",
"libthai",
Expand Down
50 changes: 34 additions & 16 deletions packages/w/wxwidgets/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,21 @@ package("wxwidgets")
add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true})
add_configs("debug", {description = "Enable debug symbols.", default = false, type = "boolean", readonly = true})
else
add_urls("https://github.com/wxWidgets/wxWidgets/archive/refs/tags/$(version).tar.gz",
add_urls("https://github.com/wxWidgets/wxWidgets/releases/download/v$(version)/wxWidgets-$(version).tar.bz2",
"https://github.com/wxWidgets/wxWidgets.git")
add_versions("v3.2.0", "43480e3887f32924246eb439520a3a2bc04d7947712de1ea0590c5b58dedadd9")
add_versions("v3.2.2", "2a4ec4d1af3f22fbfd0a40b051385a5d82628d9f28bae8427f5c30d72bdaade7")
add_versions("v3.2.3", "0eb9499c06778c6746dbd4aee2a124f1995a5db331e282d15237b0046c1788af")
add_versions("v3.2.4", "b358b7f59f5b7cb934265120d114e5fd510a8b40802d00a111a85911eb5100d1")
add_versions("3.2.0", "356e9b55f1ae3d58ae1fed61478e9b754d46b820913e3bfbc971c50377c1903a")
add_versions("3.2.2", "8edf18672b7bc0996ee6b7caa2bee017a9be604aad1ee471e243df7471f5db5d")
add_versions("3.2.3", "c170ab67c7e167387162276aea84e055ee58424486404bba692c401730d1a67a")
add_versions("3.2.4", "0640e1ab716db5af2ecb7389dbef6138d7679261fbff730d23845ba838ca133e")
add_versions("3.2.5", "0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51")

add_deps("cmake")
add_deps("libjpeg", "libpng", "nanosvg", "expat", "zlib")
add_deps("cmake", {configs = {version = "3.26.4"}})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥还要限制 cmake 版本，而且也不是这么配的

add_deps("cmake >=3.26.4")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的我修改一下

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prusa3d/PrusaSlicer#12169 具体可以参考这个issue

add_deps("libjpeg", "libpng", "nanosvg", "expat", "zlib", "pango", "at-spi2-core", "glib")
if is_plat("linux") then
add_deps("gtk+3", "opengl")
add_deps("opengl", "at-spi2-core")
end
end

if is_plat("macosx") then
add_defines("__WXOSX_COCOA__", "__WXMAC__", "__WXOSX__", "__WXMAC_XCODE__")
add_frameworks("AudioToolbox", "WebKit", "CoreFoundation", "Security", "Carbon", "Cocoa", "IOKit", "QuartzCore")
Expand All @@ -79,6 +80,9 @@ package("wxwidgets")
add_defines("__WXGTK3__", "__WXGTK__")
add_syslinks("pthread", "m", "dl")
add_syslinks("X11", "Xext", "Xtst", "xkbcommon")
add_links(
"pango-1.0", "pangoxft-1.0", "pangocairo-1.0", "pangoft2-1.0"
)
elseif is_plat("windows") then
add_defines("WXUSINGDLL", "__WXMSW__", "wxSUFFIX=u", "wxMSVC_VERSION=14x")
add_links(
Expand Down Expand Up @@ -107,8 +111,18 @@ package("wxwidgets")
if package:config("shared") then
package:add("defines", "WXUSINGDLL")
package:add("deps", "libtiff", {configs = {shared = true}})
package:add("deps", "gdk-pixbuf", {configs = {shared = true}})
else
package:add("deps", "libtiff")
package:add("deps", "gdk-pixbuf")
end

if is_plat("linux") then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

package:is_plat

if package:config("shared") then
package:add("deps", "gtk3", {configs = {shared = true}})
else
package:add("deps", "gtk3")
end
end
end
end)
Expand All @@ -124,6 +138,16 @@ package("wxwidgets")
end)

on_install("macosx", "linux", function (package)
-- Notify the user about issues caused by the CMake version.
local cmake = package:dep("cmake")
local cmake_fetch = cmake:fetch()
local major, minor, patch = cmake_fetch.version:match("^(%d+)%.(%d+)%.(%d+)$")
local cmake_version = tonumber(major.. minor.. patch)
if cmake_version > 3280 then
wprint("\ncmake may not find Cmath detail in https://github.com/prusa3d/PrusaSlicer/issues/12169\n")
end

io.replace("build/cmake/modules/FindGTK3.cmake", "QUIET", "REQUIRED")
local configs = {"-DwxBUILD_TESTS=OFF",
"-DwxBUILD_SAMPLES=OFF",
"-DwxBUILD_DEMOS=OFF",
Expand All @@ -141,13 +165,7 @@ package("wxwidgets")
table.insert(configs, "-DwxBUILD_DEBUG_LEVEL=2")
end
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
if package:is_plat("linux") then
local libgtk3 = package:dep("gtk+3"):fetch()
if libgtk3 then
table.insert(configs, "-DGTK3_INCLUDE_DIRS=" .. table.concat(libgtk3.sysincludedirs, ";"))
table.insert(configs, "-DGTK3_LIBRARIES=" .. table.concat(libgtk3.links, ";"))
end
end

import("package.tools.cmake").install(package, configs)
local version = package:version()
local subdir = "wx-" .. version:major() .. "." .. version:minor()
Expand Down
Loading