[arch-commits] Commit in gnome-bluetooth/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Fri Sep 15 13:32:15 UTC 2017
Date: Friday, September 15, 2017 @ 13:32:14
Author: heftig
Revision: 305594
3.26.0+1+g3875844-1
Added:
gnome-bluetooth/trunk/0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch
gnome-bluetooth/trunk/0002-meson-Fix-installing-the-icons.patch
Modified:
gnome-bluetooth/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch | 39 +
0002-meson-Fix-installing-the-icons.patch | 196 ++++++++++
PKGBUILD | 42 +-
3 files changed, 256 insertions(+), 21 deletions(-)
Added: 0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch
===================================================================
--- 0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch (rev 0)
+++ 0001-meson-Remove-duplicate-and-or-unused-defines-from-se.patch 2017-09-15 13:32:14 UTC (rev 305594)
@@ -0,0 +1,39 @@
+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
+
Added: 0002-meson-Fix-installing-the-icons.patch
===================================================================
--- 0002-meson-Fix-installing-the-icons.patch (rev 0)
+++ 0002-meson-Fix-installing-the-icons.patch 2017-09-15 13:32:14 UTC (rev 305594)
@@ -0,0 +1,196 @@
+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 2017-09-15 12:06:26 UTC (rev 305593)
+++ PKGBUILD 2017-09-15 13:32:14 UTC (rev 305594)
@@ -3,7 +3,7 @@
# Contributor: Roman Kyrylych <roman at archlinux.org>
pkgname=gnome-bluetooth
-pkgver=3.20.1+1+ge902d1a
+pkgver=3.26.0+1+g3875844
pkgrel=1
pkgdesc="The GNOME Bluetooth Subsystem"
url="https://wiki.gnome.org/Projects/GnomeBluetooth"
@@ -10,11 +10,15 @@
arch=(i686 x86_64)
license=(GPL LGPL)
depends=(gtk3 libnotify bluez libcanberra libsystemd pulseaudio-bluetooth)
-makedepends=(intltool gobject-introspection itstool docbook-xsl gnome-common git systemd)
-_commit=e902d1aca835bfc823e5e4cf2b37f5444d606042 # master
+makedepends=(gobject-introspection gtk-doc docbook-xsl git systemd meson)
+_commit=3875844ce772224d6fdafc71482861a31662e64d # 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() {
@@ -23,30 +27,26 @@
}
prepare() {
+ mkdir build
cd $pkgname
- NOCONFIGURE=1 ./autogen.sh
+ 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 $pkgname
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-gtk-doc \
- --disable-desktop-update \
- --disable-icon-update \
- --disable-schemas-compile
+ cd build
+ meson setup --prefix=/usr --buildtype=release ../$pkgname \
+ -Denable-gtk-doc=true -Denable-icon-update=false
+ ninja
+}
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
+check() {
+ cd build
+ meson test
}
package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- install -m644 -D ../61-gnome-bluetooth-rfkill.rules \
- "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
+ cd build
+ DESTDIR="$pkgdir" ninja install
+ install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../61-gnome-bluetooth-rfkill.rules
}
More information about the arch-commits
mailing list