This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from e1a4886 /: drop Maemo support, remove x2goclient.pro.maemo. new 6b794fc /: add README.mxe, describing MXE builds. new 4e590d3 /: add handle_mxe.sh, MXE control script. new 6f88182 handle_mxe.sh: rework, make most variables lowercase, change spacing, use proper if-else blocks, do not use special bash features for string comparison etc. new 847cfe7 macbuild.sh: qmake never supported -config, it was always CONFIG(+)='something'. new 5833e69 config_linux_static.sh: also switch from -config to CONFIG+='...'. new a62c2bd {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option and prepare selector in x2goclient.pro. new 8eb96d9 x2goclient.pro: use different parameters for MXE builds. new 41673c1 x2goclient.pro: also select on win32 and not just win32-*, fix whitespace. new f752399 x2gohelper/x2gohelper.cpp: use lower-case header files. new c4a7627 x2gohelper/: add Makefile.mxe. new 672e1d9 x2gohelper/Makefile.mxe: more quoting. new 7aba7e4 debian/changelog: whitespace only. The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: README.mxe | 103 ++++++++++++++++++++++++++++++++++++++++++++++ config_linux_static.sh | 2 +- debian/changelog | 36 +++++++++++----- handle_mxe.sh | 78 +++++++++++++++++++++++++++++++++++ macbuild.sh | 3 +- x2goclient.pro | 29 ++++++++----- x2gohelper/Makefile.mxe | 4 ++ x2gohelper/x2gohelper.cpp | 2 +- 8 files changed, 233 insertions(+), 24 deletions(-) create mode 100644 README.mxe create mode 100755 handle_mxe.sh create mode 100644 x2gohelper/Makefile.mxe -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 5833e69f03a854540283e1f437a5b5c83bfc2790 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 20:24:52 2022 +0100 config_linux_static.sh: also switch from -config to CONFIG+='...'. --- config_linux_static.sh | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config_linux_static.sh b/config_linux_static.sh index a51bac9..d6dc6fe 100755 --- a/config_linux_static.sh +++ b/config_linux_static.sh @@ -1,5 +1,5 @@ #!/bin/bash make distclean -X2GO_LINUX_STATIC=x2go_linux_static /usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec linux-g++ +X2GO_LINUX_STATIC=x2go_linux_static /usr/local/Trolltech/Qt-4.7.1/bin/qmake CONFIG+='release' -spec linux-g++ diff --git a/debian/changelog b/debian/changelog index faea010..f4847d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -139,6 +139,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium comparison etc. - macbuild.sh: qmake never supported -config, it was always CONFIG(+)='something'. + - config_linux_static.sh: also switch from -config to CONFIG+='...'. * debian/control: + Move to debian/control.in. * debian/control.in: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit f752399098dfe3d8941d75006fc37749ba2b83b8 Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu Dec 1 21:07:15 2022 +0100 x2gohelper/x2gohelper.cpp: use lower-case header files. --- debian/changelog | 1 + x2gohelper/x2gohelper.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e443554..c32b51f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -217,6 +217,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - /: add README.mxe, describing MXE builds. - /: add handle_mxe.sh, MXE control script. - x2goclient.pro: use different parameters for MXE builds. + - x2gohelper/x2gohelper.cpp: use lower-case header files. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/x2gohelper/x2gohelper.cpp b/x2gohelper/x2gohelper.cpp index 5ad039e..47b0434 100644 --- a/x2gohelper/x2gohelper.cpp +++ b/x2gohelper/x2gohelper.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. * ***************************************************************************/ #include <windows.h> -#include <TlHelp32.h> +#include <tlhelp32.h> void killProcess(DWORD pid) { HANDLE handle=OpenProcess(PROCESS_TERMINATE,0,pid); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a62c2bdb621afae6850d7ca44f4389176dd62f76 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 20:44:31 2022 +0100 {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option and prepare selector in x2goclient.pro. --- debian/changelog | 2 ++ handle_mxe.sh | 2 +- x2goclient.pro | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4847d0..234b64b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -140,6 +140,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - macbuild.sh: qmake never supported -config, it was always CONFIG(+)='something'. - config_linux_static.sh: also switch from -config to CONFIG+='...'. + - {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option + and prepare selector in x2goclient.pro. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/handle_mxe.sh b/handle_mxe.sh index 2c88999..b40a500 100755 --- a/handle_mxe.sh +++ b/handle_mxe.sh @@ -59,7 +59,7 @@ if [ 'prepare' = "${mode}" ]; then "${mxe_path}/qt5/bin/lrelease" '../x2goclient.pro' # no special Makefile required as qmake will create that - "${mxe_path}/qt5/bin/qmake" '../x2goclient.pro' -config "${BUILD_CONFIG}" + "${mxe_path}/qt5/bin/qmake" '../x2goclient.pro' CONFIG+="${BUILD_CONFIG} mxe" popd else diff --git a/x2goclient.pro b/x2goclient.pro index 3d80ac2..f52fe6e 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -157,18 +157,24 @@ unix { } } else:win32 { - # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped - # distributing pkgconfig files on non-UNIX platforms, including Windows. - # We'll hardcode stuff here. Make sure that it's consistent with the - # libraries we use on Windows. - LIBS += -lssh + mxe { + } + else { + # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped + # distributing pkgconfig files on non-UNIX platforms, including Windows. + # We'll hardcode stuff here. Make sure that it's consistent with the + # libraries we use on Windows. + LIBS += -lssh + } } else { # For backwards-compatibility. LIBS += -lssh -lssh_threads } -win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 +win32:!mxe { + LIBS += -lAdvAPI32 -lshell32 -lUser32 +} RC_FILE = res/x2goclient.rc SOURCES += src/x2goclient.cpp -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 4e590d3c331b674e06c5d0a59dc2e472b47f3db4 Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu Dec 1 01:13:23 2022 +0100 /: add handle_mxe.sh, MXE control script. --- debian/changelog | 1 + handle_mxe.sh | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/debian/changelog b/debian/changelog index 37ed3c9..e6f0e92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -205,6 +205,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support. - /: drop Maemo support, remove x2goclient.pro.maemo. - /: add README.mxe, describing MXE builds. + - /: add handle_mxe.sh, MXE control script. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/handle_mxe.sh b/handle_mxe.sh new file mode 100755 index 0000000..b0ed1f5 --- /dev/null +++ b/handle_mxe.sh @@ -0,0 +1,66 @@ +#!/bin/bash +# +# prepare or build x2goclient and x2gohelper for Windows using MXE +# cross build enviroment for Linux (https://mxe.cc/). +# +# Usage: $0 [prepare] [<config>] +# +# prepare means only prepare the build dirs (create them, clean +# them). If ommitted, it will build the binaries instead. <config> +# can be "debug" or "release". Default is "release" +# +# +# Adjust these values to match your mxe installation: +MXE_BASE=/usr/lib/mxe/usr +#MXE_TARGET=i686-w64-mingw32.shared +MXE_TARGET=i686-w64-mingw32.static +#MXE_TARGET=x86-64-w64-mingw32.shared +#MXE_TARGET=x86-64-w64-mingw32.static +MXE_PATH=${MXE_BASE}/${MXE_TARGET} + +test -d "${MXE_PATH}" || { echo >&2 "Cannot find mxe installation at '$MXE_PATH'"; exit 1; } + +BUILD_DIR="client_build_mxe" +BUILD_CONFIG=release + +MODE=build +[ "$1" == "prepare" ] && MODE=prepare && shift + +if [ "$1" == "debug" ]; then + BUILD_CONFIG=debug + shift +fi + +export MXE_BASE MXE_TARGET MXE_PATH BUILD_DIR BUILD_CONFIG + +export X2GO_CLIENT_TARGET= + +[ "$MODE" == "build" ] && [ ! -d ${BUILD_DIR} ] && { echo >&2 "Please run '$0 prepare' first"; exit 1; } + +if [ "$MODE" == "prepare" ]; then + test -e "${BUILD_DIR}" && rm -rf "${BUILD_DIR}" + make clean + + mkdir -p "${BUILD_DIR}/${BUILD_CONFIG}" + pushd "${BUILD_DIR}" + + ${MXE_PATH}/qt5/bin/lrelease ../x2goclient.pro + + # no special Makefile required as qmake will create that + ${MXE_PATH}/qt5/bin/qmake ../x2goclient.pro -config "${BUILD_CONFIG}" + + popd +else + pushd "${BUILD_DIR}" + make + popd +fi + +pushd x2gohelper +# here we do not have qmake but an own Makefile for mxe +if [ "$MODE" == "prepare" ]; then + make -f Makefile.mxe clean +else + make -f Makefile.mxe +fi +popd -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 8eb96d998569439914f703eb61aa01a051e0958b Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu Dec 1 20:54:45 2022 +0100 x2goclient.pro: use different parameters for MXE builds. --- debian/changelog | 1 + x2goclient.pro | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 234b64b..082288b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -214,6 +214,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - /: drop Maemo support, remove x2goclient.pro.maemo. - /: add README.mxe, describing MXE builds. - /: add handle_mxe.sh, MXE control script. + - x2goclient.pro: use different parameters for MXE builds. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index f52fe6e..6174371 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -158,6 +158,8 @@ unix { } else:win32 { mxe { + QMAKE_CXXFLAGS += -DLIBSSH_STATIC=1 + LIBS += -lssh -lgcrypt -lgpg-error } else { # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped @@ -283,5 +285,6 @@ win32-* { greaterThan(QT_MAJOR_VERSION, 4): QT += winextras } +mxe:QMAKE_CXXFLAGS += -std=c++11 -Wno-deprecated-declarations QMAKE_CXXFLAGS_DEBUG -= -g QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 6f881821e89c246dd241d54a50dcfc1936c1103a Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 01:36:15 2022 +0100 handle_mxe.sh: rework, make most variables lowercase, change spacing, use proper if-else blocks, do not use special bash features for string comparison etc. --- debian/changelog | 3 ++ handle_mxe.sh | 88 ++++++++++++++++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6f0e92..3b9d190 100644 --- a/debian/changelog +++ b/debian/changelog @@ -134,6 +134,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium dates for more than 10 years and nobody noticed. Go figure. - src/onmainwindow.cpp: convert server-reported time to human readable time in Qt's standard format in session list view. + - handle_mxe.sh: rework, make most variables lowercase, change spacing, + use proper if-else blocks, do not use special bash features for string + comparison etc. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/handle_mxe.sh b/handle_mxe.sh index b0ed1f5..2c88999 100755 --- a/handle_mxe.sh +++ b/handle_mxe.sh @@ -1,66 +1,78 @@ #!/bin/bash # # prepare or build x2goclient and x2gohelper for Windows using MXE -# cross build enviroment for Linux (https://mxe.cc/). +# cross build environment for Linux (https://mxe.cc/). # # Usage: $0 [prepare] [<config>] # # prepare means only prepare the build dirs (create them, clean -# them). If ommitted, it will build the binaries instead. <config> -# can be "debug" or "release". Default is "release" +# them). If omitted, it will build the binaries instead. <config> +# can be "debug" or "release". Default is "release". # # -# Adjust these values to match your mxe installation: -MXE_BASE=/usr/lib/mxe/usr -#MXE_TARGET=i686-w64-mingw32.shared -MXE_TARGET=i686-w64-mingw32.static -#MXE_TARGET=x86-64-w64-mingw32.shared -#MXE_TARGET=x86-64-w64-mingw32.static -MXE_PATH=${MXE_BASE}/${MXE_TARGET} +# Adjust these values to match your MXE installation: +MXE_BASE='/usr/lib/mxe/usr' +#MXE_TARGET='i686-w64-mingw32.shared +MXE_TARGET='i686-w64-mingw32.static' +#MXE_TARGET='x86-64-w64-mingw32.shared' +#MXE_TARGET='x86-64-w64-mingw32.static' +mxe_path="${MXE_BASE}/${MXE_TARGET}" -test -d "${MXE_PATH}" || { echo >&2 "Cannot find mxe installation at '$MXE_PATH'"; exit 1; } +if ! test -d "${mxe_path}"; then + printf 'Cannot find MXE installation at "%s".' "${mxe_path}" >&2 + exit '1' +fi -BUILD_DIR="client_build_mxe" -BUILD_CONFIG=release +BUILD_DIR='client_build_mxe' +BUILD_CONFIG='release' -MODE=build -[ "$1" == "prepare" ] && MODE=prepare && shift +mode='build' +if [ 'prepare' = "${1}" ]; then + mode='prepare' + shift +fi -if [ "$1" == "debug" ]; then - BUILD_CONFIG=debug - shift +if [ 'debug' = "${1}" ]; then + BUILD_CONFIG='debug' + shift fi -export MXE_BASE MXE_TARGET MXE_PATH BUILD_DIR BUILD_CONFIG +export 'MXE_BASE' 'MXE_TARGETS' 'BUILD_DIR' 'BUILD_CONFIG' -export X2GO_CLIENT_TARGET= +X2GO_CLIENT_TARGET='' +export 'X2GO_CLIENT_TARGET' -[ "$MODE" == "build" ] && [ ! -d ${BUILD_DIR} ] && { echo >&2 "Please run '$0 prepare' first"; exit 1; } +if [ 'build' = "${mode}" ] && [ ! -d "${BUILD_DIR}" ]; then + printf 'Please run "%s prepare" first.' "${0}" >&2 + exit '2' +fi -if [ "$MODE" == "prepare" ]; then - test -e "${BUILD_DIR}" && rm -rf "${BUILD_DIR}" - make clean +if [ 'prepare' = "${mode}" ]; then + if test -e "${BUILD_DIR}"; then + rm -rf "${BUILD_DIR}" + fi + make clean - mkdir -p "${BUILD_DIR}/${BUILD_CONFIG}" - pushd "${BUILD_DIR}" + mkdir -p "${BUILD_DIR}/${BUILD_CONFIG}" + pushd "${BUILD_DIR}" - ${MXE_PATH}/qt5/bin/lrelease ../x2goclient.pro + "${mxe_path}/qt5/bin/lrelease" '../x2goclient.pro' - # no special Makefile required as qmake will create that - ${MXE_PATH}/qt5/bin/qmake ../x2goclient.pro -config "${BUILD_CONFIG}" + # no special Makefile required as qmake will create that + "${mxe_path}/qt5/bin/qmake" '../x2goclient.pro' -config "${BUILD_CONFIG}" - popd + popd else - pushd "${BUILD_DIR}" - make - popd + pushd "${BUILD_DIR}" + make + popd fi -pushd x2gohelper -# here we do not have qmake but an own Makefile for mxe -if [ "$MODE" == "prepare" ]; then - make -f Makefile.mxe clean +pushd 'x2gohelper' +# Here we do not have qmake but a unique Makefile for MXE. +if [ 'prepare' = "${mode}" ]; then + make -f 'Makefile.mxe' 'clean' else - make -f Makefile.mxe + make -f 'Makefile.mxe' fi popd -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 847cfe7b3054b7e44a3704f8212bb4404c65b35e Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 20:20:05 2022 +0100 macbuild.sh: qmake never supported -config, it was always CONFIG(+)='something'. --- debian/changelog | 2 ++ macbuild.sh | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b9d190..faea010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -137,6 +137,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - handle_mxe.sh: rework, make most variables lowercase, change spacing, use proper if-else blocks, do not use special bash features for string comparison etc. + - macbuild.sh: qmake never supported -config, it was always + CONFIG(+)='something'. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/macbuild.sh b/macbuild.sh index 1a5cb94..cc781b0 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -316,8 +316,7 @@ phase "Running lrelease" lrelease "${PROJECT}" phase "Running qmake" -qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ - CONFIG+="${BUILD_ARCH}" \ +qmake CONFIG+="${BUILD_MODE} ${BUILD_ARCH}" -spec macx-g++ "${PROJECT}" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \ OSX_STDLIB="${STDLIB}" \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 41673c14b765ce8ae9e04094e77f07d01902ac24 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 20:57:39 2022 +0100 x2goclient.pro: also select on win32 and not just win32-*, fix whitespace. --- debian/changelog | 2 ++ x2goclient.pro | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 082288b..e443554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - config_linux_static.sh: also switch from -config to CONFIG+='...'. - {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option and prepare selector in x2goclient.pro. + - x2goclient.pro: also select on win32 and not just win32-*, fix + whitespace. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2goclient.pro b/x2goclient.pro index 6174371..fb6c88a 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -272,17 +272,17 @@ macx { PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += $${PWD}/res/osxbundle/postbuild.sh \"$${TARGET}\" \"$${VERSION}\" \"$${QMAKE_INFO_PLIST_OUT}\" \"$${QMAKE_COPY}\" \"$${ICON}\" \"$${OUT_PWD}/$${TARGET}.app/Contents/Resources/\" } -win32-* { +win32|win32-* { message("building $$TARGET for windows without ldap and cups") LIBS += -lwinspool -lws2_32 CONFIG += static release } QT += svg network linux|linux-* { -greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras + greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras } -win32-* { -greaterThan(QT_MAJOR_VERSION, 4): QT += winextras +win32|win32-* { + greaterThan(QT_MAJOR_VERSION, 4): QT += winextras } mxe:QMAKE_CXXFLAGS += -std=c++11 -Wno-deprecated-declarations -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c4a7627f78440bbcb4c76dc1f17ab1540ac2de13 Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu Dec 1 21:45:06 2022 +0100 x2gohelper/: add Makefile.mxe. --- debian/changelog | 1 + x2gohelper/Makefile.mxe | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index c32b51f..6f536b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -218,6 +218,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - /: add handle_mxe.sh, MXE control script. - x2goclient.pro: use different parameters for MXE builds. - x2gohelper/x2gohelper.cpp: use lower-case header files. + - x2gohelper/: add Makefile.mxe. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/x2gohelper/Makefile.mxe b/x2gohelper/Makefile.mxe new file mode 100644 index 0000000..b7b94ee --- /dev/null +++ b/x2gohelper/Makefile.mxe @@ -0,0 +1,4 @@ +all: + ${MXE_BASE}/bin/${MXE_TARGET}-g++ -I ${MXE_BASE}/${MXE_TARGET}/include -o ../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe x2gohelper.cpp +clean: + rm -f ../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 6b794fc10722bac49e1416e0f54648fa530fa6f5 Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu Dec 1 01:04:06 2022 +0100 /: add README.mxe, describing MXE builds. --- README.mxe | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 1 + 2 files changed, 104 insertions(+) diff --git a/README.mxe b/README.mxe new file mode 100644 index 0000000..1ad6cbb --- /dev/null +++ b/README.mxe @@ -0,0 +1,103 @@ +To build Windows binaries you can use the MXE cross build environment +(https://mxe.cc). Currently only 32bit static builds are working. + +Install MXE as described on the MXE site (I suggest to use the system +wide installation). Next, adjust the MXE_BASE variable in +handle_mxe.sh. Then run ./handle_mxe.sh prepare && +handle_mxe.sh. That's it. + +Following is the list of packages on Debian Buster that will be +sufficient to make the magic happen (many of these seem unrelated but +have to be installed due to depencies). In addition you need GNU make. + +ii mxe-i686-w64-mingw32.static-assimp 3.2-buster-build-2021-01-10 amd64 MXE package assimp for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-binutils 2.28-buster-build-2021-01-10 amd64 MXE package binutils for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-boost 1.60.0-buster-build-2021-01-10 amd64 MXE package boost for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-bzip2 1.0.6-buster-build-2021-01-10 amd64 MXE package bzip2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-cairo 1.16.0-buster-build-2021-01-10 amd64 MXE package cairo for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-cc 1-buster-build-2021-01-10 amd64 MXE package cc for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-ccache 3.6-buster-build-2021-01-10 amd64 MXE package ccache for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-cmake-conf 1-buster-build-2021-01-10 amd64 MXE package cmake-conf for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-dbus 1.13.18-buster-build-2021-01-10 amd64 MXE package dbus for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-expat 2.2.10-buster-build-2021-01-10 amd64 MXE package expat for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-fontconfig 2.13.1-buster-build-2021-01-10 amd64 MXE package fontconfig for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-freetds 1.2.18-buster-build-2021-01-10 amd64 MXE package freetds for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-freetype 2.10.4-buster-build-2021-01-10 amd64 MXE package freetype for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-freetype-bootstrap 2.10.4-buster-build-2021-01-10 amd64 MXE package freetype-bootstrap for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-gcc 5.5.0-buster-build-2021-01-10 amd64 MXE package gcc for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-gettext 0.21-buster-build-2021-01-10 amd64 MXE package gettext for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-glib 2.50.2-buster-build-2021-01-10 amd64 MXE package glib for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-gpgme 1.14.0-buster-build-2021-01-10 amd64 MXE package gpgme for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-harfbuzz 2.7.4-buster-build-2021-01-10 amd64 MXE package harfbuzz for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-icu4c 66.1-buster-build-2021-01-10 amd64 MXE package icu4c for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-jasper 2.0.23-buster-build-2021-01-10 amd64 MXE package jasper for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-jpeg 9d-buster-build-2021-01-10 amd64 MXE package jpeg for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-lcms 2.11-buster-build-2021-01-10 amd64 MXE package lcms for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libassuan 2.5.3-buster-build-2021-01-10 amd64 MXE package libassuan for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libffi 3.2.1-buster-build-2021-01-10 amd64 MXE package libffi for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libgcrypt 1.8.7-buster-build-2021-01-10 amd64 MXE package libgcrypt for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libgpg-error 1.41-buster-build-2021-01-10 amd64 MXE package libgpg_error for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libiconv 1.16-buster-build-2021-01-10 amd64 MXE package libiconv for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libidn2 2.3.0-buster-build-2021-01-10 amd64 MXE package libidn2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libmng 2.0.3-buster-build-2021-01-10 amd64 MXE package libmng for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libmysqlclient 6.1.6-buster-build-2021-01-10 amd64 MXE package libmysqlclient for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libpng 1.6.37-buster-build-2021-01-10 amd64 MXE package libpng for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libssh 0.9.1-buster-build-2021-01-10 amd64 MXE package libssh for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libunistring 0.9.10-buster-build-2021-01-10 amd64 MXE package libunistring for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libwebp 1.0.3-buster-build-2021-01-10 amd64 MXE package libwebp for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-lzo 2.10-buster-build-2021-01-10 amd64 MXE package lzo for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-mesa 20.3.0-buster-build-2021-01-10 amd64 MXE package mesa for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-mingw-w64 8.0.0-buster-build-2021-01-10 amd64 MXE package mingw-w64 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-minizip 2aa369c-buster-build-2021-01-10 amd64 MXE package minizip for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-mxe-conf 1-buster-build-2021-01-10 amd64 MXE package mxe-conf for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-openssl 1.1.1i-buster-build-2021-01-10 amd64 MXE package openssl for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pcre 8.44-buster-build-2021-01-10 amd64 MXE package pcre for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pcre2 10.36-buster-build-2021-01-10 amd64 MXE package pcre2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pe-parse 64989f6-buster-build-2021-01-10 amd64 MXE package pe-parse for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pe-util 5b07cb3-buster-build-2021-01-10 amd64 MXE package pe-util for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pixman 0.33.6-buster-build-2021-01-10 amd64 MXE package pixman for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pkgconf 0.da179fd-buster-build-2021-01-10 amd64 MXE package pkgconf for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-postgresql 9.2.4-buster-build-2021-01-10 amd64 MXE package postgresql for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pthreads 0.POSIX-1003.1-2001-buster-build-2021-01-10 amd64 MXE package pthreads for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qt3d 5.15.2-buster-build-2021-01-10 amd64 MXE package qt3d for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qt5 5.15.2-buster-build-2021-01-10 amd64 MXE package qt5 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtactiveqt 5.15.2-buster-build-2021-01-10 amd64 MXE package qtactiveqt for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtbase 5.15.2-buster-build-2021-01-10 amd64 MXE package qtbase for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtcharts 5.15.2-buster-build-2021-01-10 amd64 MXE package qtcharts for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtconnectivity 5.15.2-buster-build-2021-01-10 amd64 MXE package qtconnectivity for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtdatavis3d 5.15.2-buster-build-2021-01-10 amd64 MXE package qtdatavis3d for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtdeclarative 5.15.2-buster-build-2021-01-10 amd64 MXE package qtdeclarative for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtgamepad 5.15.2-buster-build-2021-01-10 amd64 MXE package qtgamepad for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtgraphicaleffects 5.15.2-buster-build-2021-01-10 amd64 MXE package qtgraphicaleffects for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtimageformats 5.15.2-buster-build-2021-01-10 amd64 MXE package qtimageformats for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtlocation 5.15.2-buster-build-2021-01-10 amd64 MXE package qtlocation for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtlottie 5.15.2-buster-build-2021-01-10 amd64 MXE package qtlottie for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtmultimedia 5.15.2-buster-build-2021-01-10 amd64 MXE package qtmultimedia for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtnetworkauth 5.15.2-buster-build-2021-01-10 amd64 MXE package qtnetworkauth for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtpurchasing 5.15.2-buster-build-2021-01-10 amd64 MXE package qtpurchasing for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtquick3d 5.15.2-buster-build-2021-01-10 amd64 MXE package qtquick3d for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtquickcontrols 5.15.2-buster-build-2021-01-10 amd64 MXE package qtquickcontrols for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtquickcontrols2 5.15.2-buster-build-2021-01-10 amd64 MXE package qtquickcontrols2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtremoteobjects 5.15.2-buster-build-2021-01-10 amd64 MXE package qtremoteobjects for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtscript 5.15.2-buster-build-2021-01-10 amd64 MXE package qtscript for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtscxml 5.15.2-buster-build-2021-01-10 amd64 MXE package qtscxml for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtsensors 5.15.2-buster-build-2021-01-10 amd64 MXE package qtsensors for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtserialbus 5.15.2-buster-build-2021-01-10 amd64 MXE package qtserialbus for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtserialport 5.15.2-buster-build-2021-01-10 amd64 MXE package qtserialport for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtspeech 5.15.2-buster-build-2021-01-10 amd64 MXE package qtspeech for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtsvg 5.15.2-buster-build-2021-01-10 amd64 MXE package qtsvg for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qttools 5.15.2-buster-build-2021-01-10 amd64 MXE package qttools for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qttranslations 5.15.2-buster-build-2021-01-10 amd64 MXE package qttranslations for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtvirtualkeyboard 5.15.2-buster-build-2021-01-10 amd64 MXE package qtvirtualkeyboard for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwebchannel 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwebchannel for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwebsockets 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwebsockets for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwebview 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwebview for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwinextras 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwinextras for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtxmlpatterns 5.15.2-buster-build-2021-01-10 amd64 MXE package qtxmlpatterns for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-sqlite 3340000-buster-build-2021-01-10 amd64 MXE package sqlite for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-tiff 4.2.0-buster-build-2021-01-10 amd64 MXE package tiff for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-xz 5.2.5-buster-build-2021-01-10 amd64 MXE package xz for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-zlib 1.2.11-buster-build-2021-01-10 amd64 MXE package zlib for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-zstd 1.4.8-buster-build-2021-01-10 amd64 MXE package zstd for i686-w64-mingw32.static +ii mxe-requirements 2.23-buster-build-2021-01-10 amd64 MXE requirements package +ii mxe-source 2.23-buster-build-2021-01-10 amd64 MXE source diff --git a/debian/changelog b/debian/changelog index 7405884..37ed3c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -204,6 +204,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium sessionmanagedialog,sessionwidget,settingswidget, sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support. - /: drop Maemo support, remove x2goclient.pro.maemo. + - /: add README.mxe, describing MXE builds. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 672e1d9af6e4b629e955d3e2e75a9c11fba5a8ea Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 21:53:37 2022 +0100 x2gohelper/Makefile.mxe: more quoting. --- debian/changelog | 1 + x2gohelper/Makefile.mxe | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f536b4..e916f95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -144,6 +144,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium and prepare selector in x2goclient.pro. - x2goclient.pro: also select on win32 and not just win32-*, fix whitespace. + - x2gohelper/Makefile.mxe: more quoting. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2gohelper/Makefile.mxe b/x2gohelper/Makefile.mxe index b7b94ee..1ccb6fd 100644 --- a/x2gohelper/Makefile.mxe +++ b/x2gohelper/Makefile.mxe @@ -1,4 +1,4 @@ all: - ${MXE_BASE}/bin/${MXE_TARGET}-g++ -I ${MXE_BASE}/${MXE_TARGET}/include -o ../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe x2gohelper.cpp + "${MXE_BASE}/bin/${MXE_TARGET}-g++" -I "${MXE_BASE}/${MXE_TARGET}/include" -o "../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe" 'x2gohelper.cpp' clean: - rm -f ../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe + rm -f "../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7aba7e428b089282ccb081d3005836871fef83e3 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 21:54:20 2022 +0100 debian/changelog: whitespace only. --- debian/changelog | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index e916f95..b2e16c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -205,21 +205,21 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium [ Ulrich Sibiller ] * New upstream version (4.1.2.3): - - desktop/x2goclient.desktop: drop Maemo support. - - res/img/icons: drop Maemo support, remove hildon subdirectory. - - res/img/svg: drop Maemo support, remove bg_hildon.svg. - - res/resources.qrc: drop Maemo support, remove bg_hildon.svg entry. - - src/{{InteractionDialog,configdialog,connectionwidget, - editconnectiondialog,folderbutton,mediawidget,ongetpass, - onmainwindow,printprocess,printwidget,sessionbutton, - sessionmanagedialog,sessionwidget,settingswidget, - sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support. - - /: drop Maemo support, remove x2goclient.pro.maemo. - - /: add README.mxe, describing MXE builds. - - /: add handle_mxe.sh, MXE control script. - - x2goclient.pro: use different parameters for MXE builds. - - x2gohelper/x2gohelper.cpp: use lower-case header files. - - x2gohelper/: add Makefile.mxe. + - desktop/x2goclient.desktop: drop Maemo support. + - res/img/icons: drop Maemo support, remove hildon subdirectory. + - res/img/svg: drop Maemo support, remove bg_hildon.svg. + - res/resources.qrc: drop Maemo support, remove bg_hildon.svg entry. + - src/{{InteractionDialog,configdialog,connectionwidget, + editconnectiondialog,folderbutton,mediawidget,ongetpass, + onmainwindow,printprocess,printwidget,sessionbutton, + sessionmanagedialog,sessionwidget,settingswidget, + sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support. + - /: drop Maemo support, remove x2goclient.pro.maemo. + - /: add README.mxe, describing MXE builds. + - /: add handle_mxe.sh, MXE control script. + - x2goclient.pro: use different parameters for MXE builds. + - x2gohelper/x2gohelper.cpp: use lower-case header files. + - x2gohelper/: add Makefile.mxe. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org