diff options
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | 0001-gnome-shell-fix-install-dir.patch | 58 | ||||
-rw-r--r-- | PKGBUILD | 39 |
3 files changed, 27 insertions, 79 deletions
@@ -1,7 +1,7 @@ pkgbase = yaru pkgdesc = Yaru default ubuntu theme pkgver = 18.10.7 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ubuntu/yaru arch = any license = GPL3 @@ -12,9 +12,7 @@ pkgbase = yaru options = !buildflags options = staticlibs source = git+https://github.com/ubuntu/yaru#tag=18.10.7 - source = 0001-gnome-shell-fix-install-dir.patch sha256sums = SKIP - sha256sums = c84e9720c47fc86eaf89ebc647bb656b13a3e79aa0b01c46734c5db013e42bc5 pkgname = yaru-sound-theme pkgdesc = Yaru default ubuntu sound theme @@ -29,6 +27,7 @@ pkgname = yaru-gtk-theme pkgname = yaru-gnome-shell-theme pkgdesc = Yaru default ubuntu gnome shell theme depends = gnome-shell + depends = yaru-session pkgname = yaru-icon-theme pkgdesc = Yaru default ubuntu icon theme @@ -36,3 +35,7 @@ pkgname = yaru-icon-theme depends = gtk-update-icon-cache depends = librsvg +pkgname = yaru-session + pkgdesc = Yaru session + depends = gnome-shell + diff --git a/0001-gnome-shell-fix-install-dir.patch b/0001-gnome-shell-fix-install-dir.patch deleted file mode 100644 index 5ff1efc7242b..000000000000 --- a/0001-gnome-shell-fix-install-dir.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d55e5ca2bd7544ceeb573cb24fe7cfe51a555c6b Mon Sep 17 00:00:00 2001 -From: Nicola Murino <nicola.murino@gmail.com> -Date: Thu, 26 Jul 2018 14:44:20 +0200 -Subject: [PATCH] gnome-shell: fix install dir - ---- - gnome-shell/meson.build | 2 +- - gnome-shell/src/meson.build | 2 +- - sessions/meson.build | 2 +- - sessions/meson/install-dock-override | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gnome-shell/meson.build b/gnome-shell/meson.build -index 7a1ce6dd..5de2ea79 100644 ---- a/gnome-shell/meson.build -+++ b/gnome-shell/meson.build -@@ -1,3 +1,3 @@ --gnomeshell_theme_dir = join_paths(get_option('datadir'), 'gnome-shell', 'theme') -+gnomeshell_theme_dir = join_paths(get_option('datadir'), 'themes') - - subdir('src') -diff --git a/gnome-shell/src/meson.build b/gnome-shell/src/meson.build -index b0fb61a1..c4a59f73 100644 ---- a/gnome-shell/src/meson.build -+++ b/gnome-shell/src/meson.build -@@ -1,5 +1,5 @@ - # destination directory --install_dir = join_paths(gnomeshell_theme_dir, meson.project_name()) -+install_dir = join_paths(gnomeshell_theme_dir, meson.project_name(), 'gnome-shell') - - # generate .css files - theme_sources = files([ -diff --git a/sessions/meson.build b/sessions/meson.build -index 4922cd2f..e07af06c 100644 ---- a/sessions/meson.build -+++ b/sessions/meson.build -@@ -1,4 +1,4 @@ --gnomeshell_mode_dir = join_paths(get_option('datadir'), 'gnome-shell', 'modes') -+gnomeshell_mode_dir = join_paths(get_option('datadir'), 'themes', meson.project_name(), 'gnome-shell', 'modes') - - # NOTE: GNOME Shell only accept lowercase mode names. - replace_name = find_program('../build-helpers/replace-name') -diff --git a/sessions/meson/install-dock-override b/sessions/meson/install-dock-override -index d8a74050..b716ef41 100755 ---- a/sessions/meson/install-dock-override -+++ b/sessions/meson/install-dock-override -@@ -1,7 +1,7 @@ - #!/bin/sh - set -eu - --DOCK_DIR="${MESON_INSTALL_DESTDIR_PREFIX}/share/gnome-shell/extensions/ubuntu-dock@ubuntu.com" -+DOCK_DIR="${MESON_INSTALL_DESTDIR_PREFIX}/share/themes/Yaru/gnome-shell/extensions/ubuntu-dock@ubuntu.com" - - mkdir -p "${DOCK_DIR}" - touch "${DOCK_DIR}/$1.css" --- -2.18.0 - @@ -1,8 +1,8 @@ # Maintainer: drakkan <nicola.murino at gmail dot com> pkgbase=yaru -pkgname=('yaru-sound-theme' 'yaru-gtk-theme' 'yaru-gnome-shell-theme' 'yaru-icon-theme') +pkgname=('yaru-sound-theme' 'yaru-gtk-theme' 'yaru-gnome-shell-theme' 'yaru-icon-theme' 'yaru-session') pkgver=18.10.7 -pkgrel=1 +pkgrel=2 _tag=18.10.7 pkgdesc="Yaru default ubuntu theme" arch=(any) @@ -13,16 +13,8 @@ makedepends=('meson' 'sassc' 'git') options=('!strip' '!buildflags' 'staticlibs') -source=("git+https://github.com/ubuntu/${pkgbase}#tag=${_tag}" - "0001-gnome-shell-fix-install-dir.patch") -sha256sums=('SKIP' - 'c84e9720c47fc86eaf89ebc647bb656b13a3e79aa0b01c46734c5db013e42bc5') - -prepare() { - cd "${pkgbase}" - - patch -Np1 < ../0001-gnome-shell-fix-install-dir.patch -} +source=("git+https://github.com/ubuntu/${pkgbase}#tag=${_tag}") +sha256sums=('SKIP') build() { arch-meson ${pkgbase} build @@ -38,6 +30,7 @@ package_yaru-sound-theme() { rm -r "$pkgdir/usr/share/wayland-sessions" rm -r "$pkgdir/usr/share/icons" rm -r "$pkgdir/usr/share/themes" + rm -r "$pkgdir/usr/share/gnome-shell" } package_yaru-gtk-theme() { @@ -48,14 +41,14 @@ package_yaru-gtk-theme() { rm -r "$pkgdir/usr/share/glib-2.0" rm -r "$pkgdir/usr/share/xsessions" rm -r "$pkgdir/usr/share/wayland-sessions" - rm -r "$pkgdir/usr/share/themes/Yaru/gnome-shell" rm -r "$pkgdir/usr/share/icons" rm -r "$pkgdir/usr/share/sounds" + rm -r "$pkgdir/usr/share/gnome-shell" } package_yaru-gnome-shell-theme() { pkgdesc="Yaru default ubuntu gnome shell theme" - depends=("gnome-shell") + depends=("gnome-shell" "yaru-session") DESTDIR="$pkgdir" ninja -C build install rm -r "$pkgdir/usr/share/glib-2.0" @@ -63,10 +56,7 @@ package_yaru-gnome-shell-theme() { rm -r "$pkgdir/usr/share/wayland-sessions" rm -r "$pkgdir/usr/share/icons" rm -r "$pkgdir/usr/share/sounds" - rm -r "$pkgdir/usr/share/themes/Yaru/gtk-2.0" - rm -r "$pkgdir/usr/share/themes/Yaru/gtk-3.0" - rm -r "$pkgdir/usr/share/themes/Yaru/index.theme" - rm -r "$pkgdir/usr/share/themes/Yaru-dark" + rm -r "$pkgdir/usr/share/themes" } package_yaru-icon-theme() { @@ -79,6 +69,19 @@ package_yaru-icon-theme() { rm -r "$pkgdir/usr/share/wayland-sessions" rm -r "$pkgdir/usr/share/sounds" rm -r "$pkgdir/usr/share/themes" + rm -r "$pkgdir/usr/share/gnome-shell" +} + +package_yaru-session() { + pkgdesc="Yaru session" + depends=("gnome-shell") + + DESTDIR="$pkgdir" ninja -C build install + rm -r "$pkgdir/usr/share/sounds" + rm -r "$pkgdir/usr/share/themes" + rm -r "$pkgdir/usr/share/gnome-shell" + rm -r "$pkgdir/usr/share/icons" } + # vim: ts=2 sw=2 et: |