[PR PATCH] iniparser: update to 4.2.2

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] iniparser: update to 4.2.2
@ 2024-05-26 21:51 tranzystorekk
  2024-05-26 22:26 ` tranzystorekk
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: tranzystorekk @ 2024-05-26 21:51 UTC (permalink / raw)
  To: ml

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

There is a new 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: 12120 bytes --]

From e97b4516aa3530beaed6ea307859802e95a95e99 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 4d1ed761062eeb81390e94dab482b585c8bd630a 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 0bf2558623aed0c0c193fd3abe546a980f56f3ce 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 ccb173b9e84e7c0d515194b7c9684ff703871d19 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 26 May 2024 23:45:00 +0200
Subject: [PATCH 4/4] xava: update to 0.7.0.0

---
 srcpkgs/xava/patches/broken-cmake.patch       | 22 -------------
 srcpkgs/xava/patches/fix-cmake.patch          | 30 +++++++++++++++++
 .../xava/patches/use-system-iniparser.patch   | 33 +++++++++++++++++++
 srcpkgs/xava/template                         | 18 +++++++---
 4 files changed, 76 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/xava/patches/broken-cmake.patch
 create mode 100644 srcpkgs/xava/patches/fix-cmake.patch
 create mode 100644 srcpkgs/xava/patches/use-system-iniparser.patch

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/patches/fix-cmake.patch b/srcpkgs/xava/patches/fix-cmake.patch
new file mode 100644
index 00000000000000..5fcb90457fd847
--- /dev/null
+++ b/srcpkgs/xava/patches/fix-cmake.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37a13bf..a31a3ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,25 +7,11 @@ function(cat IN_FILE OUT_FILE)
+ 	file(APPEND ${OUT_FILE} "${CONTENTS}")
+ endfunction()
+ 
+-# REQUIRE GIT to be present
+-if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/.git)
+-	message(FATAL_ERROR "XAVA from 0.7.0 onwards requires to be built in a .git directory")
+-endif()
+-
+ # Correct CMAKE_INSTALL_PREFIX so that distros don't break
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ 	set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Default installation path" FORCE)
+ endif()
+ 
+-# 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()
+-
+ # Debug is default
+ if(NOT CMAKE_BUILD_TYPE)
+ 	set(CMAKE_BUILD_TYPE Debug)
diff --git a/srcpkgs/xava/patches/use-system-iniparser.patch b/srcpkgs/xava/patches/use-system-iniparser.patch
new file mode 100644
index 00000000000000..7a4a7b3dd3b754
--- /dev/null
+++ b/srcpkgs/xava/patches/use-system-iniparser.patch
@@ -0,0 +1,33 @@
+diff --git a/src/shared/build.cmake b/src/shared/build.cmake
+index 9fb1043..22dd854 100644
+--- a/src/shared/build.cmake
++++ b/src/shared/build.cmake
+@@ -10,10 +10,11 @@ set(ADDITIONAL_SHARED_INCLUDE_DIRS "")
+ execute_process(COMMAND git submodule update --init)
+ 
+ # Pull submodule and install dependency
+-add_library(iniparser STATIC
+-		lib/iniparser/src/dictionary.c
+-		lib/iniparser/src/iniparser.c)
+-set_target_properties(iniparser PROPERTIES COMPILE_FLAGS "-fPIC")
++# add_library(iniparser STATIC
++# 		lib/iniparser/src/dictionary.c
++# 		lib/iniparser/src/iniparser.c)
++# set_target_properties(iniparser PROPERTIES COMPILE_FLAGS "-fPIC")
++find_package(iniparser REQUIRED)
+ 
+ # Runtime library load
+ if(UNIX)
+diff --git a/src/shared/config/config.c b/src/shared/config/config.c
+index 814c2be..a2e86c1 100644
+--- a/src/shared/config/config.c
++++ b/src/shared/config/config.c
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include <iniparser.h>
++#include <iniparser/iniparser.h>
+ 
+ #include "../../shared.h"
+ 
diff --git a/srcpkgs/xava/template b/srcpkgs/xava/template
index f7cf336ac7f6d3..666b893120646a 100644
--- a/srcpkgs/xava/template
+++ b/srcpkgs/xava/template
@@ -1,16 +1,24 @@
 # Template file for 'xava'
 pkgname=xava
-version=0.6.3.1
-revision=2
+version=0.7.0.0
+revision=1
+_efsw_commit=4dc2b9e2718e0ffb0a89a00db5bad7d328b9e3ae
 build_style=cmake
 hostmakedepends="automake libtool pkg-config"
-makedepends="SDL2-devel iniparser-devel ncurses-devel sndio-devel portaudio-devel"
+makedepends="SDL2-devel glew-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
+distfiles="https://github.com/nikp123/xava/archive/refs/tags/${version}.tar.gz
+ https://github.com/SpartanJ/efsw/archive/${_efsw_commit}.tar.gz"
+checksum="bc78aa3073e47bd1e247780464f4d38d05db084a4f49718e39a4d20f61b1398c
+ 74770f00613522a8733a44b81a28c65cf27e3330ff698b340f3c327bdf693083"
+skip_extraction="${_efsw_commit}.tar.gz"
+
+post_extract() {
+	vsrcextract -C lib/efsw ${_efsw_commit}.tar.gz
+}
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
@ 2024-05-26 22:26 ` tranzystorekk
  2024-05-27  7:41 ` [PR PATCH] [Updated] " tranzystorekk
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-05-26 22:26 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/50534#issuecomment-2132415017

Comment:
`xava` doesn't seem worth the maintaining effort - is barely maintained upstream, requires quite a bit of patching and probably doesn't provide much value over cava's backends

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
  2024-05-26 22:26 ` tranzystorekk
