Added build dependency libqt5xdgiconloader-dev, set minimum versions Bumped Standards to 3.9.8, no changes needed Fixed VCS-Fields, use https and plain /git/ Added Recommends lxqt-globalkeys-l10n Fixed copyright Format field Bumped copyright years Don't install translations Added translation control to rules Set CMAKE_BUILD_TYPE=RelWithDebInfo Exported LC_ALL=C.UTF-8, make builds reproducible Added hardening options to rules Fixed .gitignore Removed Patches, applied upstream
Alf Gaida
8 years ago
parent
0aabac2b6c
commit
689f14a465
@ -1,61 +0,0 @@
|
||||
Description: cast return values to error_t
|
||||
Author: Alf Gaida <agaida@siduction.org>
|
||||
|
||||
Bug: <url in upstream bugtracker>
|
||||
Last-Update: 2015-12-27
|
||||
|
||||
--- lxqt-globalkeys-0.10.0.orig/daemon/pipe_utils.cpp
|
||||
+++ lxqt-globalkeys-0.10.0/daemon/pipe_utils.cpp
|
||||
@@ -39,10 +39,10 @@ void initBothPipeEnds(int fd[2])
|
||||
|
||||
error_t createPipe(int fd[2])
|
||||
{
|
||||
- error_t result = 0;
|
||||
+ error_t result = static_cast<error_t>(0);
|
||||
if (pipe(fd) < 0)
|
||||
{
|
||||
- result = errno;
|
||||
+ result = static_cast<error_t>( errno);
|
||||
}
|
||||
if (!result)
|
||||
{
|
||||
@@ -59,16 +59,16 @@ error_t readAll(int fd, void *data, size
|
||||
ssize_t bytes_read = read(fd, data, length);
|
||||
if (bytes_read < 0)
|
||||
{
|
||||
- return errno;
|
||||
+ return static_cast<error_t>( errno);
|
||||
}
|
||||
if (!bytes_read)
|
||||
{
|
||||
- return -1;
|
||||
+ return static_cast<error_t>( -1);
|
||||
}
|
||||
data = reinterpret_cast<char *>(data) + bytes_read;
|
||||
length -= bytes_read;
|
||||
}
|
||||
- return 0;
|
||||
+ return static_cast<error_t>(0);
|
||||
}
|
||||
|
||||
error_t writeAll(int fd, const void *data, size_t length)
|
||||
@@ -78,16 +78,16 @@ error_t writeAll(int fd, const void *dat
|
||||
ssize_t bytes_written = write(fd, data, length);
|
||||
if (bytes_written < 0)
|
||||
{
|
||||
- return errno;
|
||||
+ return static_cast<error_t>( errno);
|
||||
}
|
||||
if (!bytes_written)
|
||||
{
|
||||
- return -1;
|
||||
+ return static_cast<error_t>( -1);
|
||||
}
|
||||
data = reinterpret_cast<const char *>(data) + bytes_written;
|
||||
length -= bytes_written;
|
||||
}
|
||||
- return 0;
|
||||
+ return static_cast<error_t>( 0);
|
||||
}
|
||||
|
||||
void closeBothPipeEnds(int fd[2])
|
||||
@ -1 +0,0 @@
|
||||
error_t.patch
|
||||
@ -1,9 +1,17 @@
|
||||
#!/usr/bin/make -f
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
export LC_ALL=C.UTF-8
|
||||
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
|
||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
%:
|
||||
dh ${@} --buildsystem cmake \
|
||||
--parallel \
|
||||
--fail-missing
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- \
|
||||
-DPULL_TRANSLATIONS=OFF\
|
||||
-DUPDATE_TRANSLATIONS=OFF\
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
|
||||
Loading…
Reference in new issue