First release of dislocker-noruby: 0.7.1-1

4 files changed, 65 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8434ed870e72..9f32967fc399 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
-# Generated by mksrcinfo v8
-# Thu Feb  9 16:35:23 UTC 2017
-pkgbase = dislocker
-	pkgdesc = Read BitLocker encrypted volumes under Linux
+pkgbase = dislocker-noruby
+	pkgdesc = Read BitLocker encrypted volumes under Linux (no ruby bindings/dependency)
 	pkgver = 0.7.1
-	pkgrel = 2
+	pkgrel = 1
 	url = http://www.hsc.fr/ressources/outils/dislocker
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = make
 	makedepends = cmake
 	depends = fuse
 	depends = mbedtls
-	depends = ruby
 	optdepends = ntfs-3g: NTFS file system support
+	provides = dislocker
+	conflicts = dislocker
 	conflicts = dislocker-git
 	source = https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz
+	source = no-ruby.patch
 	sha1sums = 0c5c62f63ba587663eb0474f1bd6ca7e345fe977
+	sha1sums = 0c47520eae3f9536cf7a54abc6bb244290e413d6
 
-pkgname = dislocker
+pkgname = dislocker-noruby
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..2a9e3dd7ab39
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.gz
+*.pkg.tar.*
+/pkg/
+/src/
diff --git a/PKGBUILD b/PKGBUILD
index 5aaa11f2c1a2..a9d125f71272 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,47 @@
-# Maintainer: mrxx <mrxx at cyberhome dot at>
+# Maintainer: Allen Wild <allenwild93 at gmail dot com>
+# Contributor: mrxx <mrxx at cyberhome dot at>
 
-pkgname=dislocker
+_name=dislocker
+pkgname=${_name}-noruby
 pkgver=0.7.1
-pkgrel=2
-pkgdesc="Read BitLocker encrypted volumes under Linux"
+pkgrel=1
+pkgdesc="Read BitLocker encrypted volumes under Linux (no ruby bindings/dependency)"
 arch=('i686' 'x86_64')
 url="http://www.hsc.fr/ressources/outils/dislocker"
 license=('GPL2')
-depends=('fuse' 'mbedtls' 'ruby')
-makedepends=('make' 'cmake')
-conflicts=('dislocker-git')
+depends=('fuse' 'mbedtls')
+makedepends=('cmake')
+provides=('dislocker')
+conflicts=('dislocker' 'dislocker-git')
 optdepends=('ntfs-3g: NTFS file system support')
-source=(https://github.com/Aorimn/dislocker/archive/v$pkgver.tar.gz)
-sha1sums=('0c5c62f63ba587663eb0474f1bd6ca7e345fe977')
+source=(https://github.com/Aorimn/dislocker/archive/v$pkgver.tar.gz
+        no-ruby.patch)
+sha1sums=('0c5c62f63ba587663eb0474f1bd6ca7e345fe977'
+          '0c47520eae3f9536cf7a54abc6bb244290e413d6')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd "$srcdir/$_name-$pkgver"
+  patch -p1 -i "$srcdir/no-ruby.patch"
+}
 
-  # Fix v0.7 upstream path error
-  sed -i 's/DIS_MAN \${PROJECT_SOURCE_DIR}/DIS_MAN ../' src/CMakeLists.txt
+build() {
+  cd "$srcdir/$_name-$pkgver"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -Dlibdir=/usr/lib \
         -D WARN_FLAGS:STRING="-Wall -Wextra" \
+        -DWITH_RUBY=OFF \
         .
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_name-$pkgver"
   make DESTDIR="$pkgdir/" install
 
-  install -Dm644 README.md ${pkgdir}/usr/share/doc/${pkgname}/README
-  install -Dm644 CHANGELOG.md ${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG
-  install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 README.md ${pkgdir}/usr/share/doc/${_name}/README
+  install -Dm644 CHANGELOG.md ${pkgdir}/usr/share/doc/${_name}/CHANGELOG
+  install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${_name}/LICENSE
 }
+
+# vim: ft=sh et sw=2 sts=2
diff --git a/no-ruby.patch b/no-ruby.patch
new file mode 100644
index 000000000000..059fbc283d23
--- /dev/null
+++ b/no-ruby.patch
@@ -0,0 +1,26 @@
+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()
+ 	return ()
+ endif()
+ 
+-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)
++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()
+ endif()
+ 
+ find_package (FUSE)