[PR PATCH] libbreeze-icons: split from breeze-icons

[PR PATCH] libbreeze-icons: split from breeze-icons

[Chocimier]

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

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org libbreeze-icons
https://github.com/void-linux/void-packages/pull/51000

libbreeze-icons: split from breeze-icons
<!-- Uncomment relevant sections and delete options which are not applicable -->

kf6-kiconthemes is required by many packages and requires libKF6BreezeIcons.so.6. On the other hand I do ignorepkg breeze-icons for some time.
Split so they can be installed separately.

cc @Johnnynator 

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

<!--
#### 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/51000.patch is attached

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

From e9617974f228974c29c605adec5fc48cecc8dda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 25 Jun 2024 21:21:07 +0200
Subject: [PATCH 1/2] libbreeze-icons: split from breeze-icons

---
 common/shlibs                 |  2 +-
 srcpkgs/breeze-icons/template | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e93d4cd63ae03b..6124a1dae8cc5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1949,7 +1949,7 @@ libQt6Xdg.so.4 libqtxdg-4.0.0_1
 libQt6XdgIconLoader.so.4 libqtxdg-4.0.0_1
 libqwt-qt5.so.6.2 qwt-6.2.0_2
 libqwt-qt6.so.6.2 qwt-qt6-6.2.0_2
-libKF6BreezeIcons.so.6 breeze-icons-6.3.0_1
+libKF6BreezeIcons.so.6 libbreeze-icons-6.3.0_2
 libKF6Archive.so.6 kf6-karchive-6.0.0_1
 libKF6Attica.so.6 kf6-attica-6.0.0_1
 libKF6AuthCore.so.6 kf6-kauth-6.0.0_1
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 2d830330c71bf4..9cf38d0d58910a 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,7 +1,7 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
 version=6.3.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="kcoreaddons extra-cmake-modules qt6-base qt6-tools
@@ -21,3 +21,19 @@ if [ -z "$CROSS_BUILD" ]; then
 else
 	configure_args="-DBINARY_ICONS_RESOURCE=OFF"
 fi
+
+libbreeze-icons_package() {
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libbreeze-icons-devel_package() {
+	depends="libbreeze-icons>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From c0f278028aa3f2215a2cec9a3f4c6f08b81c58bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 25 Jun 2024 21:21:32 +0200
Subject: [PATCH 2/2] kf6-kiconthemes: rebuild with split libbreeze-icons

---
 srcpkgs/kf6-kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kf6-kiconthemes/template b/srcpkgs/kf6-kiconthemes/template
index 8e76818cfacaf1..431d59b07715ba 100644
--- a/srcpkgs/kf6-kiconthemes/template
+++ b/srcpkgs/kf6-kiconthemes/template
@@ -1,13 +1,13 @@
 # Template file for 'kf6-kiconthemes'
 pkgname=kf6-kiconthemes
 version=6.3.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base
  qt6-declarative-host-tools gettext"
-makedepends="breeze-icons kf6-karchive-devel kf6-kcolorscheme-devel
+makedepends="libbreeze-icons-devel kf6-karchive-devel kf6-kcolorscheme-devel
  qt6-svg-devel kf6-kconfigwidgets-devel qt6-base-private-devel"
 short_desc="KDE Icon GUI utilities"
 maintainer="John <me@johnnynator.dev>"

Re: libbreeze-icons: split from breeze-icons

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/51000#issuecomment-2190151189

Comment:
Missing `libbreeze-icons` and `-devel` symlinks.

Re: [PR PATCH] [Updated] libbreeze-icons: split from breeze-icons

[Chocimier]

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

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

https://github.com/Chocimier/void-packages-org libbreeze-icons
https://github.com/void-linux/void-packages/pull/51000

libbreeze-icons: split from breeze-icons
<!-- Uncomment relevant sections and delete options which are not applicable -->

kf6-kiconthemes is required by many packages and requires libKF6BreezeIcons.so.6. On the other hand I do ignorepkg breeze-icons for some time.
Split so they can be installed separately.

cc @Johnnynator 

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

<!--
#### 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/51000.patch is attached

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

From e9480c24c233587988f5eb3aa0110bffc0acdba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 25 Jun 2024 21:21:07 +0200
Subject: [PATCH 1/2] libbreeze-icons: split from breeze-icons

---
 common/shlibs                 |  2 +-
 srcpkgs/breeze-icons/template | 18 +++++++++++++++++-
 srcpkgs/libbreeze-icons       |  1 +
 srcpkgs/libbreeze-icons-devel |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/libbreeze-icons
 create mode 120000 srcpkgs/libbreeze-icons-devel

diff --git a/common/shlibs b/common/shlibs
index e93d4cd63ae03b..6124a1dae8cc5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1949,7 +1949,7 @@ libQt6Xdg.so.4 libqtxdg-4.0.0_1
 libQt6XdgIconLoader.so.4 libqtxdg-4.0.0_1
 libqwt-qt5.so.6.2 qwt-6.2.0_2
 libqwt-qt6.so.6.2 qwt-qt6-6.2.0_2
-libKF6BreezeIcons.so.6 breeze-icons-6.3.0_1
+libKF6BreezeIcons.so.6 libbreeze-icons-6.3.0_2
 libKF6Archive.so.6 kf6-karchive-6.0.0_1
 libKF6Attica.so.6 kf6-attica-6.0.0_1
 libKF6AuthCore.so.6 kf6-kauth-6.0.0_1
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 2d830330c71bf4..9cf38d0d58910a 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,7 +1,7 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
 version=6.3.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="kcoreaddons extra-cmake-modules qt6-base qt6-tools
@@ -21,3 +21,19 @@ if [ -z "$CROSS_BUILD" ]; then
 else
 	configure_args="-DBINARY_ICONS_RESOURCE=OFF"
 fi
+
+libbreeze-icons_package() {
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libbreeze-icons-devel_package() {
+	depends="libbreeze-icons>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libbreeze-icons b/srcpkgs/libbreeze-icons
new file mode 120000
index 00000000000000..ff2275acaf4499
--- /dev/null
+++ b/srcpkgs/libbreeze-icons
@@ -0,0 +1 @@
+breeze-icons
\ No newline at end of file
diff --git a/srcpkgs/libbreeze-icons-devel b/srcpkgs/libbreeze-icons-devel
new file mode 120000
index 00000000000000..ff2275acaf4499
--- /dev/null
+++ b/srcpkgs/libbreeze-icons-devel
@@ -0,0 +1 @@
+breeze-icons
\ No newline at end of file

From a785ac1289868bd8301192645b71659d1083dfec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 25 Jun 2024 21:21:32 +0200
Subject: [PATCH 2/2] kf6-kiconthemes: rebuild with split libbreeze-icons

---
 srcpkgs/kf6-kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kf6-kiconthemes/template b/srcpkgs/kf6-kiconthemes/template
index 8e76818cfacaf1..431d59b07715ba 100644
--- a/srcpkgs/kf6-kiconthemes/template
+++ b/srcpkgs/kf6-kiconthemes/template
@@ -1,13 +1,13 @@
 # Template file for 'kf6-kiconthemes'
 pkgname=kf6-kiconthemes
 version=6.3.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base
  qt6-declarative-host-tools gettext"
-makedepends="breeze-icons kf6-karchive-devel kf6-kcolorscheme-devel
+makedepends="libbreeze-icons-devel kf6-karchive-devel kf6-kcolorscheme-devel
  qt6-svg-devel kf6-kconfigwidgets-devel qt6-base-private-devel"
 short_desc="KDE Icon GUI utilities"
 maintainer="John <me@johnnynator.dev>"