Changes - SailfishOS Open Build Service

Changes of Revision 6

[-] [+]	Changed	_service:tar_git:libgrilio.changes
@@ -1,3 +1,10 @@ +* Mon May 25 2020 Slava Monich <slava.monich@jolla.com> - 1.0.37 +- [libgrilio] Fixed 'strncpy' destination size warning. JB#33787 +- [libgrilio] Fixed warning: G_ADD_PRIVATE. JB#33787 +- [libgrilio] Fixed warning: static inline. JB#33787 +- [libgrilio] Freshened up license. JB#33787 +- [libgrilio] Respect arch specific lib dir. JB#49681 + * Tue Aug 27 2019 Slava Monich <slava.monich@jolla.com> - 1.0.36 - [build] Allow use of CC defined by build system. JB#33787
[-] [+]	Changed	_service:tar_git:libgrilio.spec ^
@@ -1,5 +1,5 @@ Name: libgrilio -Version: 1.0.36 +Version: 1.0.37 Release: 0 Summary: RIL I/O library Group: Development/Libraries @@ -27,11 +27,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 %check make -C test test
[-] [+]	Changed	_service ^
@@ -1,8 +1,8 @@ <services> <service name="tar_git"> - <param name="url">https://git.merproject.org/mer-core/libgrilio.git</param> + <param name="url">https://git.sailfishos.org/mer-core/libgrilio.git</param> <param name="branch">master</param> - <param name="revision">8a01e8093ec1bea57692aaad256e0a1dd59f0bf0</param> + <param name="revision">db31207015739663db084882b1f330e56eb1cbfc</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Deleted	_service:tar_git:libgrilio-1.0.36.tar.bz2/debian/libgrilio-dev.install ^
@@ -1,3 +0,0 @@ -debian/tmp/usr/lib/libgrilio.so usr/lib -include/*.h usr/include/grilio -build/libgrilio.pc usr/lib/pkgconfig
[-] [+]	Deleted	_service:tar_git:libgrilio-1.0.36.tar.bz2/debian/libgrilio.install ^
@@ -1 +0,0 @@ -debian/tmp/usr/lib/libgrilio.so.* usr/lib
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/.gitignore ^
@@ -7,6 +7,7 @@ debian/libgrilio-dev debian/.debhelper.log debian/.debhelper +debian/.install debian/.substvars debian/tmp documentation.list
[-] [+]	Added	_service:tar_git:libgrilio-1.0.37.tar.bz2/LICENSE ^
@@ -0,0 +1,29 @@ +Copyright (C) 2015-2020 Jolla Ltd. +Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com> + +You may use this file under the terms of 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.
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/Makefile ^
@@ -21,7 +21,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 0 -VERSION_RELEASE = 36 +VERSION_RELEASE = 37 # Version for pkg-config PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) @@ -69,26 +69,20 @@ # Tools and flags # -ifndef CC -CC = $(CROSS_COMPILE)gcc -endif - +CC ?= $(CROSS_COMPILE)gcc LD = $(CC) WARNINGS = -Wall INCLUDES = -I$(INCLUDE_DIR) BASE_FLAGS = -fPIC FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \ -MMD -MP $(shell pkg-config --cflags $(PKGS)) -FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname -Wl,$(LIB_SONAME) \ +FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname=$(LIB_SONAME) \ $(shell pkg-config --libs $(PKGS)) DEBUG_FLAGS = -g RELEASE_FLAGS = COVERAGE_FLAGS = -g -ifndef KEEP_SYMBOLS -KEEP_SYMBOLS = 0 -endif - +KEEP_SYMBOLS ?= 0 ifneq ($(KEEP_SYMBOLS),0) RELEASE_FLAGS += -g endif @@ -142,8 +136,6 @@ coverage: $(COVERAGE_STATIC_LIB) -pkgconfig: $(PKGCONFIG) - print_debug_lib: @echo $(DEBUG_STATIC_LIB) @@ -160,6 +152,7 @@ rm -fr debian/tmp debian/libgrilio debian/libgrilio-dev rm -f documentation.list debian/files debian/.substvars rm -f debian/.debhelper.log debian/.debhelper debian/~ + rm -f debian/*.install test: make -C test test @@ -209,8 +202,21 @@ $(COVERAGE_STATIC_LIB): $(COVERAGE_OBJS) $(AR) rc $@ $? -$(PKGCONFIG): $(LIB_NAME).pc.in $(BUILD_DIR) - sed -e 's/\[version\]/'$(PCVERSION)/g $< > $@ +# +# 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: $(PKGCONFIG) + +$(PKGCONFIG): $(LIB_NAME).pc.in Makefile + sed -e 's\|@version@\|$(PCVERSION)\|g' -e 's\|@libdir@\|$(ABS_LIBDIR)\|g' $< > $@ + +debian/%.install: debian/%.install.in + sed 's\|@LIBDIR@\|$(LIBDIR)\|g' $< > $@ # # Install @@ -218,15 +224,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_LIB) $(INSTALL_LIB_DIR) + $(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR) ln -sf $(LIB) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK2) ln -sf $(LIB_SYMLINK2) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/debian/changelog ^
@@ -1,3 +1,10 @@ +libgrilio (1.0.37) unstable; urgency=low + + * Fixed various compilation warnings + * Respect arch specific lib dir + + -- Slava Monich <slava.monich@jolla.com> Mon, 25 May 2020 18:40:14 +0300 + libgrilio (1.0.36) unstable; urgency=low * Allow use of CC defined by build system
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/debian/control ^
@@ -2,14 +2,14 @@ Section: libs Priority: optional Maintainer: Slava Monich <slava.monich@jolla.com> -Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.0), libglibutil (>= 1.0.10) +Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil (>= 1.0.10) Standards-Version: 3.8.4 Package: libgrilio Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Library of glib utilities +Description: RIL I/O library Package: libgrilio-dev Section: libdevel
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/debian/copyright ^
@@ -1,5 +1,5 @@ -Copyright (C) 2015-2018 Jolla Ltd. -Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com> +Copyright (C) 2015-2020 Jolla Ltd. +Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com> You may use this file under the terms of BSD license as follows: @@ -12,9 +12,9 @@ 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 name of Jolla Ltd nor the names of its contributors may - be used to endorse or promote products derived from this software - without specific prior written permission. + 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
[-] [+]	Added	_service:tar_git:libgrilio-1.0.37.tar.bz2/debian/libgrilio-dev.install.in ^
@@ -0,0 +1,3 @@ +debian/tmp/@LIBDIR@/libgrilio.so @LIBDIR@ +debian/tmp/@LIBDIR@/pkgconfig/libgrilio.pc @LIBDIR@/pkgconfig +debian/tmp/usr/include/* usr/include/
[-] [+]	Added	_service:tar_git:libgrilio-1.0.37.tar.bz2/debian/libgrilio.install.in ^
@@ -0,0 +1 @@ +debian/tmp/@LIBDIR@/libgrilio.so.* @LIBDIR@
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/debian/rules ^
@@ -4,8 +4,13 @@ # Uncomment this to turn on verbose mode. #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/libgrilio.install debian/libgrilio-dev.install + override_dh_auto_install: - dh_auto_install -- install-dev + dh_auto_install -- LIBDIR=$(LIBDIR) install-dev %: dh $@
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/libgrilio.pc.in ^
@@ -1,10 +1,10 @@ name=grilio -libdir=/usr/lib +libdir=@libdir@ includedir=/usr/include Name: libgrilio Description: RIL I/O library -Version: [version] -Requires: glib-2.0 gio-2.0 libglibutil +Version: @version@ +Requires.private: glib-2.0 gio-2.0 libglibutil Libs: -L${libdir} -l${name} Cflags: -I${includedir} -I${includedir}/${name}
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/src/grilio_channel.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2019 Jolla Ltd. - * Copyright (C) 2015-2019 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2015-2020 Jolla Ltd. + * Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -30,6 +30,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include "grilio_p.h" #include "grilio_parser.h" #include "grilio_transport_p.h"
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/src/grilio_p.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2019 Jolla Ltd. - * Copyright (C) 2015-2019 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2015-2020 Jolla Ltd. + * Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -102,66 +102,66 @@ gboolean timeout, gpointer user_data); -G_GNUC_INTERNAL void grilio_request_unref_proc( - gpointer data); + gpointer data) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL void grilio_queue_remove( - GRilIoRequest* req); + GRilIoRequest* req) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL GRilIoRequest* grilio_channel_get_request( GRilIoChannel* channel, - guint id); + guint id) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL void grilio_channel_set_pending_timeout( GRilIoChannel* channel, - int ms); + int ms) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL GRILIO_TRANSACTION_STATE grilio_channel_transaction_start( GRilIoChannel* channel, - GRilIoQueue* queue); + GRilIoQueue* queue) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL GRILIO_TRANSACTION_STATE grilio_channel_transaction_state( GRilIoChannel* channel, - GRilIoQueue* queue); + GRilIoQueue* queue) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL void grilio_channel_transaction_finish( GRilIoChannel* channel, - GRilIoQueue* queue); + GRilIoQueue* queue) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL guint grilio_channel_get_id( - GRilIoChannel* channel); + GRilIoChannel* channel) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL gboolean grilio_channel_release_id( GRilIoChannel* channel, - guint id); + guint id) + G_GNUC_INTERNAL; -G_GNUC_INTERNAL guint grilio_channel_get_id_with_timeout( GRilIoChannel* channel, guint timeout_ms, GRilIoChannelIdCleanupFunc cleanup, - gpointer user_data); + gpointer user_data) + G_GNUC_INTERNAL; -G_INLINE_FUNC gboolean +static inline gboolean grilio_request_can_retry(GRilIoRequest* req) { return req->max_retries < 0 \|\| req->max_retries > req->retry_count; }
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/src/grilio_transport.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 BSD license as follows: * @@ -30,6 +30,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include "grilio_transport_impl.h" #include "grilio_transport_p.h" #include "grilio_p.h"
[-] [+]	Changed	_service:tar_git:libgrilio-1.0.37.tar.bz2/src/grilio_transport_socket.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 BSD license as follows: * @@ -731,7 +731,7 @@ struct sockaddr_un addr; memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); if (connect(fd, (struct sockaddr)&addr, sizeof(addr)) == 0) { GRilIoTransport transport = grilio_transport_socket_new(fd, sub, TRUE);