diff options
| author | ormorph <roma251078@mail.ru> | 2024-03-24 21:53:58 +0300 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2024-03-26 03:31:07 +0100 |
| commit | 9a76c13fddb55b0f202e048df62c939e06f39559 (patch) | |
| tree | df3f4b90227ea65df873a427b972f1c4435feaef | |
| parent | dce40bcbeecf6170c3979a09750e4200ccc65e3b (diff) | |
| download | tde-packaging-gentoo-9a76c13fddb55b0f202e048df62c939e06f39559.tar.gz tde-packaging-gentoo-9a76c13fddb55b0f202e048df62c939e06f39559.zip | |
Solving the problem of building tdewebdev packages with ninja
Signed-off-by: ormorph <roma251078@mail.ru>
(cherry picked from commit 2769940be476aca58d96f626ecab898409ad8b48)
| -rw-r--r-- | trinity-base/klinkstatus/files/tdewebdev-ninja.patch | 10 | ||||
| -rw-r--r-- | trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild | 4 | ||||
| -rw-r--r-- | trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild | 4 | ||||
| -rw-r--r-- | trinity-base/kxsldbg/files/tdewebdev-ninja.patch | 10 | ||||
| -rw-r--r-- | trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild | 1 | ||||
| -rw-r--r-- | trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild | 1 | ||||
| -rw-r--r-- | trinity-base/quanta/files/tdewebdev-ninja.patch | 10 | ||||
| -rw-r--r-- | trinity-base/quanta/quanta-14.1.0.ebuild | 1 | ||||
| -rw-r--r-- | trinity-base/quanta/quanta-14.1.1.ebuild | 1 |
9 files changed, 42 insertions, 0 deletions
diff --git a/trinity-base/klinkstatus/files/tdewebdev-ninja.patch b/trinity-base/klinkstatus/files/tdewebdev-ninja.patch new file mode 100644 index 00000000..1d2a04ba --- /dev/null +++ b/trinity-base/klinkstatus/files/tdewebdev-ninja.patch @@ -0,0 +1,10 @@ +--- a/ConfigureChecks.cmake 2024-03-24 21:40:09.165729665 +0300 ++++ b/ConfigureChecks.cmake 2024-03-24 21:41:43.299725728 +0300 +@@ -59,6 +59,7 @@ + tde_execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc + OUTPUT_VARIABLE ICU_CXXFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + diff --git a/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild b/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild index 2a7b4d26..94e37fe9 100644 --- a/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild +++ b/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild @@ -17,6 +17,10 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi +PATCHES=( + "${FILESDIR}/tdewebdev-ninja.patch" +) + src_configure() { append-cxxflags "-std=c++11" trinity-meta-2_src_configure diff --git a/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild b/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild index 2a7b4d26..94e37fe9 100644 --- a/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild +++ b/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild @@ -17,6 +17,10 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi +PATCHES=( + "${FILESDIR}/tdewebdev-ninja.patch" +) + src_configure() { append-cxxflags "-std=c++11" trinity-meta-2_src_configure diff --git a/trinity-base/kxsldbg/files/tdewebdev-ninja.patch b/trinity-base/kxsldbg/files/tdewebdev-ninja.patch new file mode 100644 index 00000000..1d2a04ba --- /dev/null +++ b/trinity-base/kxsldbg/files/tdewebdev-ninja.patch @@ -0,0 +1,10 @@ +--- a/ConfigureChecks.cmake 2024-03-24 21:40:09.165729665 +0300 ++++ b/ConfigureChecks.cmake 2024-03-24 21:41:43.299725728 +0300 +@@ -59,6 +59,7 @@ + tde_execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc + OUTPUT_VARIABLE ICU_CXXFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + diff --git a/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild b/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild index e75bb2bd..dc8dc2fb 100644 --- a/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild +++ b/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild @@ -26,6 +26,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-add-headers.patch" + "${FILESDIR}/tdewebdev-ninja.patch" ) src_configure() { diff --git a/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild b/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild index e75bb2bd..dc8dc2fb 100644 --- a/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild +++ b/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild @@ -26,6 +26,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-add-headers.patch" + "${FILESDIR}/tdewebdev-ninja.patch" ) src_configure() { diff --git a/trinity-base/quanta/files/tdewebdev-ninja.patch b/trinity-base/quanta/files/tdewebdev-ninja.patch new file mode 100644 index 00000000..1d2a04ba --- /dev/null +++ b/trinity-base/quanta/files/tdewebdev-ninja.patch @@ -0,0 +1,10 @@ +--- a/ConfigureChecks.cmake 2024-03-24 21:40:09.165729665 +0300 ++++ b/ConfigureChecks.cmake 2024-03-24 21:41:43.299725728 +0300 +@@ -59,6 +59,7 @@ + tde_execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc + OUTPUT_VARIABLE ICU_CXXFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + diff --git a/trinity-base/quanta/quanta-14.1.0.ebuild b/trinity-base/quanta/quanta-14.1.0.ebuild index e587c136..75077812 100644 --- a/trinity-base/quanta/quanta-14.1.0.ebuild +++ b/trinity-base/quanta/quanta-14.1.0.ebuild @@ -37,6 +37,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-xml2.patch" + "${FILESDIR}/tdewebdev-ninja.patch" ) src_unpack() { diff --git a/trinity-base/quanta/quanta-14.1.1.ebuild b/trinity-base/quanta/quanta-14.1.1.ebuild index e587c136..75077812 100644 --- a/trinity-base/quanta/quanta-14.1.1.ebuild +++ b/trinity-base/quanta/quanta-14.1.1.ebuild @@ -37,6 +37,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-xml2.patch" + "${FILESDIR}/tdewebdev-ninja.patch" ) src_unpack() { |