Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:tar_git:libgbinder-radio.changes
@@ -1,3 +1,12 @@ +* Wed Jun 03 2020 Slava Monich <slava.monich@jolla.com> - 1.0.10 +- [gbinder-radio] Constants for android.hardware.radio@1.1 interfaces +- [gbinder-radio] Hide internal symbols +- [gbinder-radio] Ignore GLib deprecation warnings +- [gbinder-radio] Respect arch specific lib dir. JB#49681 + +* Tue Mar 24 2020 Slava Monich <slava.monich@jolla.com> - 1.0.9 +- [debian] Packaging for Debian-based distros. JB#42254 + * Wed Aug 14 2019 Slava Monich <slava.monich@jolla.com> - 1.0.8 - [gbinder-radio] Added RADIO_DEVICE_STATE enum. JB#46836
[-] [+]	Changed	_service:tar_git:libgbinder-radio.spec ^
@@ -1,5 +1,5 @@ Name: libgbinder-radio -Version: 1.0.8 +Version: 1.0.10 Release: 0 Summary: Binder client library for Android radio interfaces Group: Development/Libraries @@ -31,11 +31,11 @@ %setup -q %build -make KEEP_SYMBOLS=1 release pkgconfig +make LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig %install rm -rf %{buildroot} -make install-dev DESTDIR=%{buildroot} +make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev %post -p /sbin/ldconfig
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/libgbinder-radio.git</param> <param name="branch">master</param> - <param name="revision">1.0.8</param> + <param name="revision">1.0.10</param> <param name="token"/> <param name="debian"/> <param name="dumb"/>
[-] [+]	Changed	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/.gitignore ^
@@ -1,13 +1,11 @@ ~ debian/files -debian/libgbinder-radio-dev.debhelper.log -debian/libgbinder-radio-dev.substvars debian/libgbinder-radio-dev -debian/libgbinder-radio.debhelper.log -debian/libgbinder-radio.postinst.debhelper -debian/libgbinder-radio.postrm.debhelper -debian/libgbinder-radio.substvars debian/libgbinder-radio +debian/.debhelper.log +debian/.debhelper +debian/.substvars +debian/*.install debian/tmp documentation.list installroot
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/AUTHORS ^
@@ -0,0 +1,3 @@ +Danct12 <danct12@disroot.org> +Frajo Haider <f_haider@gmx.at> +Slava Monich <slava@monich.com>
[-] [+]	Changed	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/Makefile ^
@@ -23,7 +23,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 0 -VERSION_RELEASE = 8 +VERSION_RELEASE = 10 # Version for pkg-config PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) @@ -78,10 +78,7 @@ RELEASE_FLAGS = COVERAGE_FLAGS = -g -ifndef KEEP_SYMBOLS -KEEP_SYMBOLS = 0 -endif - +KEEP_SYMBOLS ?= 0 ifneq ($(KEEP_SYMBOLS),0) RELEASE_FLAGS += -g endif @@ -144,6 +141,10 @@ clean: rm -f ~ $(SRC_DIR)/~ $(INCLUDE_DIR)/~ rm -fr $(BUILD_DIR) RPMS installroot + rm -fr debian/tmp debian/libgbinder-radio debian/libgbinder-radio-dev + rm -f documentation.list debian/files debian/.substvars + rm -f debian/.debhelper.log debian/.debhelper debian/~ + rm -f debian/.install $(BUILD_DIR): mkdir -p $@ @@ -189,8 +190,19 @@ $(AR) rc $@ $? ranlib $@ +# +# LIBDIR usually gets substituted with arch specific dir. +# It's relative in deb build and can be whatever in rpm build. +# + +LIBDIR ?= usr/lib +ABS_LIBDIR := $(shell echo /$(LIBDIR) \| sed -r 's\|/+\|/\|g') + $(PKGCONFIG): $(LIB_NAME).pc.in Makefile - sed -e 's/\[version\]/'$(PCVERSION)/g $< > $@ + sed -e 's\|@version@\|$(PCVERSION)\|g' -e 's\|@libdir@\|$(ABS_LIBDIR)\|g' $< > $@ + +debian/%.install: debian/%.install.in + sed 's\|@LIBDIR@\|$(LIBDIR)\|g' $< > $@ # # Install @@ -198,15 +210,14 @@ INSTALL = install INSTALL_DIRS = $(INSTALL) -d -INSTALL_LIBS = $(INSTALL) -m 755 INSTALL_FILES = $(INSTALL) -m 644 -INSTALL_LIB_DIR = $(DESTDIR)/usr/lib +INSTALL_LIB_DIR = $(DESTDIR)$(ABS_LIBDIR) INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/$(NAME) -INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig +INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig install: $(INSTALL_LIB_DIR) - $(INSTALL_LIBS) $(RELEASE_SO) $(INSTALL_LIB_DIR) + $(INSTALL_FILES) $(RELEASE_SO) $(INSTALL_LIB_DIR) ln -sf $(LIB_SO) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK2) ln -sf $(LIB_SYMLINK2) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/changelog ^
@@ -0,0 +1,14 @@ +libgbinder-radio (1.0.10) unstable; urgency=medium + + * Hide internal symbols + * Respect arch specific lib dir + * Ignore GLib deprecation warnings + * Added constants for android.hardware.radio@1.1 interfaces + + -- Slava Monich <slava.monich@jolla.com> Wed, 03 Jun 2020 15:24:17 +0300 + +libgbinder-radio (1.0.9) unstable; urgency=medium + + * Added packaging for Debian-based distros. + + -- Danct12 <danct12@disroot.org> Tue, 24 Mar 2020 02:55:50 +0700
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/compat ^
@@ -0,0 +1 @@ +9
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/control ^
@@ -0,0 +1,17 @@ +Source: libgbinder-radio +Priority: optional +Maintainer: Danct12 <danct12@disroot.org> +Build-Depends: debhelper (>=9), libgbinder-dev (>= 1.0.9) +Standards-Version: 3.9.6 + +Package: libgbinder-radio-dev +Section: libdevel +Architecture: any +Depends: libgbinder-radio (= ${binary:Version}), ${misc:Depends} +Description: Development files for libgbinder-radio + +Package: libgbinder-radio +Section: libs +Architecture: any +Depends: libgbinder (>= 1.0.9), ${shlibs:Depends}, ${misc:Depends} +Description: Binder client library for Android radio interfaces
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/copyright ^
@@ -0,0 +1,33 @@ +Copyright (C) 2018-2020 Jolla Ltd. +Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> + +You may use this file under the terms of the BSD license as follows: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the names of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation +are those of the authors and should not be interpreted as representing +any official policies, either expressed or implied.
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/libgbinder-radio-dev.install.in ^
@@ -0,0 +1,3 @@ +debian/tmp/@LIBDIR@/libgbinder-radio.so @LIBDIR@ +debian/tmp/@LIBDIR@/pkgconfig/libgbinder-radio.pc @LIBDIR@/pkgconfig +debian/tmp/usr/include/* usr/include
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/libgbinder-radio.install.in ^
@@ -0,0 +1 @@ +debian/tmp/@LIBDIR@/libgbinder-radio.so.* @LIBDIR@
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/rules ^
@@ -0,0 +1,14 @@ +#!/usr/bin/make -f +# Uncomment to enable verbose build +#export DH_VERBOSE = 1 + +LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +override_dh_auto_build: + dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libgbinder-radio.install debian/libgbinder-radio-dev.install + +override_dh_auto_install: + dh_auto_install -- LIBDIR=$(LIBDIR) install-dev + +%: + dh $@
[-] [+]	Added	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/debian/source/format ^
@@ -0,0 +1 @@ +3.0 (native)
[-] [+]	Changed	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/include/radio_types.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2019 Jolla Ltd. - * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of the BSD license as follows: * @@ -46,9 +46,13 @@ #define RADIO_IFACE_PREFIX "android.hardware.radio@" #define RADIO_IFACE_1_0(x) RADIO_IFACE_PREFIX "1.0::" x +#define RADIO_IFACE_1_1(x) RADIO_IFACE_PREFIX "1.1::" x #define RADIO_1_0 RADIO_IFACE_1_0("IRadio") +#define RADIO_1_1 RADIO_IFACE_1_1("IRadio") #define RADIO_RESPONSE_1_0 RADIO_IFACE_1_0("IRadioResponse") +#define RADIO_RESPONSE_1_1 RADIO_IFACE_1_1("IRadioResponse") #define RADIO_INDICATION_1_0 RADIO_IFACE_1_0("IRadioIndication") +#define RADIO_INDICATION_1_1 RADIO_IFACE_1_1("IRadioIndication") /* Types defined in types.hal / @@ -850,6 +854,18 @@ c(128,127,setIndicationFilter,SET_INDICATION_FILTER) \ c(129,128,setSimCardPower,SET_SIM_CARD_POWER) +#define RADIO_1_0_REQ_LAST RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT + +#define RADIO_CALL_1_1(c) \ + c(131,130,setCarrierInfoForImsiEncryption,SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION) \ + c(132,131,setSimCardPower_1_1,SET_SIM_CARD_POWER_1_1) \ + c(133,132,startNetworkScan,START_NETWORK_SCAN) \ + c(134,133,stopNetworkScan,STOP_NETWORK_SCAN) \ + c(135,134,startKeepalive,START_KEEPALIVE) \ + c(136,135,stopKeepalive,STOP_KEEPALIVE) + +#define RADIO_1_1_REQ_LAST RADIO_REQ_STOP_KEEPALIVE + / e(code,eventName,EVENT_NAME) / #define RADIO_EVENT_1_0(e) \ e(1,radioStateChanged,RADIO_STATE_CHANGED) \ @@ -898,14 +914,20 @@ e(44,pcoData,PCO_DATA) \ e(45,modemReset,MODEM_RESET) +#define RADIO_EVENT_1_1(e) \ + e(46,carrierInfoForImsiEncryption,CARRIER_INFO_FOR_IMSI_ENCRYPTION) \ + e(47,networkScanResult,NETWORK_SCAN_RESULT) \ + e(48,keepaliveStatus,KEEPALIVE_STATUS) + typedef enum radio_req { RADIO_REQ_ANY = 0, RADIO_REQ_NONE = 0, RADIO_REQ_SET_RESPONSE_FUNCTIONS = 1, / setResponseFunctions / #define RADIO_REQ_(req,resp,Name,NAME) RADIO_REQ_##NAME = req, RADIO_CALL_1_0(RADIO_REQ_) + RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT = 130, / responseAcknowledgement / + RADIO_CALL_1_1(RADIO_REQ_) #undef RADIO_REQ_ - RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT = 130 / responseAcknowledgement / } RADIO_REQ; typedef enum radio_resp { @@ -913,8 +935,9 @@ RADIO_RESP_NONE = 0, #define RADIO_RESP_(req,resp,Name,NAME) RADIO_RESP_##NAME = resp, RADIO_CALL_1_0(RADIO_RESP_) + RADIO_RESP_ACKNOWLEDGE_REQUEST = 129, / acknowledgeRequest */ + RADIO_CALL_1_1(RADIO_RESP_) #undef RADIO_RESP_ - RADIO_RESP_ACKNOWLEDGE_REQUEST = 129 } RADIO_RESP; typedef enum radio_ind { @@ -922,6 +945,7 @@ RADIO_IND_NONE = 0, #define RADIO_IND_(code,Name,NAME) RADIO_IND_##NAME = code, RADIO_EVENT_1_0(RADIO_IND_) + RADIO_EVENT_1_1(RADIO_IND_) #undef RADIO_IND_ } RADIO_IND;
[-] [+]	Changed	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/libgbinder-radio.pc.in ^
@@ -1,10 +1,10 @@ name=gbinder-radio -libdir=/usr/lib +libdir=@libdir@ includedir=/usr/include Name: libgbinder-radio Description: Binder client library for Android radio interfaces -Version: [version] -Requires: glib-2.0 libglibutil libgbinder +Version: @version@ +Requires.private: glib-2.0 libglibutil libgbinder Libs: -L${libdir} -l${name} Cflags: -I${includedir} -I${includedir}/${name}
[-] [+]	Changed	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/src/radio_instance.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2019 Jolla Ltd. - * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of the BSD license as follows: * @@ -34,6 +34,8 @@ * any official policies, either expressed or implied. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include "radio_instance.h" #include "radio_registry_p.h" #include "radio_util.h"
[-] [+]	Changed	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/src/radio_registry_p.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2019 Jolla Ltd. - * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of the BSD license as follows: * @@ -41,11 +41,13 @@ void radio_registry_instance_added( - RadioInstance* instance); + RadioInstance* instance) + G_GNUC_INTERNAL; void radio_registry_instance_removed( - const char* key); + const char* key) + G_GNUC_INTERNAL; #endif /* RADIO_REGISTRY_PRIVATE_H */
[-] [+]	Changed	_service:tar_git:libgbinder-radio-1.0.10.tar.bz2/src/radio_util.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2019 Jolla Ltd. - * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of the BSD license as follows: * @@ -49,6 +49,7 @@ #define RADIO_REQ_(req,resp,Name,NAME) \ case RADIO_REQ_##NAME: return #Name; RADIO_CALL_1_0(RADIO_REQ_) + RADIO_CALL_1_1(RADIO_REQ_) #undef RADIO_REQ_ case RADIO_REQ_ANY: break; @@ -65,6 +66,7 @@ #define RADIO_RESP_(req,resp,Name,NAME) \ case RADIO_RESP_##NAME: return #Name "Response"; RADIO_CALL_1_0(RADIO_RESP_) + RADIO_CALL_1_1(RADIO_RESP_) #undef RADIO_RESP_ case RADIO_RESP_ANY: break; @@ -80,6 +82,7 @@ #define RADIO_IND_(code,Name,NAME) \ case RADIO_IND_##NAME: return #Name; RADIO_EVENT_1_0(RADIO_IND_) + RADIO_EVENT_1_1(RADIO_IND_) #undef RADIO_IND_ case RADIO_IND_ANY: break;