diff --git a/README b/README index 2cf5022f..2770fb7b 100644 --- a/README +++ b/README @@ -1,181 +1,181 @@ This is gpg4win - the GUI Installer Builder for W32. See also the file doc/README.en.txt. For MSI Package instructions see src/README-msi.txt. Instructions: ============= 1. Download the source and binary packages that are required to build the installer: $ cd packages $ sh download.sh [...] $ cd .. 1.5 (Only necessary when building from Git) $ ./autogen.sh 2. Configure the source tree for cross compilation: $ ./autogen.sh --build-w32 3. Build the installer: $ make The installer will be made available in two files: src/installers/gpg4win-X.Y.Z.exe src/installers/gpg4win-src-X.Y.Z.exe Basic requirements ================== A decent POSIX system is required for building this software as well -as GNU make. We are using Debian GNU/Linux 9 (stretch), any other +as GNU make. We are using Debian GNU/Linux 10 (buster), any other POSIX system should work as well but you may run into problems due to different toolchain versions. For MSI Packages you will additionally need the dependencies mentioned in src/README-msi.txt To satisfy all needs of configure at least the following packages need to be installed: build-essential autoconf automake mingw-w64 mingw-w64-i686-dev \ mingw-w64-x86-64-dev nsis stow unzip imagemagick texlive \ - latex-xcolor libglib2.0-dev gettext docbook-utils ghostscript \ + libglib2.0-dev gettext docbook-utils ghostscript \ texinfo libgdk-pixbuf2.0-dev texlive-latex-extra libqt4-dev-bin \ wget mingw-w64 texlive-lang-german cmake libgtk2.0-bin libxml2-utils \ - gperf libgettextpo-dev + gperf libgettextpo-dev automake-1.15 Building the Webpages ===================== The website is in the dedicated branch "website" in the git reposity. Checkout that branch and read the instructions: git checkout website Development Branches ==================== The old version of gpg4win (version < 1.2) is since 1.1.3 tracked by the GIT branch: gpg4win-1-branch. Only important fixes will go into this version. The current version in the GIT master starts as version 1.9. Adding new packages to the installer: ===================================== This requires editing a couple of files; we might eventually automate some of these tasks. Here is a short run up: 1. Add constants for the package FOO into src/config.nsi.in . 2. Create 2 new installer scripts, named src/inst-foo.nsi and uninst-foo.nsi and add them to EXTRA_DIST in src/Makefile.am. 3. Add foo to one the variables gpg4win_bpgks (if foo should not be build be the gpg4win) or gpg4win_spkgs (if foo should be build by gpg4win) in src/Makefile.am . Also add any required configure flags etc. 4. Add FOO to src/inst-sections.nsi. 5. Add detection of packages to configure.ac. Check out the available macros in m4/gpg4win.m4. Depending on the way an upstream package is packaged, you might need to write a new macro. 6. Add download information to packages/download.sh. 7. If the package ships pkg-config (*.pc) support files, you need add post install instructions to Makefile.am. Note that *.pc files may be in the "runtime" directory ${pkgidir} if the package is built within gpg4win (or peculiarly shipped), or in the development package ${pkgidir_dev}. 8. Add the installed files to the mkportable headers. Then run the usual "./autogen.sh" to create the actual configure file and run configure as described above. Kleopatra Locatization ====================== The kde-l10n package is generated with the script src/kde-l10n.sh execute it after a build to generate an updated l10n package which you can then upload and add to packages.current. The tarballs and the nsis scripts are located in the temp directory kde-l10n prints as output. Installer Slideshow =================== During installation we are showing a slide show. If you want to change the contents shown add / modify files in the src/slideshow subfolder. Install them in inst-gpg4win.nsi (Add them to the list of files before g4wihelp::slide_show) and modify src/slideshow/slides.dat accordingly. Version numbers =============== We use a specific order of version numbers. This is best shown by an example: 2.1.1 - The final 2.1.1 release. 2.1.1-beta88 - A snapshot before the 2.1.1 release. (The 88 in this example is the number of commits since the last release). The important point is that we bump up the version number before we do an release and append a suffix to mark it as a development version. This allows other software to use a configure check for the next to be released version of gpg4win. Copyright ========= The entire Gpg4win package is Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012, 2013 g10 Code GmbH GPG4Win is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. GPG4Win is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA This file ========= Copyright 2005, 2006, 2008 g10 Code GmbH This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/packages/packages.current b/packages/packages.current index 98323973..86b6ba19 100644 --- a/packages/packages.current +++ b/packages/packages.current @@ -1,595 +1,595 @@ # packages.current - list of current packages for use with gpg4win -*- sh -*- # # The download script processes the statements here to # actually download the packages. The syntax is trivial: # # If the first non whitespace character of a line is #, the line is # considered a comment. If the first word of a line is "server", the # rest of the line will be taken as the base URL for following file # commands. If the first word of a line is "file" the rest of the # line will be appended to the current base URL (with a / as # delimiter). The statement "chk" is followed by the SHA1 checksum of # the last file. # # zlib # server http://zlib.net # last-changed: 2017-01-23 # by: ah # verified: Sig 5ED4 6A67 21D3 6558 7791 E2AA 783F CD8E 58BC AFBA file zlib-1.2.11.tar.gz chk c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 # # GNU # server ftp://ftp.gnu.org/pub/gnu # last-changed: 2017-02-15 # by: ah # verified: Sig 68D9 4D8A AEEA D48A E7DC 5B90 4F49 4A94 2E46 16C2 file libiconv/libiconv-1.15.tar.gz chk ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 # last-changed: 2017-02-15 # by: ah # verified: Sig 4622 25C3 B46F 3487 9FC8 496C D605 848E D7E6 9871 file gettext/gettext-0.19.8.tar.xz chk 9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f # # GLIB # # The GTK boyz seem to think that sha256sum files on the server # magically get them a lot of additional security karma. # # And it's plain to see # You were meant for me # Yeah I'm your .sig # Your 21th Century sig # 21th Century sig, I wanna be your file # server http://ftp.gnome.org/pub/gnome/sources/glib/2.41 # last-changed: 2015-06-05 # Latest minor release is 2.45 but 2.41 works for us. # by: ah # compared checksum with debian experimental version. # https://lists.debian.org/debian-experimental-changes/2014/09/msg00182.html # verified: Sig 3D0E FB95 E7B5 237F 16E8 2258 E352 D5C5 1C50 41D4 file glib-2.41.5.tar.xz chk e76a6bd1456749bdd05db19a8f0f174e787e612ed443d30cc9cf02237dd58e16 # # GDK-PIXBUF # server http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/ # checked: 2015-06-05 # by: ah # There is a 2.31 series but afaik no security problems with 2.30 # verified: with linuxfromscratch and frugalware checksums file gdk-pixbuf-2.30.8.tar.xz chk 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be # # ATK # server http://ftp.gnome.org/pub/gnome/sources/atk/1.32 # checked: 2013-04-29 wk (1.32.0 still the latest in 1.32) file atk-1.32.0.tar.bz2 chk e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32 # checked: 2013-04-29 wk name atk-1.32.0.zip file atk_1.32.0-2_win32.zip chk cadc6d52f2af21996a6dcba7b1fac27ce66721e14d1c4ab21fde7bc9965f5037 # checked: 2013-04-29 wk name atk-dev-1.32.0.zip file atk-dev_1.32.0-2_win32.zip chk 5021d64043d270350d6a8d50b91db691a7421a68ca0bfa4eeb0c8804a176ac44 # # PANGO # server http://ftp.gnome.org/pub/gnome/sources/pango/1.29 # fixme: 2013-04-29 wk - There is a 1.29.5 but no 1.29.5 binaries # What shall we do: Update to 1.32? There are no # 1.32 binaries either. file pango-1.29.4.tar.bz2 chk f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.29 name pango-1.29.4.zip file pango_1.29.4-1_win32.zip chk e1b865ae2e4054388c598f92b34593b3d24d7fd15e6308c8926ee634717c21ce name pango-dev-1.29.4.zip file pango-dev_1.29.4-1_win32.zip chk 0d7fb255e65ed4bd43acedab4405986e4877b87ba8227d5fa22b38330485e3cb # # CAIRO # server http://cairographics.org/releases # checked: 2013-04-29 wk - 1.10.2 is the latest in the 1.10 series. file cairo-1.10.2.tar.gz chk 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies # checked: 2013-07-16 ah most recent package on that server is from # 2012-09-27 TODO -> Move to another source / source build of those # dependencies # checked: 2013-04-29 wk name cairo-1.10.2.zip file cairo_1.10.2-2_win32.zip chk e6c361ec1df4ccb23edbe5b68db16329d563a19eeee7fa70d583dda3d2358f4e name cairo-dev-1.10.2.zip file cairo-dev_1.10.2-2_win32.zip chk b86f875bf776bbf578e3fa8c46866b84c93200b962b30d03cf795f82157e3167 # checked: 2013-04-29 wk file freetype-2.4.2.tar.bz2 chk 9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe name freetype-2.4.2.zip file freetype_2.4.2-1_win32.zip chk bdf67e6573363fd2256a58295931cc1186382fd0ad1fe420059d6ffdb5fba7c0 name freetype-dev-2.4.2.zip file freetype-dev_2.4.2-1_win32.zip chk eed58c2807b65d5e0ec78031e89f1628577ad76bf47f02eaecde432c0b99eae9 server http://www.fontconfig.org/release # checked: 2013-04-29 wk - 2.8.0 still the latest in 2.8 file fontconfig-2.8.0.tar.gz chk fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies # checked: 2013-04-29 wk name fontconfig-2.8.0.zip file fontconfig_2.8.0-2_win32.zip chk 9d6bcaeed0eced43a649953132d9f2b3e15b98c7bb9e4a207872dfeade818204 name fontconfig-dev-2.8.0.zip file fontconfig-dev_2.8.0-2_win32.zip chk 2f15af3d27ca507dad2a208e58409f484aa7e7c7eac10b49edca079b31ae7073 server ftp://ftp.g10code.com/g10code/misc # checked: 2013-04-29 wk - 2.0.1 still the latest in 2.0 file expat-2.0.1.tar.gz chk 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93 server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies # checked: 2013-04-29 wk name expat-2.0.1.zip file expat_2.0.1-1_win32.zip chk 77b88ab780e698d6590426b26a877878584b9f8b6357909699674fb5045737bd name expat-dev-2.0.1.zip file expat-dev_2.0.1-1_win32.zip chk 67b92b7f3441fee077bdc0094bf4dd673870acdf51899e32e199246801538162 # # GTK+ # server http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24 # last-changed: 2015-06-05 # by: ah # verified: chk from https://download.gnome.org/core/3.17/3.17.2/sources/SHA256SUMS-for-xz file gtk+-2.24.28.tar.xz chk b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 # # GIMP stuff for W32 # server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies # checked: 2012-03-28 wk - Not updated - not a security problem name pkgconfig-0.23.tar.gz file pkg-config-0.23.tar.gz chk 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53 name pkgconfig-0.23.zip file pkg-config_0.23-3_win32.zip chk 677d6055494e24cad6c49eab33eee618ddc6ed65da827c8b5b7da761b4063278 # PNG # last changed: 2017-08-28 # by: js # verified: Sig 8048 643B A2C8 40F4 F92A 195F F549 84BF A16C 640F server ftp://ftp.simplesystems.org/pub/png/src file libpng14/libpng-1.4.22.tar.xz chk 8d419a8b2a5edddda5cbcb897ded92205344a3249fa7a00d6384ea23ac3ccbd8 # # LibFFI # server ftp://sourceware.org/pub/libffi # checked: 2013-04-29 wk - updated from 3.0.10. # checked: 2014-07-16 ah - only rc availble from 3.0.14 file libffi-3.0.13.tar.gz chk 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c # # GpgOL # server http://files.gpg4win.org/src # last-changed: 2018-11-12 # by: ah # verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28 file gpgol/gpgol-2.3.2.tar.bz2 chk 6c298c7a8787e0796a1984d3c1e948b55b9fff685dff3fe7e9d3012001b5b85f # for beta #server http://files.intevation.de/projects/gpg4all #file gpgol/gpgol-2.3.2-beta22.tar.bz2 #chk 72c0a9e08dc74494eb4f07076a82808f7d71218ec0d0ba48c309702d90e87e61 # # GpgEX # server http://files.gpg4win.org/src # last-changed: 2018-04-10 # by: ah # verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28 file gpgex/gpgex-1.0.6.tar.bz2 chk d69898d1022400bd09bb684080edc95be554af736ae9c014df73543f34f7481b # # Pth emulation # server ftp://ftp.g10code.com/g10code/w32pth # checked: 2014-07-16 ah file w32pth-2.0.5.tar.bz2 chk 5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06 # # Stripped down version of BZIP2 # (full source at http://bzip.org) # server ftp://ftp.g10code.com/g10code/bzip2 # checked: 2014-07-16 ah file bzip2-1.0.6-g10.tar.gz chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07 # # GnuPG et al. # # All tarballs from this server are verified with an openpgp # signature made by "Werner Koch (dist sig)". # D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6 server ftp://ftp.gnupg.org/gcrypt # last changed 2018-05-03 # by ah # verified: distsigkey.gpg server ftp://ftp.gnupg.org/gcrypt file libgpg-error/libgpg-error-1.32.tar.bz2 chk c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca # last-changed: 2017-12-07 # by: ah file libassuan/libassuan-2.5.1.tar.bz2 chk 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449 # last changed: 2018-08-30 # by: ah #name gnupg-w32-2.2.10-20180830-bin.exe #file binary/gnupg-w32-2.2.10_20180830.exe #chk e84bad2436e3a0309d59e0ed313b346a1fc4ac556b5fd68bcea2d0e58d0516a2 #name gnupg-w32-2.2.10-20180830-src.tar.xz #file binary/gnupg-w32-2.2.10_20180830.tar.xz #chk 9a8c5d1b6326547a8a014665105520be7e2bd6624e48fb9a68ac2a84c99ee567 # last-changed: 2018-11-12 # by: ah # verified: Created internally # Patched 2.1.11 with gnupg rev. 00321a025f90990a71b60b4689ede1f38fbde347 server http://files.intevation.de/projects/gpg4all name gnupg-w32-2.2.11-20181112-bin.exe file gnupg/gnupg-w32-2.2.11_20181112.exe chk 9a459e28f2890f3fe959be55b88d22d84091d4c67ce09d782f2cd694e410decb name gnupg-w32-2.2.11-201811112-src.tar.xz file gnupg/gnupg-w32-2.2.11_20181112.tar.xz chk 5b35b3d1bbf843da9c6d8cc3a81ac977044f2df568d285942ad9828f430688cb server ftp://ftp.gnupg.org/gcrypt # TODO back to stable # last changed: 2017-12-05 # by: ah #file pinentry/pinentry-1.1.0.tar.bz2 #chk 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570 # TODO back to stable # last changed: 2018-10-08 # by: ah #file gpgme/gpgme-1.12.0.tar.bz2 #chk b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8 # last changed: 2018-10-17 # by: ah file gpa/gpa-0.10.0.tar.bz2 chk 95dbabe75fa5c8dc47e3acf2df7a51cee096051e5a842b4c9b6d61e40a6177b1 # # GnuPG utilities # server http://www.jabberwocky.com/software/paperkey # last-changed: 2017-12-05 # by: ah # verified: SIG 7D92 FD31 3AB6 F373 4CC5 9CA1 DB69 8D71 9924 2560 file paperkey-1.5.tar.gz chk c4737943083ce92e41faf13c27a9d608105b6285c0840dfb684a7ee294142ddf # # Kleopatra and dependencies # # Boost # last changes: 2016-01-21 # by: ah # verified: Second source https://github.com/mxe/mxe/commit/fdd5b9f7aa8bf0e40c1f1f8119701af96e51457e server http://downloads.sourceforge.net/project/boost/boost/ name boost-1.60.0.tar.bz2 file 1.60.0/boost_1_60_0.tar.bz2 chk 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b # Qt base -# last changed: 2018-02-27 +# last changed: 2019-02-11 # by: ah -# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz.sha256 +# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz.sha256 server http://download.qt.io/official_releases/qt/ -name qtbase-5.10.1.tar.xz -file 5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz -chk d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969 +name qtbase-5.12.1.tar.xz +file 5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz +chk 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049 # Qt Tools -# last changed: 2018-02-27 +# last changed: 2019-02-11 # by: ah -# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz.sha256 -name qttools-5.10.1.tar.xz -file 5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz -chk f1ea441e5fe138756e6de3b60ab7d8d3051799eabe85a9408c995dfd4d048a53 +# verified: HTTPS https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qttools-everywhere-src-5.12.1.tar.xz.sha256 +name qttools-5.12.1.tar.xz +file 5.12/5.12.1/submodules/qttools-everywhere-src-5.12.1.tar.xz +chk ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3 # Qt Winextras -# last changed: 2018-02-27 +# last changed: 2019-02-11 # by: ah -# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz.sha256 -name qtwinextras-5.10.1.tar.xz -file 5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz -chk 12401eea9abe87307b9aeba9d539ad403858ea43a99248421caf069f27b28917 +# verified: HTTPS https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwinextras-everywhere-src-5.12.1.tar.xz.sha256 +name qtwinextras-5.12.1.tar.xz +file 5.12/5.12.1/submodules/qtwinextras-everywhere-src-5.12.1.tar.xz +chk 8d312155a7da329df41cc2ea5d265eb632be7dd9cbd789fa3bc0206b4022f557 # Qt svg -# last changed: 2018-02-27 +# last changed: 2019-02-11 # by: ah -# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz.sha256 -name qtsvg-5.10.1.tar.xz -file 5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz -chk 00e00c04abcc8363cf7d94ca8b16af61840995a4af23685d49fa4ccafa1c7f5a +# verified: HTTPS https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtsvg-everywhere-src-5.12.1.tar.xz.sha256 +name qtsvg-5.12.1.tar.xz +file 5.12/5.12.1/submodules/qtsvg-everywhere-src-5.12.1.tar.xz +chk 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8 # Qt translations -# last changed: 2018-02-27 +# last changed: 2019-02-11 # by: ah -# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz.sha256 -name qttranslations-5.10.1.tar.xz -file 5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz -chk 1f6d840e3d04b00b976bc1a86ea2be9d61051b7c3455dc2b891fae61772643fd +# verified: HTTPS https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qttranslations-everywhere-src-5.12.1.tar.xz.sha256 +name qttranslations-5.12.1.tar.xz +file 5.12/5.12.1/submodules/qttranslations-everywhere-src-5.12.1.tar.xz +chk 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7 # KDE Frameworks generated by gen-frameworks.sh server https://download.kde.org/Attic/frameworks/ ##### Paste Here ##### # # Don't forget to update gpg4win.mk.in with new version numbers # # extra-cmake-modules # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/extra-cmake-modules-5.43.0.tar.xz chk 5757a5ddceede5321b58345a8dbf953c2282487bf9c24ae477efde800b94fffd # kconfig # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kconfig-5.43.0.tar.xz chk 22ebe055ae6545e01653b2e7d678145261cc5073202561735a894aa59b5841d9 # ki18n # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/ki18n-5.43.0.tar.xz chk 8a802507ba6a5a91470d09c649e842843d70f37968d86473567928f2cdee57ff # kwidgetsaddons # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kwidgetsaddons-5.43.0.tar.xz chk 59a7329e8a4a3b22677dc09648de9c0a042b9ae284af2556c5db48394a9aa797 # kcompletion # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kcompletion-5.43.0.tar.xz chk 2999af185dea2164b6943c9cabf2330e4cae4bea46863a1c3d66e86b04ffb618 # kwindowsystem # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kwindowsystem-5.43.0.tar.xz chk 4df6da4f313f8c52a5d202caa5cc90791b4a07f0d91d5b7252e2da5487a6997d # kcoreaddons # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kcoreaddons-5.43.0.tar.xz chk c67f008b79365913cbb8c62d2b1b48353c1302f6a351a9bc34b874b18392ef82 # kcodecs # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kcodecs-5.43.0.tar.xz chk 5bc09761bf3a3e5fcbea76b1b41c2f07e372fd8449c14fb7276250e177ff9959 # kconfigwidgets # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kconfigwidgets-5.43.0.tar.xz chk 7c9016f2c98452d912359def78185f4bf3c6f8c45833fe0e321278124c45bbe3 # kxmlgui # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kxmlgui-5.43.0.tar.xz chk a3fd16055c5c37130edc80cc331356dea0be78ad227ed4bf00d45bb59dbfccca # kguiaddons # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kguiaddons-5.43.0.tar.xz chk 19b32ef071dd51271b5999f22968864cf8409cb8caf9c9daa7707a922f71da7c # kitemviews # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kitemviews-5.43.0.tar.xz chk 304cbdd832b12c9e2b08f29efc5d876a9de60076d444c3d502849fdc21ec86a7 # kitemmodels # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kitemmodels-5.43.0.tar.xz chk ad617dc843297c2c4d5db97ea528c44c886d52c89125a77f9494da09de8187fb # kiconthemes # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kiconthemes-5.43.0.tar.xz chk 5ce7918311b89e30a4715f3ebeeb7263c550c9e9c59556a1a6e45ad24442ac80 # breeze-icons # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/breeze-icons-5.43.0.tar.xz chk 3eda58a4c7c9369fe9b246500d88a964d3411f83e1113727ed723989d935dea7 # karchive # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/karchive-5.43.0.tar.xz chk 0e639a2818700220bf20aea83a00697b385d67f39eba5840b400d8d72ec477b8 # kcrash # last changed: 2018-02-27 # by: ah # verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh) file 5.43/kcrash-5.43.0.tar.xz chk 2b74ab0d0d393c32a7e53e16757763fbe91d25e8dd157e860dec45a047866ec3 ##### End Paste ##### # KDE Applications # For older releases check here: server https://download.kde.org/Attic/applications # server http://download.kde.org/stable/applications/ # kmime # last changed: 2018-02-02 # by: ah # verified: https://download.kde.org/stable/applications/17.12.2/src/kmime-17.12.2.tar.xz.mirrorlist file 17.12.2/src/kmime-17.12.2.tar.xz chk 29f11eafeb13c0045069a250bdcd57fda4bdd3423e7e1b7e0ca0517a9afefd24 # Devel versions are needed until Kleopatra can be based on # a stable branch. server http://files.intevation.de/projects/gpg4all # by: ah file pinentry/pinentry-1.1.1-beta5.tar.bz2 chk 7bda3fef7d7f0f77dd4dfe11e3364c64f1e9646945afa995da8a5084ce59e101 # by: ah file gpgme/gpgme-1.12.1-beta43.tar.bz2 chk 08fbbe522e33e847da5f0c3f360f2f7089fa200ad9eddb58458b7218aee6ec04 # Libkleo # last changed: see package date. # by: ah # verified: Tarball created by ah. file libkleo/libkleo-201811121611.tar.gz chk d0c1e5dc370986b0cfd1697f46317ae1bee6598d1a4ca26d0ee88a14ec07e622 # KDE-L10n # last changed: see package date. # by: ah # verified: Tarball created by ah with script kde-l10n.sh file kde-l10n/kde-l10n-201811121428-bin.tar.xz chk c18b7305c3cbd9b2911e02cb852eb1933e39fb21b101da837787b18a733d1743 file kde-l10n/kde-l10n-201811121428-src.tar.xz chk b1ad6751a0f544d6399a42592fe7b7cc1fe395880bc5cec5db1396e7e48d9a49 # Gpg4win-tools package # last changed: see package date. # by: ah # verified: Tarball created by ah. file gpg4win-tools/gpg4win-tools-201811121334.tar.gz chk c4a1c40d9bf1bc36ee31a1c9735a4cfe025a706d48eb226467777d0e5fd0613d # Kleopatra # last changed: see package date. # by: ah # verified: Tarball created by ah. file kleopatra/kleopatra-201811261513.tar.gz chk 20410768596a7ccb78788bb43695df36c13f4a5b2a0cb95ee888197906410199 diff --git a/patches/qtbase/config-standardpaths.patch b/patches/qtbase/config-standardpaths.patch index 55d66104..4b8740c7 100755 --- a/patches/qtbase/config-standardpaths.patch +++ b/patches/qtbase/config-standardpaths.patch @@ -1,139 +1,119 @@ i#! /bin/sh patch -p1 -f -l $* < $0 exit $? diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp qtbase-5.6.1/src/corelib/io/qstandardpaths.cpp --- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp 2016-07-22 15:11:23.307466618 +0200 +++ qtbase-5.6.1/src/corelib/io/qstandardpaths.cpp 2016-07-22 15:12:52.629403686 +0200 @@ -56,6 +56,14 @@ #include #endif -+#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) ++#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) && !defined(QT_BOOTSTRAPPED) +#include +#include +#endif +#ifdef Q_OS_WIN +#include +#endif + #ifndef QT_NO_STANDARDPATHS QT_BEGIN_NAMESPACE -@@ -671,6 +679,90 @@ +@@ -672,6 +680,70 @@ return qsp_testMode; } ++#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) && !defined(QT_BOOTSTRAPPED) +static const char standardPathsSection[] = "StandardPaths"; -+ +static QSettings *findConfiguration() +{ -+#ifdef QT_BUILD_QMAKE -+ QString qtconfig = qmake_libraryInfoFile(); -+ if (QFile::exists(qtconfig)) -+ return new QSettings(qtconfig, QSettings::IniFormat); -+#else + QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); -+#ifdef Q_OS_DARWIN -+ CFBundleRef bundleRef = CFBundleGetMainBundle(); -+ if (bundleRef) { -+ QCFType urlRef = CFBundleCopyResourceURL(bundleRef, -+ QCFString(QLatin1String("qt.conf")), -+ 0, -+ 0); -+ if (urlRef) { -+ QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle); -+ qtconfig = QDir::cleanPath(path); -+ if (QFile::exists(qtconfig)) -+ return new QSettings(qtconfig, QSettings::IniFormat); -+ } -+ } -+#endif + if (QCoreApplication::instance()) { + QDir pwd(QCoreApplication::applicationDirPath()); + qtconfig = pwd.filePath(QLatin1String("qt.conf")); + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); + } -+#endif + return 0; //no luck +} ++#endif + +QString QStandardPaths::presetLocation(StandardLocation type) +{ +#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) && !defined(QT_BOOTSTRAPPED) + QStringList locations = QStringList() << QStringLiteral("DesktopLocation") + << QStringLiteral("DocumentsLocation") + << QStringLiteral("FontsLocation") + << QStringLiteral("ApplicationsLocation") + << QStringLiteral("MusicLocation") + << QStringLiteral("MoviesLocation") + << QStringLiteral("PicturesLocation") + << QStringLiteral("TempLocation") + << QStringLiteral("HomeLocation") + << QStringLiteral("DataLocation") + << QStringLiteral("CacheLocation") + << QStringLiteral("GenericDataLocation") + << QStringLiteral("RuntimeLocation") + << QStringLiteral("ConfigLocation") + << QStringLiteral("DownloadLocation") + << QStringLiteral("GenericCacheLocation") + << QStringLiteral("GenericConfigLocation") + << QStringLiteral("AppDataLocation") + << QStringLiteral("AppConfigLocation") + << QStringLiteral("AppLocalDataLocation"); + + QScopedPointer settings(findConfiguration()); + if (!settings.isNull()) { + QString key = QLatin1String(standardPathsSection); + key += QLatin1Char('/'); + key += locations[type]; + const QString value = settings->value(key).toString(); +#ifdef Q_OS_WIN + if (value.isEmpty()) +#endif + return value; +#ifdef Q_OS_WIN + wchar_t expandedPath[MAX_PATH] = {0}; + if (ExpandEnvironmentStrings((wchar_t*)value.utf16(), expandedPath, MAX_PATH)) { + return QString::fromWCharArray(expandedPath).replace("\\", "/"); + } + return value; +#endif + } +#endif // !QT_BUILD_QMAKE && !QT_NO_SETTINGS + + return QString(); +} + QT_END_NAMESPACE :diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.h qtbase-5.6.1/src/corelib/io/qstandardpaths.h --- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.h 2016-07-22 15:11:23.307466618 +0200 +++ qtbase-5.6.1/src/corelib/io/qstandardpaths.h 2016-07-22 15:11:49.940044214 +0200 @@ -92,6 +92,8 @@ static bool isTestModeEnabled(); private: + static QString presetLocation(StandardLocation type); + // prevent construction QStandardPaths(); ~QStandardPaths(); diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths_win.cpp qtbase-5.6.1/src/corelib/io/qstandardpaths_win.cpp --- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths_win.cpp 2016-07-22 15:11:23.307466618 +0200 +++ qtbase-5.6.1/src/corelib/io/qstandardpaths_win.cpp 2016-07-22 15:13:41.682467339 +0200 @@ -203,7 +203,9 @@ QString QStandardPaths::writableLocation(StandardLocation type) { - QString result; + QString result = QStandardPaths::presetLocation(type); + if (!result.isEmpty()) + return result; switch (type) { case DownloadLocation: result = sHGetKnownFolderPath(qCLSID_FOLDERID_Downloads, type); diff --git a/patches/qtbase/qtbase-mingw-fixes.patch b/patches/qtbase/qtbase-mingw-fixes.patch index ee19679c..0946f356 100755 --- a/patches/qtbase/qtbase-mingw-fixes.patch +++ b/patches/qtbase/qtbase-mingw-fixes.patch @@ -1,210 +1,210 @@ #! /bin/sh patch -p1 -f -l $* < $0 exit $? Taken from MXE - -From 12eed60ff166200c12d203d0daaa6c58c41df0ea Mon Sep 17 00:00:00 2001 +From 01ee0b5260f1b83a81769132c0705aab05481641 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. Source: https://git.io/vzWJz See also: https://github.com/mxe/mxe/issues/1185 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index d2358ca..6b1dc95 100644 +index 3ed6dd5889..cc5bc9dc16 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - endif() +@@ -214,12 +214,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF +!!IF equals(TEMPLATE, aux) + add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) +!!ELSE !!IF !isEmpty(CMAKE_STATIC_TYPE) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") - !!ELSE +-!!ELSE -!!IF equals(TEMPLATE, aux) - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) --!!ELSE + !!ELSE add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF - !!ENDIF -- -2.9.3 +2.19.1 -From 68f406b40eb3708809c042dfaf41b5366b437308 Mon Sep 17 00:00:00 2001 +From 48723a27c10322a9beff2f84422c757df2639edd Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH 2/6] Fix pkgconfig file and library naming +Subject: [PATCH 2/5] Fix pkgconfig file and library naming See: https://codereview.qt-project.org/#/c/165394/ https://bugreports.qt.io/browse/QTBUG-30898 Currently, *.pc files are generated with debug suffix `d` in `-release` mode and without the suffix in `-debug` or `-debug-and-release`. This can be worked around by `CONIFG-=debug_and_release`, however, a more predictable and consistent naming approach would be preferable. This change mimics the *.prl file and lib conventions: -release: creates normal *.pc files and lib names -release -force-debug-info: normal as above -debug: creates *d.pc and *d lib names -debug-and-release: creates both -default: creates both (default link: debug) and should be unsurprising to users of `pkg-config`. At very least, it's deterministic and easily incorporated into build systems. Task-number: 30898 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index e6a0d97f1a..5aefea28e5 100644 +index 51b5bde67a..faba17aedd 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -265,6 +265,10 @@ load(qt_installs) +@@ -263,6 +263,10 @@ load(qt_installs) load(qt_targets) +# Set TARGET towards the end but before pkgconfig setup to keep naming +# conventions consistent with *prl files +TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) + # this builds on top of qt_common - !internal_module:!lib_bundle:if(unix|mingw) { + !internal_module:if(unix|mingw) { CONFIG += create_pc -@@ -275,12 +279,12 @@ load(qt_targets) - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] - QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME +@@ -278,12 +282,12 @@ load(qt_targets) + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] + QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME + } - QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") - QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) + QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ") + QMAKE_PKGCONFIG_FILE = $$TARGET for(i, MODULE_DEPENDS): \ - QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0)) + QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix() isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ - QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module + QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module pclib_replace.match = $$lib_replace.match !isEmpty(lib_replace.replace): \ pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -314,5 +318,3 @@ win32 { +@@ -317,5 +321,3 @@ win32 { # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 } - -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end -- -2.14.1 +2.19.1 -From d0ccaee377241a6b661ccb9a6d57ebc694b50f76 Mon Sep 17 00:00:00 2001 +From 6a7989a069a7aa88e898c4f68bd753b480af0cdf Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 29 Jan 2017 13:02:16 +0100 -Subject: [PATCH 3/6] reenable fontconfig for win32 (MXE-specific) +Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f diff --git a/src/gui/configure.json b/src/gui/configure.json -index dab66fafb4..b90ce6e4d9 100644 +index 89934c8f1d..456643a22c 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -956,7 +956,7 @@ - }, +@@ -1209,7 +1209,7 @@ "fontconfig": { "label": "Fontconfig", -- "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig", -+ "condition": "!config.darwin && features.system-freetype && libs.fontconfig", + "autoDetect": "!config.darwin", +- "condition": "!config.win32 && features.system-freetype && libs.fontconfig", ++ "condition": "features.system-freetype && libs.fontconfig", "output": [ "privateFeature", "feature" ] }, "gbm": { diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp -index ca33689cd7..194523eee0 100644 +index 0c04608fca..a26e02fbf3 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp -@@ -130,7 +130,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const - { - if (!m_fontDatabase && (m_options & EnableFonts)) { +@@ -161,7 +161,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const + + if (!m_fontDatabase) { #if QT_CONFIG(fontconfig) +- m_fontDatabase = new QGenericUnixFontDatabase; +#ifdef Q_OS_WIN + m_fontDatabase = new QFreeTypeFontDatabase; +#else - m_fontDatabase = new QGenericUnixFontDatabase; ++ m_fontDatabase = new QGenericUnixFontDatabase; +#endif - #elif defined(Q_OS_WINRT) - m_fontDatabase = new QWinRTFontDatabase; - #elif defined(Q_OS_WIN) + #else + m_fontDatabase = QPlatformIntegration::fontDatabase(); + #endif -- -2.14.1 +2.19.1 -From 35e8ce1f490f973045c77385f96acaa3736c8787 Mon Sep 17 00:00:00 2001 +From dbe7086a860dc8aac17ed5d76bc45d605a19ac02 Mon Sep 17 00:00:00 2001 From: Mark Brand -Date: Sun, 29 Jan 2017 16:22:03 +0100 -Subject: [PATCH 4/6] fix treatment of SYBASE_LIBS - -Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0 - -diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri -index b69b51b679..d37423adbd 100644 ---- a/src/plugins/sqldrivers/configure.pri -+++ b/src/plugins/sqldrivers/configure.pri -@@ -92,7 +92,7 @@ defineTest(qtConfLibrary_sybaseEnv) { - libs += "-L$${sybase}/lib" - libs += $$getenv(SYBASE_LIBS) - !isEmpty(libs) { -- $${1}.libs = "$$val_escape(libs)" -+ $${1}.libs = $$libs - export($${1}.libs) - } - return(true) +Date: Sun, 11 Jun 2017 00:27:41 +0200 +Subject: [PATCH 4/5] use pkg-config for harfbuzz + +Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 456643a22c..f36e15603b 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -301,7 +301,8 @@ + }, + "headers": "harfbuzz/hb.h", + "sources": [ +- "-lharfbuzz" ++ { "type": "pkgConfig", "args": "harfbuzz" }, ++ "-lharfbuzz" + ] + }, + "imf": { -- -2.14.1 +2.19.1 -From 8427c411a789c537b41d113d1f8f9ea7eb9d009a Mon Sep 17 00:00:00 2001 +From 2f96f49ffa2e4b42bb35da9304bba971cfcc1475 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH 6/6] disable qt_random_cpu for i686-w64-mingw32 +Subject: [PATCH 5/5] disable qt_random_cpu for i686-w64-mingw32 Workaround for gcc internal error compiling for mingw32: global/qrandom.cpp: In function 'qsizetype qt_random_cpu(void*, qsizetype)': global/qrandom.cpp:123:1: internal compiler error: in ix86_compute_frame_layout, at config/i386/i386.c:10145 } ^ global/qrandom.cpp:123:1: internal compiler error: Segmentation fault i686-w64-mingw32.static-g++: internal compiler error: Segmentation fault (program cc1plus) Based on https://codereview.qt-project.org/#/c/212360/ Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 72ba299280..90a0f378ff 100644 +index 6195c324e7..94902bcfc2 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp -@@ -92,7 +92,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando +@@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando QT_BEGIN_NAMESPACE -#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) +#if defined(Q_PROCESSOR_X86) && !defined(Q_PROCESSOR_X86_32) && QT_COMPILER_SUPPORTS_HERE(RDRND) static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW; # ifdef Q_PROCESSOR_X86_64 -- -2.14.1 +2.19.1