tags 675293 + patch
thanks
This is a patch to fix compiling issues in experimental with gcc-4.7.
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
juffed (0.9.1137-1.2) UNRELEASED; urgency=low
.
* Non-maintainer upload.
*
Author: <tdjb@mobile>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- juffed-0.9.1137.orig/src/3rd_party/qtsingleapplication/qtlocalpeer.cpp
+++ juffed-0.9.1137/src/3rd_party/qtsingleapplication/qtlocalpeer.cpp
@@ -57,6 +57,7 @@ static PProcessIdToSessionId pProcessIdT
#endif
#if defined(Q_OS_UNIX)
#include <time.h>
+#include <unistd.h>
#endif
namespace QtLP_Private {
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
juffed (0.9.1137-1) experimental; urgency=low
.
* New upstream release.
* Remove debian/juffed.1, added upstream (in debian.in).
* Remove debian/patches/static.patch: we can now bundle the .so after
upstream has resolved soname issues.
* debian/control:
- Bump Standards-Version to 0.9.2.
- Update homepage.
- Do not build-depend on chrpath, not needed anymore.
* debian/rules:
- Remove chrpath rule, not needed anymore.
* Add juffed-dev and juffed-plugins packages.
* Do not install the libkeybindings.so plugin: causes a segfault on my
amd64 machine.
Author: Maia Kozheva <si...@ubuntu.com>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- juffed-0.9.1137.orig/src/lib/Document.cpp
+++ juffed-0.9.1137/src/lib/Document.cpp
@@ -122,7 +122,7 @@ QString Document::titleWithModification(
bool Document::isNoname(const QString& fileName, bool* ok) {
if ( fileName.isEmpty() ) {
if ( ok != NULL ) {
- ok = false;
+ *ok = false;
}
return true;
}
