Re: [PR PATCH] [Updated] iniparser: update to 4.2.2

[tranzystorekk <tranzystorekk@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]

There is an updated pull request by tranzystorekk against master on the void-packages repository

https://github.com/tranzystorekk/void-packages iniparser
https://github.com/void-linux/void-packages/pull/50534

iniparser: update to 4.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Dropped `iniparser-example` as it now builds example binaries which are neither useful nor allowed.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/50534.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iniparser-50534.patch --]
[-- Type: text/x-diff, Size: 9847 bytes --]

From 8b773ac7c93381af2351b93c4387f28f23e90ff2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 26 May 2024 22:50:48 +0200
Subject: [PATCH 1/4] iniparser: update to 4.2.2

---
 common/shlibs                                 |  2 +-
 srcpkgs/iniparser-example                     |  1 -
 srcpkgs/iniparser/files/iniparser.pc          | 11 ----
 .../iniparser/patches/no-install-tests.patch  | 15 +++++
 srcpkgs/iniparser/template                    | 59 +++++--------------
 5 files changed, 31 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/iniparser-example
 delete mode 100644 srcpkgs/iniparser/files/iniparser.pc
 create mode 100644 srcpkgs/iniparser/patches/no-install-tests.patch

diff --git a/common/shlibs b/common/shlibs
index 65658013b5ffb6..800be475ad4d2c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2480,7 +2480,7 @@ libCEGUISILLYImageCodec.so cegui-0.8.7_1
 libct.so.4 freetds-0.95.19_1
 libsybdb.so.5 freetds-0.95.19_1
 libqqwing.so.2 qqwing-1.3.4_1
-libiniparser.so.1 iniparser-4.1_1
+libiniparser.so.4 iniparser-4.2.2_1
 libzita-resampler.so.1 zita-resampler-1.3.0_1
 libmlt.so.6 mlt-6.4.1_1
 libmlt++.so.3 mlt-6.4.1_1
