haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

qtox, bump version (needed for updated qrencode) (#9108)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-07-29 16:25:03 +00:00
committed by GitHub
parent 479f8ce652
commit 7d920c9f0b
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net-im/qtox/patches/qtox-1.17.4.patchset → net-im/qtox/patches/qtox-1.17.6.patchset
View File

@@ -1,6 +1,6 @@
From f84f1528028c47ab30f80025f122a2482e6468f5 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 13 Dec 2020 15:04:22 +0000
From 07f5cdd50f094d5629c70b2edc18fd0c6556ff3d Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 29 Jul 2023 17:01:09 +0000
Subject: Haiku doesn't use sys/errno.h
@@ -18,17 +18,17 @@ index fd29869..7656a2e 100644
#else
#include <sys/errno.h>
--
2.28.0
2.37.3
From e55563b2d097de5bc07f7711ea7cad88311d08af Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 13 Dec 2020 15:08:08 +0000
From 9fd224ead75380f6c5423dd460f5c777fc25ba24 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 29 Jul 2023 17:01:46 +0000
Subject: Don't use fstack-protector on Haiku also
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5191d5..a52837a 100644
index 29858c4..153070d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,7 @@ if (COMPILER_SUPPORTS_WDATE_TIME)
@@ -41,5 +41,5 @@ index c5191d5..a52837a 100644
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstack-protector")
endif()
--
2.28.0
2.37.3

8
net-im/qtox/qtox-1.17.4.recipe → net-im/qtox/qtox-1.17.6.recipe
View File

@@ -6,7 +6,7 @@ COPYRIGHT="2015-2021 qTox maintainers"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/qTox/qTox/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="3d2fe2a344c83c50e6603d2a4070f2cc0c6ccd13fa5e77457eff96f57ee6f8c2"
CHECKSUM_SHA256="cd0781241b4ea536da90ce8c72ad9f2aa9bbdf9fbae5d38ee645e30d790fa7f2"
SOURCE_FILENAME="qtox-v$portVersion.tar.gz"
SOURCE_DIR="qTox-$portVersion"
PATCHES="qtox-$portVersion.patchset"
@@ -28,6 +28,7 @@ REQUIRES="
lib:libexif$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libKF5SonnetCore$secondaryArchSuffix
lib:libopenal$secondaryArchSuffix
lib:libopus$secondaryArchSuffix
lib:libqrencode$secondaryArchSuffix
@@ -46,10 +47,12 @@ REQUIRES="
lib:libswscale$secondaryArchSuffix
lib:libtoxcore$secondaryArchSuffix
lib:libvpx$secondaryArchSuffix
lib:libX11$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
xlibe${secondaryArchSuffix}_devel
devel:libavcodec$secondaryArchSuffix
devel:libavdevice$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
@@ -57,6 +60,7 @@ BUILD_REQUIRES="
devel:libexif$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libKF5SonnetCore$secondaryArchSuffix
devel:libopenal$secondaryArchSuffix
devel:libopus$secondaryArchSuffix
devel:libqrencode$secondaryArchSuffix
@@ -90,7 +94,7 @@ BUILD()
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$appsDir \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DCMAKE_EXE_LINKER_FLAGS=-lnetwork ..
-DCMAKE_EXE_LINKER_FLAGS=-lnetwork -Wno-dev ..
make $jobArgs
}