[arch-commits] Commit in gnome-shell/trunk (PKGBUILD fix.diff)

[Jan Steffens]

    Date: Wednesday, July 18, 2018 @ 18:32:33
  Author: heftig
Revision: 329000

3.28.2+15+g9c51c87d8-1

Added:
  gnome-shell/trunk/fix.diff
Modified:
  gnome-shell/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 fix.diff |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-18 17:52:30 UTC (rev 328999)
+++ PKGBUILD	2018-07-18 18:32:33 UTC (rev 329000)
@@ -3,7 +3,7 @@
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.28.2
+pkgver=3.28.2+15+g9c51c87d8
 pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -17,11 +17,13 @@
 optdepends=('gnome-control-center: System settings'
             'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
-_commit=c70b18764b2658849b170c897ce4c423a118d7f2  # tags/3.28.2^0
+_commit=9c51c87d8c145990285643c89deec77263d3d416  # gnome-3-28
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://git.gnome.org/browse/libgnome-volume-control")
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+        fix.diff)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '11dcffae170776140b1f0c9bed90b8df70e8d3c6694b60ab40bb46235e3ad755')
 
 pkgver() {
   cd $pkgname
@@ -31,6 +33,9 @@
 prepare() {
   cd $pkgname
 
+  # Try to fix docs build
+  patch -Np1 -i ../fix.diff
+
   # Move the plugin to our custom epiphany-only dir
   sed -i "s/'mozilla'/'epiphany'/g" meson.build
 

Added: fix.diff
===================================================================
--- fix.diff	                        (rev 0)
+++ fix.diff	2018-07-18 18:32:33 UTC (rev 329000)
@@ -0,0 +1,36 @@
+diff --git i/docs/reference/shell/meson.build w/docs/reference/shell/meson.build
+index 1469ed422..bf99c9446 100644
+--- i/docs/reference/shell/meson.build
++++ w/docs/reference/shell/meson.build
+@@ -45,6 +45,7 @@ configure_file(
+ 
+ gnome.gtkdoc('shell',
+   main_sgml: 'shell-docs.sgml',
++  dependencies: [libshell_dep, libshell_menu_dep],
+   src_dir: [
+     join_paths(meson.source_root(), 'src'),
+     join_paths(meson.build_root(), 'src')
+diff --git i/docs/reference/st/meson.build w/docs/reference/st/meson.build
+index fe89b53d4..8fdd4f4b5 100644
+--- i/docs/reference/st/meson.build
++++ w/docs/reference/st/meson.build
+@@ -11,6 +11,7 @@ configure_file(
+ 
+ gnome.gtkdoc('st',
+   main_sgml: 'st-docs.sgml',
++  dependencies: libst_dep,
+   src_dir: [
+     join_paths(meson.source_root(), 'src', 'st'),
+     join_paths(meson.build_root(), 'src', 'st')
+diff --git i/src/st/meson.build w/src/st/meson.build
+index 97ce6134d..216700fb7 100644
+--- i/src/st/meson.build
++++ w/src/st/meson.build
+@@ -122,6 +122,7 @@ libst = shared_library('st-1.0',
+   sources: st_gir_sources + st_non_gir_sources,
+   c_args: st_cflags,
+   dependencies: [clutter_dep, gtk_dep, croco_dep, x11_dep, m_dep],
++  build_rpath: mutter_typelibdir,
+   install_rpath: mutter_typelibdir,
+   install_dir: pkglibdir,
+   install: true