diff --git a/srcpkgs/iniparser-example b/srcpkgs/iniparser-example
deleted file mode 120000
index 237c429bcdd2b2..00000000000000
--- a/srcpkgs/iniparser-example
+++ /dev/null
@@ -1 +0,0 @@
-iniparser
\ No newline at end of file
diff --git a/srcpkgs/iniparser/files/iniparser.pc b/srcpkgs/iniparser/files/iniparser.pc
deleted file mode 100644
index 8f820f01bc8991..00000000000000
--- a/srcpkgs/iniparser/files/iniparser.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Package configuration for @PKGNAME@-@VERSION@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: @PKGNAME@
-Description: Library to parse ini files
-Version: @VERSION@
-Libs: -L${libdir} -liniparser
-Cflags: -I${includedir}
diff --git a/srcpkgs/iniparser/patches/no-install-tests.patch b/srcpkgs/iniparser/patches/no-install-tests.patch
new file mode 100644
index 00000000000000..61e43f952c8a60
--- /dev/null
+++ b/srcpkgs/iniparser/patches/no-install-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f97b195..b679519 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,10 +141,6 @@ if(BUILD_TESTS)
+             $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/>
+             $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>)
+ 
+-  install(TARGETS ${TEST_NAME})
+-  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test/ressources
+-          DESTINATION ${CMAKE_INSTALL_BINDIR})
+-
+   enable_testing()
+   add_test(
+     NAME testsuite
diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template
index fb813c7d870db6..94570542a0ef04 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -1,49 +1,24 @@
 # Template file for 'iniparser'
 pkgname=iniparser
-version=4.1
-revision=3
-build_style=gnu-makefile
-hostmakedepends="doxygen chrpath"
+version=4.2.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_EXAMPLES=OFF"
+hostmakedepends="doxygen"
 short_desc="Free stand-alone ini file parsing library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://ndevilla.free.fr/iniparser/"
-distfiles="https://github.com/ndevilla/iniparser/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae
+homepage="https://gitlab.com/iniparser/iniparser"
+changelog="https://gitlab.com/iniparser/iniparser/-/releases"
+distfiles="https://gitlab.com/iniparser/iniparser/-/archive/v${version}/iniparser-v${version}.tar.gz"
+checksum=7996b62cf499b83edb1a47e28d3c5cc74a2320c7e0b7f8cbb9f5cd5f3c5477e3
 
-CFLAGS="-fPIC"
+if [ "${XBPS_CHECK_PKGS}" ]; then
+	configure_args+=" -DBUILD_TESTS=ON"
+fi
 
-post_build() {
-	make docs
-}
-
-do_install() {
+post_install() {
 	vlicense LICENSE
-
-	# Install header files
-	vmkdir usr/include
-	vcopy "src/*.h" usr/include
-
-	# Install libraries
-	vmkdir usr/lib
-	vcopy "libiniparser.*" usr/lib
-	ln -s libiniparser.so.1 ${DESTDIR}/usr/lib/libiniparser.so
-	chrpath -d ${DESTDIR}/usr/lib/libiniparser.so
-
-	# Install pkg-config file
-	vmkdir usr/lib/pkgconfig
-	sed ${FILESDIR}/${pkgname}.pc \
-		-e "s;@PKGNAME@;$pkgname;g" \
-		-e "s;@VERSION@;$version;g" \
-		> ${DESTDIR}/usr/lib/pkgconfig/${pkgname}.pc
-
-	# Install example source and binaries
-	vmkdir usr/share/${pkgname}/example
-	vcopy "${wrksrc}/example/*" usr/share/${pkgname}/example
-
-	# Install documentation
-	vmkdir usr/share/doc/${pkgname}
-	vcopy "${wrksrc}/html/*" usr/share/doc/${pkgname}
 }
 
 iniparser-devel_package() {
@@ -51,20 +26,16 @@ iniparser-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
+
 iniparser-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
 		vmove usr/share/doc/iniparser
 	}
 }
-iniparser-example_package() {
-	short_desc+=" - example code"
-	pkg_install() {
-		vmove usr/share/iniparser/example
-	}
-}

From c9ce40f1d62f5ff03385126174c5f65240f1ae15 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 26 May 2024 23:42:47 +0200
Subject: [PATCH 2/4] cava: rebuild for iniparser

---
 srcpkgs/cava/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cava/template b/srcpkgs/cava/template
index 102607733abb96..6c9a016da12a46 100644
--- a/srcpkgs/cava/template
+++ b/srcpkgs/cava/template
@@ -1,7 +1,7 @@
 # Template file for 'cava'
 pkgname=cava
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf-archive automake libtool pkg-config"
 makedepends="fftw-devel iniparser-devel ncurses-devel SDL2-devel

From 5c9d8bf477697413cadf28fa6bce8213617a3500 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 26 May 2024 23:43:28 +0200
Subject: [PATCH 3/4] ubridge: rebuild for iniparser

---
 srcpkgs/ubridge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ubridge/template b/srcpkgs/ubridge/template
index edaf0ef76a1f06..f56d35312022e6 100644
--- a/srcpkgs/ubridge/template
+++ b/srcpkgs/ubridge/template
@@ -1,7 +1,7 @@
 # Template file for 'ubridge'
 pkgname=ubridge
 version=0.9.18
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="SYSTEM_INIPARSER=1"
 makedepends="libpcap-devel iniparser-devel"

From d3f0e435d8251b7eb1248b9b0c79cf9cb79f93ac Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 27 May 2024 09:36:12 +0200
Subject: [PATCH 4/4] xava: remove package

---
 srcpkgs/cava-gui                        |  1 -
 srcpkgs/removed-packages/template       |  2 ++
 srcpkgs/xava/patches/broken-cmake.patch | 22 ----------------------
 srcpkgs/xava/template                   | 25 -------------------------
 4 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 120000 srcpkgs/cava-gui
 delete mode 100644 srcpkgs/xava/patches/broken-cmake.patch
 delete mode 100644 srcpkgs/xava/template

diff --git a/srcpkgs/cava-gui b/srcpkgs/cava-gui
deleted file mode 120000
index 987273b2a47e73..00000000000000
--- a/srcpkgs/cava-gui
+++ /dev/null
@@ -1 +0,0 @@
-xava
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2a9c23233278b0..bb135d9a58cbdb 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -59,6 +59,7 @@ replaces="
  captain-ballard<=1.0.0_2
  cargo-edit<=0.12.2_1
  cargo-outdated<=0.13.1_2
+ cava-gui<=0.6.3.1_2
  cawbird<=1.3.2_3
  cegui07-data<=0.7.9_8
  cegui07-devel<=0.7.9_8
@@ -748,6 +749,7 @@ replaces="
  wlroots0.14-devel<=0.14.1_1
  wlroots0.14<=0.14.1_1
  wmii<=3.9.2_8
+ xava<=0.6.3.1_2
  xcdroast<=1.19_1
  xdebug8.0<=3.2.1_1
  xlennart<=1.1.1_1
diff --git a/srcpkgs/xava/patches/broken-cmake.patch b/srcpkgs/xava/patches/broken-cmake.patch
deleted file mode 100644
index 56411aadd3da14..00000000000000
--- a/srcpkgs/xava/patches/broken-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt	2020-08-27 15:31:42.000000000 +0700
-+++ b/CMakeLists.txt	2021-01-14 21:44:51.704505119 +0700
-@@ -10,19 +10,6 @@
- option(SNDIO "SNDIO" ON)
- option(PORTAUDIO "PORTAUDIO" ON)
- 
--# Fix pkg-config for cross-builds (such as MinGW on ArchLinux)
--if(CMAKE_FIND_ROOT_PATH)
--    set(CMAKE_SYSROOT "${CMAKE_FIND_ROOT_PATH}")
--
--    set(ENV{PKG_CONFIG_DIR} "")
--    set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig")
--    set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT})
--endif()
--
--if(NOT CMAKE_BUILD_TYPE)
--	set(CMAKE_BUILD_TYPE Debug)
--endif()
--
- set(CMAKE_C_STANDARD 11)
- set(xava_VERSION_MAJOR 0)
- set(xava_VERSION_MINOR 6)
diff --git a/srcpkgs/xava/template b/srcpkgs/xava/template
deleted file mode 100644
index f7cf336ac7f6d3..00000000000000
--- a/srcpkgs/xava/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'xava'
-pkgname=xava
-version=0.6.3.1
-revision=2
-build_style=cmake
-hostmakedepends="automake libtool pkg-config"
-makedepends="SDL2-devel iniparser-devel ncurses-devel sndio-devel portaudio-devel"
-short_desc="X11 Audio Visualizer for ALSA"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/nikp123/xava"
-distfiles="https://github.com/nikp123/xava/archive/${version}.tar.gz"
-checksum=b38b810e4bfd71aff44f223b444ae4f158eb8d6428c5e9d42697343ccb5a19f9
-
-post_install() {
-	vlicense LICENSE
-	vmkdir usr/share/examples
-	vcopy example_files/etc usr/share/examples/xava
-}
-
-cava-gui_package() {
-	depends="xava"
-	short_desc+=" - transition package"
-	build_style=meta
-}