summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO11
-rw-r--r--0001-gnome-shell-fix-install-dir.patch58
-rw-r--r--PKGBUILD54
3 files changed, 38 insertions, 85 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 15bb0dcbaa22..3cdd8f37721d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = yaru-git
pkgdesc = Yaru default ubuntu theme
- pkgver = 18.10.7.r143.g4f9e8a41
+ pkgver = 18.10.7.r288.g93c13b3e
pkgrel = 1
url = https://github.com/ubuntu/yaru
arch = any
@@ -12,9 +12,7 @@ pkgbase = yaru-git
options = !buildflags
options = staticlibs
source = git+https://github.com/ubuntu/yaru
- source = 0001-gnome-shell-fix-install-dir.patch
sha256sums = SKIP
- sha256sums = c84e9720c47fc86eaf89ebc647bb656b13a3e79aa0b01c46734c5db013e42bc5
pkgname = yaru-sound-theme-git
pkgdesc = Yaru default ubuntu sound theme
@@ -33,6 +31,7 @@ pkgname = yaru-gtk-theme-git
pkgname = yaru-gnome-shell-theme-git
pkgdesc = Yaru default ubuntu gnome shell theme
depends = gnome-shell
+ depends = yaru-session
provides = yaru-gnome-shell-theme
conflicts = yaru-gnome-shell-theme
@@ -44,3 +43,9 @@ pkgname = yaru-icon-theme-git
provides = yaru-icon-theme
conflicts = yaru-icon-theme
+pkgname = yaru-session-git
+ pkgdesc = Yaru session
+ depends = gnome-shell
+ provides = yaru-session
+ conflicts = yaru-session
+
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
-
diff --git a/PKGBUILD b/PKGBUILD
index 8abc29c80e3b..25f17a7fdd72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,28 +5,23 @@ pkgbase=yaru-git
pkgname=(yaru-sound-theme-git
yaru-gtk-theme-git
yaru-gnome-shell-theme-git
- yaru-icon-theme-git)
-pkgver=18.10.7.r143.g4f9e8a41
+ yaru-icon-theme-git
+ yaru-session-git)
+pkgver=18.10.7.r288.g93c13b3e
pkgrel=1
pkgdesc="Yaru default ubuntu theme"
arch=(any)
url="https://github.com/ubuntu/yaru"
license=('GPL3')
-makedepends=('meson' 'sassc' 'git')
+makedepends=(meson sassc git)
options=('!strip' '!buildflags' 'staticlibs')
-source=("git+https://github.com/ubuntu/yaru"
- "0001-gnome-shell-fix-install-dir.patch")
-sha256sums=('SKIP'
- 'c84e9720c47fc86eaf89ebc647bb656b13a3e79aa0b01c46734c5db013e42bc5')
+source=("git+https://github.com/ubuntu/yaru")
+sha256sums=('SKIP')
-pkgver() {
- cd yaru
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-prepare() {
+pkgver() {
cd yaru
- patch -Np1 < ../0001-gnome-shell-fix-install-dir.patch
+ git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
@@ -35,7 +30,7 @@ build() {
}
package_yaru-sound-theme-git() {
- pkgdesc="Yaru default ubuntu sound theme"
+ pkgdesc="Yaru default ubuntu sound theme"
provides=(yaru-sound-theme)
conflicts=(yaru-sound-theme)
@@ -45,40 +40,37 @@ package_yaru-sound-theme-git() {
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-git() {
pkgdesc="Yaru default ubuntu gtk theme"
- depends=("gtk3" "gdk-pixbuf2" "gtk-engine-murrine" "gnome-themes-extra")
+ depends=(gtk3 gdk-pixbuf2 gtk-engine-murrine gnome-themes-extra)
provides=(yaru-gtk-theme)
conflicts=(yaru-gtk-theme)
-
+
DESTDIR="$pkgdir" ninja -C build install
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-git() {
pkgdesc="Yaru default ubuntu gnome shell theme"
- depends=("gnome-shell")
+ depends=(gnome-shell yaru-session)
provides=(yaru-gnome-shell-theme)
conflicts=(yaru-gnome-shell-theme)
-
+
DESTDIR="$pkgdir" ninja -C build install
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/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/gtk-3.20"
- 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-git() {
@@ -93,4 +85,18 @@ package_yaru-icon-theme-git() {
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-git() {
+ pkgdesc="Yaru session"
+ depends=(gnome-shell)
+ provides=(yaru-session)
+ conflicts=(yaru-session)
+
+ 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"
}