@ 2024-05-27  7:41 ` tranzystorekk
  2024-05-27  9:17 ` tranzystorekk
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-05-27  7:41 UTC (permalink / raw)
  To: ml

[-- 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
-}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
  2024-05-26 22:26 ` tranzystorekk
  2024-05-27  7:41 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-05-27  9:17 ` tranzystorekk
  2024-05-27  9:28 ` tranzystorekk
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-05-27  9:17 UTC (permalink / raw)
  To: ml

[-- 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: 11692 bytes --]

From 3f44b75bc8f4d06a91e50740d2bfdd91a86f76ba 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 ----
 .../patches/fix-pkgconfig-includedir.patch    | 10 ++++
 .../iniparser/patches/no-install-tests.patch  | 15 +++++
 srcpkgs/iniparser/template                    | 59 +++++--------------
 6 files changed, 41 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/iniparser-example
 delete mode 100644 srcpkgs/iniparser/files/iniparser.pc
 create mode 100644 srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
 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/fix-pkgconfig-includedir.patch b/srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
new file mode 100644
index 00000000000000..7fd383685c5042
--- /dev/null
+++ b/srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
@@ -0,0 +1,10 @@
+diff --git a/cmake/pc.in b/cmake/pc.in
+index 9098c6d..4017b95 100644
+--- a/cmake/pc.in
++++ b/cmake/pc.in
+@@ -7,4 +7,4 @@ Name: @PROJECT_NAME@
+ Description: @PROJECT_NAME@ library
+ Version: @PROJECT_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/@PROJECT_NAME@
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 9edba734d3a5237e4c89cf9cd7ffddb7afb0319c 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/patches/iniparser-pkgconfig.patch | 17 +++++++++++++++++
 srcpkgs/cava/template                          |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cava/patches/iniparser-pkgconfig.patch

diff --git a/srcpkgs/cava/patches/iniparser-pkgconfig.patch b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
new file mode 100644
index 00000000000000..2b2994abfce783
--- /dev/null
+++ b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 5aeda60..f050570 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,9 +423,10 @@ dnl checking for iniparser
+ dnl ######################
+ 
+ AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
++    PKG_CHECK_MODULES(INIPARSER, iniparser, have_iniparser=yes, have_iniparser=no)
+     if [[ $have_iniparser = "yes" ]] ; then
+-    LIBS="$LIBS -liniparser"
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
++    LIBS="$LIBS $INIPARSER_LIBS"
++      CPPFLAGS="$CPPFLAGS $INIPARSER_CFLAGS"
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
+       [[dictionary* ini;
+       const char *keys[3];
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 592ff8de5dcac700e759b93bec48f2db7d76f086 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 9f46de70df2d10e526ebf7b030e2ebeed9497c1f 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
-}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
                   ` (2 preceding siblings ...)
  2024-05-27  9:17 ` tranzystorekk
@ 2024-05-27  9:28 ` tranzystorekk
  2024-05-27  9:40 ` tranzystorekk
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-05-27  9:28 UTC (permalink / raw)
  To: ml

[-- 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: 12045 bytes --]

From 3f44b75bc8f4d06a91e50740d2bfdd91a86f76ba 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 ----
 .../patches/fix-pkgconfig-includedir.patch    | 10 ++++
 .../iniparser/patches/no-install-tests.patch  | 15 +++++
 srcpkgs/iniparser/template                    | 59 +++++--------------
 6 files changed, 41 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/iniparser-example
 delete mode 100644 srcpkgs/iniparser/files/iniparser.pc
 create mode 100644 srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
 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/fix-pkgconfig-includedir.patch b/srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
new file mode 100644
index 00000000000000..7fd383685c5042
--- /dev/null
+++ b/srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
@@ -0,0 +1,10 @@
+diff --git a/cmake/pc.in b/cmake/pc.in
+index 9098c6d..4017b95 100644
+--- a/cmake/pc.in
++++ b/cmake/pc.in
+@@ -7,4 +7,4 @@ Name: @PROJECT_NAME@
+ Description: @PROJECT_NAME@ library
+ Version: @PROJECT_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/@PROJECT_NAME@
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 dad72ea2004e2ba14758bb1114fcdc27dbe91feb 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

---
 .../cava/patches/iniparser-pkgconfig.patch    | 24 +++++++++++++++++++
 srcpkgs/cava/template                         |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cava/patches/iniparser-pkgconfig.patch

diff --git a/srcpkgs/cava/patches/iniparser-pkgconfig.patch b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
new file mode 100644
index 00000000000000..4b88fb701affe6
--- /dev/null
+++ b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index 5aeda60..6913062 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,16 +423,10 @@ dnl checking for iniparser
+ dnl ######################
+ 
+ AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
++    PKG_CHECK_MODULES(INIPARSER, iniparser, have_iniparser=yes, have_iniparser=no)
+     if [[ $have_iniparser = "yes" ]] ; then
+-    LIBS="$LIBS -liniparser"
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
+-      [[dictionary* ini;
+-      const char *keys[3];
+-      iniparser_getseckeys(ini, "eq", keys);]])],
+-      [AC_MSG_RESULT(iniparser > 3.2 test OK)],
+-      [AC_MSG_RESULT(iniparser > 3.2 test failed falling back to legacy iniparser mode)
+-      CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER"])
++      LIBS="$LIBS $INIPARSER_LIBS"
++      CPPFLAGS="$CPPFLAGS $INIPARSER_CFLAGS"
+     fi
+     if [[ $have_iniparser = "no" ]] ; then
+       AC_MSG_ERROR([iniparser library is required!])
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 62c792c4fee4209e2d0caca7c1203f0c55c10742 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 a7b2c04de5e07d415b69d7d51b274edf7a3261fd 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
-}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
                   ` (3 preceding siblings ...)
  2024-05-27  9:28 ` tranzystorekk
@ 2024-05-27  9:40 ` tranzystorekk
  2024-06-06  8:23 ` tranzystorekk
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-05-27  9:40 UTC (permalink / raw)
  To: ml

[-- 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: 12226 bytes --]

From 7cdcb4442a4a8d525f7dcb1b49818f50be499302 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 ----
 .../patches/fix-pkgconfig-includedir.patch    | 16 +++++
 .../iniparser/patches/no-install-tests.patch  | 15 +++++
 srcpkgs/iniparser/template                    | 59 +++++--------------
 6 files changed, 47 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/iniparser-example
 delete mode 100644 srcpkgs/iniparser/files/iniparser.pc
 create mode 100644 srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
 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/fix-pkgconfig-includedir.patch b/srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
new file mode 100644
index 00000000000000..2cda940f261229
--- /dev/null
+++ b/srcpkgs/iniparser/patches/fix-pkgconfig-includedir.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/pc.in b/cmake/pc.in
+index 9098c6d..40f6759 100644
+--- a/cmake/pc.in
++++ b/cmake/pc.in
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=/usr
+ exec_prefix=${prefix}
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+@@ -7,4 +7,4 @@ Name: @PROJECT_NAME@
+ Description: @PROJECT_NAME@ library
+ Version: @PROJECT_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/@PROJECT_NAME@
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 ae5273f245211259b89aa4d586587324d8a7eb88 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

---
 .../cava/patches/iniparser-pkgconfig.patch    | 24 +++++++++++++++++++
 srcpkgs/cava/template                         |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cava/patches/iniparser-pkgconfig.patch

diff --git a/srcpkgs/cava/patches/iniparser-pkgconfig.patch b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
new file mode 100644
index 00000000000000..4b88fb701affe6
--- /dev/null
+++ b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index 5aeda60..6913062 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,16 +423,10 @@ dnl checking for iniparser
+ dnl ######################
+ 
+ AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
++    PKG_CHECK_MODULES(INIPARSER, iniparser, have_iniparser=yes, have_iniparser=no)
+     if [[ $have_iniparser = "yes" ]] ; then
+-    LIBS="$LIBS -liniparser"
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
+-      [[dictionary* ini;
+-      const char *keys[3];
+-      iniparser_getseckeys(ini, "eq", keys);]])],
+-      [AC_MSG_RESULT(iniparser > 3.2 test OK)],
+-      [AC_MSG_RESULT(iniparser > 3.2 test failed falling back to legacy iniparser mode)
+-      CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER"])
++      LIBS="$LIBS $INIPARSER_LIBS"
++      CPPFLAGS="$CPPFLAGS $INIPARSER_CFLAGS"
+     fi
+     if [[ $have_iniparser = "no" ]] ; then
+       AC_MSG_ERROR([iniparser library is required!])
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 d4324dfad9c7f43c9b1153b06e7f0fd281176b3e 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 0dfee871ef5d79a8f162813df0ac540385e328c1 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
-}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
                   ` (4 preceding siblings ...)
  2024-05-27  9:40 ` tranzystorekk
@ 2024-06-06  8:23 ` tranzystorekk
  2024-06-06  8:24 ` tranzystorekk
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-06-06  8:23 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/50534#issuecomment-2151696028

Comment:
cc @skmpz I nearly forgot to heads-up about the cava patches for iniparser detection

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
                   ` (5 preceding siblings ...)
  2024-06-06  8:23 ` tranzystorekk
@ 2024-06-06  8:24 ` tranzystorekk
  2024-06-14  1:48 ` [PR PATCH] [Updated] " tranzystorekk
  2024-06-16 10:10 ` [PR PATCH] [Updated] iniparser: update to 4.2.3 tranzystorekk
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-06-06  8:24 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/50534#issuecomment-2151696028

