-
Notifications
You must be signed in to change notification settings - Fork 665
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream packaging.diff #6045
Upstream packaging.diff #6045
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for taking care of this crappy task ❤️
stream << "Git revision " << GIT_SHA1 << endl; | ||
#endif | ||
stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl; | ||
stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be good to check for availability of SSL - not sure Qt does not crash here otherwise.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked, it should not crash.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the output then? (just out of curiosity)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nothing: https://code.woboq.org/qt5/qtbase/src/network/ssl/qsslsocket_openssl11.cpp.html#180
arrguably, it is a bit strange to have an empty Using, but this should not happen in practice.
@@ -16,7 +16,8 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") | |||
# cannot be pedantic with sqlite3 directly linked | |||
# FIXME Can we somehow not use those flags for sqlite3.* but use them for the rest of csync? | |||
if (NOT USE_OUR_OWN_SQLITE3) | |||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors") | |||
# -pedantic-errors explodes in src/csync/csync_private.h:166 | |||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ogoffart do you think this is still relevant? Or did something got refactored/cleaned up here?
@@ -243,7 +267,7 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) | |||
if(BUILD_OWNCLOUD_OSX_BUNDLE) | |||
install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/) | |||
configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY) | |||
else() | |||
elseif(BUILD_CLIENT) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is nonsense - don't know how it got into the diff
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dschmidt Why is it nonsense? Shouldn't the whole preparation for sync-exclude.lst be done for BUILD_CLIENT only?
CMakeLists.txt
Outdated
@@ -247,7 +247,6 @@ if(BUILD_CLIENT) | |||
if(NOT BUILD_LIBRARIES_ONLY) | |||
add_subdirectory(doc) | |||
add_subdirectory(doc/dev) | |||
add_subdirectory(admin) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this really in the diff? Looks like an accident or something - it looks pretty wrong, don't even know what it would be good for in the linux packages
I took the liberty of adding the RPATH change to your branch/PR, hope that was ok |
stream << "Git revision " << GIT_SHA1 << endl; | ||
#endif | ||
stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl; | ||
stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked, it should not crash.
src/cmd/cmd.cpp
Outdated
@@ -196,8 +196,7 @@ void help() | |||
|
|||
void showVersion() | |||
{ | |||
const char *binaryName = APPLICATION_EXECUTABLE "cmd"; | |||
std::cout << binaryName << " version " << qPrintable(Theme::instance()->version()) << std::endl; | |||
std::cout << qPrintable(Theme::instance()->versionSwitchOutput()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-1: Encoding! should be qPrintableUtf8
(the application executable might contains non-ascii)
@@ -16,7 +16,8 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") | |||
# cannot be pedantic with sqlite3 directly linked | |||
# FIXME Can we somehow not use those flags for sqlite3.* but use them for the rest of csync? | |||
if (NOT USE_OUR_OWN_SQLITE3) | |||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors") | |||
# -pedantic-errors explodes in src/csync/csync_private.h:166 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
csync_private.h:166 is a comment for me.
So I guess this comment is already outdated and should be removed.
Maybe pedentic-errors would make sens on a CI, but not when building packages, so it is fine to remove it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ooh of course, it was early, when I wrote the comment ... 😄
Yeah, let's just remove it.
CMakeLists.txt
Outdated
find_package(Sparkle) | ||
endif(APPLE) | ||
if(BUILD_CLIENT) | ||
find_package(OpenSSL 1.0.0 REQUIRED) # still needed? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-1: Not needed
@dschmidt Sure :) |
dd59d1b
to
e9e97be
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. Thanks for digging through that ugly heap!
the admin folder is unused in linux, so I left it out at some point. It is indeed needed for macos.
I assume to keep it inside
if (BUILD_CLIENT)
if (NOT BUILD_LIBRARIES_ONLY)
would help macos and not harm linux.
I cannot currently run a test with the nightlies, looks like part of the changes are already in master...
We removed many useless subdirs for linux, to achieve a DFSG-free tarball according to #6005
But removing the admin folder via de8ab35 is probably not needed. I suggest change clean_tarball.sh to not remove the admin folder.
ack
clean_tarball.sh was only intended for external linux packagers, not for us doing all kind of stuff
Wait for this PR to get merged and then see that packaging.diff should not be needed anymore? |
e9e97be
to
cf69a7a
Compare
{ | ||
QString helpText; | ||
QTextStream stream(&helpText); | ||
stream << appName().toLatin1().constData() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ooops! Encoding (not new in this patch)
stream << "Git revision " << GIT_SHA1 << endl; | ||
#endif | ||
stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl; | ||
stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nothing: https://code.woboq.org/qt5/qtbase/src/network/ssl/qsslsocket_openssl11.cpp.html#180
arrguably, it is a bit strange to have an empty Using, but this should not happen in practice.
Please review and test. The admin removal looks dubious to me! See #5957