public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
Date: Thu, 26 Aug 2021 17:28:54 +0000 (UTC)	[thread overview]
Message-ID: <1629998920.6444c42226d1abc81ce9ec47d232bdf74a0b08a3.asturm@gentoo> (raw)

commit:     6444c42226d1abc81ce9ec47d232bdf74a0b08a3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 17:28:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 17:28:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6444c422

kde-frameworks/plasma: Fix build with IUSE="gles2-only"

Closes: https://bugs.gentoo.org/809815
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../plasma/files/plasma-5.85.0-fix-cmake.patch     | 48 ++++++++++++++++++++++
 kde-frameworks/plasma/plasma-5.85.0-r1.ebuild      |  1 +
 2 files changed, 49 insertions(+)

diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch
new file mode 100644
index 00000000000..0eab0a772c0
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch
@@ -0,0 +1,48 @@
+From e496ef0440c92e119da0b1088f1ab788cebeae33 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 26 Aug 2021 19:12:00 +0200
+Subject: [PATCH] CMake: do not expand variables beforehand
+
+Fixes build when FindOpenGL is disabled, producing a syntax error:
+"Function invoked with incorrect arguments for function named: ADD_FEATURE_INFO"
+
+See also: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/267
+
+Downstream report: https://bugs.gentoo.org/809815
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e27ebd914..25abbf921 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,20 +110,20 @@ set_package_properties(EGL PROPERTIES
+                        TYPE OPTIONAL
+                       )
+ 
+-add_feature_info(GLX ${OpenGL_GLX_FOUND} "OpenGL GLX libraries.")
++add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
+ if(OpenGL_GLX_FOUND AND X11_FOUND AND (Qt5Gui_OPENGL_IMPLEMENTATION STREQUAL "GL"))
+     set(HAVE_GLX 1)
+ else()
+     set(HAVE_GLX 0)
+ endif()
+ 
+-add_feature_info(EGL ${OpenGL_EGL_FOUND}
++add_feature_info(EGL OpenGL_EGL_FOUND
+                  "A platform-agnostic mechanism for creating rendering surfaces for use with other graphics libraries, such as OpenGL|ES and OpenVG.")
+ # OpenGL_EGL_FOUND is defined by FindOpenGL
+ if(TARGET OpenGL::EGL)
+     set(HAVE_EGL ${OpenGL_EGL_FOUND})
+     set(EGL_TARGET OpenGL::EGL)
+-elseif(${EGL_FOUND})
++elseif(EGL_FOUND)
+     set(HAVE_EGL ${EGL_FOUND})
+     set(EGL_TARGET EGL::EGL)
+     message(STATUS "Switch to EGL compatibility target EGL::EGL because OpenGL::EGL is not available")
+-- 
+2.33.0
+

diff --git a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
index 4c087e69234..1e392e19061 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
@@ -64,6 +64,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch
 	"${FILESDIR}"/${P}-fix-pinned-calendar-dots.patch # KDE-bug 440627
+	"${FILESDIR}"/${P}-fix-cmake.patch # bug 809815
 )
 
 src_configure() {


             reply	other threads:[~2021-08-26 17:28 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-26 17:28 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-02-01 19:46 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/ Andreas Sturmlechner
2023-01-29  0:12 Andreas Sturmlechner
2022-11-27 11:20 Andreas Sturmlechner
2022-08-06  7:44 Andreas Sturmlechner
2022-07-26 12:08 Andreas Sturmlechner
2022-06-14 12:44 Andreas Sturmlechner
2022-04-21  8:56 Andreas Sturmlechner
2022-04-15 18:27 Andreas Sturmlechner
2022-03-30 14:41 Andreas Sturmlechner
2022-02-10  9:13 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-11-23 14:59 Andreas Sturmlechner
2021-10-11 11:01 Andreas Sturmlechner
2021-09-30 17:24 Andreas Sturmlechner
2021-08-15 18:57 Andreas Sturmlechner
2021-08-15 18:57 Andreas Sturmlechner
2021-01-11 12:28 Andreas Sturmlechner
2020-11-16 23:41 Andreas Sturmlechner
2020-10-26 19:06 Andreas Sturmlechner
2020-04-17 20:59 Andreas Sturmlechner
2020-02-13 23:20 Andreas Sturmlechner
2019-03-13 11:05 Andreas Sturmlechner
2017-04-15 20:31 Andreas Sturmlechner

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=1629998920.6444c42226d1abc81ce9ec47d232bdf74a0b08a3.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.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