Comment:
cc @skmpz I nearly forgot to heads-up about the cava patch for iniparser detection

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] iniparser: update to 4.2.2
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
                   ` (6 preceding siblings ...)
  2024-06-06  8:24 ` tranzystorekk
@ 2024-06-14  1:48 ` tranzystorekk
  2024-06-16 10:10 ` [PR PATCH] [Updated] iniparser: update to 4.2.3 tranzystorekk
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-06-14  1:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1542 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**

Highlights:

- Dropped `iniparser-example` as it now builds example binaries which are neither useful nor allowed.
- Modified pkgconfig includedir for compatiblity with `#include "iniparser.h"`
- Disabled test installation
- Patched cava to use pkgconfig to find iniparser

<!--
#### 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: 10318 bytes --]

From caf62bd0e1738586195f108758362587c737964a 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.3

---
 common/shlibs                        |  2 +-
 srcpkgs/iniparser-example            |  1 -
 srcpkgs/iniparser/files/iniparser.pc | 11 ------
 srcpkgs/iniparser/template           | 57 ++++++----------------------
 4 files changed, 13 insertions(+), 58 deletions(-)
 delete mode 120000 srcpkgs/iniparser-example
 delete mode 100644 srcpkgs/iniparser/files/iniparser.pc

diff --git a/common/shlibs b/common/shlibs
index a33bb85772e392..a2a6880d341db6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2479,7 +2479,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.3_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/template b/srcpkgs/iniparser/template
index fb813c7d870db6..61fc3ad8284953 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -1,49 +1,20 @@
 # Template file for 'iniparser'
 pkgname=iniparser
