Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pisilinux/main

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-05-07 21:36:16 +03:00
parent fcfbe85288 aa980e5dcb
commit 31c590d61c
6 changed files with 130 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/font/fontconfig/pspec.xml
+16 -3
View File
@@ -12,8 +12,10 @@
<IsA>library</IsA>
<Summary>A library for configuring and customizing font access</Summary>
<Description>Fontconfig is a library designed to provide system-wide font configuration, customization and application access.</Description>
<Archive sha1sum="30d832b754fb10a3b70ebac750a38a0275438ad8" type="tarbz2">https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.bz2</Archive>
<Archive sha1sum="b7bcc5d47211b7bbac35bb221860407db3601f5b" type="tarbz2">https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libutil-linux-devel</Dependency>
<Dependency>gperf</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>expat-devel</Dependency>
</BuildDependencies>
@@ -21,7 +23,7 @@
<!-- prefer dejavu over bitstream -->
<Patch level="1">0001-fix-test-with-freetype2-2.7.1.patch</Patch>
<Patch level="1">prefer_dejavu.patch</Patch>
<Patch level="1">anymetrics_urw.patch</Patch>
<!-- <Patch level="1">anymetrics_urw.patch</Patch> -->
<Patch level="1">use_legacy_lcdfilter_on_small_monospace.patch</Patch>
<!-- <Patch level="1">add_hinting_and_antialiasing_to_proper_fonts.patch</Patch> -->
<!-- Sleep less in fc-cache -->
@@ -34,7 +36,8 @@
<Package>
<Name>fontconfig</Name>
<RuntimeDependencies>
<Dependency>freetype</Dependency>
<Dependency>libutil-linux</Dependency>
<Dependency>freetype</Dependency>
<Dependency>expat</Dependency>
</RuntimeDependencies>
<Files>
@@ -56,6 +59,7 @@
<Summary>Development files for fontconfig</Summary>
<RuntimeDependencies>
<Dependency release="current">fontconfig</Dependency>
<Dependency>libutil-linux-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>expat-devel</Dependency>
</RuntimeDependencies>
@@ -76,11 +80,13 @@
<BuildDependencies>
<Dependency>expat-32bit</Dependency>
<Dependency>freetype-32bit</Dependency>
<Dependency>libutil-linux-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="current">fontconfig</Dependency>
<Dependency>expat-32bit</Dependency>
<Dependency>freetype-32bit</Dependency>
<Dependency>libutil-linux-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
@@ -88,6 +94,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-05-07</Date>
<Version>2.13.0</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2017-02-13</Date>
<Version>2.12.1</Version>
desktop/misc/at-spi2-core/actions.py
+7 -3
View File
@@ -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
desktop/misc/at-spi2-core/pspec.xml
+7
View File
@@ -98,6 +98,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-05-07</Date>
<Version>2.28.0</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2018-04-19</Date>
<Version>2.28.0</Version>
hardware/bluetooth/bluez/files/gatt_fix_crash.diff
+41
View File
@@ -0,0 +1,41 @@
From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
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
hardware/bluetooth/bluez/files/refresh_adv_manager_for_non-LE_devices.diff
+50
View File
@@ -0,0 +1,50 @@
From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
From: "antoine.belvire@laposte.net" <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=<optimized out>,
adapter=0x556fe53f7c70) at src/adapter.c:543
2 new_settings_callback (index=<optimized out>, length=<optimized out>,
param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
status=<optimized out>, 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=<optimized out>,
user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
5 0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
cond=<optimized out>, user_data=<optimized out>)
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=<optimized out>, argv=<optimized out>)
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
hardware/bluetooth/bluez/pspec.xml
+9
View File
@@ -30,6 +30,8 @@
</BuildDependencies>
<Patches>
<Patch level="1">0001-Allow-using-obexd-without-systemd-in-the-user-session.patch</Patch>
<Patch level="1">refresh_adv_manager_for_non-LE_devices.diff</Patch>
<Patch level="1">gatt_fix_crash.diff</Patch>
</Patches>
</Source>
@@ -92,6 +94,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-05-07</Date>
<Version>5.49</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2018-04-23</Date>
<Version>5.49</Version>