Date: Wednesday, March 11, 2020 @ 14:44:17 Author: bgyorgy Revision: 594281
upgpkg: shotwell 2:0.30.8-2: Fix build, remove unused gnome-doc-utils makedependency Added: shotwell/trunk/0115-fix_meson_build.patch Modified: shotwell/trunk/PKGBUILD ----------------------------+ 0115-fix_meson_build.patch | 17 +++++++++++++++++ PKGBUILD | 15 +++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) Added: 0115-fix_meson_build.patch =================================================================== --- 0115-fix_meson_build.patch (rev 0) +++ 0115-fix_meson_build.patch 2020-03-11 14:44:17 UTC (rev 594281) @@ -0,0 +1,17 @@ +Description: Remove --fatal-warnings from build options +Author: Jörg Frings-Fürst <[email protected]> +Last-Update: 2019-10-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/meson.build +=================================================================== +--- trunk.orig/meson.build ++++ trunk/meson.build +@@ -25,7 +25,6 @@ add_global_arguments(['--target-glib=2.4 + '--vapidir=@0@'.format(join_paths(meson.current_source_dir(), + 'vapi')), + '--enable-checking', +- '--fatal-warnings', + '--enable-experimental', + '--enable-deprecated'], language : 'vala') + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-11 14:42:51 UTC (rev 594280) +++ PKGBUILD 2020-03-11 14:44:17 UTC (rev 594281) @@ -6,7 +6,7 @@ epoch=2 pkgver=0.30.8 _basever=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('x86_64') url="http://yorba.org/shotwell/"; @@ -15,11 +15,18 @@ 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' 'gst-plugins-base' 'libgphoto2' 'libgudev' 'gcr' 'libgdata') -makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils' 'itstool' 'meson' 'ninja') +makedepends=('intltool' 'vala>=0.17.2' 'itstool' 'meson' 'ninja') # odd versions are unstable! -source=("https://download.gnome.org/sources/shotwell/${_basever}/shotwell-$pkgver.tar.xz";) -sha256sums=('722d2ed2ffc843b150490d5e346395398b0b5f40dd706034fa3a70f30e00f5b8') +source=("https://download.gnome.org/sources/shotwell/${_basever}/shotwell-$pkgver.tar.xz"; + 0115-fix_meson_build.patch) +sha256sums=('722d2ed2ffc843b150490d5e346395398b0b5f40dd706034fa3a70f30e00f5b8' + 'ccc6127df325df5d36732e670e938a88dfb986f46ef860baaf5a23867db4158b') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../0115-fix_meson_build.patch +} + build() { arch-meson ${pkgname}-${pkgver} build ninja -C build
