[arch-commits] Commit in tcplay/trunk (PKGBUILD tc-play-1.1-fix-paths.patch)

[Levente Polyak]

    Date: Sunday, March 1, 2020 @ 20:35:51
  Author: anthraxx
Revision: 588163

upgpkg: tcplay 3.1-1

Modified:
  tcplay/trunk/PKGBUILD
Deleted:
  tcplay/trunk/tc-play-1.1-fix-paths.patch

-----------------------------+
 PKGBUILD                    |   51 ++++++++++++++++++++++--------------------
 tc-play-1.1-fix-paths.patch |   49 ----------------------------------------
 2 files changed, 27 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-01 20:35:46 UTC (rev 588162)
+++ PKGBUILD	2020-03-01 20:35:51 UTC (rev 588163)
@@ -1,36 +1,39 @@
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Timothy Redaelli <timothy.redaelli at gmail.com>
 # Contributor: Thomas Weißschuh <thomas t-8ch de>
 # Contributor: James Reed <supplantr at archlinux dot info>
 
 pkgname=tcplay
-pkgver=2.0
-pkgrel=2
-pkgdesc="Free and simple TrueCrypt implementation based on dm-crypt."
+pkgver=3.1
+pkgrel=1
+pkgdesc='Free and simple TrueCrypt implementation based on dm-crypt'
+url='https://github.com/bwalex/tc-play'
 arch=('x86_64')
-url="https://github.com/bwalex/tc-play"
-license=('custom')
-depends=('device-mapper')
+license=('BSD')
+depends=('glibc' 'device-mapper' 'libutil-linux' 'libgcrypt' 'libuuid.so')
 makedepends=('cmake' 'udev')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/bwalex/tc-play/archive/v${pkgver}.tar.gz"
-        tc-play-1.1-fix-paths.patch)
-sha256sums=('0e17890f37e862746364b10bad62bbd9f3e2b2811a24b07df12eff266534e42d'
-            '007b960675400b7e0a10765952041dcc1943e5cb79367e2ed4938f2c5e64ea57')
+provides=('libtcplay.so')
+source=(https://github.com/bwalex/tc-play/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('edca7cf5ea4ad824adb86be83ab742781a87e6b16c53a045bdd1b781a8da75e6')
+b2sums=('03195a3fffae843ae9336bc7b2fdd8834c7f31bedabb9014b041ac49768cebd9bd37c7e2000c6dbab1878ab2ec5d9c2dc8ba372b7e0e538b5613c047d527caa7')
 
-prepare() {
-  cd "tc-play-$pkgver"
-  patch -Np1 -i ../tc-play-1.1-fix-paths.patch
-  sed -i 's/-Wnested-externs/-Wnested-externs -fPIC/g' CMakeLists.txt
-}
-
 build() {
-  cd "tc-play-$pkgver"
-  mkdir -p objdir
-  cd objdir
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  mkdir -p tc-play-${pkgver}/build
+  cd tc-play-${pkgver}/build
+  # cmake is stupid
+  export CFLAGS+=" ${CPPFLAGS}"
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX= \
+    -DSBIN_DIR=bin ..
+  make VERBOSE=1
 }
 
 package() {
-  cd "tc-play-$pkgver/objdir"
-  make DESTDIR="$pkgdir" install
-  install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/tcplay/LICENSE
+  cd tc-play-${pkgver}
+  make -C build DESTDIR="$pkgdir" install
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 CHANGELOG README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
+
+# vim: ts=2 sw=2 et:

Deleted: tc-play-1.1-fix-paths.patch
===================================================================
--- tc-play-1.1-fix-paths.patch	2020-03-01 20:35:46 UTC (rev 588162)
+++ tc-play-1.1-fix-paths.patch	2020-03-01 20:35:51 UTC (rev 588163)
@@ -1,49 +0,0 @@
---- tc-play-1.1/CMakeLists.txt.orig	2013-12-12 22:55:24.788832261 +0100
-+++ tc-play-1.1/CMakeLists.txt	2013-12-12 22:56:16.099181617 +0100
-@@ -63,20 +63,6 @@
- endif()
- 
- 
--if (NOT LIB_SUFFIX)
--	message(STATUS "")
--	message(STATUS "LIB_SUFFIX variable is not defined. It will be autodetected now.")
--	message(STATUS "You can set it manually with -DLIB_SUFFIX=<value> (e.g. 64).")
--	if (CMAKE_SIZEOF_VOID_P EQUAL 8)
--		message(STATUS "\nSetting LIB_SUFFIX=64\n")
--		set (LIB_SUFFIX "64")
--	else()
--		message(STATUS "\nSetting LIB_SUFFIX=\n")
--		set (LIB_SUFFIX "")
--	endif()
--endif()
--
--
- 
- add_executable(tcplay-bin main.c ${SRCS_COMMON} ${SRCS_LINUX} ${SRCS_PBKDF})
- set_target_properties(tcplay-bin PROPERTIES OUTPUT_NAME tcplay)
-@@ -102,7 +88,7 @@
- # Generate pkg-config file tcplay.pc
- file(WRITE ${PROJECT_BINARY_DIR}/tcplay.pc "prefix=${CMAKE_INSTALL_PREFIX}
- exec_prefix=${CMAKE_INSTALL_PREFIX}
--libdir=${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-+libdir=${CMAKE_INSTALL_PREFIX}/lib
- includedir=${CMAKE_INSTALL_PREFIX}/include
- 
- Name: libtcplay
-@@ -117,12 +103,12 @@
- 
- # Installation targets
- install(TARGETS tcplay-bin tcplay-static tcplay-so
--	RUNTIME DESTINATION sbin             COMPONENT bin
--	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib
--	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT lib-dev
-+	RUNTIME DESTINATION bin             COMPONENT bin
-+	LIBRARY DESTINATION lib COMPONENT lib
-+	ARCHIVE DESTINATION lib COMPONENT lib-dev
- )
- 
--install(FILES ${PROJECT_BINARY_DIR}/tcplay.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT lib-dev)
-+install(FILES ${PROJECT_BINARY_DIR}/tcplay.pc DESTINATION lib/pkgconfig COMPONENT lib-dev)
- 
- install(FILES tcplay_api.h DESTINATION include        COMPONENT lib-dev)
- install(FILES tcplay.3     DESTINATION share/man/man3 COMPONENT lib-dev)