diff --git a/desktop/font/fontconfig/pspec.xml b/desktop/font/fontconfig/pspec.xml
index 317afb7e52..c095f0fe99 100644
--- a/desktop/font/fontconfig/pspec.xml
+++ b/desktop/font/fontconfig/pspec.xml
@@ -12,8 +12,10 @@
library
A library for configuring and customizing font access
Fontconfig is a library designed to provide system-wide font configuration, customization and application access.
- https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.bz2
+ https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.0.tar.bz2
+ libutil-linux-devel
+ gperf
freetype-devel
expat-devel
@@ -21,7 +23,7 @@
0001-fix-test-with-freetype2-2.7.1.patch
prefer_dejavu.patch
- anymetrics_urw.patch
+
use_legacy_lcdfilter_on_small_monospace.patch
@@ -34,7 +36,8 @@
fontconfig
- freetype
+ libutil-linux
+ freetype
expat
@@ -56,6 +59,7 @@
Development files for fontconfig
fontconfig
+ libutil-linux-devel
freetype-devel
expat-devel
@@ -76,11 +80,13 @@
expat-32bit
freetype-32bit
+ libutil-linux-32bit
fontconfig
expat-32bit
freetype-32bit
+ libutil-linux-32bit
/usr/lib32
@@ -88,6 +94,13 @@
+
+ 2018-05-07
+ 2.13.0
+ Version Bump
+ Pisi Linux Community
+ admin@pisilinux.org
+
2017-02-13
2.12.1
diff --git a/desktop/misc/at-spi2-core/actions.py b/desktop/misc/at-spi2-core/actions.py
index 79f163adb7..19c4a2d024 100644
--- a/desktop/misc/at-spi2-core/actions.py
+++ b/desktop/misc/at-spi2-core/actions.py
@@ -13,10 +13,12 @@ from pisi.actionsapi import get
def setup():
shelltools.makedirs("build")
shelltools.cd("build")
- options = "meson .. --prefix=/usr -D enable_docs=true"
+ options = "meson --prefix=/usr --libexec=/usr/libexec/at-spi2 --sysconfdir=/etc -D dbus_daemon=/usr/bin \
+ -D systemd_user_dir=/usr/share/dbus-1/services -D enable_docs=true"
if get.buildTYPE() == "emul32":
- options += "meson --prefix=/usr --libexec=tmp --sysconfdir=tmp --libdir=lib32 -D enable_docs=false"
+ options += "meson --prefix=/usr --libexec=tmp --datadir=tmp --sysconfdir=tmp -D dbus_dir=tmp \
+ -D systemd_user_dir=tmp --libdir=lib32 -D enable_docs=false .."
shelltools.system(options)
@@ -30,7 +32,9 @@ def install():
shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
if get.buildTYPE() == "emul32":
- #pisitools.dosed("%s/usr/share/dbus-1/services" % get.installDIR(), "^(Exec=)\/tmp", r"\1/usr/libexec/at-spi2")
+ #pisitools.dosed("%s/usr/share/dbus-1/services" % get.installDIR(), "^(Exec=)\/usr/tmp", r"\1/usr/libexec/at-spi2")
+ #pisitools.dosed("%s/usr/share/dbus-1/accessibility-services" % get.installDIR(), "^(Exec=)\/usr/tmp", r"\1/usr/libexec/at-spi2")
+ #pisitools.dosed("%s/etc/dbus-1/system.d" % get.installDIR(), "^(ExecStart=)\/usr/tmp", r"\1/usr/libexec/at-spi2")
pisitools.removeDir("/usr/tmp")
return
diff --git a/desktop/misc/at-spi2-core/pspec.xml b/desktop/misc/at-spi2-core/pspec.xml
index f2100e2ca2..dbb6b52199 100644
--- a/desktop/misc/at-spi2-core/pspec.xml
+++ b/desktop/misc/at-spi2-core/pspec.xml
@@ -98,6 +98,13 @@
+
+ 2018-05-07
+ 2.28.0
+ Rebuild.
+ Pisi Linux Community
+ admin@pisilinux.org
+
2018-04-19
2.28.0
diff --git a/hardware/bluetooth/bluez/files/gatt_fix_crash.diff b/hardware/bluetooth/bluez/files/gatt_fix_crash.diff
new file mode 100644
index 0000000000..53ed385880
--- /dev/null
+++ b/hardware/bluetooth/bluez/files/gatt_fix_crash.diff
@@ -0,0 +1,41 @@
+From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001
+From: Szymon Janc
+Date: Wed, 4 Apr 2018 09:28:56 +0200
+Subject: gatt: Fix crash with BR/EDR only adapter
+
+adapter->database can be NULL if controller is BR/EDR only or LE was
+disabled. Make btd_gatt_database_restore_svc_chng_ccc accept NULL
+pointer and silently ignore it similiar to rest of btd_gatt_database
+API.
+
+Invalid read of size 8
+ at 0x164DCB: btd_gatt_database_restore_svc_chng_ccc (src/bluez-git/src/bluetoothd)
+ by 0x17B70F: read_info_complete (src/bluez-git/src/bluetoothd)
+ by 0x1A7E58: request_complete (src/bluez-git/src/bluetoothd)
+ by 0x1A89AD: can_read_data (src/bluez-git/src/bluetoothd)
+ by 0x1B5752: watch_callback (src/bluez-git/src/bluetoothd)
+ by 0x4E852C5: g_main_context_dispatch (in /usr/lib/libglib-2.0.so.0.5600.0)
+ by 0x4E856A0: ??? (in /usr/lib/libglib-2.0.so.0.5600.0)
+ by 0x4E859D1: g_main_loop_run (in /usr/lib/libglib-2.0.so.0.5600.0)
+ by 0x125058: main (src/bluez-git/src/bluetoothd)
+ Address 0x40 is not stack'd, malloc'd or (recently) free'd
+---
+ src/gatt-database.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gatt-database.c b/src/gatt-database.c
+index 1cdc72e..0ac5b75 100644
+--- a/src/gatt-database.c
++++ b/src/gatt-database.c
+@@ -3330,6 +3330,9 @@ void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database)
+ uint8_t value[4];
+ uint16_t handle, ccc_handle;
+
++ if (!database)
++ return;
++
+ handle = gatt_db_attribute_get_handle(database->svc_chngd);
+ ccc_handle = gatt_db_attribute_get_handle(database->svc_chngd_ccc);
+
+--
+cgit v1.1
diff --git a/hardware/bluetooth/bluez/files/refresh_adv_manager_for_non-LE_devices.diff b/hardware/bluetooth/bluez/files/refresh_adv_manager_for_non-LE_devices.diff
new file mode 100644
index 0000000000..aba861c8a0
--- /dev/null
+++ b/hardware/bluetooth/bluez/files/refresh_adv_manager_for_non-LE_devices.diff
@@ -0,0 +1,50 @@
+From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
+From: "antoine.belvire@laposte.net"
+Date: Tue, 27 Mar 2018 20:30:26 +0200
+Subject: adapter: Don't refresh adv_manager for non-LE devices
+
+btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
+but as only LE adapters have an adv_manager, this leads to segmentation fault
+for non-LE devices:
+
+0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
+1 0x0000556fe45fcb02 in settings_changed (settings=,
+ adapter=0x556fe53f7c70) at src/adapter.c:543
+2 new_settings_callback (index=, length=,
+ param=, user_data=0x556fe53f7c70) at src/adapter.c:573
+3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
+ status=, opcode=opcode@entry=7, index=index@entry=0,
+ length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
+4 0x0000556fe462cd9d in can_read_data (io=,
+ user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
+5 0x0000556fe46396e3 in watch_callback (channel=,
+ cond=, user_data=)
+ at src/shared/io-glib.c:170
+6 0x00007fe351c980e5 in g_main_context_dispatch ()
+ from /usr/lib64/libglib-2.0.so.0
+7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
+8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
+9 0x0000556fe45abc75 in main (argc=, argv=)
+ at src/main.c:770
+
+This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
+---
+ src/adapter.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index 6b9222b..daccfdc 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
+ g_dbus_emit_property_changed(dbus_conn, adapter->path,
+ ADAPTER_INTERFACE, "Discoverable");
+ store_adapter_info(adapter);
+- btd_adv_manager_refresh(adapter->adv_manager);
++ if (adapter->supported_settings & MGMT_SETTING_LE)
++ btd_adv_manager_refresh(adapter->adv_manager);
+ }
+
+ if (changed_mask & MGMT_SETTING_BONDABLE) {
+--
+cgit v1.1
diff --git a/hardware/bluetooth/bluez/pspec.xml b/hardware/bluetooth/bluez/pspec.xml
index eadf7909dc..ec16f81d96 100644
--- a/hardware/bluetooth/bluez/pspec.xml
+++ b/hardware/bluetooth/bluez/pspec.xml
@@ -30,6 +30,8 @@
0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+ refresh_adv_manager_for_non-LE_devices.diff
+ gatt_fix_crash.diff
@@ -92,6 +94,13 @@
+
+ 2018-05-07
+ 5.49
+ Rebuild.
+ Pisi Linux Community
+ admin@pisilinux.org
+
2018-04-23
5.49