-version=4.1
-revision=3
-build_style=gnu-makefile
-hostmakedepends="doxygen chrpath"
+version=4.2.3
+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=c928139592541211a8ab1059d8a647065a777625772e79e953e8b500492288bc
 
-CFLAGS="-fPIC"
-
-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 +22,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 54b4390930b31eaad16a02946aa1f63941f293e3 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

---
 .../cava/patches/iniparser-pkgconfig.patch    | 24 +++++++++++++++++++
 srcpkgs/cava/template                         |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cava/patches/iniparser-pkgconfig.patch

diff --git a/srcpkgs/cava/patches/iniparser-pkgconfig.patch b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
new file mode 100644
index 00000000000000..4b88fb701affe6
--- /dev/null
+++ b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index 5aeda60..6913062 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,16 +423,10 @@ dnl checking for iniparser
+ dnl ######################
+ 
+ AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
++    PKG_CHECK_MODULES(INIPARSER, iniparser, have_iniparser=yes, have_iniparser=no)
+     if [[ $have_iniparser = "yes" ]] ; then
+-    LIBS="$LIBS -liniparser"
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
+-      [[dictionary* ini;
+-      const char *keys[3];
+-      iniparser_getseckeys(ini, "eq", keys);]])],
+-      [AC_MSG_RESULT(iniparser > 3.2 test OK)],
+-      [AC_MSG_RESULT(iniparser > 3.2 test failed falling back to legacy iniparser mode)
+-      CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER"])
++      LIBS="$LIBS $INIPARSER_LIBS"
++      CPPFLAGS="$CPPFLAGS $INIPARSER_CFLAGS"
+     fi
+     if [[ $have_iniparser = "no" ]] ; then
+       AC_MSG_ERROR([iniparser library is required!])
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 38d757941b65a078fcf0ed09ca93836e2656beec 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 bbda13cf2ef261ae2508d2ecd997dc73c3e8c746 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
-}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] iniparser: update to 4.2.3
  2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
                   ` (7 preceding siblings ...)
  2024-06-14  1:48 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-06-16 10:10 ` tranzystorekk
  8 siblings, 0 replies; 10+ messages in thread
