Date: Friday, July 14, 2017 @ 13:04:23 Author: alucryd Revision: 245089
archrelease: copy trunk to community-any Added: lollypop/repos/community-any/PKGBUILD (from rev 245088, lollypop/trunk/PKGBUILD) lollypop/repos/community-any/lollypop-libexecdir.patch (from rev 245088, lollypop/trunk/lollypop-libexecdir.patch) lollypop/repos/community-any/lollypop-portal-libexecdir.patch (from rev 245088, lollypop/trunk/lollypop-portal-libexecdir.patch) Deleted: lollypop/repos/community-any/PKGBUILD ----------------------------------+ PKGBUILD | 119 ++++++++++++++++++------------------- lollypop-libexecdir.patch | 22 ++++++ lollypop-portal-libexecdir.patch | 22 ++++++ 3 files changed, 105 insertions(+), 58 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-07-14 13:04:08 UTC (rev 245088) +++ PKGBUILD 2017-07-14 13:04:23 UTC (rev 245089) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: kirek <rbu...@gmail.com> -# Contributor: Cédric Bellegarde <gnu...@gmail.com> - -pkgname=lollypop -pkgver=0.9.240 -_portal_pkgver=0.9.1 -pkgrel=1 -pkgdesc='Music player for GNOME' -arch=('any') -url='https://github.com/gnumdk/lollypop' -license=('GPL') -depends=('desktop-file-utils' 'gst-python' 'gtk3' 'python-cairo' - 'python-dbus' 'python-gobject' 'totem-plparser') -makedepends=('gobject-introspection' 'intltool' 'itstool' 'python') -optdepends=('easytag: Modify tags' - 'flatpak: Flatpak Portal' - 'gst-libav: FFmpeg plugin for GStreamer' - 'kid3-qt: Store covers in tags' - 'libsecret: Last.FM support' - 'python-pylast: Last.FM support' - 'python-wikipedia: Wikipedia support' - 'youtube-dl: YouTube playback') -_commit='8f3fec20c99498a48f33df00eb64d5af20f81a38' -source=("https://github.com/gnumdk/lollypop/releases/download/${pkgver}/lollypop-${pkgver}.tar.xz" - "https://github.com/gnumdk/lollypop-portal/releases/download/${_portal_pkgver}/lollypop-portal-${_portal_pkgver}.tar.xz") -sha256sums=('78cbd57c41f5d97f8c9286f7e01c0c3d0fde17a3dc01a4a5bae1bf665e653e58' - 'd7c5ae781eb3a7d24b1303b6f0c618d386e7ee0c977f87220f889c12e2713e6f') - -build() { - cd lollypop-portal-${_portal_pkgver} - - ./configure \ - --prefix='/usr' \ - --libexecdir='/usr/lib/lollypop' - make - - cd ../lollypop-${pkgver} - - ./configure \ - --prefix='/usr' \ - --libexecdir='/usr/lib/lollypop' \ - --disable-schemas-compile - make -} - -package() { - cd lollypop-portal-${_portal_pkgver} - - make DESTDIR="${pkgdir}" install - - cd ../lollypop-${pkgver} - - make DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: Copied: lollypop/repos/community-any/PKGBUILD (from rev 245088, lollypop/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-07-14 13:04:23 UTC (rev 245089) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: kirek <rbu...@gmail.com> +# Contributor: Cédric Bellegarde <gnu...@gmail.com> + +pkgname=lollypop +pkgver=0.9.244 +_portal_pkgver=0.9.2 +pkgrel=1 +pkgdesc='Music player for GNOME' +arch=('any') +url='https://github.com/gnumdk/lollypop' +license=('GPL') +depends=('desktop-file-utils' 'gst-python' 'gtk3' 'python-cairo' + 'python-dbus' 'python-gobject' 'totem-plparser') +makedepends=('gobject-introspection' 'intltool' 'itstool' 'meson' 'python') +optdepends=('easytag: Modify tags' + 'flatpak: Flatpak Portal' + 'gst-libav: FFmpeg plugin for GStreamer' + 'kid3-qt: Store covers in tags' + 'libsecret: Last.FM support' + 'python-pylast: Last.FM support' + 'python-wikipedia: Wikipedia support' + 'youtube-dl: YouTube playback') +_commit='8f3fec20c99498a48f33df00eb64d5af20f81a38' +source=("https://github.com/gnumdk/lollypop/releases/download/${pkgver}/lollypop-${pkgver}.tar.xz" + "https://github.com/gnumdk/lollypop-portal/releases/download/${_portal_pkgver}/lollypop-portal-${_portal_pkgver}.tar.xz" + 'lollypop-portal-libexecdir.patch' + 'lollypop-libexecdir.patch') +sha256sums=('7ca012a6a6b4dc4d517d79e888b1b17a9e24a55faea925d8a6957c7a33af3679' + '5dd56b8c76397eb6b75106c2734fa6af8874777089a8ee9991fa99a970e0e723' + '69145bffdb0043d9ce082a45a92630255f2cddf6f2d9e815c3e1d94b306e61a6' + 'd094e2cb434cb402a4ebf6b9282f9b428b59d7bf64bc7fa2c513579d25346519') + +prepare() { + cd lollypop-portal-${_portal_pkgver} + patch -Np1 -i ../lollypop-portal-libexecdir.patch + cd ../lollypop-${pkgver} + patch -Np1 -i ../lollypop-libexecdir.patch +} + +build() { + for d in lollypop-portal-${_portal_pkgver} lollypop-${pkgver}; do + pushd $d + meson \ + --buildtype='release' \ + --prefix='/usr' \ + --libexecdir='lib/lollypop' \ + build + ninja -C build + popd + done +} + +package() { + for d in lollypop-portal-${_portal_pkgver} lollypop-${pkgver}; do + DESTDIR="${pkgdir}" ninja -C $d/build install + done +} + +# vim: ts=2 sw=2 et: Copied: lollypop/repos/community-any/lollypop-libexecdir.patch (from rev 245088, lollypop/trunk/lollypop-libexecdir.patch) =================================================================== --- lollypop-libexecdir.patch (rev 0) +++ lollypop-libexecdir.patch 2017-07-14 13:04:23 UTC (rev 245089) @@ -0,0 +1,22 @@ +From e0caf5391989534a684845999f567bab16832cd3 Mon Sep 17 00:00:00 2001 +From: Maxime Gauduin <aluc...@archlinux.org> +Date: Fri, 14 Jul 2017 14:59:34 +0200 +Subject: [PATCH] Customize libexecdir + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0eee8e9b..017bbd2b 100644 +--- a/meson.build ++++ b/meson.build +@@ -18,7 +18,7 @@ dependency('gobject-introspection-1.0', version: '>=1.35.9') + dependency('gtk+-3.0', version :'>=3.14') + + python_dir = join_paths(get_option('prefix'), python.sysconfig_path('purelib')) +-LIBEXEC_DIR = join_paths(get_option('prefix'), 'libexec') ++LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir')) + DATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) + + conf = configuration_data() Copied: lollypop/repos/community-any/lollypop-portal-libexecdir.patch (from rev 245088, lollypop/trunk/lollypop-portal-libexecdir.patch) =================================================================== --- lollypop-portal-libexecdir.patch (rev 0) +++ lollypop-portal-libexecdir.patch 2017-07-14 13:04:23 UTC (rev 245089) @@ -0,0 +1,22 @@ +From 968e8956110c6f0ad089ac3c8b11948ef0c1d023 Mon Sep 17 00:00:00 2001 +From: Maxime Gauduin <aluc...@archlinux.org> +Date: Fri, 14 Jul 2017 14:54:56 +0200 +Subject: [PATCH] Customize libexecdir + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 76c186b..2a0acf6 100644 +--- a/meson.build ++++ b/meson.build +@@ -11,7 +11,7 @@ dependency('gtk+-3.0', version :'>=3.14') + + python_dir = join_paths(get_option('prefix'), python.sysconfig_path('purelib')) + service_dir = join_paths(get_option('datadir'), 'dbus-1', 'services') +-libexec_dir = join_paths(get_option('prefix'), 'libexec') ++libexec_dir = join_paths(get_option('prefix'), get_option('libexecdir')) + + conf = configuration_data() + conf.set('pythondir', python_dir)