Skip to content

Commit 90fcf58

Browse files
committed
update flatpak_option.patch
1 parent 1eddcec commit 90fcf58

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

flatpak_option.patch

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ index cff6df95e..27ee33305 100644
3030
--
3131
2.34.1
3232

33-
34-
From 3ff86e67a97ddca53df2732846112f3fe783d2c2 Mon Sep 17 00:00:00 2001
33+
From b9dad02a19a084c00fed88600cd67f3cff614bb2 Mon Sep 17 00:00:00 2001
3534
From: Shyamnath Premnadh <[email protected]>
3635
Date: Fri, 26 Jul 2024 10:50:53 +0200
3736
Subject: [PATCH 2/3] PySide Build: Add an option to provide extra include
@@ -46,25 +45,21 @@ Subject: [PATCH 2/3] PySide Build: Add an option to provide extra include
4645
Pick-to: 6.7
4746
Change-Id: Ibd4c9702a741d8047ccaf53d84a1c97550d78ffe
4847
---
49-
build_scripts/main.py | 9 +++++++++
48+
build_scripts/main.py | 5 +++++
5049
build_scripts/options.py | 8 +++++++-
5150
sources/pyside6/cmake/PySideHelpers.cmake | 12 +++++++++++-
52-
3 files changed, 27 insertions(+), 2 deletions(-)
51+
3 files changed, 23 insertions(+), 2 deletions(-)
5352

5453
diff --git a/build_scripts/main.py b/build_scripts/main.py
55-
index 506a9891f..1b5fee450 100644
54+
index 506a9891f..da132f0e0 100644
5655
--- a/build_scripts/main.py
5756
+++ b/build_scripts/main.py
58-
@@ -613,6 +613,15 @@ class PysideBuild(_build, CommandMixin, BuildInfoCollectorMixin):
57+
@@ -613,6 +613,11 @@ class PysideBuild(_build, CommandMixin, BuildInfoCollectorMixin):
5958
cmake_cmd.append("-DPYSIDE_TREAT_QT_INCLUDE_DIRS_AS_NON_SYSTEM=ON")
6059
log.info("Shiboken will now process system Qt headers")
6160

6261
+ if OPTION['SHIBOKEN_EXTRA_INCLUDE_PATHS']:
63-
+ extra_include_paths = ''
64-
+ for path in OPTION['SHIBOKEN_EXTRA_INCLUDE_PATHS'].split(','):
65-
+ if extra_include_paths:
66-
+ extra_include_paths += ';'
67-
+ extra_include_paths += path
62+
+ extra_include_paths = ';'.join(OPTION['SHIBOKEN_EXTRA_INCLUDE_PATHS'].split(','))
6863
+ cmake_cmd.append(f"-DSHIBOKEN_FORCE_PROCESS_SYSTEM_INCLUDE_PATHS={extra_include_paths}")
6964
+ log.info(f"Shiboken will now process system headers from: {extra_include_paths}")
7065
+
@@ -130,8 +125,7 @@ index 01c438107..48502f384 100644
130125
--
131126
2.34.1
132127

133-
134-
From 75ff562443d2369aae2f0d3755d16cdd75a707a6 Mon Sep 17 00:00:00 2001
128+
From e6aabc488976156122e6a4d073b10111775a127f Mon Sep 17 00:00:00 2001
135129
From: Shyamnath Premnadh <[email protected]>
136130
Date: Fri, 26 Jul 2024 11:04:20 +0200
137131
Subject: [PATCH 3/3] PySide Build: Add --flatpak option

0 commit comments

Comments
 (0)