From: tranzystorekk @ 2024-06-16 10:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1550 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.3
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

Highlights:

- Dropped `iniparser-example` as it now builds example binaries which are neither useful nor allowed.
- ~~Modified pkgconfig includedir for compatiblity with `#include "iniparser.h"`~~
- ~~Disabled test installation~~
- Patched cava to use pkgconfig to find iniparser

<!--
#### 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: 10318 bytes --]

From 0e7002f029d5e35f9801cecd706bd80a73673e87 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.4

---
 common/shlibs                        |  2 +-
 srcpkgs/iniparser-example            |  1 -
 srcpkgs/iniparser/files/iniparser.pc | 11 ------
 srcpkgs/iniparser/template           | 57 ++++++----------------------
 4 files changed, 13 insertions(+), 58 deletions(-)
 delete mode 120000 srcpkgs/iniparser-example
 delete mode 100644 srcpkgs/iniparser/files/iniparser.pc

diff --git a/common/shlibs b/common/shlibs
index abcfb0e0ee4bec..e492f6d30c1b53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2481,7 +2481,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.4_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/template b/srcpkgs/iniparser/template
index fb813c7d870db6..9c6e2f248e9acf 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -1,49 +1,20 @@
 # Template file for 'iniparser'
 pkgname=iniparser
