From: hervyqa <hervyqa@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] coin3: disable check_cxx_source_compiles, fix freecad for wayland
Date: Sun, 08 May 2022 00:19:40 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37027@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 950 bytes --]
There is a new pull request by hervyqa against master on the void-packages repository
https://github.com/hervyqa/void-packages coin3
https://github.com/void-linux/void-packages/pull/37027
coin3: disable check_cxx_source_compiles, fix freecad for wayland
- fix FreeCAD for wayland (#14626). patch from:
https://forum.freecadweb.org/viewtopic.php?p=354412&sid=85ff490ba28d18686795d961cf062754#p354412
- previously @paper42 using Gnome Wayland also had the same error.
https://github.com/void-linux/void-packages/issues/30515#issuecomment-826906957
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/37027.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coin3-37027.patch --]
[-- Type: text/x-diff, Size: 2108 bytes --]
From 6e57761e964730af7e5ffa104f588e4b9e92118e Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sun, 8 May 2022 04:38:03 +0700
Subject: [PATCH] coin3: disable check_cxx_source_compiles, fix freecad for
wayland
- fix FreeCAD for wayland (#14626). patch from:
https://forum.freecadweb.org/viewtopic.php?p=354412&sid=85ff490ba28d18686795d961cf062754#p354412
- previously @paper42 using Gnome Wayland also had the same error.
https://github.com/void-linux/void-packages/issues/30515#issuecomment-826906957
---
.../disable-check_cxx_source_compiles.patch | 20 +++++++++++++++++++
srcpkgs/coin3/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/coin3/patches/disable-check_cxx_source_compiles.patch
diff --git a/srcpkgs/coin3/patches/disable-check_cxx_source_compiles.patch b/srcpkgs/coin3/patches/disable-check_cxx_source_compiles.patch
new file mode 100644
index 000000000000..adb754d04cdd
--- /dev/null
+++ b/srcpkgs/coin3/patches/disable-check_cxx_source_compiles.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -586,11 +586,11 @@ if(NOT (HAVE_WGL OR HAVE_AGL OR HAVE_CGL
+ list(APPEND COIN_TARGET_LINK_LIBRARIES OpenGL::GLX)
+ endif()
+ set(CMAKE_REQUIRED_LIBRARIES ${COIN_TARGET_LINK_LIBRARIES})
+- check_cxx_source_compiles("
+- #include <GL/gl.h>
+- #include <GL/glx.h>
+- int main() { (void)glXChooseVisual(0L, 0, 0L); glEnd(); return 0; }
+- " HAVE_GLX)
++# check_cxx_source_compiles("
++# #include <GL/gl.h>
++# #include <GL/glx.h>
++# int main() { (void)glXChooseVisual(0L, 0, 0L); glEnd(); return 0; }
++# " HAVE_GLX)
+ endif()
+
+ # Checks specific OpenGL configurations
+
diff --git a/srcpkgs/coin3/template b/srcpkgs/coin3/template
index 2130c0b8b263..4a6ab27df272 100644
--- a/srcpkgs/coin3/template
+++ b/srcpkgs/coin3/template
@@ -1,7 +1,7 @@
# Template file for 'coin3'
pkgname=coin3
version=4.0.0
-revision=2
+revision=3
wrksrc="coin-Coin-${version}"
build_style=cmake
configure_args="-DCMAKE_INSTALL_INCLUDEDIR=include/Coin3
next reply other threads:[~2022-05-07 22:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-07 22:19 hervyqa [this message]
2022-05-08 1:02 ` [PR REVIEW] " sgn
2022-05-08 2:10 ` hervyqa
2022-05-08 8:08 ` hervyqa
2022-05-09 22:42 ` hervyqa
2022-05-09 22:43 ` [PR PATCH] [Closed]: " hervyqa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37027@inbox.vuxu.org \
--to=hervyqa@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).