Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:bluebinder.changes
@@ -1,10 +1,3 @@ -* Mon Aug 03 2020 Slava Monich <slava.monich@jolla.com> - 1.0.12 -- [bluebinder] gbinder reader expects gsize for size and count. JB#42254 -- [bluebinder] Make linking against systemd optional. JB#42254 - -* Fri Jul 17 2020 Matti Lehtimäki <matti.lehtimaki@gmail.com> - 1.0.11 -- [bluebinder] Fix systemd unit file locations. Use macros. Contributes to JB#50435 - * Wed Jun 10 2020 Frajo <f_haider@gmx.at> - 1.0.10 - [bluebinder] Handle initializationComplete callback more accurate. Fixes JB#49643
[-] [+]	Changed	_service:tar_git:bluebinder.spec ^
@@ -1,5 +1,5 @@ Name: bluebinder -Version: 1.0.12 +Version: 1.0.10 Release: 1%{?dist} Summary: a simple proxy for using android binder based bluetooth through vhci. @@ -28,13 +28,13 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -cp bluebinder.service $RPM_BUILD_ROOT%{_unitdir} -mkdir $RPM_BUILD_ROOT%{_unitdir}/graphical.target.wants -ln -s ../bluebinder.service $RPM_BUILD_ROOT%{_unitdir}/graphical.target.wants/bluebinder.service -mkdir -p $RPM_BUILD_ROOT%{_bindir}/droid/ -cp bluebinder_post.sh $RPM_BUILD_ROOT%{_bindir}/droid/ -cp bluebinder_wait.sh $RPM_BUILD_ROOT%{_bindir}/droid/ +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +cp bluebinder.service $RPM_BUILD_ROOT/lib/systemd/system +mkdir $RPM_BUILD_ROOT/lib/systemd/system/graphical.target.wants +ln -s ../bluebinder.service $RPM_BUILD_ROOT/lib/systemd/system/graphical.target.wants/bluebinder.service +mkdir -p $RPM_BUILD_ROOT/usr/bin/droid/ +cp bluebinder_post.sh $RPM_BUILD_ROOT/usr/bin/droid/ +cp bluebinder_wait.sh $RPM_BUILD_ROOT/usr/bin/droid/ %clean rm -rf $RPM_BUILD_ROOT @@ -42,8 +42,8 @@ %files %defattr(-,root,root,-) -%{_sbindir}/bluebinder -%{_unitdir}/graphical.target.wants/bluebinder.service -%{_unitdir}/bluebinder.service -%{_bindir}/droid/bluebinder_post.sh -%{_bindir}/droid/bluebinder_wait.sh +/usr/sbin/bluebinder +/lib/systemd/system/graphical.target.wants/bluebinder.service +/lib/systemd/system/bluebinder.service +/usr/bin/droid/bluebinder_post.sh +/usr/bin/droid/bluebinder_wait.sh
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/bluebinder.git</param> <param name="branch">master</param> - <param name="revision"></param> + <param name="revision">1.0.10</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:bluebinder-1.0.10.tar.bz2/Makefile ^
@@ -1,16 +1,9 @@ # TODO: this is a bit minimalistic isn't it? -USE_SYSTEMD ?= 1 - -DEPEND_LIBS = libgbinder glib-2.0 -ifeq ($(USE_SYSTEMD),1) -DEPEND_LIBS += libsystemd -endif - build: bluebinder bluebinder: bluebinder.c - gcc $(CFLAGS) -Wall -flto $^ `pkg-config --cflags --libs $(DEPEND_LIBS)` -DUSE_SYSTEMD=$(USE_SYSTEMD) -o $@ + gcc $(CFLAGS) -Wall -flto $^ `pkg-config --cflags --libs libgbinder glib-2.0 libsystemd` -o $@ install: mkdir -p $(DESTDIR)/usr/sbin
[-] [+]	Changed	_service:tar_git:bluebinder-1.0.10.tar.bz2/bluebinder.c ^
@@ -39,9 +39,7 @@ #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> -#if USE_SYSTEMD #include <systemd/sd-daemon.h> -#endif #include <gbinder.h> @@ -408,9 +406,7 @@ if (binder_init_complete(proxy)) { proxy->init_failed = FALSE; -#if USE_SYSTEMD sd_notify(0, "READY=1"); -#endif status = GBINDER_STATUS_OK; return gbinder_local_reply_append_int32(gbinder_local_object_new_reply(obj), 0); } else { @@ -420,7 +416,7 @@ } } else if (code == 2 \|\| code == 3 \|\| code == 4) { - gsize count, elemsize; + unsigned int count, elemsize; GBinderReader reader; const uint8_t vec; uint8_t *packet; @@ -578,11 +574,9 @@ close(proxy.host_fd); -#if USE_SYSTEMD sd_notify(0, "STATUS=Exiting.\n" "ERRNO=19"); -#endif return err; }