[packages/taglib] unbreak pc file; rel 2

[atler]

commit a3a6334460ba73ce30b6b8eff9040aa5d411c8cd
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Sep 29 22:00:35 2023 +0200

    unbreak pc file; rel 2
    
    submitted upstream: https://github.com/taglib/taglib/pull/1152

 pc.patch    | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 taglib.spec |  4 ++-
 2 files changed, 93 insertions(+), 1 deletion(-)
---
diff --git a/taglib.spec b/taglib.spec
index e7c9b6d..297ded1 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -2,12 +2,13 @@ Summary:	A tag library for reading and editing audio meta data
 Summary(pl.UTF-8):	Biblioteka tag do odczytu i edycji metadanych dotyczących dźwięku
 Name:		taglib
 Version:	1.13.1
-Release:	1
+Release:	2
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 #Source0Download: http://taglib.org/
 Source0:	https://taglib.org/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	2fe6089da73ad414aa1b982b83415362
+Patch0:		pc.patch
 URL:		https://taglib.org/
 BuildRequires:	cmake >= 3.0.0
 BuildRequires:	libstdc++-devel
@@ -61,6 +62,7 @@ Przykładowe programy w postaci źródłowej dla tagliba.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
diff --git a/pc.patch b/pc.patch
new file mode 100644
index 0000000..a5fe51b
--- /dev/null
+++ b/pc.patch
@@ -0,0 +1,90 @@
+From a27ce770db14fcc4dcb971f2122b9ede64c6298d Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus at fastmail.com>
+Date: Fri, 29 Sep 2023 21:36:12 +0200
+Subject: [PATCH] cmake: support both relative and absolute paths for pc files
+
+cmake supports both absolute and relative to prefix install dirs. #1071
+effectively mandated relative paths only. check if install dir is
+relative or absolute and either include ${prefix} in pc file or not
+
+Fixes #1098
+---
+ CMakeLists.txt               | 10 ++++++++++
+ bindings/c/CMakeLists.txt    | 10 ++++++++++
+ bindings/c/taglib_c.pc.cmake |  4 ++--
+ taglib.pc.cmake              |  4 ++--
+ 4 files changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2393290..e330b690 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -119,6 +119,16 @@ if(WIN32)
+ endif()
+ 
+ if(NOT BUILD_FRAMEWORK)
++  if (IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
++    set(CMAKE_PC_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
++  else()
++    set(CMAKE_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
++  endif()
++  if (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
++    set(CMAKE_PC_LIBDIR ${CMAKE_INSTALL_LIBDIR})
++  else()
++    set(CMAKE_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
++  endif()
+   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" @ONLY)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endif()
+diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
+index d947aa4a..b24c9dca 100644
+--- a/bindings/c/CMakeLists.txt
++++ b/bindings/c/CMakeLists.txt
+@@ -69,6 +69,16 @@ install(TARGETS tag_c
+ )
+ 
+ if(NOT BUILD_FRAMEWORK)
++	if (IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
++		set(CMAKE_PC_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
++	else()
++		set(CMAKE_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
++	endif()
++	if (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
++		set(CMAKE_PC_LIBDIR ${CMAKE_INSTALL_LIBDIR})
++	else()
++		set(CMAKE_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
++	endif()
+ 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc @ONLY)
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+diff --git a/bindings/c/taglib_c.pc.cmake b/bindings/c/taglib_c.pc.cmake
+index 178f1e50..b3b4b2ac 100644
+--- a/bindings/c/taglib_c.pc.cmake
++++ b/bindings/c/taglib_c.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_PC_LIBDIR@
++includedir=@CMAKE_PC_INCLUDEDIR@
+ 
+ Name: TagLib C Bindings
+ Description: Audio meta-data library (C bindings)
+diff --git a/taglib.pc.cmake b/taglib.pc.cmake
+index 3800f078..1f1c9fdb 100644
+--- a/taglib.pc.cmake
++++ b/taglib.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_PC_LIBDIR@
++includedir=@CMAKE_PC_INCLUDEDIR@
+ 
+ Name: TagLib
+ Description: Audio meta-data library
+-- 
+2.42.0
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/taglib.git/commitdiff/102c6803595a910463c6f640433b5787abff40a5