-version=4.1
-revision=3
-build_style=gnu-makefile
-hostmakedepends="doxygen chrpath"
+version=4.2.4
+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=3b6a6cf85d18727371d7c02f548e9e34fa311a9244c504690f21d508168bd70e
 
-CFLAGS="-fPIC"
-
-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 +22,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 25f3250127eeaa0db83c2cc35f06b993d0939b37 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

---
 .../cava/patches/iniparser-pkgconfig.patch    | 24 +++++++++++++++++++
 srcpkgs/cava/template                         |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cava/patches/iniparser-pkgconfig.patch

diff --git a/srcpkgs/cava/patches/iniparser-pkgconfig.patch b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
new file mode 100644
index 00000000000000..4b88fb701affe6
--- /dev/null
+++ b/srcpkgs/cava/patches/iniparser-pkgconfig.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index 5aeda60..6913062 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,16 +423,10 @@ dnl checking for iniparser
+ dnl ######################
+ 
+ AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
++    PKG_CHECK_MODULES(INIPARSER, iniparser, have_iniparser=yes, have_iniparser=no)
+     if [[ $have_iniparser = "yes" ]] ; then
+-    LIBS="$LIBS -liniparser"
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
+-      [[dictionary* ini;
+-      const char *keys[3];
+-      iniparser_getseckeys(ini, "eq", keys);]])],
+-      [AC_MSG_RESULT(iniparser > 3.2 test OK)],
+-      [AC_MSG_RESULT(iniparser > 3.2 test failed falling back to legacy iniparser mode)
+-      CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER"])
++      LIBS="$LIBS $INIPARSER_LIBS"
++      CPPFLAGS="$CPPFLAGS $INIPARSER_CFLAGS"
+     fi
+     if [[ $have_iniparser = "no" ]] ; then
+       AC_MSG_ERROR([iniparser library is required!])
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 5069d22fb3d02ff08ba38ff5ddfa568cb7d961b8 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 4300ea9a109f8ffd228ac74e3bcb015d1cfbac45 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
-}

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2024-06-16 10:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-26 21:51 [PR PATCH] iniparser: update to 4.2.2 tranzystorekk
2024-05-26 22:26 ` tranzystorekk
2024-05-27  7:41 ` [PR PATCH] [Updated] " tranzystorekk
2024-05-27  9:17 ` tranzystorekk
2024-05-27  9:28 ` tranzystorekk
2024-05-27  9:40 ` tranzystorekk
2024-06-06  8:23 ` tranzystorekk
2024-06-06  8:24 ` tranzystorekk
2024-06-14  1:48 ` [PR PATCH] [Updated] " tranzystorekk
2024-06-16 10:10 ` [PR PATCH] [Updated] iniparser: update to 4.2.3 tranzystorekk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).