From 008d703de1cedd9af0e3a7ab7933f65a6d758249 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 11 Sep 2018 14:50:35 +0200 Subject: [PATCH 1/3] make the package cross-compile safe --- connectivity.pro | 4 ++-- load.pro | 4 ++-- pokerth_game.pro | 4 ++-- pokerth_server.pro | 4 ++-- zlib_compress.pro | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/connectivity.pro b/connectivity.pro index a6704719..f8321d9c 100644 --- a/connectivity.pro +++ b/connectivity.pro @@ -41,13 +41,13 @@ unix : !mac { QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib INCLUDEPATH += $${PREFIX}/include - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_SYS = boost_system boost_system-mt # - # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. # diff --git a/load.pro b/load.pro index 8e3d80f1..31285aea 100644 --- a/load.pro +++ b/load.pro @@ -42,14 +42,14 @@ unix : !mac { QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib INCLUDEPATH += $${PREFIX}/include - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) BOOST_THREAD = boost_thread boost_thread-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_SYS = boost_system boost_system-mt # - # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. # diff --git a/pokerth_game.pro b/pokerth_game.pro index 4ec08abb..2c188e44 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -412,7 +412,7 @@ unix:!mac { LIB_DIRS = $${PREFIX}/lib \ $${PREFIX}/lib64 \ $${PREFIX}/lib/x86_64-linux-gnu \ - $$system(qmake -query QT_INSTALL_LIBS) + $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) } android{ LIBPATH += $${PREFIX}/lib/armv7 @@ -433,7 +433,7 @@ unix:!mac { BOOST_CHRONO = boost_chrono \ boost_chrono-mt - # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. for(dir, LIB_DIRS):exists($$dir) { diff --git a/pokerth_server.pro b/pokerth_server.pro index 1f701b16..ccaff69e 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -180,7 +180,7 @@ unix : !mac { INCLUDEPATH += $${PREFIX}/include # see issue https://github.com/pokerth/pokerth/issues/282 INCLUDEPATH += $${PREFIX}/include/libircclient - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_THREAD = boost_thread boost_thread-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt @@ -191,7 +191,7 @@ unix : !mac { BOOST_CHRONO = boost_chrono boost_chrono-mt # - # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. # diff --git a/zlib_compress.pro b/zlib_compress.pro index 7863d6fb..73fa7709 100644 --- a/zlib_compress.pro +++ b/zlib_compress.pro @@ -48,7 +48,7 @@ unix : !mac { #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections #QMAKE_LFLAGS += -Wl,--gc-sections - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS) BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt BOOST_SYSTEM = boost_system boost_system-mt From f5688e01b0efb37035e3b0e3a432200185b9a0c5 Mon Sep 17 00:00:00 2001 From: q4z1 Date: Wed, 17 Oct 2018 16:39:49 +0200 Subject: [PATCH 2/3] minor bugfix newSock <-> acceptedSocket --- src/net/serveraccepthelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/serveraccepthelper.h b/src/net/serveraccepthelper.h index bcaba929..60f2acf4 100644 --- a/src/net/serveraccepthelper.h +++ b/src/net/serveraccepthelper.h @@ -125,7 +125,7 @@ protected: // Deprecated non_blocking_io command /*boost::asio::socket_base::non_blocking_io command(true); newSock->io_control(command);*/ - newSock->non_blocking(true); + acceptedSocket->non_blocking(true); acceptedSocket->set_option(typename P::no_delay(true)); acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true)); boost::shared_ptr sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService)); From 09281f31790dec66c3b7d5247ca164f726df5480 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Mon, 21 Jan 2019 03:30:35 +0100 Subject: [PATCH 3/3] French translation improvements --- ts/pokerth_fr.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/pokerth_fr.ts b/ts/pokerth_fr.ts index 637455cf..16d8c743 100644 --- a/ts/pokerth_fr.ts +++ b/ts/pokerth_fr.ts @@ -17,17 +17,17 @@ Some cards pictures are missing, please contact style maintainer for this issue. - Certaines images des cartes sont manquantes, veuillez contacter l'auteur pour qu'il corrige ce problème. + Certaines images de cartes sont manquantes, veuillez contacter le mainteneur du style pour qu'il corrige ce problème. Some style fields are missing, please contact style maintainer for this issue. - Certains champs sont manquants, veuillez contacter l'auteur pour lui demander de corriger ce problème. + Certains champs sont manquants, veuillez contacter le mainteneur du style pour qu'il corrige ce problème. This style is outdated, please contact style maintainer for this issue. - Ce style est obsolète, veuillez contacter l'auteur pour lui demander de le mettre à jour. + Ce style est obsolète, veuillez contacter le mainteneur du style pour ce problème. @@ -8991,7 +8991,7 @@ Veuillez choisir un nom différent. Chance - Chance + Probabilité