WIP: buildenv/1.3.x/win32-static: update dependencies #80

davidebeatrici · 2018-09-08T15:48:24Z

No description provided.

mkrautz · 2018-09-26T08:40:49Z

Quick drive-by comment:

BTW, the reason some URLs don't use https:// is that on some platforms, i.e. CentOS 5.9, the system OpenSSL only supports TLS 1.0, which fails to negotiate on the web nowadays :)

We have the correct hashes (sha1, sha256 and blake2) so it's not a big deal to get the files via http.
However, we can solve that by adding some logic to mumble-build to retry the URLs by swapping https:// -> http:// if all of them fail.

mkrautz · 2018-09-30T09:03:50Z

buildenv/1.3.x/win32-static/pcre.build

 	elif [ "${MUMBLE_BUILD_CONFIGURATION}" == "Debug" ]; then
 		BUILD_TYPE="Debug"
+		cmd /c $(cygpath -w ${MUMBLE_PREFIX}/cmake/bin/cmake.exe) -G "NMake Makefiles" -DPCRE2_BUILD_PCRE2_8=OFF -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=OFF -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DINSTALL_MSVC_PDB=ON -DCMAKE_INSTALL_PREFIX=$(cygpath -w ${MUMBLE_PREFIX}/pcre)


???

Why split them in two? And what's this MSVC PDB option?
We're building PCRE statically, so we get object PDBs.
In any case, we'd want PDBs also for release builds. How else are we going to debug?

Please explain.

It seems to me the original way I did it just OK?

You're right, there's no need for -DINSTALL_MSVC_PDB=ON in our case.

I will move the first line after the if block and delete the second one.

buildenv/1.3.x/win32-static/pcre.build

mkrautz · 2018-10-02T20:10:47Z

buildenv/1.3.x/win32-static/harfbuzz-ng.build

 }

 function prepare {
-	cp ${MUMBLE_BUILDENV_ROOT}/cmake/harfbuzz-ng-CMakeLists.txt ./CMakeLists.txt


Does harfbuzz's own CMakeListsts.txt really do a static build? And against a shared CRT? :)

mkrautz · 2018-10-02T20:12:04Z

buildenv/1.3.x/win32-static/libogg.build

 }

 function prepare {
-	patch -p1 < ${MUMBLE_BUILDENV_ROOT}/patches/libogg-static-vs2010-Zi.patch


Is it safe to drop this without losing debug symbols?

I don't think so, I have to update the patch.

mkrautz · 2018-10-02T20:19:04Z

buildenv/1.3.x/common/qt5/qt5.build

-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-macextras-disable-qmacpasteboardmime.patch
-
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-force-qtimageformats-jasper-no-libjpeg.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-qtimageformats-jasper-4-color-rct-debian.patch


I'm guessing you've just left out the three patches above because they aren't used on Windows... Or?...

The first patch is not required anymore: https://bugreports.qt.io/browse/QTBUG-35310
The second and third patches should be updated.

Are you sure it's fixed in MSVC 2017?

Ah, per Thiago: "The fix is coming in 15.8." (from the linked bug)

mkrautz · 2018-10-02T20:20:11Z

buildenv/1.3.x/common/qt5/qt5.build

-
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-configureapp-use-msvc2013-mkspec.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-mariadb-support.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-mkspecs-common-msvc-desktop-mumble-debug+opt.patch


I doubt it's correct to drop this outright. Elaborate?

You're right, only the workaround for QTBUG-58318 should be removed.

mkrautz · 2018-10-02T20:20:40Z

buildenv/1.3.x/common/qt5/qt5.build

-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-avoid-j-underflow-in-harfbuzz.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-we-want-a-buffer-for-named-pipes.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-quick-and-dirty-hack-to-avoid-ssl-error-poisoning.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt-5.6.1-work-around-client-verification-error.patch


Don't drop this.

Is it still required?

I don't know for sure. But I don't think just before a release is a time to drop something like this.

mkrautz · 2018-10-02T20:21:16Z

buildenv/1.3.x/common/qt5/qt5.build

-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt-5.6.2-qsystemtrayicon-win-nosound.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-fix-no-sse2-win32-build.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-fix-win32-no-sse2-build-for-angle.patch
-	patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-define-using-v110-sdk71-for-rc-exe-when-targetting-winxp.patch


Dropping this because this version of Qt doesn't support XP?

qt-5.6.2-qsystemtrayicon-win-nosound.patch isn't Windows XP specific though?

It's contained in qt-5.9.6-qsystemtrayicon-win-realtime-nosound.patch.

Hold on, I'm confused...

I had to use the same file to prevent a merge conflict.

mkrautz · 2018-10-02T20:23:30Z

buildenv/1.3.x/win32-static/mariadb-client.build

@@ -47,10 +47,6 @@ function install {
 	# Remove libmariadb .dll and .lib. We don't need/want them in our static build.
 	rm -rf ${MUMBLE_PREFIX}/mariadbclient/lib/libmariadb.*

-	# Qt, our only user, expects to link against libmysqlclient.


Qt now links against mariadbclient? ...Or?

I specified the libraries with MYSQL_LIBS="-lmariadbclient -lzlib -lws2_32 -ladvapi32 -lshlwapi".

mkrautz · 2018-10-02T20:25:28Z

OK. Done with this round of review. Mostly concerned about potentially missing Qt patches :)

…checksum

… 878.30.4

…AKE2 checksums

…KE2 checksums

…to 2.0.0

….3.6

…2.3.2 to 3.0.6

…0.2p

…PCRE2)

