pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

plasma-workspace: fix build



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sat Apr 27 21:01:04 2019 +0300
Changeset:	76fdee0dfedb115188dc2ef7f0592b273a9187c7

Modified Files:
	plasma-workspace/distinfo
Added Files:
	plasma-workspace/patches/patch-config-X11.h.cmake
	plasma-workspace/patches/patch-libkworkspace_config-libkworkspace.h.cmake
	plasma-workspace/patches/patch-runners_windows_config-windowsrunner.h.cmake

Log Message:
plasma-workspace: fix build

TRUE is not defined anywhere, so #define HAVE_X11 TRUE becomes
 #define HAVE_X11 0!

(Perhaps this was working on a purely wayland setup?)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=76fdee0dfedb115188dc2ef7f0592b273a9187c7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 plasma-workspace/distinfo                                    |  3 +++
 plasma-workspace/patches/patch-config-X11.h.cmake            | 12 ++++++++++++
 .../patches/patch-libkworkspace_config-libkworkspace.h.cmake | 11 +++++++++++
 .../patch-runners_windows_config-windowsrunner.h.cmake       | 11 +++++++++++
 4 files changed, 37 insertions(+)

diffs:
diff --git a/plasma-workspace/distinfo b/plasma-workspace/distinfo
index 41b61299ff..77f02c0601 100644
--- a/plasma-workspace/distinfo
+++ b/plasma-workspace/distinfo
@@ -4,4 +4,7 @@ SHA1 (plasma-workspace-5.12.4.tar.xz) = 1440b91bfda3e3aae9bfa3d586e1491da7cbb818
 RMD160 (plasma-workspace-5.12.4.tar.xz) = d1c3ea7ee4ec036f204203e441f62e6971635ab3
 SHA512 (plasma-workspace-5.12.4.tar.xz) = 629f0286fffd1e90cf68611a3b14a8934e9770dd821b4c6de25549af00fefd305c848342f55559a9223199433ed8f180975ceac38765904de95179d1980fc3f5
 Size (plasma-workspace-5.12.4.tar.xz) = 4556108 bytes
+SHA1 (patch-config-X11.h.cmake) = 53d6aeab4310d73d8546fe632306ecb797b4c3fb
+SHA1 (patch-libkworkspace_config-libkworkspace.h.cmake) = f30e556a27fc179379ca2502f9b849a8d30312b3
+SHA1 (patch-runners_windows_config-windowsrunner.h.cmake) = 2d674c113fb1c1b8342739a28409546ca2edeff6
 SHA1 (patch-startkde_startkde.cmake) = 49e9f3a5a3d0eb76865c1120d8aa3fee3a886030
diff --git a/plasma-workspace/patches/patch-config-X11.h.cmake b/plasma-workspace/patches/patch-config-X11.h.cmake
new file mode 100644
index 0000000000..65883391bd
--- /dev/null
+++ b/plasma-workspace/patches/patch-config-X11.h.cmake
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Avoid HAVE_X11 TRUE, where TRUE is not defined yet!
+
+--- config-X11.h.cmake.orig	2018-03-27 11:26:39.000000000 +0000
++++ config-X11.h.cmake
+@@ -41,4 +41,4 @@
+ #cmakedefine HAS_RANDR_1_3 1
+ 
+ /* Define if you have X11 at all */
+-#define HAVE_X11 ${X11_FOUND}
++#cmakedefine01 HAVE_X11
diff --git a/plasma-workspace/patches/patch-libkworkspace_config-libkworkspace.h.cmake b/plasma-workspace/patches/patch-libkworkspace_config-libkworkspace.h.cmake
new file mode 100644
index 0000000000..9219125cc3
--- /dev/null
+++ b/plasma-workspace/patches/patch-libkworkspace_config-libkworkspace.h.cmake
@@ -0,0 +1,11 @@
+$NetBSD$
+
+Avoid HAVE_X11 TRUE, where TRUE is not defined yet!
+
+--- libkworkspace/config-libkworkspace.h.cmake.orig	2018-03-27 11:26:39.000000000 +0000
++++ libkworkspace/config-libkworkspace.h.cmake
+@@ -1,2 +1,2 @@
+ /* Define if you have X11 at all */
+-#define HAVE_X11 ${X11_FOUND}
+\ No newline at end of file
++#cmakedefine01 HAVE_X11
diff --git a/plasma-workspace/patches/patch-runners_windows_config-windowsrunner.h.cmake b/plasma-workspace/patches/patch-runners_windows_config-windowsrunner.h.cmake
new file mode 100644
index 0000000000..2da63af1a8
--- /dev/null
+++ b/plasma-workspace/patches/patch-runners_windows_config-windowsrunner.h.cmake
@@ -0,0 +1,11 @@
+$NetBSD$
+
+Avoid HAVE_X11 TRUE, where TRUE is not defined yet!
+
+--- runners/windows/config-windowsrunner.h.cmake.orig	2018-03-27 11:26:39.000000000 +0000
++++ runners/windows/config-windowsrunner.h.cmake
+@@ -1,2 +1,2 @@
+ /* Define if you have X11 at all */
+-#define HAVE_X11 ${X11_FOUND}
+\ No newline at end of file
++#cmakedefine01 HAVE_X11


Home | Main Index | Thread Index | Old Index