breeze-snow-cursor-theme: move from breeze-cursors to breeze.

This fixes the file conflicts between breeze-snow-cursor-theme and
breeze, without requiring any changes by the users who have any of these
packages installed.

Also:

- xlint fix in breeze-cursors
- remove unzip hostmakedep
This commit is contained in:
Érico Rolim 2020-06-18 01:16:26 -03:00 committed by Piotr
parent 30866f958f
commit a4a760f252
3 changed files with 16 additions and 21 deletions

View file

@ -1,11 +1,10 @@
# Template file for 'breeze-cursors' # Template file for 'breeze-cursors'
pkgname=breeze-cursors pkgname=breeze-cursors
version=1.0 version=1.0
revision=1 revision=2
create_wrksrc=yes
archs=noarch archs=noarch
create_wrksrc=yes
build_style=meta build_style=meta
hostmakedepends="unzip"
depends="breeze-amber-cursor-theme depends="breeze-amber-cursor-theme
breeze-blue-cursor-theme breeze-blue-cursor-theme
breeze-contrast-cursor-theme breeze-contrast-cursor-theme
@ -16,7 +15,7 @@ depends="breeze-amber-cursor-theme
breeze-snow-cursor-theme" breeze-snow-cursor-theme"
short_desc="Breeze Cursors meta-package" short_desc="Breeze Cursors meta-package"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2" license="GPL-2.0-or-later"
homepage="https://kver.wordpress.com/2015/01/09/curses-i-mean-cursors/" homepage="https://kver.wordpress.com/2015/01/09/curses-i-mean-cursors/"
distfiles="https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-amber-cursor-theme.zip distfiles="https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-amber-cursor-theme.zip
https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-blue-cursor-theme.zip https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-blue-cursor-theme.zip
@ -24,16 +23,14 @@ distfiles="https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-
https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-hacked-cursor-theme.zip https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-hacked-cursor-theme.zip
https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-obsidian-cursor-theme.zip https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-obsidian-cursor-theme.zip
https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-purple-cursor-theme.zip https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-purple-cursor-theme.zip
https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-red-cursor-theme.zip https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-red-cursor-theme.zip"
https://code.jpope.org/jpope/breeze_cursor_sources/raw/master/breeze-snow-cursor-theme.zip"
checksum="61b488366e3b3d405a20cfc20102cbbca5ae30a72802e3f5ac1eb3804a372d96 checksum="61b488366e3b3d405a20cfc20102cbbca5ae30a72802e3f5ac1eb3804a372d96
76fd9fbde97601227419d5a3b678ea20866e114bfb96e56e142a49670e8fac7b 76fd9fbde97601227419d5a3b678ea20866e114bfb96e56e142a49670e8fac7b
055356ae4fe6050fe403b82a16abb909ef7e459cc3f64be77ca660bb951dcb61 055356ae4fe6050fe403b82a16abb909ef7e459cc3f64be77ca660bb951dcb61
675b9d1f8e0718505da82abcf0e3377e1e509bd0be71e3c0998136c3895a6b15 675b9d1f8e0718505da82abcf0e3377e1e509bd0be71e3c0998136c3895a6b15
2f8b9f8dd1bbf3e8ea6d5ab649d59ec7a0136658b2fd3368a87958c6975d48cb 2f8b9f8dd1bbf3e8ea6d5ab649d59ec7a0136658b2fd3368a87958c6975d48cb
ed7944b0175b455b5ebce8b0937936a5defda992f54830d5ef98b90a8d422b11 ed7944b0175b455b5ebce8b0937936a5defda992f54830d5ef98b90a8d422b11
8b952060fffffd0e704501dfb568779782517a649c897e7f5f5fff638a1b5b32 8b952060fffffd0e704501dfb568779782517a649c897e7f5f5fff638a1b5b32"
1390272e693f258dc55f86fbd5c99f0f36cfb4e71f22e9062b8d6ff14483562e"
do_install() { do_install() {
vinstall Breeze_Amber/index.theme 644 /usr/share/icons/Breeze_Amber vinstall Breeze_Amber/index.theme 644 /usr/share/icons/Breeze_Amber
@ -56,9 +53,6 @@ do_install() {
vinstall Breeze_Red/index.theme 644 /usr/share/icons/Breeze_Red vinstall Breeze_Red/index.theme 644 /usr/share/icons/Breeze_Red
vcopy Breeze_Red/cursors /usr/share/icons/Breeze_Red vcopy Breeze_Red/cursors /usr/share/icons/Breeze_Red
vinstall Breeze_Snow/index.theme 644 /usr/share/icons/Breeze_Snow
vcopy Breeze_Snow/cursors /usr/share/icons/Breeze_Snow
} }
breeze-amber-cursor-theme_package() { breeze-amber-cursor-theme_package() {
@ -110,10 +104,3 @@ breeze-red-cursor-theme_package() {
vmove usr/share/icons/Breeze_Red vmove usr/share/icons/Breeze_Red
} }
} }
breeze-snow-cursor-theme_package() {
archs=noarch
short_desc="Breeze Snow cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Snow
}
}

View file

@ -1 +1 @@
breeze-cursors breeze

View file

@ -1,14 +1,14 @@
# Template file for 'breeze' # Template file for 'breeze'
pkgname=breeze pkgname=breeze
version=5.19.1 version=5.19.1
revision=1 revision=2
build_style=cmake build_style=cmake
configure_args="-DBUILD_TESTING=OFF" configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons
gettext kpackage" gettext kpackage"
makedepends="frameworkintegration-devel kcmutils-devel kdecoration-devel makedepends="frameworkintegration-devel kcmutils-devel kdecoration-devel
fftw-devel plasma-framework-devel" fftw-devel plasma-framework-devel"
depends="breeze-icons frameworkintegration" depends="breeze-icons frameworkintegration breeze-snow-cursor-theme"
short_desc="Breeze visual style for the Plasma Desktop" short_desc="Breeze visual style for the Plasma Desktop"
maintainer="John <johnz@posteo.net>" maintainer="John <johnz@posteo.net>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
@ -20,3 +20,11 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
fi fi
breeze-snow-cursor-theme_package() {
short_desc="Breeze Snow cursor theme"
archs=noarch
pkg_install() {
vmove usr/share/icons/Breeze_Snow
}
}