Skip to content

Commit

Permalink
update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
KristofferC committed Dec 12, 2021
1 parent bd29446 commit d8617d9
Show file tree
Hide file tree
Showing 7 changed files with 145 additions and 59 deletions.
6 changes: 4 additions & 2 deletions N/Notcurses/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ cd ${WORKSPACE}/srcdir/notcurses-*/
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/repent.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/0001-compat-only-declare-strndup-on-windows-c-2428.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/0001-CMake-require-LIBRT-wherever-we-require-LIBM-2453.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/librt_notcurses_input.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/0001-CMake-everything-wants-LIBRT-2453.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/0001-always-define-AT_NO_AUTOMOUNT-if-it-is-not-defined.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/0001-add-missing-cstdint-include.patch
mkdir build && cd build
FLAGS=(-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN}
-DCMAKE_INSTALL_PREFIX=${prefix}
-DCMAKE_BUILD_TYPE=Release
-DBUILD_SHARED_LIBS=ON
-DUSE_MULTIMEDIA=none
-DUSE_DOCTEST=off
-DUSE_PANDOC=off
-DUSE_STATIC=off
Expand All @@ -48,6 +49,7 @@ products = [
# Dependencies that must be installed before this package can be built.
dependencies = [
Dependency("Ncurses_jll"),
Dependency("FFMPEG_jll"),
Dependency("libunistring_jll"),
Dependency("libdeflate_jll"),
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
From 4a13e39da5a7f79a3d4db6c54fef040e08ab6110 Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Sun, 12 Dec 2021 06:10:51 -0500
Subject: [PATCH] [CMake] everything wants LIBRT #2453

thanks Kristoffer Carlsson <kcarlsson89@gmail.com>!
---
CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5ed5c171..b7f723f81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,7 +139,7 @@ find_package(Threads)
set_package_properties(Threads PROPERTIES TYPE REQUIRED)
# platform-specific logics
if(WIN32)
- set(LIBRT_LIBRARIES wsock32 ws2_32 Secur32)
+ set(LIBRT wsock32 ws2_32 Secur32)
elseif(NOT APPLE)
find_library(LIBM m REQUIRED)
find_library(LIBRT rt REQUIRED)
@@ -270,7 +270,7 @@ target_link_libraries(notcurses-core
"${gpm}"
PUBLIC
Threads::Threads
- "${LIBRT_LIBRARIES}"
+ "${LIBRT}"
)
target_link_libraries(notcurses-core-static
PRIVATE
@@ -281,7 +281,7 @@ target_link_libraries(notcurses-core-static
"${unistring}"
"${gpm}"
Threads::Threads
- "${LIBRT_LIBRARIES}"
+ "${LIBRT}"
)
target_link_directories(notcurses-core
PRIVATE
@@ -599,6 +599,7 @@ target_include_directories(notcurses-info
target_link_libraries(notcurses-info
PRIVATE
notcurses
+ "${LIBRT}"
)

############################################################################
@@ -616,6 +617,7 @@ target_include_directories(notcurses-input
target_link_libraries(notcurses-input
PRIVATE
notcurses++
+ "${LIBRT}"
)

############################################################################
@@ -633,6 +635,7 @@ target_include_directories(nctetris
target_link_libraries(nctetris
PRIVATE
notcurses++
+ "${LIBRT}"
)
endif()

@@ -678,6 +681,7 @@ target_include_directories(ncneofetch
target_link_libraries(ncneofetch
PRIVATE
notcurses
+ "${LIBRT}"
)

# documentation source, processed by pandoc into XHTML and man pages. declare
--
2.30.2

23 changes: 23 additions & 0 deletions N/Notcurses/bundled/patches/0001-add-missing-cstdint-include.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 667d0e81f7bb1760f1b8825582e5136c6b595363 Mon Sep 17 00:00:00 2001
From: KristofferC <kcarlsson89@gmail.com>
Date: Sun, 12 Dec 2021 14:32:14 +0100
Subject: [PATCH] add missing `cstdint` include

---
src/player/play.cpp | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/player/play.cpp b/src/player/play.cpp
index 1886f7852..94c0e303a 100644
--- a/src/player/play.cpp
+++ b/src/player/play.cpp
@@ -1,5 +1,6 @@
#include <array>
#include <memory>
+#include <cinttypes>
#include <cstring>
#include <cstdlib>
#include <clocale>
--
2.30.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From df3b37f9a4487fac49643c39f55349d6c03f2c57 Mon Sep 17 00:00:00 2001
From: Kristoffer Carlsson <kcarlsson89@gmail.com>
Date: Sun, 12 Dec 2021 14:15:49 +0100
Subject: [PATCH] always define `AT_NO_AUTOMOUNT` if it is not defined

---
src/ls/main.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ls/main.cpp b/src/ls/main.cpp
index 7f89bf6fe..714d60393 100644
--- a/src/ls/main.cpp
+++ b/src/ls/main.cpp
@@ -14,8 +14,8 @@
#include <sys/types.h>
#include <compat/compat.h>
#include <ncpp/Direct.hh>
-#ifndef __linux__
-#define AT_NO_AUTOMOUNT 0 // not defined on freebsd
+#ifndef AT_NO_AUTOMOUNT
+#define AT_NO_AUTOMOUNT 0x800
#endif

void usage(std::ostream& os, const char* name, int code){
--
2.30.2

15 changes: 15 additions & 0 deletions N/Notcurses/bundled/patches/define_at_no_automount.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/ls/main.cpp b/src/ls/main.cpp
index 7f89bf6fe..76b14c49c 100644
--- a/src/ls/main.cpp
+++ b/src/ls/main.cpp
@@ -14,8 +14,8 @@
#include <sys/types.h>
#include <compat/compat.h>
#include <ncpp/Direct.hh>
-#ifndef __linux__
-#define AT_NO_AUTOMOUNT 0 // not defined on freebsd
+#ifndef AT_NO_AUTOMOUNT
+#define AT_NO_AUTOMOUNT 0x800
#endif

void usage(std::ostream& os, const char* name, int code){
20 changes: 0 additions & 20 deletions N/Notcurses/bundled/patches/librt.patch

This file was deleted.

37 changes: 0 additions & 37 deletions N/Notcurses/bundled/patches/librt_notcurses_input.patch

This file was deleted.

0 comments on commit d8617d9

Please sign in to comment.