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

[Jan Steffens]

    Date: Wednesday, September 5, 2018 @ 17:14:05
  Author: heftig
Revision: 333483

3.30.0+16+g1bdb3f194-1

Modified:
  gnome-shell/trunk/PKGBUILD	(contents, properties)
Deleted:
  gnome-shell/trunk/fix.diff

----------+
 PKGBUILD |   21 ++++++++-------------
 fix.diff |   36 ------------------------------------
 2 files changed, 8 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-05 17:13:30 UTC (rev 333482)
+++ PKGBUILD	2018-09-05 17:14:05 UTC (rev 333483)
@@ -1,11 +1,11 @@
-# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.28.3+7+g721ce5403
+pkgver=3.30.0+16+g1bdb3f194
 pkgrel=1
-pkgdesc="The next generation GNOME Shell"
+pkgdesc="Next generation desktop shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
 arch=(x86_64)
 license=(GPL2)
@@ -17,13 +17,11 @@
 optdepends=('gnome-control-center: System settings'
             'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
-_commit=721ce54037cc07a82927cfdfb7928dadad7d7791  # gnome-3-28
+_commit=1bdb3f194d5ae6c07d4a5fe05fad2abeb8f61c14  # master
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-        fix.diff)
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
-            'SKIP'
-            '11dcffae170776140b1f0c9bed90b8df70e8d3c6694b60ab40bb46235e3ad755')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -33,9 +31,6 @@
 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
 
@@ -50,8 +45,8 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 
-  # Must exist; FS#37412
+  # https://bugs.archlinux.org/task/37412
   mkdir "$pkgdir/usr/share/gnome-shell/modes"
 }


Property changes on: gnome-shell/trunk/PKGBUILD
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: fix.diff
===================================================================
--- fix.diff	2018-09-05 17:13:30 UTC (rev 333482)
+++ fix.diff	2018-09-05 17:14:05 UTC (rev 333483)
@@ -1,36 +0,0 @@
-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