….2.1 to 5.28.0.1

…3.11

…ecksum

mkrautz · 2018-10-03T21:09:19Z

Qt 5 patches:

Removed:

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-macextras-disable-qmacpasteboardmime.patch

Why did you drop this? I don't remember why the patch is there in the first place: Perhaps QMacPasteboardMime just didn't work? I'm worried that the macOS build will break without this, but I guess it just doesn't apply anymore?

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-mkspecs-common-msvc-desktop-mumble-debug+opt.patch

This should be kept.

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt-5.6.1-work-around-client-verification-error.patch

Don't drop.

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-define-using-v110-sdk71-for-rc-exe-when-targetting-winxp.patch

Don't drop. It don't think it harms anything?

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt-5.5.1-freetype-libs-private-win32.patch

Dropped why?

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt-5.5.1-static-pcre-dependency.patch

Dropped why?

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-qsslsocket-evaluate-cas-in-all-keychain-categories.patch

I guess this is now upstream?

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-build-qbytearray_mac-and-qstring_mac-for-qmake.patch

This is fixed upstream now I guess?

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-macos-handle-qsetting-strings-with-embedded-zero-bytes-QTBUG-56124.patch

This is fixed upstream now I guess?

patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-features-resources-prf-fix-use-of-unescaped-backslash.patch

This is fixed upstream now I guess?

davidebeatrici · 2018-10-03T21:17:09Z

Why did you drop this? I don't remember why the patch is there in the first place: Perhaps QMacPasteboardMime just didn't work? I'm worried that the macOS build will break without this, but I guess it just doesn't apply anymore?

The issue is fixed upstream: https://bugreports.qt.io/browse/QTBUG-35310

mumble-releng/buildenv/1.3.x/common/qt5/qt5.build

Lines 31 to 34 in 694e6d0

    
           # Disable qmacpasteboardmime. There are symbol clashes with the 'cocoa' plugin, 
        
           # so seemingly, these two modules aren't currently engineered to be used in a 
        
           # static build together. 
        
           patch -p1 < ${MUMBLE_BUILDENV_COMMON}/qt5/patches/qt5-macextras-disable-qmacpasteboardmime.patch

davidebeatrici force-pushed the win32-dependencies-update branch 5 times, most recently from a2d0413 to 1cf4f00 Compare September 9, 2018 20:26

davidebeatrici mentioned this pull request Sep 24, 2018

buildenv/1.3.x: merge Windows directories in a single one #81

Merged

mkrautz reviewed Sep 30, 2018

View reviewed changes

buildenv/1.3.x/win32-static/pcre.build Show resolved Hide resolved

davidebeatrici mentioned this pull request Sep 30, 2018

buildenv/1.3.x/win32-static: add support for MSVC 2017 #79

Merged

mkrautz reviewed Oct 2, 2018

View reviewed changes

davidebeatrici added 12 commits October 3, 2018 21:41

buildenv/1.3.x/win32-static: update ASIO SDK from version 2.3 to 2.3.1

7d74853

buildenv/1.3.x/win32-static: update Berkeley DB links and add BLAKE2 …

ec067ec

…checksum

buildenv/1.3.x/win32-static: update Bonjour from version 765.30.11 to…

9d03bc0

… 878.30.4

buildenv/1.3.x/win32-static: update Boost from version 1.63.0 to 1.68.0

ba5013e

buildenv/1.3.x/win32-static: update bzip2 links and add SHA256 and BL…

e771172

…AKE2 checksums

buildenv/1.3.x/win32-static: update CMake from version 3.7.2 to 3.12.1

a9051fd

buildenv/1.3.x/win32-static: update Expat from version 2.2.0 to 2.2.6

83185d9

buildenv/1.3.x/win32-static: update FreeType from version 2.7.1 to 2.9.1

