[arch-commits] Commit in gnome-bluetooth/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Sun Mar 11 19:16:22 UTC 2018
Date: Sunday, March 11, 2018 @ 19:16:21
Author: heftig
Revision: 318612
3.27.92+2+g38e85c47-1
Modified:
gnome-bluetooth/trunk/PKGBUILD
Deleted:
gnome-bluetooth/trunk/0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch
gnome-bluetooth/trunk/0002-meson-Fix-installing-the-icons.patch
-----------------------------------------------------------------+
0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch | 39 -
0002-meson-Fix-installing-the-icons.patch | 196 ----------
PKGBUILD | 24 -
3 files changed, 6 insertions(+), 253 deletions(-)
Deleted: 0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch
===================================================================
--- 0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch 2018-03-11 19:15:47 UTC (rev 318611)
+++ 0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch 2018-03-11 19:16:21 UTC (rev 318612)
@@ -1,39 +0,0 @@
-From bfd81de1a4871f2b16d8d4d2630d8dcfb5e45491 Mon Sep 17 00:00:00 2001
-Message-Id: <bfd81de1a4871f2b16d8d4d2630d8dcfb5e45491.1505481573.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 15 Sep 2017 15:17:34 +0200
-Subject: [PATCH 1/2] meson: Remove duplicate and/or unused defines from sendto
-
----
- sendto/meson.build | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/sendto/meson.build b/sendto/meson.build
-index bf4f81652a126047..cc683117a16b91e3 100644
---- a/sendto/meson.build
-+++ b/sendto/meson.build
-@@ -5,21 +5,14 @@ deps = [
- dependency('gio-2.0')
- ]
-
--cflags = [
-- '-DDATADIR="@0@"'.format(gnomebt_datadir),
-- '-DICONDIR="@0@"'.format(gnomebt_icondir),
-- '-DLOCALEDIR="@0@"'.format(gnomebt_localedir)
--]
--
- executable(
- name,
- 'main.c',
- include_directories: [
- top_inc,
- lib_inc
- ],
- dependencies: deps,
-- c_args: cflags,
- link_with: libgnome_bluetooth,
- install: true,
- install_dir: gnomebt_bindir
---
-2.14.1
-
Deleted: 0002-meson-Fix-installing-the-icons.patch
===================================================================
--- 0002-meson-Fix-installing-the-icons.patch 2018-03-11 19:15:47 UTC (rev 318611)
+++ 0002-meson-Fix-installing-the-icons.patch 2018-03-11 19:16:21 UTC (rev 318612)
@@ -1,196 +0,0 @@
-From 42cf99858f1d50de7e86654a5b7e5d96907b620b Mon Sep 17 00:00:00 2001
-Message-Id: <42cf99858f1d50de7e86654a5b7e5d96907b620b.1505481573.git.jan.steffens at gmail.com>
-In-Reply-To: <bfd81de1a4871f2b16d8d4d2630d8dcfb5e45491.1505481573.git.jan.steffens at gmail.com>
-References: <bfd81de1a4871f2b16d8d4d2630d8dcfb5e45491.1505481573.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 15 Sep 2017 15:18:19 +0200
-Subject: [PATCH 2/2] meson: Fix installing the icons
-
----
- .../16x16/apps/bluetooth.png} | Bin
- .../16x16/status/bluetooth-active.png} | Bin
- .../16x16/status/bluetooth-disabled.png} | Bin
- .../16x16/status/bluetooth-paired.png} | Bin
- .../22x22/apps/bluetooth.png} | Bin
- .../22x22/status/bluetooth-active.png} | Bin
- .../22x22/status/bluetooth-disabled.png} | Bin
- .../22x22/status/bluetooth-paired.png} | Bin
- .../24x24/apps/bluetooth.png} | Bin
- .../24x24/status/bluetooth-active.png} | Bin
- .../24x24/status/bluetooth-disabled.png} | Bin
- .../24x24/status/bluetooth-paired.png} | Bin
- .../32x32/apps/bluetooth.png} | Bin
- .../32x32/status/bluetooth-active.png} | Bin
- .../32x32/status/bluetooth-disabled.png} | Bin
- .../32x32/status/bluetooth-paired.png} | Bin
- .../48x48/apps/bluetooth.png} | Bin
- .../48x48/status/bluetooth-active.png} | Bin
- .../48x48/status/bluetooth-disabled.png} | Bin
- .../scalable/apps/bluetooth.svg} | 0
- .../scalable/status/bluetooth-paired.svg} | 0
- icons/meson.build | 36 +--------------------
- meson.build | 2 +-
- 23 files changed, 2 insertions(+), 36 deletions(-)
- rename icons/{hicolor_apps_16x16_bluetooth.png => hicolor/16x16/apps/bluetooth.png} (100%)
- rename icons/{hicolor_status_16x16_bluetooth-active.png => hicolor/16x16/status/bluetooth-active.png} (100%)
- rename icons/{hicolor_status_16x16_bluetooth-disabled.png => hicolor/16x16/status/bluetooth-disabled.png} (100%)
- rename icons/{hicolor_status_16x16_bluetooth-paired.png => hicolor/16x16/status/bluetooth-paired.png} (100%)
- rename icons/{hicolor_apps_22x22_bluetooth.png => hicolor/22x22/apps/bluetooth.png} (100%)
- rename icons/{hicolor_status_22x22_bluetooth-active.png => hicolor/22x22/status/bluetooth-active.png} (100%)
- rename icons/{hicolor_status_22x22_bluetooth-disabled.png => hicolor/22x22/status/bluetooth-disabled.png} (100%)
- rename icons/{hicolor_status_22x22_bluetooth-paired.png => hicolor/22x22/status/bluetooth-paired.png} (100%)
- rename icons/{hicolor_apps_24x24_bluetooth.png => hicolor/24x24/apps/bluetooth.png} (100%)
- rename icons/{hicolor_status_24x24_bluetooth-active.png => hicolor/24x24/status/bluetooth-active.png} (100%)
- rename icons/{hicolor_status_24x24_bluetooth-disabled.png => hicolor/24x24/status/bluetooth-disabled.png} (100%)
- rename icons/{hicolor_status_24x24_bluetooth-paired.png => hicolor/24x24/status/bluetooth-paired.png} (100%)
- rename icons/{hicolor_apps_32x32_bluetooth.png => hicolor/32x32/apps/bluetooth.png} (100%)
- rename icons/{hicolor_status_32x32_bluetooth-active.png => hicolor/32x32/status/bluetooth-active.png} (100%)
- rename icons/{hicolor_status_32x32_bluetooth-disabled.png => hicolor/32x32/status/bluetooth-disabled.png} (100%)
- rename icons/{hicolor_status_32x32_bluetooth-paired.png => hicolor/32x32/status/bluetooth-paired.png} (100%)
- rename icons/{hicolor_apps_48x48_bluetooth.png => hicolor/48x48/apps/bluetooth.png} (100%)
- rename icons/{hicolor_status_48x48_bluetooth-active.png => hicolor/48x48/status/bluetooth-active.png} (100%)
- rename icons/{hicolor_status_48x48_bluetooth-disabled.png => hicolor/48x48/status/bluetooth-disabled.png} (100%)
- rename icons/{hicolor_apps_scalable_bluetooth.svg => hicolor/scalable/apps/bluetooth.svg} (100%)
- rename icons/{hicolor_status_scalable_bluetooth-paired.svg => hicolor/scalable/status/bluetooth-paired.svg} (100%)
-
-diff --git a/icons/hicolor_apps_16x16_bluetooth.png b/icons/hicolor/16x16/apps/bluetooth.png
-similarity index 100%
-rename from icons/hicolor_apps_16x16_bluetooth.png
-rename to icons/hicolor/16x16/apps/bluetooth.png
-diff --git a/icons/hicolor_status_16x16_bluetooth-active.png b/icons/hicolor/16x16/status/bluetooth-active.png
-similarity index 100%
-rename from icons/hicolor_status_16x16_bluetooth-active.png
-rename to icons/hicolor/16x16/status/bluetooth-active.png
-diff --git a/icons/hicolor_status_16x16_bluetooth-disabled.png b/icons/hicolor/16x16/status/bluetooth-disabled.png
-similarity index 100%
-rename from icons/hicolor_status_16x16_bluetooth-disabled.png
-rename to icons/hicolor/16x16/status/bluetooth-disabled.png
-diff --git a/icons/hicolor_status_16x16_bluetooth-paired.png b/icons/hicolor/16x16/status/bluetooth-paired.png
-similarity index 100%
-rename from icons/hicolor_status_16x16_bluetooth-paired.png
-rename to icons/hicolor/16x16/status/bluetooth-paired.png
-diff --git a/icons/hicolor_apps_22x22_bluetooth.png b/icons/hicolor/22x22/apps/bluetooth.png
-similarity index 100%
-rename from icons/hicolor_apps_22x22_bluetooth.png
-rename to icons/hicolor/22x22/apps/bluetooth.png
-diff --git a/icons/hicolor_status_22x22_bluetooth-active.png b/icons/hicolor/22x22/status/bluetooth-active.png
-similarity index 100%
-rename from icons/hicolor_status_22x22_bluetooth-active.png
-rename to icons/hicolor/22x22/status/bluetooth-active.png
-diff --git a/icons/hicolor_status_22x22_bluetooth-disabled.png b/icons/hicolor/22x22/status/bluetooth-disabled.png
-similarity index 100%
-rename from icons/hicolor_status_22x22_bluetooth-disabled.png
-rename to icons/hicolor/22x22/status/bluetooth-disabled.png
-diff --git a/icons/hicolor_status_22x22_bluetooth-paired.png b/icons/hicolor/22x22/status/bluetooth-paired.png
-similarity index 100%
-rename from icons/hicolor_status_22x22_bluetooth-paired.png
-rename to icons/hicolor/22x22/status/bluetooth-paired.png
-diff --git a/icons/hicolor_apps_24x24_bluetooth.png b/icons/hicolor/24x24/apps/bluetooth.png
-similarity index 100%
-rename from icons/hicolor_apps_24x24_bluetooth.png
-rename to icons/hicolor/24x24/apps/bluetooth.png
-diff --git a/icons/hicolor_status_24x24_bluetooth-active.png b/icons/hicolor/24x24/status/bluetooth-active.png
-similarity index 100%
-rename from icons/hicolor_status_24x24_bluetooth-active.png
-rename to icons/hicolor/24x24/status/bluetooth-active.png
-diff --git a/icons/hicolor_status_24x24_bluetooth-disabled.png b/icons/hicolor/24x24/status/bluetooth-disabled.png
-similarity index 100%
-rename from icons/hicolor_status_24x24_bluetooth-disabled.png
-rename to icons/hicolor/24x24/status/bluetooth-disabled.png
-diff --git a/icons/hicolor_status_24x24_bluetooth-paired.png b/icons/hicolor/24x24/status/bluetooth-paired.png
-similarity index 100%
-rename from icons/hicolor_status_24x24_bluetooth-paired.png
-rename to icons/hicolor/24x24/status/bluetooth-paired.png
-diff --git a/icons/hicolor_apps_32x32_bluetooth.png b/icons/hicolor/32x32/apps/bluetooth.png
-similarity index 100%
-rename from icons/hicolor_apps_32x32_bluetooth.png
-rename to icons/hicolor/32x32/apps/bluetooth.png
-diff --git a/icons/hicolor_status_32x32_bluetooth-active.png b/icons/hicolor/32x32/status/bluetooth-active.png
-similarity index 100%
-rename from icons/hicolor_status_32x32_bluetooth-active.png
-rename to icons/hicolor/32x32/status/bluetooth-active.png
-diff --git a/icons/hicolor_status_32x32_bluetooth-disabled.png b/icons/hicolor/32x32/status/bluetooth-disabled.png
-similarity index 100%
-rename from icons/hicolor_status_32x32_bluetooth-disabled.png
-rename to icons/hicolor/32x32/status/bluetooth-disabled.png
-diff --git a/icons/hicolor_status_32x32_bluetooth-paired.png b/icons/hicolor/32x32/status/bluetooth-paired.png
-similarity index 100%
-rename from icons/hicolor_status_32x32_bluetooth-paired.png
-rename to icons/hicolor/32x32/status/bluetooth-paired.png
-diff --git a/icons/hicolor_apps_48x48_bluetooth.png b/icons/hicolor/48x48/apps/bluetooth.png
-similarity index 100%
-rename from icons/hicolor_apps_48x48_bluetooth.png
-rename to icons/hicolor/48x48/apps/bluetooth.png
-diff --git a/icons/hicolor_status_48x48_bluetooth-active.png b/icons/hicolor/48x48/status/bluetooth-active.png
-similarity index 100%
-rename from icons/hicolor_status_48x48_bluetooth-active.png
-rename to icons/hicolor/48x48/status/bluetooth-active.png
-diff --git a/icons/hicolor_status_48x48_bluetooth-disabled.png b/icons/hicolor/48x48/status/bluetooth-disabled.png
-similarity index 100%
-rename from icons/hicolor_status_48x48_bluetooth-disabled.png
-rename to icons/hicolor/48x48/status/bluetooth-disabled.png
-diff --git a/icons/hicolor_apps_scalable_bluetooth.svg b/icons/hicolor/scalable/apps/bluetooth.svg
-similarity index 100%
-rename from icons/hicolor_apps_scalable_bluetooth.svg
-rename to icons/hicolor/scalable/apps/bluetooth.svg
-diff --git a/icons/hicolor_status_scalable_bluetooth-paired.svg b/icons/hicolor/scalable/status/bluetooth-paired.svg
-similarity index 100%
-rename from icons/hicolor_status_scalable_bluetooth-paired.svg
-rename to icons/hicolor/scalable/status/bluetooth-paired.svg
-diff --git a/icons/meson.build b/icons/meson.build
-index 98690ee7bb708778..f60a08808478c14c 100644
---- a/icons/meson.build
-+++ b/icons/meson.build
-@@ -1,35 +1 @@
--icons_files = [
-- ['apps', 'bluetooth.png'],
-- ['status', 'bluetooth-active.png'],
-- ['status', 'bluetooth-disabled.png'],
-- ['status', 'bluetooth-paired.png']
--]
--
--icons_48x48_files = [
-- ['apps', 'bluetooth.png'],
-- ['status', 'bluetooth-active.png'],
-- ['status', 'bluetooth-disabled.png']
--]
--
--icons_scalable_files = [
-- ['apps', 'bluetooth.svg'],
-- ['status', 'bluetooth-paired.svg']
--]
--
--icons = [
-- ['16x16', icons_files],
-- ['22x22', icons_files],
-- ['24x24', icons_files],
-- ['32x32', icons_files],
-- ['48x48', icons_48x48_files],
-- ['scalable', icons_scalable_files]
--]
--
--foreach icon: icons
-- foreach icon_file: icon[1]
-- install_data(
-- '_'.join(['hicolor', icon_file[0], icon[0], icon_file[1]]),
-- install_dir: join_paths(gnomebt_icondir, icon[0], icon_file[0])
-- )
-- endforeach
--endforeach
-+install_subdir('hicolor', install_dir: gnomebt_icondir)
-diff --git a/meson.build b/meson.build
-index 6fceb80615d72656..236e480dd7ab4645 100644
---- a/meson.build
-+++ b/meson.build
-@@ -35,7 +35,7 @@ gnomebt_mandir = join_paths(gnomebt_prefix, get_option('mandir'))
- gnomebt_pkgdatadir = join_paths(gnomebt_datadir, meson.project_name())
- gnomebt_pkglibdir = join_paths(gnomebt_libdir, meson.project_name())
-
--gnomebt_icondir = join_paths(gnomebt_datadir, 'icons', 'hicolor')
-+gnomebt_icondir = join_paths(gnomebt_datadir, 'icons')
-
- gnomebt_buildtype = get_option('buildtype')
- gnomebt_debug = gnomebt_buildtype.contains('debug')
---
-2.14.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-11 19:15:47 UTC (rev 318611)
+++ PKGBUILD 2018-03-11 19:16:21 UTC (rev 318612)
@@ -3,7 +3,7 @@
# Contributor: Roman Kyrylych <roman at archlinux.org>
pkgname=gnome-bluetooth
-pkgver=3.26.0+1+g3875844
+pkgver=3.27.92+2+g38e85c47
pkgrel=1
pkgdesc="The GNOME Bluetooth Subsystem"
url="https://wiki.gnome.org/Projects/GnomeBluetooth"
@@ -11,14 +11,10 @@
license=(GPL LGPL)
depends=(gtk3 libnotify bluez libcanberra libsystemd pulseaudio-bluetooth)
makedepends=(gobject-introspection gtk-doc docbook-xsl git systemd meson)
-_commit=3875844ce772224d6fdafc71482861a31662e64d # master
+_commit=38e85c473d24a218df73781e46faf5a53b8d733e # master
source=("git+https://git.gnome.org/browse/gnome-bluetooth#commit=$_commit"
- 0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch
- 0002-meson-Fix-installing-the-icons.patch
61-gnome-bluetooth-rfkill.rules)
sha256sums=('SKIP'
- '327d8b07c76fbf7c752eace757440a657d79a56b1fd0097e408bf6ca4c2192b7'
- '1603ba04936f69627a562b3a69db3c73b2ebc0208eca9e52434e3e17fad57c58'
'8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
pkgver() {
@@ -27,19 +23,12 @@
}
prepare() {
- mkdir build
cd $pkgname
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=787728
- git apply -3 ../0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch
- git apply -3 ../0002-meson-Fix-installing-the-icons.patch
}
build() {
- cd build
- meson setup --prefix=/usr --buildtype=release ../$pkgname \
- -Denable-gtk-doc=true -Denable-icon-update=false
- ninja
+ arch-meson $pkgname build -D gtk_doc=true -D icon_update=false
+ ninja -C build
}
check() {
@@ -48,7 +37,6 @@
}
package() {
- cd build
- DESTDIR="$pkgdir" ninja install
- install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../61-gnome-bluetooth-rfkill.rules
+ DESTDIR="$pkgdir" ninja -C build install
+ install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 61-gnome-bluetooth-rfkill.rules
}
More information about the arch-commits
mailing list