summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Grande2021-01-12 21:11:05 -0500
committerVincent Grande2021-01-12 21:11:05 -0500
commit73aab6401d9fdf08e2c225ca22221885ae1ccbe7 (patch)
treef824baf8c2f20fd77b6ffc4854c076f0682f5d3c
parent1d78000db3633e46cd9d148494d5f0296c00b761 (diff)
downloadaur-73aab6401d9fdf08e2c225ca22221885ae1ccbe7.tar.gz
big fixes
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD19
-rw-r--r--cmake-man.diff11
3 files changed, 3 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 27230fa6b27e..627720c9e35e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,8 +15,6 @@ pkgbase = libmikmod-git
provides = libmikmod
conflicts = libmikmod
source = git://git.code.sf.net/p/mikmod/mikmod.git
- source = cmake-man.diff
- sha256sums = SKIP
sha256sums = SKIP
pkgname = libmikmod-git
diff --git a/PKGBUILD b/PKGBUILD
index 0f625942bcec..fc874dc10bf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,26 +15,19 @@ depends=(glibc libpulse sh)
makedepends=(alsa-lib cmake)
provides=(libmikmod.so libmikmod)
conflicts=(libmikmod)
-source=(git://git.code.sf.net/p/mikmod/mikmod.git
- cmake-man.diff)
-sha256sums=('SKIP'
- 'SKIP')
+source=(git://git.code.sf.net/p/mikmod/mikmod.git)
+sha256sums=('SKIP')
pkgver() {
cd mikmod
git describe --tags | sed 's/-/+/g'
}
-prepare() {
- cd mikmod
- patch -Np1 -i ../cmake-man.diff
-}
-
build() {
# cmake ignores CPPFLAGS
CFLAGS+=" $CPPFLAGS"
- cmake -H$mikmod -Bbuild \
+ cmake -Hmikmod/libmikmod -Bbuild \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_DL=1
cmake --build build
@@ -42,12 +35,6 @@ build() {
package() {
DESTDIR="$pkgdir" cmake --build build --target install
-
- install -Dt "$pkgdir/usr/share/aclocal" -m644 libmikmod/libmikmod.m4
- install -Dt "$pkgdir/usr/share/doc/$pkgname" -m644 \
- libmikmod/{NEWS,README,TODO} build/docs/mikmod.html
- install -Dt "$pkgdir/usr/share/info" build/docs/mikmod.info
- install -Dt "$pkgdir/usr/share/man/man1" build/docs/libmikmod-config.1
}
# vim: ts=2 sw=2 et:
diff --git a/cmake-man.diff b/cmake-man.diff
deleted file mode 100644
index 9cc6b44063b7..000000000000
--- a/cmake-man.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r libmikmod-3.3.11.1/docs/CMakeLists.txt libmikmod-3.3.11.1-man/docs/CMakeLists.txt
---- libmikmod-3.3.11.1/docs/CMakeLists.txt 2014-07-10 07:37:00.000000000 +0000
-+++ libmikmod-3.3.11.1-man/docs/CMakeLists.txt 2020-01-11 18:54:48.154853499 +0000
-@@ -20,5 +20,7 @@
- COMMENT "Creating HTML file ${html_out}"
- VERBATIM)
-
-+configure_file(libmikmod-config.1.in libmikmod-config.1 @ONLY)
-+
- add_custom_target(info ALL DEPENDS ${info_out} ${html_out})
- ENDIF(ENABLE_DOC)