1e83144

buildenv/1.3.x/win32-static: update G15SDK link and add BLAKE2 checksum

db0f765

buildenv/1.3.x/win32-static: update HarfBuzz from version 1.4.5 to 1.8.8

49ccbc4

buildenv/1.3.x/win32-static: update Jom links and add BLAKE2 checksum

7e21d24

buildenv/1.3.x/win32-static: update libflac links

6f9b9ce

davidebeatrici added 18 commits October 3, 2018 21:41

buildenv/1.3.x/win32-static: update mcpp links and add SHA256 and BLA…

bc76a21

…KE2 checksums

buildenv/1.3.x/win32-static: update libjpeg-turbo from version 1.5.1 …

7a30319

…to 2.0.0

buildenv/1.3.x/win32-static: update libogg from version 1.3.2 to 1.3.3

bb3c72e

buildenv/1.3.x/win32-static: update libpng from version 1.6.28 to 1.6.35

cb39e06

buildenv/1.3.x/win32-static: update libsndfile links

428487a

buildenv/1.3.x/win32-static: update libvorbis from version 1.3.5 to 1…

98f9fac

….3.6

buildenv/1.3.x/win32-static: update MariaDB Connector/C from version …

df8af83

…2.3.2 to 3.0.6

buildenv/1.3.x/win32-static: update NASM from version 2.11 to 2.13

d353b5a

buildenv/1.3.x/win32-static: update OpenSSL from version 1.0.2k to 1.…

2009845

…0.2p

buildenv/1.3.x/win32-static: update PCRE from version 8.40 to 10.31 (…

48e9089

…PCRE2)

buildenv/1.3.x/win32-static: update Strawberry Perl from version 5.20…

0c79761

….2.1 to 5.28.0.1

buildenv/1.3.x/win32-static: update protobuf from version 3.2.0 to 3.6.1

948c3fe

buildenv/1.3.x/win32-static: update Python from version 3.4.3 to 3.4.4

0bb4f50

buildenv/1.3.x/win32-static: update Qt from version 5.6.2 to 5.9.6

48f97e1

buildenv/1.3.x/win32-static: update SQLite from version 3.18.0 to 3.24.0

ae86624

buildenv/1.3.x/win32-static: update WiX Toolset from version 3.10 to …

87c3980

…3.11

buildenv/1.3.x/win32-static: update ZeroC Ice links and add BLAKE2 ch…

1ab107b

…ecksum

buildenv/1.3.x/win32-static: update zlib links

6b97ad8

davidebeatrici force-pushed the win32-dependencies-update branch from 1cf4f00 to 6b97ad8 Compare October 3, 2018 19:49

davidebeatrici force-pushed the master branch 7 times, most recently from ff585d4 to 4b87926 Compare April 28, 2020 22:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: buildenv/1.3.x/win32-static: update dependencies #80

WIP: buildenv/1.3.x/win32-static: update dependencies #80

davidebeatrici commented Sep 8, 2018

mkrautz commented Sep 26, 2018

mkrautz Sep 30, 2018

davidebeatrici Sep 30, 2018

mkrautz Oct 2, 2018

mkrautz Oct 2, 2018

davidebeatrici Oct 3, 2018

mkrautz Oct 2, 2018

davidebeatrici Oct 3, 2018

mkrautz Oct 3, 2018

mkrautz Oct 3, 2018

mkrautz Oct 2, 2018

davidebeatrici Oct 3, 2018

mkrautz Oct 2, 2018

davidebeatrici Oct 3, 2018

mkrautz Oct 3, 2018

mkrautz Oct 2, 2018

davidebeatrici Oct 3, 2018

mkrautz Oct 3, 2018 •

edited

Loading

davidebeatrici Oct 3, 2018

mkrautz Oct 3, 2018

davidebeatrici Oct 3, 2018

mkrautz Oct 2, 2018

davidebeatrici Oct 3, 2018

mkrautz Oct 3, 2018

mkrautz commented Oct 2, 2018

mkrautz commented Oct 3, 2018 •

edited

Loading

davidebeatrici commented Oct 3, 2018

WIP: buildenv/1.3.x/win32-static: update dependencies #80

Are you sure you want to change the base?

WIP: buildenv/1.3.x/win32-static: update dependencies #80

Conversation

davidebeatrici commented Sep 8, 2018

mkrautz commented Sep 26, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mkrautz Oct 3, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mkrautz commented Oct 2, 2018

mkrautz commented Oct 3, 2018 • edited Loading

davidebeatrici commented Oct 3, 2018

mkrautz Oct 3, 2018 •

edited

Loading

mkrautz commented Oct 3, 2018 •

edited

Loading