From 46ba9e9b0bdfb486929e1339f52891bac4cd02f1 Mon Sep 17 00:00:00 2001 From: ZXED Date: Sun, 5 Apr 2020 19:09:18 +0300 Subject: [PATCH] Initial commit --- .github/workflows/main.yml | 79 +++++ .gitignore | 2 + COPYING | 674 +++++++++++++++++++++++++++++++++++++ README.md | 5 + build-linux.sh | 365 ++++++++++++++++++++ build-osx.sh | 5 + build-win.sh | 32 ++ generate-release-notes.sh | 23 ++ mingw-packages.patch | 253 ++++++++++++++ push-release.sh | 18 + qtbase.patch | 19 ++ qtdeclarative.patch | 50 +++ relpc.py | 54 +++ versions | 31 ++ 14 files changed, 1610 insertions(+) create mode 100644 .github/workflows/main.yml create mode 100644 .gitignore create mode 100644 COPYING create mode 100644 README.md create mode 100755 build-linux.sh create mode 100755 build-osx.sh create mode 100755 build-win.sh create mode 100755 generate-release-notes.sh create mode 100644 mingw-packages.patch create mode 100755 push-release.sh create mode 100644 qtbase.patch create mode 100644 qtdeclarative.patch create mode 100755 relpc.py create mode 100644 versions diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..c52f185 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,79 @@ +name: Build Qt + + +on: + push: + tags: + - v* + + +jobs: + build-win: + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Setup MSYS2 + uses: numworks/setup-msys2@v1 + with: + msystem: MINGW64 + + - name: Build + run: msys2do ./build-win.sh + + - name: Generate release notes + shell: bash + run: ./generate-release-notes.sh > RELEASE.md + + - name: Release + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + with: + files: ${{ runner.temp }}/msys/msys64/home/a/*.pkg.tar.xz + + + build-osx: + runs-on: macos-latest + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Build + run: ./build-osx.sh all + + - name: Generate release notes + run: ./generate-release-notes.sh > RELEASE.md + + - name: Release + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + with: + files: archive/*.tar.xz + + + build-linux: + runs-on: ubuntu-18.04 + container: ubuntu:18.04 + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Build + run: ./build-linux.sh all + + - name: Generate release notes + run: ./generate-release-notes.sh > RELEASE.md + + - name: Release + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + with: + files: archive/*.tar.xz + body_path: RELEASE.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4e25f6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/*/ +!/.github/ diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program 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 3 of the License, or + (at your option) any later version. + + This program 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..620999e --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# Qt5 Build + +Scripts and patches for building Qt5 and some tools. + +Not intended for a public use. diff --git a/build-linux.sh b/build-linux.sh new file mode 100755 index 0000000..9c979a8 --- /dev/null +++ b/build-linux.sh @@ -0,0 +1,365 @@ +#!/usr/bin/env bash +set -xeuo pipefail +cd "$(dirname -- "$0")" + +. versions + + + +ROOTDIR="$(pwd)" +SHADOWDIR="$ROOTDIR/shadow" +DISTDIR="$ROOTDIR/dist" + +if [[ $OSTYPE =~ ^darwin ]] +then + OSX=1 +else + OSX= +fi + +if [[ $OSX ]] +then + NPROC="$(sysctl -n hw.activecpu)" + export LLVM_INSTALL_DIR=/usr/local/opt/llvm +else + NPROC="$(nproc)" + export LLVM_INSTALL_DIR="/usr/lib/llvm-8" +fi + +export QT_INSTALL_HEADERS="$DISTDIR/include" +export PATH="$DISTDIR/bin:$LLVM_INSTALL_DIR/bin${PATH:+:$PATH}" + +if [[ $OSX ]] +then + export DYLD_FALLBACK_LIBRARY_PATH="$DISTDIR/lib:$LLVM_INSTALL_DIR/lib${DYLD_FALLBACK_LIBRARY_PATH:+:$DYLD_FALLBACK_LIBRARY_PATH}" +else + export LD_LIBRARY_PATH="$DISTDIR/lib:$LLVM_INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +fi + +export PKG_CONFIG_PATH="$DISTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" +export CMAKE_PREFIX_PATH="$ROOTDIR${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}" + + +function doBootstrap { + if [[ $OSX ]] + then + brew install pkg-config llvm xz zstd freetype > /dev/null + else + PACKAGES=( + git + build-essential + python + python3 + pkg-config + libclang-8-dev + cmake + libfontconfig1-dev + libwayland-dev + libwayland-egl1-mesa + libegl1-mesa-dev + mesa-common-dev + libssl-dev + libxkbcommon-dev + chrpath + ) + + INSTALLED="$(dpkg -s "${PACKAGES[@]}" 2>/dev/null | grep -Pio '^Status:.*\binstalled\b' | wc -l)" || true + NEEDED=${#PACKAGES[@]} + if [[ $INSTALLED != $NEEDED ]] + then + if [[ -t 1 ]] + then + YFLAG="" + else + YFLAG="-y" + fi + if [[ $EUID != 0 ]] + then + sudo apt update $YFLAG > /dev/null + sudo apt install $YFLAG "${PACKAGES[@]}" > /dev/null + else + apt update $YFLAG > /dev/null + apt install $YFLAG "${PACKAGES[@]}" > /dev/null + fi + fi + fi +} + + + +function doInit { + PATCHFILES=(qtbase qtdeclarative) + for PATCHFILENAME in "${PATCHFILES[@]}" + do + PATCHFILE="$ROOTDIR/$PATCHFILENAME.patch" + if [[ ! -f $PATCHFILE ]] + then + echo "$PATCHFILE not found" + exit -1 + fi + done + + rm -rf qt5 + git clone https://code.qt.io/qt/qt5.git > /dev/null + pushd qt5 + git checkout "$QT5_BUILD_QT" > /dev/null + MODULE_SUBSET=qtbase,qtcharts,qtdeclarative,qtquickcontrols,qtquickcontrols2,qtgraphicaleffects,qttools,qttranslations + ./init-repository --module-subset="$MODULE_SUBSET" > /dev/null + for PATCHFILENAME in "${PATCHFILES[@]}" + do + pushd $PATCHFILENAME + git apply "$ROOTDIR/$PATCHFILENAME.patch" + popd + done + popd +} + + + +function doConfigure { + rm -rf "$SHADOWDIR" + mkdir -p "$SHADOWDIR" + pushd "$SHADOWDIR" + + ARGS=( + -release + -silent + -prefix "$DISTDIR" + -opensource + -confirm-license + -reduce-exports + -make libs + -make tools + -no-glib + -no-icu + -opengl desktop + -system-zlib \ + -qt-doubleconversion + -qt-pcre + -qt-harfbuzz + -qt-libjpeg + -qt-libpng + -qt-sqlite + -pkg-config + ) + + if [[ -z $OSX ]] + then + ARGS+=( + -reduce-relocations + -fontconfig + -system-freetype + -openssl + ) + fi + + "$ROOTDIR/qt5/configure" "${ARGS[@]}" + + popd +} + + + +function doBuild { + pushd "$SHADOWDIR" + make -j"$NPROC" &> /dev/null || make + rm -rf "$DISTDIR" + make install &> /dev/null || make install + popd + + cat > "$DISTDIR/bin/qt.conf" << EOF +[Paths] +Prefix=.. +EOF +} + + + +function doDocs { + pushd "$SHADOWDIR" + make -j"$NPROC" docs &> /dev/null || make docs + make install_qch_docs &> /dev/null || make install_qch_docs + popd +} + + + +function doLibs { + # + # QuaZip + # + rm -rf quazip + git clone https://github.com/stachenov/quazip.git > /dev/null + pushd quazip/quazip + git checkout "$QT5_BUILD_QUAZIP" > /dev/null + if [[ $OSX ]] + then + qmake PREFIX="$DISTDIR" QMAKE_LFLAGS+="-lz" + else + qmake PREFIX="$DISTDIR" + fi + make -j"$NPROC" &> /dev/null || make + make install &> /dev/null || make install + popd + + if [[ -z $OSX ]] + then + # + # QtDBusExtended + # + rm -rf qtdbusextended + git clone https://github.com/nemomobile/qtdbusextended.git > /dev/null + pushd qtdbusextended + git checkout "$QT5_BUILD_QTDBUSEXTENDED" > /dev/null + qmake + make -j"$NPROC" &> /dev/null || make + make install &> /dev/null || make install + popd + + # + # QtMPRIS + # + rm -rf qtmpris + git clone https://git.merproject.org/mer-core/qtmpris.git > /dev/null + pushd qtmpris + git checkout "$QT5_BUILD_QTMPRIS" > /dev/null + qmake + make -j"$NPROC" &> /dev/null || make + make install &> /dev/null || make + popd + + # + # ECM + # + rm -rf extra-cmake-modules + git clone https://github.com/KDE/extra-cmake-modules.git > /dev/null + pushd extra-cmake-modules + git checkout "$QT5_BUILD_KDECMAKEEXTRAMODULES" > /dev/null + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX="$DISTDIR" .. + make -j"$NPROC" &> /dev/null || make + make install &> /dev/null || make install + popd + + # + # KSyntaxHighlighting + # + rm -rf syntax-highlighting + git clone https://github.com/KDE/syntax-highlighting.git > /dev/null + pushd syntax-highlighting + git checkout "$QT5_BUILD_KSYNTAXHIGHLIGHTING" > /dev/null + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX="$DISTDIR" .. > /dev/null + make -j"$NPROC" &> /dev/null || make + make install &> /dev/null || make install + popd + + cp -a "$DISTDIR/lib/x86_64-linux-gnu/." "$DISTDIR/lib/" + rm -rf "$DISTDIR/lib/x86_64-linux-gnu/" + fi +} + + + +function doQbs { + rm -rf qbs + git clone https://code.qt.io/qbs/qbs.git > /dev/null + pushd qbs + git checkout "$QT5_BUILD_QBS" > /dev/null + git submodule update --init > /dev/null + qmake + make -j"$NPROC" &> /dev/null || make + if [[ $OSX ]] + then + SED_INPLACE_OPTS=( -i "" ) + else + SED_INPLACE_OPTS=( -i ) + fi + find . -name 'Makefile*' -type f -exec sed "${SED_INPLACE_OPTS[@]}" -e 's/$(INSTALL_ROOT)\/usr\/local\//$(INSTALL_ROOT)\//g' {} + + make install INSTALL_ROOT="$DISTDIR" &> /dev/null || make install INSTALL_ROOT="$DISTDIR" + find . -name 'Makefile*' -type f -exec sed "${SED_INPLACE_OPTS[@]}" -e 's/$(INSTALL_ROOT)\/share\/doc\//$(INSTALL_ROOT)\/doc\//g' {} + + make qch_docs install_inst_qch_docs INSTALL_ROOT="$DISTDIR" &> /dev/null || make qch_docs install_inst_qch_docs INSTALL_ROOT="$DISTDIR" + if [[ $OSX ]] + then + install_name_tool -add_rpath "@executable_path/../../lib" "$DISTDIR/libexec/qbs/qbs_processlauncher" + fi + cat > "$DISTDIR/libexec/qbs/qt.conf" << EOF +[Paths] +Prefix=../.. +EOF + popd +} + + + +function doPatch { + ./relpc.py "$DISTDIR" + + if [[ -z $OSX ]] + then + find "$DISTDIR/lib" -iname '*.so*' -type f | + while read LIBPATH + do + RELDIR="$(realpath --relative-to="$(dirname "$LIBPATH")" "$DISTDIR/lib")" + if [[ $RELDIR == "." ]] + then + NEW_RPATH='$ORIGIN' + else + NEW_RPATH='$ORIGIN/'"$RELDIR" + fi + chrpath -r "$NEW_RPATH" "$LIBPATH" || true + done + fi +} + + + +function doArchive { + mkdir archive + pushd archive + mv ../dist qt5 + if [[ $OSX ]] + then + OS_NAME=osx + else + OS_NAME=linux + fi + ARCH="$(uname -m)" + tar -cf - qt5 | xz -9e -c - > "qt5-$QT5_BUILD_QT-$OS_NAME-$ARCH.tar.xz" + popd +} + + + +case "${1:-}" in + bootstrap) doBootstrap ;; + init) doInit ;; + configure) doConfigure ;; + build) doBuild ;; + docs) doDocs ;; + libs) doLibs ;; + qbs) doQbs ;; + patch) doPatch ;; + archive) doArchive ;; + all) + doBootstrap + doInit + doConfigure + doBuild + doDocs + doLibs + doQbs + doPatch + doArchive + ;; + *) + echo "specify a valid task (bootstrap, init, configure, build, docs, libs, qbs, patch, archive, all) as a first argument" + exit -1 + ;; +esac + + + +echo "DONE!" diff --git a/build-osx.sh b/build-osx.sh new file mode 100755 index 0000000..9809ee3 --- /dev/null +++ b/build-osx.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -xeuo pipefail +cd "$(dirname -- "$0")" + +./build-linux.sh "$@" diff --git a/build-win.sh b/build-win.sh new file mode 100755 index 0000000..66e20b1 --- /dev/null +++ b/build-win.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -ex +cd "$(dirname -- "$(readlink -f -- "$0")")" + +. versions + + +if [[ $MSYSTEM == MINGW32 ]] +then + PKG_ARCH=i686 +else + PKG_ARCH=x86_64 +fi + +pacman --noconfirm -S git patch dos2unix "mingw-w64-$PKG_ARCH-toolchain" > /dev/null + +git clone https://github.com/msys2/MINGW-packages.git > /dev/null +pushd MINGW-packages + git checkout "$QT5_BUILD_MSYSGITHASH" > /dev/null + git apply --ignore-space-change --ignore-whitespace ../mingw-packages.patch + dos2unix mingw-w64-qt5/PKGBUILD +popd + +SRC_DIR="/home/a" +mv MINGW-packages/mingw-w64-qt5 "$SRC_DIR" + +cp qtbase.patch qtdeclarative.patch "$SRC_DIR/" + +cd "$SRC_DIR" +makepkg --skipinteg --syncdeps --noconfirm + +echo "ALL DONE!" diff --git a/generate-release-notes.sh b/generate-release-notes.sh new file mode 100755 index 0000000..d3ed2c4 --- /dev/null +++ b/generate-release-notes.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e +cd "$(dirname -- "$0")" + +. versions + +echo " +* [Qt](https://code.qt.io/cgit/qt/qt5.git/refs/): **$QT5_BUILD_QT** Linux, Windows, OSX + +* [MSYS2 git hash](https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-qt5): **$QT5_BUILD_MSYSGITHASH** Windows + +* [Qbs](https://code.qt.io/cgit/qbs/qbs.git/refs/): **$QT5_BUILD_QBS** Linux, OSX + +* [Quazip](https://github.com/stachenov/quazip/tags): **$QT5_BUILD_QUAZIP** Linux, OSX + +* [Extended DBus for Qt](https://github.com/nemomobile/qtdbusextended/tags): **$QT5_BUILD_QTDBUSEXTENDED** Linux + +* [Qt and QML MPRIS interface and adaptor](https://git.sailfishos.org/mer-core/qtmpris/-/tags): **$QT5_BUILD_QTMPRIS** Linux + +* [KDE Extra CMake Modules](https://github.com/KDE/extra-cmake-modules/tags): **$QT5_BUILD_KDECMAKEEXTRAMODULES** Linux + +* [KDE Syntax Highlighting](https://github.com/KDE/syntax-highlighting/tags): **$QT5_BUILD_KSYNTAXHIGHLIGHTING** Linux +" diff --git a/mingw-packages.patch b/mingw-packages.patch new file mode 100644 index 0000000..aac8fa9 --- /dev/null +++ b/mingw-packages.patch @@ -0,0 +1,253 @@ +diff --git a/mingw-w64-qt5/PKGBUILD b/mingw-w64-qt5/PKGBUILD +index 8eaf0f1b1..3953142b1 100644 +--- a/mingw-w64-qt5/PKGBUILD ++++ b/mingw-w64-qt5/PKGBUILD +@@ -7,7 +7,7 @@ + _variant=-shared + + # The way Qt5 libraries are built. Possible values are '-release', '-debug' or '-debug-and-release' +-_build_mode=-debug-and-release ++_build_mode=-release + + # Tune the following to decide how and what to build + if [ "${_variant}" = "-static" ]; then +@@ -33,8 +33,8 @@ if [ "${_variant}" = "-static" ]; then + # _ltcg="yes" + _ltcg="no" + else +- _namesuff= +- _with_icu=yes ++ _namesuff=alst ++ _with_icu=no + _with_fontconfig=yes + _with_openssl=yes + _with_dbus=yes +@@ -48,10 +48,10 @@ else + _system_doubleconversion=yes + _system_libtiff=yes + _system_libwebp=yes +- _build_examples=yes ++ _build_examples=no + _build_tools=yes +- _build_tests=yes +- _make_docs=yes ++ _build_tests=no ++ _make_docs=no + _ltcg=no + fi + +@@ -121,7 +121,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') + if [ "${_variant}" = "-static" ]; then + _qt5_prefix="${MINGW_PREFIX}/${_realname}" + else +- _qt5_prefix="${MINGW_PREFIX}" ++ _qt5_prefix="${MINGW_PREFIX}/opt/${_realname}" + fi + + depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" +@@ -159,7 +159,9 @@ optdepends=($([[ "$_variant" == "-shared" ]] && echo \ + "${MINGW_PACKAGE_PREFIX}-firebird2" \ + "${MINGW_PACKAGE_PREFIX}-postgresql") + ) +-makedepends=("bison" ++makedepends=("dos2unix" ++ "p7zip" ++ "bison" + "diffutils" + "flex" + "gperf" +@@ -232,7 +234,9 @@ source=(#https://download.qt.io/development_releases/qt/${pkgver%.*}/${_ver_base + 0300-qt-5.8.0-cast-errors.patch + 0301-link-evr.patch + 0302-ugly-hack-disable-qdoc-build.patch +- qml_static_plugins.patch) ++ qml_static_plugins.patch ++ qtbase.patch ++ qtdeclarative.patch) + + # Translates using cygpath according to the ${_make} being used + # (so either mingw32-make or MSYS2 make can be used) +@@ -263,13 +267,28 @@ apply_patch_with_msg() { + for _patch in "$@" + do + msg2 "Applying ${_patch}" +- patch -Nbp1 -i "${srcdir}/${_patch}" ++ patch -sNbp1 -i "${srcdir}/${_patch}" || true + done + } + + prepare() { ++ set -x ++ + [[ -d ${srcdir}/${_pkgfqn} ]] && rm -rf ${srcdir}/${_pkgfqn} +- tar -xJf ${srcdir}/${_pkgfqn}${_hotfix}.tar.xz -C ${srcdir} --exclude=${_pkgfqn}/{qtandroidextras,qtmacextras,qtwayland,qtwebengine,qtx11extras} || true ++ ++ 7za x "${srcdir}/${_pkgfqn}${_hotfix}.tar.xz" -so | 7z x -si -ttar -o"${srcdir}/" \ ++ ${_pkgfqn}/qtbase \ ++ ${_pkgfqn}/qtquickcontrols \ ++ ${_pkgfqn}/qtgraphicaleffects \ ++ ${_pkgfqn}/gnuwin32 \ ++ ${_pkgfqn}/qtquickcontrols2 \ ++ ${_pkgfqn}/qtcharts \ ++ ${_pkgfqn}/qtdeclarative \ ++ ${_pkgfqn}/qttools \ ++ ${_pkgfqn}/qttranslations \ ++ ${_pkgfqn}/coin \ ++ ${_pkgfqn}/qtwinextras \ ++ ${_pkgfqn}/"*.*" + + cd ${srcdir}/${_pkgfqn} + +@@ -341,6 +360,13 @@ prepare() { + 0300-qt-5.8.0-cast-errors.patch \ + 0301-link-evr.patch + ++ pushd qtbase ++ apply_patch_with_msg qtbase.patch ++ popd ++ pushd qtdeclarative ++ apply_patch_with_msg qtdeclarative.patch ++ popd ++ + # See: https://bugreports.qt.io/browse/QTBUG-37902 + # _ver_num=${_ver_base%%-*} + # sed -i "s/^MODULE_VERSION = .*$/MODULE_VERSION = ${_ver_num}/g" qtenginio/.qmake.conf +@@ -443,6 +469,7 @@ build() { + if [ "${_configure}" = "./configure" ]; then + _extra_config+=("-no-glib") + else ++ _extra_config+=("-no-glib") + _extra_config+=("-make-tool") + _extra_config+=("${_make}") + fi +@@ -461,10 +488,13 @@ build() { + _sql_config+=("-sql-sqlite") + _sql_config+=("-qt-sqlite") + else +- _sql_config+=("-plugin-sql-ibase") +- _sql_config+=("-plugin-sql-psql") +- _sql_config+=("-plugin-sql-mysql") +- _sql_config+=("-plugin-sql-odbc") ++ _sql_config+=("-no-sql-ibase") ++ _sql_config+=("-no-sql-mysql") ++ _sql_config+=("-no-sql-odbc") ++ _sql_config+=("-no-sql-psql") ++ _sql_config+=("-no-sql-sqlite2") ++ _sql_config+=("-sql-sqlite") ++ _sql_config+=("-qt-sqlite") + fi + + #if [ "${_variant}" = "-static" ]; then +@@ -514,8 +544,6 @@ build() { + fi + else + configure_opts+=("-shared") +- configure_opts+=("-jasper") +- configure_opts+=("-no-mng") + if [ "$_with_dbus" == "yes" ]; then + configure_opts+=("-dbus") + else +@@ -545,16 +573,6 @@ build() { + if [ "$_system_libpng" == "no" ]; then + configure_opts+=("-qt-libpng") + fi +- if [ "$_system_libtiff" == "yes" ]; then +- configure_opts+=("-system-tiff") +- else +- configure_opts+=("-qt-tiff") +- fi +- if [ "$_system_libwebp" == "yes" ]; then +- configure_opts+=("-system-webp") +- else +- configure_opts+=("-qt-webp") +- fi + if [ "$_system_zlib" == "no" ]; then + configure_opts+=("-qt-zlib") + fi +@@ -566,11 +584,6 @@ build() { + else + configure_opts+=("-no-icu") + fi +- if [ "$_system_assimp" == "yes" ]; then +- configure_opts+=("-system-assimp") +- else +- configure_opts+=("-qt-assimp") +- fi + if [ "$_system_doubleconversion" == "yes" ]; then + configure_opts+=("-system-doubleconversion") + else +@@ -592,6 +605,7 @@ build() { + #fi + + ${_configure} \ ++ -silent \ + -prefix ${QTDIR_WIN} \ + -datadir ${QTDIR_WIN}/share/qt5 \ + -archdatadir ${QTDIR_WIN}/share/qt5 \ +@@ -606,7 +620,6 @@ build() { + "${_extra_libpaths[@]}" \ + "${_extra_libs[@]}" \ + -no-iconv \ +- -no-gstreamer \ + "${_extra_config[@]}" \ + "${_sql_config[@]}" \ + "${configure_opts[@]}" +@@ -633,7 +646,9 @@ build() { + # There is a race condition / dependency problem with libqtiff and dumpdoc.exe which + # can happen at -j9 so make twice (dumpdoc.exe depends on libqtiff but can get built + # first). +- ${_make} ${MAKEFLAGS} || ${_make} ${MAKEFLAGS} ++ ${_make} ${MAKEFLAGS} &> /dev/null || perl -pi -e 's~\\(?![\r\n])~/~g' qttools/src/qdoc/Makefile.Release ++ ${_make} ${MAKEFLAGS} &> /dev/null || ${_make} ${MAKEFLAGS} ++ + # For quicker turn-around testing qtwebengine. + # ${_make} module-qtbase + # ${_make} module-qtwebengine +@@ -649,7 +664,7 @@ build() { + + check() { + cd ${CARCH} +- make check -j1 -k ++ make check -j1 -k &> /dev/null || make check -j1 -k + } + + package() { +@@ -658,7 +673,8 @@ package() { + + export PATH=${pkgdir}${_qt5_prefix}/bin:${srcdir}/${CARCH}/qtbase/bin:${srcdir}/${CARCH}/qtbase/lib:${PATH} + +- ${_make} install ++ echo "Packaging..." ++ ${_make} install &> /dev/null || ${_make} install + if [ "$_build_tools" == "yes" ]; then + if [ "$_make_docs" == "yes" ]; then + make docs +@@ -707,10 +723,10 @@ package() { + if [ "${_variant}" = "-static" ]; then + find "${pkgdir}${_qt5_prefix}/lib" -type f -name '*.cmake' \ + -exec sed -i -e "s|${MINGW_PREFIX_WIN}|${PKGDIR_QT_PREFIX_WIN}/..|g" {} \; +- ++ + find "${pkgdir}${_qt5_prefix}/share/qt5" -type f \( -name '*.pri' -o -name '*.prl' \) \ +- -exec sed -i -e "s|${MINGW_PREFIX_WIN}|${PKGDIR_QT_PREFIX_WIN}/..|g" {} \; +- ++ -exec sed -i -e "s|${MINGW_PREFIX_WIN}|${PKGDIR_QT_PREFIX_WIN}/..|g" {} \; ++ + find "${pkgdir}${_qt5_prefix}/lib" -type f \( -name '*.pri' -o -name '*.prl' \) \ + -exec sed -i -e "s|${MINGW_PREFIX_WIN}|${PKGDIR_QT_PREFIX_WIN}/..|g" {} \; + fi +diff --git a/mingw-w64-qt5/qt5-x86_64.install b/mingw-w64-qt5/qt5-x86_64.install +index 8aa02a53a..07ab83199 100644 +--- a/mingw-w64-qt5/qt5-x86_64.install ++++ b/mingw-w64-qt5/qt5-x86_64.install +@@ -1,7 +1,7 @@ + post_install() { +- if [ -f "mingw64/bin/qmake.exe" ]; then +- cd mingw64/bin +- ./qtbinpatcher --verbose --nobackup ++ if [ -f "mingw64/opt/qt5alst/bin/qmake.exe" ]; then ++ cd mingw64/opt/qt5alst/bin ++ /mingw64/bin/qtbinpatcher.exe --verbose --nobackup + cd - + fi + } diff --git a/push-release.sh b/push-release.sh new file mode 100755 index 0000000..78a41aa --- /dev/null +++ b/push-release.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -e +cd "$(dirname -- "$0")" + +. versions + +VER="$QT5_BUILD_QT" +SUBVER="$(git tag | sort -Vr | grep -Po "${VER//./\\.}-\K\d+" | head -1)" +if [[ -z $SUBVER ]] +then + SUBVER=0 +else + SUBVER=$(($SUBVER + 1)) +fi +NEW_TAG="$VER-$SUBVER" + +git tag -s -a "$NEW_TAG" -m "$NEW_TAG" +git push --follow-tags diff --git a/qtbase.patch b/qtbase.patch new file mode 100644 index 0000000..33d348e --- /dev/null +++ b/qtbase.patch @@ -0,0 +1,19 @@ +diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp +index c9c3172304..8767faec80 100644 +--- a/src/network/access/qhttpnetworkreply.cpp ++++ b/src/network/access/qhttpnetworkreply.cpp +@@ -490,8 +490,12 @@ qint64 QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket) + + // is this a valid reply? + if (fragment.length() == 5 && !fragment.startsWith("HTTP/")) { +- fragment.clear(); +- return -1; ++ if(fragment.startsWith("ICY ")) { ++ fragment.replace("ICY ", "HTTP/1.1 "); ++ } else { ++ fragment.clear(); ++ return -1; ++ } + } + } while (haveRead == 1); + diff --git a/qtdeclarative.patch b/qtdeclarative.patch new file mode 100644 index 0000000..9f18e5a --- /dev/null +++ b/qtdeclarative.patch @@ -0,0 +1,50 @@ +diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp +index bfc9f4c76..ff2d7c2df 100644 +--- a/src/quick/items/qquicktextedit.cpp ++++ b/src/quick/items/qquicktextedit.cpp +@@ -2788,6 +2788,33 @@ void QQuickTextEdit::insert(int position, const QString &text) + d->control->updateCursorRectangle(false); + } + ++/*! ++ \qmlmethod QtQuick::TextEdit::replace(int start, int end, string text) ++ ++ Removes the section of text that is between the \a start and \a end positions from the TextEdit ++ and replaces it with the \a text. ++*/ ++void QQuickTextEdit::replace(int start, int end, const QString &text) ++{ ++ Q_D(QQuickTextEdit); ++ start = qBound(0, start, d->document->characterCount() - 1); ++ end = qBound(0, end, d->document->characterCount() - 1); ++ QTextCursor cursor(d->document); ++ cursor.setPosition(start, QTextCursor::MoveAnchor); ++ cursor.setPosition(end, QTextCursor::KeepAnchor); ++ d->richText = d->richText || (d->format == AutoText && Qt::mightBeRichText(text)); ++ if (d->richText) { ++#if QT_CONFIG(texthtmlparser) ++ cursor.insertHtml(text); ++#else ++ cursor.insertText(text); ++#endif ++ } else { ++ cursor.insertText(text); ++ } ++ d->control->updateCursorRectangle(false); ++} ++ + /*! + \qmlmethod string QtQuick::TextEdit::remove(int start, int end) + +diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h +index 7a847ffea..d6cc7dbb8 100644 +--- a/src/quick/items/qquicktextedit_p.h ++++ b/src/quick/items/qquicktextedit_p.h +@@ -360,6 +360,7 @@ public Q_SLOTS: + void undo(); + void redo(); + void insert(int position, const QString &text); ++ void replace(int start, int end, const QString &text); + void remove(int start, int end); + Q_REVISION(2) void append(const QString &text); + Q_REVISION(7) void clear(); diff --git a/relpc.py b/relpc.py new file mode 100755 index 0000000..294a7fc --- /dev/null +++ b/relpc.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 + +import os +import re +import shutil +import sys +import tempfile + + +def find_files(root_dir): + for root, dirs, files in os.walk(root_dir): + for file in files: + if file.endswith(".pc"): + yield root + "/" + file + + +def read_lines(filename): + with open(filename) as f: + for line in f: + yield line + + +def generate_updated_file(filename): + with tempfile.NamedTemporaryFile(mode="w", delete=False) as f: + for line in read_lines(filename): + m = re.search(r"^(\s*prefix\s*=\s*)([^$]+)$", line) + if m: + prefix = m.group(2).rstrip() + file_dir = os.path.dirname(filename) + rel_dir = os.path.relpath(prefix, file_dir) + if rel_dir == ".": + new_prefix = "${pcfiledir}" + else: + new_prefix = "${pcfiledir}/" + rel_dir + new_line = m.group(1) + new_prefix + "\n" + else: + new_line = line + f.write(new_line) + return f.name + + +def patch_file(filename): + patched_filename = generate_updated_file(filename) + shutil.move(patched_filename, filename) + + +def patch_all_files(root_dir): + for filename in find_files(root_dir): + patch_file(filename) + + +if __name__ == "__main__": + root_dir = sys.argv[1] + patch_all_files(root_dir) diff --git a/versions b/versions new file mode 100644 index 0000000..c99e486 --- /dev/null +++ b/versions @@ -0,0 +1,31 @@ +# Qt +# https://code.qt.io/cgit/qt/qt5.git/refs/ +QT5_BUILD_QT=v5.13.2 + +# MSYS2 git hash +# https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-qt5 +QT5_BUILD_MSYSGITHASH=5cf8707963ac05c22ca58bd975ee4ed07e4dd714 + +# Qbs +# https://code.qt.io/cgit/qbs/qbs.git/refs/ +QT5_BUILD_QBS=v1.15.0 + +# Quazip +# https://github.com/stachenov/quazip/tags +QT5_BUILD_QUAZIP=v0.8.1 + +# Extended DBus for Qt +# https://github.com/nemomobile/qtdbusextended/tags +QT5_BUILD_QTDBUSEXTENDED=0.0.3 + +# Qt and QML MPRIS interface and adaptor +# https://git.sailfishos.org/mer-core/qtmpris/-/tags +QT5_BUILD_QTMPRIS=1.0.2 + +# KDE Extra CMake Modules +# https://github.com/KDE/extra-cmake-modules/tags +QT5_BUILD_KDECMAKEEXTRAMODULES=v5.68.0 + +# KDE Syntax Highlighting +# https://github.com/KDE/syntax-highlighting/tags +QT5_BUILD_KSYNTAXHIGHLIGHTING="$QT5_BUILD_KDECMAKEEXTRAMODULES"