diff options
Diffstat (limited to '')
| -rw-r--r-- | source/l/libdiscid/b89c145.patch | 28 | ||||
| -rwxr-xr-x | source/l/libdiscid/libdiscid.SlackBuild | 7 |
2 files changed, 33 insertions, 2 deletions
diff --git a/source/l/libdiscid/b89c145.patch b/source/l/libdiscid/b89c145.patch new file mode 100644 index 000000000..528af5721 --- /dev/null +++ b/source/l/libdiscid/b89c145.patch @@ -0,0 +1,28 @@ +From b89c14599fd8798eef64431bb05e8705aaaea683 Mon Sep 17 00:00:00 2001 +From: Emanuel Haupt <ehaupt@critical.ch> +Date: Mon, 6 Mar 2023 10:42:33 +0100 +Subject: [PATCH] Restore includedir and libdir + +Restore includedir and libdir. This was removed some time between 0.6.2 and 0.6.3 [1] causing pkg-config --libs and --ldflags to report empty -I and -L paths. + +[1] https://github.com/metabrainz/libdiscid/compare/v0.6.2...v0.6.3 + +See also: +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269990 +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1f24916..911bf4a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,6 +38,8 @@ SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installatio + SET(PACKAGE ${PROJECT_NAME}) + SET(VERSION ${PROJECT_VERSION}) + SET(PACKAGE_STRING "${PACKAGE} ${VERSION}") ++SET(includedir ${INCLUDE_INSTALL_DIR}) ++SET(libdir ${LIB_INSTALL_DIR}) + + CONFIGURE_FILE(libdiscid.pc.in libdiscid.pc) + CONFIGURE_FILE(versioninfo.rc.in versioninfo.rc) diff --git a/source/l/libdiscid/libdiscid.SlackBuild b/source/l/libdiscid/libdiscid.SlackBuild index 4bf74517b..613ce870f 100755 --- a/source/l/libdiscid/libdiscid.SlackBuild +++ b/source/l/libdiscid/libdiscid.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libdiscid VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -79,6 +79,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix pkgconfig file: +zcat $CWD/b89c145.patch.gz | patch -p1 --verbose || exit 1 + mkdir build cd build cmake \ |