diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 40 | ||||
-rw-r--r-- | meson-fixes.patch | 23 |
3 files changed, 52 insertions, 33 deletions
@@ -1,29 +1,21 @@ pkgbase = pocillo-gtk-theme-git pkgdesc = Theme for the Budgie Desktop that has Material Design elements and styled using the Arc colour palette - pkgver = 0.6.r15.gaa800c9 + pkgver = 0.9.r0.g7a12511c pkgrel = 1 url = https://github.com/UbuntuBudgie/pocillo-gtk-theme arch = any license = GPL2 - makedepends = inkscape - makedepends = optipng - makedepends = gtk-engine-murrine - makedepends = gdk-pixbuf2 + makedepends = meson + makedepends = dart-sass makedepends = git - makedepends = libsass - makedepends = sassc - makedepends = make - makedepends = glib2 - makedepends = libxml2 - makedepends = parallel depends = gtk-engine-murrine - depends = gtk3 + depends = gnome-themes-extra optdepends = budgie-desktop: The Budgie desktop - optdepends = gdk-pixbuf2 provides = pocillo-gtk-theme conflicts = pocillo-gtk-theme source = pocillo-gtk-theme-git::git+https://github.com/UbuntuBudgie/pocillo-gtk-theme - sha256sums = SKIP + source = meson-fixes.patch + b2sums = SKIP + b2sums = 21964b269b34ac7c601cdc098d2d9be9e8d98685385d5bad5c80c231ea2edee5969fc9d17df4fa72e617d8dc3402cc1b21b01668c30a35dcf905c1a41d224acd pkgname = pocillo-gtk-theme-git - @@ -1,17 +1,18 @@ pkgname=pocillo-gtk-theme-git -pkgver=0.6.r15.gaa800c9 +pkgver=0.9.r0.g7a12511c pkgrel=1 pkgdesc='Theme for the Budgie Desktop that has Material Design elements and styled using the Arc colour palette' arch=('any') url=https://github.com/UbuntuBudgie/pocillo-gtk-theme license=(GPL2) -depends=(gtk-engine-murrine gtk3) -makedepends=(inkscape optipng gtk-engine-murrine gdk-pixbuf2 git libsass sassc make glib2 libxml2 parallel) -optdepends=('budgie-desktop: The Budgie desktop' 'gdk-pixbuf2') +depends=(gtk-engine-murrine gnome-themes-extra) +makedepends=(meson dart-sass git) +optdepends=('budgie-desktop: The Budgie desktop') provides=(pocillo-gtk-theme) conflicts=(pocillo-gtk-theme) -source=("${pkgname}::git+${url}") -sha256sums=('SKIP') +source=("${pkgname}::git+${url}" meson-fixes.patch) +b2sums=('SKIP' + '21964b269b34ac7c601cdc098d2d9be9e8d98685385d5bad5c80c231ea2edee5969fc9d17df4fa72e617d8dc3402cc1b21b01668c30a35dcf905c1a41d224acd') pkgver() { cd "${pkgname}" @@ -22,20 +23,23 @@ pkgver() { ) } -build() { +prepare() { cd "${pkgname}" - make -j$(nproc) + patch -p1 < "${srcdir}/meson-fixes.patch" } -package() { - cd "${pkgname}" - make DESTDIR="${pkgdir}" install - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +build() { + arch-meson \ + -Ddocumentation=true \ + -Dflatpak=false \ + -Dgtk4_version=4.6 \ + -Dgnome_shell_version=42 \ + -Dcolors=default,light,dark \ + -Dsizes=default,slim \ + _build "${pkgname}" + meson compile -C _build +} - # Fix dangling symlink - local symlink - for symlink in $(find "${pkgdir}" -type l -name 'gtk-3.0') ; do - rm "${symlink}" - ln -vs 'gtk-3.22' "${symlink}" - done +package() { + meson install -C _build --destdir="${pkgdir}" } diff --git a/meson-fixes.patch b/meson-fixes.patch new file mode 100644 index 000000000000..264d6dcc2f83 --- /dev/null +++ b/meson-fixes.patch @@ -0,0 +1,23 @@ +diff --git a/meson.build b/meson.build +index 871c5304..0cf9a082 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,8 +21,7 @@ sass = find_program('sass', required: false) + sass_opts = ['--no-source-map'] + + if sass.found() +- sass_full_version = run_command(sass, '--version', +- version:'>= 1.23.0').stdout() ++ sass_full_version = run_command(sass, '--version', check: true).stdout() + sass_is_ruby_sass = sass_full_version.contains('Ruby Sass') + sass_has_module_system = sass_full_version.version_compare('>= 1.23.0') + endif +@@ -30,7 +29,7 @@ endif + if not sass.found() or sass_is_ruby_sass or not sass_has_module_system + message('dart-sass >= 1.23.0 not found, installing it locally via npm') + npm = find_program('npm') +- run_command(npm, 'install') ++ run_command(npm, 'install', check: true) + sass = find_program('./node_modules/.bin/sass') + endif + |