haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

SubtitleComposer: fix build for secondary arch

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-10-15 23:07:46 +10:00
parent f5f9980ab5
commit a13858f50a
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
media-video/subtitlecomposer/patches/subtitlecomposer-0.7.0.patchset
View File

@@ -1,4 +1,4 @@
From b74e4c7e1d7a5f53ec3f5eb6623ff442149b11ba Mon Sep 17 00:00:00 2001
From 76a8bccb9cdf3049931e8dc637f4e9231ffa0698 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 15 Oct 2019 20:49:48 +1000
Subject: Use system iconset
@@ -24,7 +24,7 @@ index dd29dfa..d1a4ffd 100644
2.23.0
From 85066ee3afed712695a5572dfe93333679820f29 Mon Sep 17 00:00:00 2001
From 4d2dc6643098bf34d96ec5570626122bef3dcde4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 15 Oct 2019 20:50:28 +1000
Subject: Fix phonon widget
@@ -46,3 +46,32 @@ index 813fd10..c4b4e2f 100644
--
2.23.0
From 49a7a627393cb3d0008a893eb50c64e20313bbbb Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 15 Oct 2019 23:03:05 +1000
Subject: Disable stack protector
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b9dfb2e..8d16df9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,10 +7,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
message(STATUS "GNU C compiler detected")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -O0 -g")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -O0 -g")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g -Wall -O2 -pipe")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g -Wall -O2 -pipe")
endif()
include_directories(
--
2.23.0

3
media-video/subtitlecomposer/subtitlecomposer-0.7.0.recipe
View File

@@ -26,7 +26,7 @@ FEATURES:
HOMEPAGE="https://github.com/maxrd2/SubtitleComposer"
COPYRIGHT="2007-2019 Subtitle Composer project"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/maxrd2/SubtitleComposer/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="90dee806df0ee57f4098d417f62014b4533dbf5598d5535c9da1066536c1ed41"
SOURCE_DIR="SubtitleComposer-$portVersion"
@@ -148,7 +148,6 @@ BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:python2
cmd:pkg_config$secondaryArchSuffix
"