[arch-commits] Commit in meson/repos/extra-any (5 files)

Jan Steffens heftig at archlinux.org
Sat Aug 25 21:29:07 UTC 2018


    Date: Saturday, August 25, 2018 @ 21:29:07
  Author: heftig
Revision: 333015

archrelease: copy trunk to extra-any

Added:
  meson/repos/extra-any/PKGBUILD
    (from rev 333014, meson/trunk/PKGBUILD)
  meson/repos/extra-any/arch-meson
    (from rev 333014, meson/trunk/arch-meson)
  meson/repos/extra-any/test.diff
    (from rev 333014, meson/trunk/test.diff)
Deleted:
  meson/repos/extra-any/PKGBUILD
  meson/repos/extra-any/arch-meson

------------+
 PKGBUILD   |  122 ++++++++++++++++++++++++++++++-----------------------------
 arch-meson |   44 ++++++++++-----------
 test.diff  |   13 ++++++
 3 files changed, 98 insertions(+), 81 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-25 21:27:43 UTC (rev 333014)
+++ PKGBUILD	2018-08-25 21:29:07 UTC (rev 333015)
@@ -1,59 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
-
-pkgname=meson
-pkgver=0.47.1
-pkgrel=2
-pkgdesc='High productivity build system'
-url='http://mesonbuild.com/'
-arch=('any')
-license=('Apache')
-depends=('python' 'ninja')
-makedepends=('python-setuptools')
-checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' 'qt5-base' 'git' 'cython'
-              'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection'
-              'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz'
-              'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools'
-              'libwmf' 'dmd' 'valgrind')
-source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
-        arch-meson)
-sha512sums=('b86a95a057cfe3b46a33dfe57d0b215133306808871cd2d0f479421b7fd7ce7f5b49aa4c1d429ac0a1a56f805e1c690d220b567b8118e875b140dc75ad8218a5'
-            'SKIP'
-            '4cdacd6a7d2bdaacde176fd7f90f8a06ae403db7e63498518c637b13bdc344dca595fb8b9f41f978f450cd43ffef8a4013c0e74f669d13ba6881d38068ea1c0d')
-validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  python setup.py build
-}
-
-check() (
-  cd ${pkgname}-${pkgver}
-
-  # set for debug output
-  #export MESON_PRINT_TEST_OUTPUT=1
-
-  export LC_CTYPE=en_US.UTF-8
-  ./run_tests.py
-)
-
-package() {
-  cd ${pkgname}-${pkgver}
-  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-
-  install -d "${pkgdir}/usr/share/vim/vimfiles"
-  cp -rt "${pkgdir}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*
-
-  install -Dt "${pkgdir}/usr/share/emacs/site-lisp" -m644 data/syntax-highlighting/emacs/*
-  install -Dt "${pkgdir}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/*
-
-  # Arch packaging helper
-  install -D ../arch-meson -t "${pkgdir}/usr/bin"
-}
-
-# vim: ts=2 sw=2 et:

Copied: meson/repos/extra-any/PKGBUILD (from rev 333014, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-25 21:29:07 UTC (rev 333015)
@@ -0,0 +1,63 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+
+pkgname=meson
+pkgver=0.47.2
+pkgrel=1
+pkgdesc='High productivity build system'
+url='http://mesonbuild.com/'
+arch=('any')
+license=('Apache')
+depends=('python' 'ninja')
+makedepends=('python-setuptools')
+checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' 'qt5-base' 'git' 'cython'
+              'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection'
+              'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz'
+              'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools'
+              'libwmf' 'dmd' 'valgrind')
+source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
+        arch-meson test.diff)
+sha512sums=('a1ac5691a5319ccf196d9443aea61e6c3ee9f09a9f638a3a7b5e5381b4c14372253c845be74fa2b59f42b9697671f12bce92c46bcb5cb629aeebd68e044e0021'
+            'SKIP'
+            '4cdacd6a7d2bdaacde176fd7f90f8a06ae403db7e63498518c637b13bdc344dca595fb8b9f41f978f450cd43ffef8a4013c0e74f669d13ba6881d38068ea1c0d'
+            '0e537c4fc04535decf901713f05d895dd8b93f2136e463b4a5adc5f2bf3a3e4c4ee07b5936fd7d01309af75a50fb1dc8d842b953c039ffe096efd54fd86aa7d0')
+validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # https://github.com/mesonbuild/meson/issues/4083
+  patch -Np1 -i ../test.diff
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  python setup.py build
+}
+
+check() (
+  cd ${pkgname}-${pkgver}
+
+  # set for debug output
+  #export MESON_PRINT_TEST_OUTPUT=1
+
+  export LC_CTYPE=en_US.UTF-8
+  ./run_tests.py
+)
+
+package() {
+  cd ${pkgname}-${pkgver}
+  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+
+  install -d "${pkgdir}/usr/share/vim/vimfiles"
+  cp -rt "${pkgdir}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*
+
+  install -Dt "${pkgdir}/usr/share/emacs/site-lisp" -m644 data/syntax-highlighting/emacs/*
+  install -Dt "${pkgdir}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/*
+
+  # Arch packaging helper
+  install -D ../arch-meson -t "${pkgdir}/usr/bin"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: arch-meson
===================================================================
--- arch-meson	2018-08-25 21:27:43 UTC (rev 333014)
+++ arch-meson	2018-08-25 21:29:07 UTC (rev 333015)
@@ -1,22 +0,0 @@
-#!/bin/bash -ex
-# Meson wrapper for Arch Linux packaging
-
-exec meson setup \
-  --prefix         /usr \
-  --libdir         /usr/lib \
-  --libexecdir     /usr/lib \
-  --bindir         /usr/bin \
-  --sbindir        /usr/bin \
-  --includedir     /usr/include \
-  --datadir        /usr/share \
-  --mandir         /usr/share/man \
-  --infodir        /usr/share/info \
-  --localedir      /usr/share/locale \
-  --sysconfdir     /etc \
-  --localstatedir  /var \
-  --sharedstatedir /var/lib \
-  --buildtype      release \
-  --auto-features  enabled \
-  --wrap-mode      nofallback \
-  -D               b_lto=true \
-  "$@"

Copied: meson/repos/extra-any/arch-meson (from rev 333014, meson/trunk/arch-meson)
===================================================================
--- arch-meson	                        (rev 0)
+++ arch-meson	2018-08-25 21:29:07 UTC (rev 333015)
@@ -0,0 +1,22 @@
+#!/bin/bash -ex
+# Meson wrapper for Arch Linux packaging
+
+exec meson setup \
+  --prefix         /usr \
+  --libdir         /usr/lib \
+  --libexecdir     /usr/lib \
+  --bindir         /usr/bin \
+  --sbindir        /usr/bin \
+  --includedir     /usr/include \
+  --datadir        /usr/share \
+  --mandir         /usr/share/man \
+  --infodir        /usr/share/info \
+  --localedir      /usr/share/locale \
+  --sysconfdir     /etc \
+  --localstatedir  /var \
+  --sharedstatedir /var/lib \
+  --buildtype      release \
+  --auto-features  enabled \
+  --wrap-mode      nofallback \
+  -D               b_lto=true \
+  "$@"

Copied: meson/repos/extra-any/test.diff (from rev 333014, meson/trunk/test.diff)
===================================================================
--- test.diff	                        (rev 0)
+++ test.diff	2018-08-25 21:29:07 UTC (rev 333015)
@@ -0,0 +1,13 @@
+diff --git i/run_unittests.py w/run_unittests.py
+index 28264606..7c267e17 100755
+--- i/run_unittests.py
++++ w/run_unittests.py
+@@ -3441,7 +3441,7 @@ class LinuxlikeTests(BasePlatformTests):
+                 break
+         self.assertIsInstance(docbook_target, dict)
+         ifile = self.introspect(['--target-files', 'generated-gdbus-docbook at cus'])[0]
+-        self.assertEqual(t['filename'], 'gdbus/generated-gdbus-doc-' + ifile)
++        self.assertEqual(t['filename'], 'gdbus/generated-gdbus-doc-' + os.path.basename(ifile))
+ 
+     def test_build_rpath(self):
+         if is_cygwin():



More information about the arch-commits mailing list