diff options
| author | Allen Wild | 2021-01-09 19:45:26 -0500 |
|---|---|---|
| committer | Allen Wild | 2021-01-10 02:13:53 -0500 |
| commit | 7c2b29e0df95ef1f412b08db95f9a685e0b79096 (patch) | |
| tree | b5d40ab961fd08da9a8a240f3516c766a7e09da4 | |
| parent | 111a7ef6893cc3ad172c21734796a5e70fd56129 (diff) | |
| download | aur-7c2b29e0df95ef1f412b08db95f9a685e0b79096.tar.gz | |
rebase patch and fix build
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | no-ruby.patch | 28 |
3 files changed, 15 insertions, 19 deletions
@@ -17,7 +17,7 @@ pkgbase = dislocker-noruby source = https://github.com/Aorimn/dislocker/archive/v0.7.3.tar.gz source = no-ruby.patch sha256sums = 8d5275577c44f2bd87f6e05dd61971a71c0e56a9cbedf000bd38deadd8b6c1e6 - sha256sums = 0b8d211cab004d17ec7a3841ca4597a909a5b61fe6197125d26a09f4ef669a85 + sha256sums = 2ec0b679a914544eda264fb9d2f2c1c618df411b16b9c1605d0ddb12623a340e pkgname = dislocker-noruby @@ -17,7 +17,7 @@ optdepends=('ntfs-3g: NTFS file system support') source=($url/archive/v$pkgver.tar.gz no-ruby.patch) sha256sums=('8d5275577c44f2bd87f6e05dd61971a71c0e56a9cbedf000bd38deadd8b6c1e6' - '0b8d211cab004d17ec7a3841ca4597a909a5b61fe6197125d26a09f4ef669a85') + '2ec0b679a914544eda264fb9d2f2c1c618df411b16b9c1605d0ddb12623a340e') prepare() { cd "$srcdir/$_name-$pkgver" @@ -30,8 +30,6 @@ build() { cmake -DCMAKE_INSTALL_PREFIX=/usr \ -Dlibdir=/usr/lib \ - -DC_INCLUDE_PATH="$C_INCLUDE_PATH:/usr/include/ruby-2.6.0/" \ - -D WARN_FLAGS:STRING="-Wall -Wextra" \ -DWITH_RUBY=OFF \ . make diff --git a/no-ruby.patch b/no-ruby.patch index 059fbc283d23..7766bbc4f631 100644 --- a/no-ruby.patch +++ b/no-ruby.patch @@ -1,26 +1,24 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 656b4e6..b5caa0c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -121,12 +121,15 @@ else() +--- dislocker-0.7.3/src/CMakeLists.txt.orig ++++ dislocker-0.7.3/src/CMakeLists.txt +@@ -129,12 +129,15 @@ return () endif() -find_package (Ruby) --if(RUBY_FOUND AND RUBY_INCLUDE_DIRS AND RUBY_LIBRARIES) +-if(RUBY_FOUND AND RUBY_INCLUDE_DIRS AND RUBY_LIBRARY) - include_directories (${RUBY_INCLUDE_DIRS}) -- set (LIB "${LIB} ${RUBY_LIBRARIES}") +- set (LIB ${LIB} ${RUBY_LIBRARY}) - add_definitions (-D_HAVE_RUBY=${RUBY_VERSION_STRING}) - set (SOURCES ${SOURCES} ruby.c) -+option(WITH_RUBY "Enable ruby bindings" ON) ++option (WITH_RUBY "Enable Ruby bindings" ON) +if (WITH_RUBY) -+ find_package (Ruby) -+ if(RUBY_FOUND AND RUBY_INCLUDE_DIRS AND RUBY_LIBRARIES) -+ include_directories (${RUBY_INCLUDE_DIRS}) -+ set (LIB "${LIB} ${RUBY_LIBRARIES}") -+ add_definitions (-D_HAVE_RUBY=${RUBY_VERSION_STRING}) -+ set (SOURCES ${SOURCES} ruby.c) -+ endif() ++ find_package (Ruby) ++ if(RUBY_FOUND AND RUBY_INCLUDE_DIRS AND RUBY_LIBRARY) ++ include_directories (${RUBY_INCLUDE_DIRS}) ++ set (LIB ${LIB} ${RUBY_LIBRARY}) ++ add_definitions (-D_HAVE_RUBY=${RUBY_VERSION_STRING}) ++ set (SOURCES ${SOURCES} ruby.c) ++ endif() endif() find_package (FUSE) |