From 629a6a4f68a8130b65532e5d5cc0eafe5414df71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A5=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= <xpamych@yandex.ru>
Date: Thu, 20 Nov 2025 19:48:38 +0300
Subject: [PATCH] =?UTF-8?q?lib32-llvm18=20=D0=B8=20lib32-lm=5Fsensors:=20?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B8=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

lib32-llvm18:
- Добавлены provides для llvm-libs(x86-32) и llvm-static(x86-32) для замены системных пакетов
- Расширены conflicts для предотвращения конфликтов файлов с llvm-libs.i686 и llvm-static.i686
- release: 3 -> 4

lib32-lm_sensors:
- Исправлена сборка: использование make target 'user' вместо 'lib/libsensors.so'
- Исправлена установка: использование 'make install-lib' для корректной установки библиотек
- Удаление конфликтующего pkgconfig файла
- release: 2 -> 3

Устраняет конфликты при установке lib32-mesa.
---
 lib32-llvm18/alr.sh     | 16 +++++++++++++---
 lib32-lm_sensors/alr.sh | 18 ++++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib32-llvm18/alr.sh b/lib32-llvm18/alr.sh
index d1d795e..a014dfa 100644
--- a/lib32-llvm18/alr.sh
+++ b/lib32-llvm18/alr.sh
@@ -1,6 +1,6 @@
 name='lib32-llvm18'
 version='18.1.8'
-release='3'
+release='4'
 desc='32-bit LLVM libraries for Mesa'
 desc_ru='32-битные библиотеки LLVM для Mesa'
 homepage='https://llvm.org/'
@@ -42,12 +42,22 @@ build_deps_redos=("${build_deps[@]}")
 provides=(
 	'lib32-llvm18'
 	'llvm18-libs.i686'
+	'llvm18-libs(x86-32)'
 	'llvm18-devel.i686'
+	'llvm18-devel(x86-32)'
+	'llvm-libs.i686'
+	'llvm-libs(x86-32)'
+	'llvm-static.i686'
+	'llvm-static(x86-32)'
 )
 
 conflicts=(
-	'llvm-libs.i686 < 18.0'
-	'llvm-static.i686 < 18.0'
+	'llvm-libs.i686'
+	'llvm-libs(x86-32)'
+	'llvm-static.i686'
+	'llvm-static(x86-32)'
+	'llvm-devel.i686'
+	'llvm-devel(x86-32)'
 )
 
 _pkgver="${version}"
diff --git a/lib32-lm_sensors/alr.sh b/lib32-lm_sensors/alr.sh
index 4e29284..08a6b1b 100644
--- a/lib32-lm_sensors/alr.sh
+++ b/lib32-lm_sensors/alr.sh
@@ -1,6 +1,6 @@
 name='lib32-lm_sensors'
 version='3.6.0'
-release='2'
+release='3'
 desc='32-bit hardware monitoring library'
 desc_ru='32-битная библиотека мониторинга оборудования'
 homepage='https://github.com/lm-sensors/lm-sensors'
@@ -64,7 +64,7 @@ build() {
 		MANDIR=/usr/share/man \
 		BUILD_STATIC_LIB=0 \
 		-j$(nproc) \
-		lib/libsensors.so
+		user
 }
 
 package() {
@@ -72,10 +72,16 @@ package() {
 
 	echo "==> Installing lm_sensors (32-bit) libraries..."
 
-	# Install library
-	install -Dm755 lib/libsensors.so.${version} "$pkgdir/usr/lib/libsensors.so.${version}"
-	ln -sf libsensors.so.${version} "$pkgdir/usr/lib/libsensors.so.5"
-	ln -sf libsensors.so.${version} "$pkgdir/usr/lib/libsensors.so"
+	# Install library using make install (only libraries)
+	mkdir -p "$pkgdir/usr/lib"
+	make PREFIX="$pkgdir/usr" \
+		LIBDIR="$pkgdir/usr/lib" \
+		BUILD_STATIC_LIB=0 \
+		install-lib
+
+	# Remove pkg-config file (conflicts with 64-bit version)
+	rm -f "$pkgdir/usr/lib/pkgconfig/libsensors.pc"
+	rmdir "$pkgdir/usr/lib/pkgconfig" 2>/dev/null || true
 
 	# Install license
 	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$name/COPYING"