From 0aea9ee163552d6c677de6e7a0058d1ce728b086 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Apr 04 2020 18:56:31 +0000 Subject: Initial packaging of wxWidgets 3.1.x (dev version) (#1714714) --- diff --git a/.gitignore b/.gitignore index ba5fb67..4e8b931 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -wxGTK-2.8.11.tar.bz2 -/wxGTK-2.8.12.tar.bz2 +/wxWidgets-3.1.3.tar.bz2 diff --git a/disable-tests-failing-mock.patch b/disable-tests-failing-mock.patch new file mode 100644 index 0000000..372bb7a --- /dev/null +++ b/disable-tests-failing-mock.patch @@ -0,0 +1,21 @@ +diff -up wxWidgets-3.1.3/tests/filename/filenametest.cpp.mock wxWidgets-3.1.3/tests/filename/filenametest.cpp +--- wxWidgets-3.1.3/tests/filename/filenametest.cpp.mock 2019-10-27 13:41:42.000000000 -0400 ++++ wxWidgets-3.1.3/tests/filename/filenametest.cpp 2020-03-04 20:04:17.756175644 -0500 +@@ -756,7 +756,7 @@ void FileNameTestCase::TestExists() + // These files are only guaranteed to exist under Linux. + // No need for wxFILE_EXISTS_NO_FOLLOW here; wxFILE_EXISTS_SYMLINK implies it + CPPUNIT_ASSERT( wxFileName::Exists("/proc/self", wxFILE_EXISTS_SYMLINK) ); +- CPPUNIT_ASSERT( wxFileName::Exists("/dev/log", wxFILE_EXISTS_SOCKET) ); ++ //CPPUNIT_ASSERT( wxFileName::Exists("/dev/log", wxFILE_EXISTS_SOCKET) ); + #endif // __LINUX__ + #ifndef __VMS + wxString fifo = dirTemp.GetPath() + "/fifo"; +@@ -1057,7 +1057,7 @@ TEST_CASE("wxFileName::GetSizeSpecial", + { + wxULongLong size = wxFileName::GetSize("/proc/kcore"); + INFO( "size of /proc/kcore=" << size ); +- CHECK( size > 0 ); ++ //CHECK( size > 0 ); + + // All files in /sys seem to have size of 4KiB currently. + CHECK( wxFileName::GetSize("/sys/power/state") == 4096 ); diff --git a/sources b/sources index d3fa5dd..d8cccb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08f81ab60647308058f6ce99712b14f8 wxGTK-2.8.12.tar.bz2 +SHA512 (wxWidgets-3.1.3.tar.bz2) = d19305c96f1a382ec74549f69d6a7c61ecd0abac383623c308c45f0168c670c15262efc4fb64c14fa9d1fdb3579f19abdb5c8247ead72dc926342e586d7b4532 diff --git a/update-license-text.patch b/update-license-text.patch new file mode 100644 index 0000000..834a2d2 --- /dev/null +++ b/update-license-text.patch @@ -0,0 +1,940 @@ +From 8886f47ee444decae1b11cb61317946ab77f984b Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Thu, 26 Mar 2020 19:50:13 -0400 +Subject: [PATCH] Update GPL and LGPL license texts to the latest versions + +This corrects the outdated FSF address and reformats the text slightly. + +References: +https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +https://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt +--- + docs/gpl.txt | 32 +-- + docs/lgpl.txt | 756 ++++++++++++++++++++++++-------------------------- + 2 files changed, 376 insertions(+), 412 deletions(-) + +diff --git a/docs/gpl.txt b/docs/gpl.txt +index b8cf3a1ab2b..d159169d105 100644 +--- a/docs/gpl.txt ++++ b/docs/gpl.txt +@@ -1,12 +1,12 @@ +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 675 Mass Ave, Cambridge, MA 02139, USA ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by +-the GNU Library General Public License instead.) You can apply it to ++the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not +@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all. + The precise terms and conditions for copying, distribution and + modification follow. + +- GNU GENERAL PUBLIC LICENSE ++ GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +@@ -277,9 +277,9 @@ 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. + +- END OF TERMS AND CONDITIONS ++ END OF TERMS AND CONDITIONS + +- Appendix: How to Apply These Terms to Your New Programs ++ 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 +@@ -291,7 +291,7 @@ convey 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) 19yy ++ 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 +@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. + 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ 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. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + +- Gnomovision version 69, Copyright (C) 19yy name of author ++ Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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. +@@ -335,5 +335,5 @@ necessary. Here is a sample; alter the names: + This 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 Library General ++library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. +diff --git a/docs/lgpl.txt b/docs/lgpl.txt +index 12e440211e0..5bc8fb2c8f7 100644 +--- a/docs/lgpl.txt ++++ b/docs/lgpl.txt +@@ -1,171 +1,155 @@ +- +- GNU LIBRARY GENERAL PUBLIC LICENSE +- ================================== +- Version 2, June 1991 ++ GNU LIBRARY GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. +- 675 Mass Ave, Cambridge, MA 02139, USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + [This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + +- Preamble +- +-The licenses for most software are designed to take away your +-freedom to share and change it. By contrast, the GNU General +-Public Licenses are intended to guarantee your freedom to share +-and change free software--to make sure the software is free for +-all its users. +- +-This license, the Library General Public License, applies to +-some specially designated Free Software Foundation software, and +-to any other libraries whose authors decide to use it. You can +-use it for your libraries, 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 this service 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 make restrictions that forbid +-anyone to deny you these rights or to ask you to surrender the +-rights. These restrictions translate to certain responsibilities +-for you if you distribute copies of the library, or if you +-modify it. +- +-For example, if you distribute copies of the library, whether +-gratis or for a fee, you must give the recipients all the rights +-that we gave you. You must make sure that they, too, receive or +-can get the source code. If you link a program with the +-library, you must provide complete object files to the +-recipients so that they can relink them with the library, after +-making changes to the library and recompiling it. And you must +-show them these terms so they know their rights. +- +-Our method of protecting your rights has two steps: (1) +-copyright the library, and (2) offer you this license which +-gives you legal permission to copy, distribute and/or modify the +-library. +- +-Also, for each distributor's protection, we want to make certain +-that everyone understands that there is no warranty for this +-free library. If the library is modified by someone else and +-passed on, we want its recipients to know that what they have is +-not the original version, so that any problems introduced by +-others will not reflect on the original authors' reputations. +- +-Finally, any free program is threatened constantly by software +-patents. We wish to avoid the danger that companies +-distributing free software will individually obtain patent +-licenses, thus in effect transforming the program into +-proprietary software. To prevent this, we have made it clear +-that any patent must be licensed for everyone's free use or not +-licensed at all. +- +-Most GNU software, including some libraries, is covered by the +-ordinary GNU General Public License, which was designed for +-utility programs. This license, the GNU Library General Public +-License, applies to certain designated libraries. This license +-is quite different from the ordinary one; be sure to read it in +-full, and don't assume that anything in it is the same as in the +-ordinary license. +- +-The reason we have a separate public license for some libraries +-is that they blur the distinction we usually make between +-modifying or adding to a program and simply using it. Linking a +-program with a library, without changing the library, is in some +-sense simply using the library, and is analogous to running a +-utility program or application program. However, in a textual +-and legal sense, the linked executable is a combined work, a +-derivative of the original library, and the ordinary General +-Public License treats it as such. +- +-Because of this blurred distinction, using the ordinary General +-Public License for libraries did not effectively promote +-software sharing, because most developers did not use the +-libraries. We concluded that weaker conditions might promote +-sharing better. +- +-However, unrestricted linking of non-free programs would deprive +-the users of those programs of all benefit from the free status +-of the libraries themselves. This Library General Public +-License is intended to permit developers of non-free programs to +-use free libraries, while preserving your freedom as a user of +-such programs to change the free libraries that are incorporated +-in them. (We have not seen how to achieve this as regards +-changes in header files, but we have achieved it as regards +-changes in the actual functions of the Library.) The hope is +-that this will lead to faster development of free libraries. +- +-The precise terms and conditions for copying, distribution and +-modification follow. Pay close attention to the difference +-between a "work based on the library" and a "work that uses the +-library". The former contains code derived from the library, +-while the latter only works together with the library. +- +-Note that it is possible for a library to be covered by the +-ordinary General Public License rather than by this special one. +- +- GNU LIBRARY GENERAL PUBLIC LICENSE +- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +- +-0. This License Agreement applies to any software library which +-contains a notice placed by the copyright holder or other +-authorized party saying it may be distributed under the terms of +-this Library General Public License (also called "this +-License"). Each licensee is addressed as "you". +- +-A "library" means a collection of software functions and/or data +-prepared so as to be conveniently linked with application +-programs (which use some of those functions and data) to form +-executables. +- +-The "Library", below, refers to any such software library or +-work which has been distributed under these terms. A "work +-based on the Library" means either the Library or any derivative +-work under copyright law: that is to say, a work containing the +-Library or a portion of it, either verbatim or with +-modifications and/or translated straightforwardly into another +-language. (Hereinafter, translation is included without +-limitation in the term "modification".) +- +-"Source code" for a work means the preferred form of the work +-for making modifications to it. For a library, complete source +-code means all the source code for all modules it contains, plus +-any associated interface definition files, plus the scripts used +-to control compilation and installation of the library. +- +-Activities other than copying, distribution and modification are +-not covered by this License; they are outside its scope. The +-act of running a program using the Library is not restricted, +-and output from such a program is covered only if its contents +-constitute a work based on the Library (independent of the use +-of the Library in a tool for writing it). Whether that is true +-depends on what the Library does and what the program that uses +-the Library does. +- +-1. You may copy and distribute verbatim copies of the Library's +-complete source code as you receive it, in any medium, provided +-that you conspicuously and appropriately publish on each copy an +-appropriate copyright notice and disclaimer of warranty; keep +-intact all the notices that refer to this License and to the +-absence of any warranty; and distribute a copy of this License +-along with the Library. +- +-You may charge a fee for the physical act of transferring a +-copy, and you may at your option offer warranty protection in +-exchange for a fee. +- +-2. You may modify your copy or copies of the Library or any +-portion of it, thus forming a work based on the Library, and +-copy and distribute such modifications or work under the terms +-of Section 1 above, provided that you also meet all of these +-conditions: ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++Licenses are intended to guarantee your freedom to share and change ++free software--to make sure the software is free for all its users. ++ ++ This license, the Library General Public License, applies to some ++specially designated Free Software Foundation software, and to any ++other libraries whose authors decide to use it. You can use it for ++your libraries, 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 ++this service 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 make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if ++you distribute copies of the library, or if you modify it. ++ ++ For example, if you distribute copies of the library, whether gratis ++or for a fee, you must give the recipients all the rights that we gave ++you. You must make sure that they, too, receive or can get the source ++code. If you link a program with the library, you must provide ++complete object files to the recipients so that they can relink them ++with the library, after making changes to the library and recompiling ++it. And you must show them these terms so they know their rights. ++ ++ Our method of protecting your rights has two steps: (1) copyright ++the library, and (2) offer you this license which gives you legal ++permission to copy, distribute and/or modify the library. ++ ++ Also, for each distributor's protection, we want to make certain ++that everyone understands that there is no warranty for this free ++library. If the library is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original ++version, so that any problems introduced by others will not reflect on ++the original authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that companies distributing free ++software will individually obtain patent licenses, thus in effect ++transforming the program into proprietary software. To prevent this, ++we have made it clear that any patent must be licensed for everyone's ++free use or not licensed at all. ++ ++ Most GNU software, including some libraries, is covered by the ordinary ++GNU General Public License, which was designed for utility programs. This ++license, the GNU Library General Public License, applies to certain ++designated libraries. This license is quite different from the ordinary ++one; be sure to read it in full, and don't assume that anything in it is ++the same as in the ordinary license. ++ ++ The reason we have a separate public license for some libraries is that ++they blur the distinction we usually make between modifying or adding to a ++program and simply using it. Linking a program with a library, without ++changing the library, is in some sense simply using the library, and is ++analogous to running a utility program or application program. However, in ++a textual and legal sense, the linked executable is a combined work, a ++derivative of the original library, and the ordinary General Public License ++treats it as such. ++ ++ Because of this blurred distinction, using the ordinary General ++Public License for libraries did not effectively promote software ++sharing, because most developers did not use the libraries. We ++concluded that weaker conditions might promote sharing better. ++ ++ However, unrestricted linking of non-free programs would deprive the ++users of those programs of all benefit from the free status of the ++libraries themselves. This Library General Public License is intended to ++permit developers of non-free programs to use free libraries, while ++preserving your freedom as a user of such programs to change the free ++libraries that are incorporated in them. (We have not seen how to achieve ++this as regards changes in header files, but we have achieved it as regards ++changes in the actual functions of the Library.) The hope is that this ++will lead to faster development of free libraries. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. Pay close attention to the difference between a ++"work based on the library" and a "work that uses the library". The ++former contains code derived from the library, while the latter only ++works together with the library. ++ ++ Note that it is possible for a library to be covered by the ordinary ++General Public License rather than by this special one. ++ ++ GNU LIBRARY GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License Agreement applies to any software library which ++contains a notice placed by the copyright holder or other authorized ++party saying it may be distributed under the terms of this Library ++General Public License (also called "this License"). Each licensee is ++addressed as "you". ++ ++ A "library" means a collection of software functions and/or data ++prepared so as to be conveniently linked with application programs ++(which use some of those functions and data) to form executables. ++ ++ The "Library", below, refers to any such software library or work ++which has been distributed under these terms. A "work based on the ++Library" means either the Library or any derivative work under ++copyright law: that is to say, a work containing the Library or a ++portion of it, either verbatim or with modifications and/or translated ++straightforwardly into another language. (Hereinafter, translation is ++included without limitation in the term "modification".) ++ ++ "Source code" for a work means the preferred form of the work for ++making modifications to it. For a library, complete source code means ++all the source code for all modules it contains, plus any associated ++interface definition files, plus the scripts used to control compilation ++and installation of the library. ++ ++ Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running a program using the Library is not restricted, and output from ++such a program is covered only if its contents constitute a work based ++on the Library (independent of the use of the Library in a tool for ++writing it). Whether that is true depends on what the Library does ++and what the program that uses the Library does. ++ ++ 1. You may copy and distribute verbatim copies of the Library's ++complete source code as you receive it, in any medium, provided that ++you conspicuously and appropriately publish on each copy an ++appropriate copyright notice and disclaimer of warranty; keep intact ++all the notices that refer to this License and to the absence of any ++warranty; and distribute a copy of this License along with the ++Library. ++ ++ You may charge a fee for the physical act of transferring a copy, ++and you may at your option offer warranty protection in exchange for a ++fee. ++ ++ 2. You may modify your copy or copies of the Library or any portion ++of it, thus forming a work based on the Library, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + +@@ -191,108 +175,100 @@ conditions: + root function must still compute square roots.) + + These requirements apply to the modified work as a whole. If +-identifiable sections of that work are not derived from the +-Library, and can be reasonably considered independent and +-separate works in themselves, then this License, and its terms, +-do not apply to those sections when you distribute them as +-separate works. But when you distribute the same sections as +-part of a whole which is a work based on the Library, the +-distribution of the whole must be on the terms of this License, +-whose permissions for other licensees extend to the entire +-whole, and thus to each and every part regardless of who wrote ++identifiable sections of that work are not derived from the Library, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Library, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote + it. + +-Thus, it is not the intent of this section to claim rights or +-contest your rights to work written entirely by you; rather, the +-intent is to exercise the right to control the distribution of +-derivative or collective works based on the Library. +- +-In addition, mere aggregation of another work not based on the +-Library with the Library (or with a work based on the Library) +-on a volume of a storage or distribution medium does not bring +-the other work under the scope of this License. +- +-3. You may opt to apply the terms of the ordinary GNU General +-Public License instead of this License to a given copy of the +-Library. To do this, you must alter all the notices that refer +-to this License, so that they refer to the ordinary GNU General +-Public License, version 2, instead of to this License. (If a +-newer version than version 2 of the ordinary GNU General Public +-License has appeared, then you can specify that version instead +-if you wish.) Do not make any other change in these notices. +- +-Once this change is made in a given copy, it is irreversible for +-that copy, so the ordinary GNU General Public License applies to +-all subsequent copies and derivative works made from that copy. +- +-This option is useful when you wish to copy part of the code of ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Library. ++ ++In addition, mere aggregation of another work not based on the Library ++with the Library (or with a work based on the Library) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may opt to apply the terms of the ordinary GNU General Public ++License instead of this License to a given copy of the Library. To do ++this, you must alter all the notices that refer to this License, so ++that they refer to the ordinary GNU General Public License, version 2, ++instead of to this License. (If a newer version than version 2 of the ++ordinary GNU General Public License has appeared, then you can specify ++that version instead if you wish.) Do not make any other change in ++these notices. ++ ++ Once this change is made in a given copy, it is irreversible for ++that copy, so the ordinary GNU General Public License applies to all ++subsequent copies and derivative works made from that copy. ++ ++ This option is useful when you wish to copy part of the code of + the Library into a program that is not a library. + +-4. You may copy and distribute the Library (or a portion or +-derivative of it, under Section 2) in object code or executable +-form under the terms of Sections 1 and 2 above provided that you +-accompany it with the complete corresponding machine-readable +-source code, which must be distributed under the terms of +-Sections 1 and 2 above on a medium customarily used for software +-interchange. +- +-If distribution of object code is made by offering access to +-copy from a designated place, then offering equivalent access to +-copy the source code from the same place satisfies the +-requirement to distribute the source code, even though third +-parties are not compelled to copy the source along with the +-object code. +- +-5. A program that contains no derivative of any portion of the +-Library, but is designed to work with the Library by being +-compiled or linked with it, is called a "work that uses the +-Library". Such a work, in isolation, is not a derivative work +-of the Library, and therefore falls outside the scope of this +-License. +- +-However, linking a "work that uses the Library" with the Library +-creates an executable that is a derivative of the Library +-(because it contains portions of the Library), rather than a +-"work that uses the library". The executable is therefore +-covered by this License. Section 6 states terms for distribution +-of such executables. +- +-When a "work that uses the Library" uses material from a header +-file that is part of the Library, the object code for the work +-may be a derivative work of the Library even though the source +-code is not. Whether this is true is especially significant if +-the work can be linked without the Library, or if the work is +-itself a library. The threshold for this to be true is not +-precisely defined by law. +- +-If such an object file uses only numerical parameters, data +-structure layouts and accessors, and small macros and small +-inline functions (ten lines or less in length), then the use of +-the object file is unrestricted, regardless of whether it is +-legally a derivative work. (Executables containing this object +-code plus portions of the Library will still fall under Section +-6.) +- +-Otherwise, if the work is a derivative of the Library, you may +-distribute the object code for the work under the terms of +-Section 6. Any executables containing that work also fall under +-Section 6, whether or not they are linked directly with the +-Library itself. +- +-6. As an exception to the Sections above, you may also compile +-or link a "work that uses the Library" with the Library to +-produce a work containing portions of the Library, and +-distribute that work under terms of your choice, provided that +-the terms permit modification of the work for the customer's own +-use and reverse engineering for debugging such modifications. +- +-You must give prominent notice with each copy of the work that +-the Library is used in it and that the Library and its use are +-covered by this License. You must supply a copy of this +-License. If the work during execution displays copyright +-notices, you must include the copyright notice for the Library +-among them, as well as a reference directing the user to the +-copy of this License. Also, you must do one of these things: ++ 4. You may copy and distribute the Library (or a portion or ++derivative of it, under Section 2) in object code or executable form ++under the terms of Sections 1 and 2 above provided that you accompany ++it with the complete corresponding machine-readable source code, which ++must be distributed under the terms of Sections 1 and 2 above on a ++medium customarily used for software interchange. ++ ++ If distribution of object code is made by offering access to copy ++from a designated place, then offering equivalent access to copy the ++source code from the same place satisfies the requirement to ++distribute the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 5. A program that contains no derivative of any portion of the ++Library, but is designed to work with the Library by being compiled or ++linked with it, is called a "work that uses the Library". Such a ++work, in isolation, is not a derivative work of the Library, and ++therefore falls outside the scope of this License. ++ ++ However, linking a "work that uses the Library" with the Library ++creates an executable that is a derivative of the Library (because it ++contains portions of the Library), rather than a "work that uses the ++library". The executable is therefore covered by this License. ++Section 6 states terms for distribution of such executables. ++ ++ When a "work that uses the Library" uses material from a header file ++that is part of the Library, the object code for the work may be a ++derivative work of the Library even though the source code is not. ++Whether this is true is especially significant if the work can be ++linked without the Library, or if the work is itself a library. The ++threshold for this to be true is not precisely defined by law. ++ ++ If such an object file uses only numerical parameters, data ++structure layouts and accessors, and small macros and small inline ++functions (ten lines or less in length), then the use of the object ++file is unrestricted, regardless of whether it is legally a derivative ++work. (Executables containing this object code plus portions of the ++Library will still fall under Section 6.) ++ ++ Otherwise, if the work is a derivative of the Library, you may ++distribute the object code for the work under the terms of Section 6. ++Any executables containing that work also fall under Section 6, ++whether or not they are linked directly with the Library itself. ++ ++ 6. As an exception to the Sections above, you may also compile or ++link a "work that uses the Library" with the Library to produce a ++work containing portions of the Library, and distribute that work ++under terms of your choice, provided that the terms permit ++modification of the work for the customer's own use and reverse ++engineering for debugging such modifications. ++ ++ You must give prominent notice with each copy of the work that the ++Library is used in it and that the Library and its use are covered by ++this License. You must supply a copy of this License. If the work ++during execution displays copyright notices, you must include the ++copyright notice for the Library among them, as well as a reference ++directing the user to the copy of this License. Also, you must do one ++of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever +@@ -318,28 +294,27 @@ copy of this License. Also, you must do one of these things: + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + +-For an executable, the required form of the "work that uses the ++ For an executable, the required form of the "work that uses the + Library" must include any data and utility programs needed for +-reproducing the executable from it. However, as a special +-exception, the source code distributed need not include anything +-that is normally distributed (in either source or binary form) +-with the major components (compiler, kernel, and so on) of the +-operating system on which the executable runs, unless that +-component itself accompanies the executable. +- +-It may happen that this requirement contradicts the license ++reproducing the executable from it. However, as a special exception, ++the source code distributed need not include anything that is normally ++distributed (in either source or binary form) with the major ++components (compiler, kernel, and so on) of the operating system on ++which the executable runs, unless that component itself accompanies ++the executable. ++ ++ It may happen that this requirement contradicts the license + restrictions of other proprietary libraries that do not normally +-accompany the operating system. Such a contradiction means you +-cannot use both them and the Library together in an executable +-that you distribute. +- +-7. You may place library facilities that are a work based on the +-Library side-by-side in a single library together with other +-library facilities not covered by this License, and distribute +-such a combined library, provided that the separate distribution +-of the work based on the Library and of the other library +-facilities is otherwise permitted, and provided that you do +-these two things: ++accompany the operating system. Such a contradiction means you cannot ++use both them and the Library together in an executable that you ++distribute. ++ ++ 7. You may place library facilities that are a work based on the ++Library side-by-side in a single library together with other library ++facilities not covered by this License, and distribute such a combined ++library, provided that the separate distribution of the work based on ++the Library and of the other library facilities is otherwise ++permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library +@@ -350,108 +325,99 @@ these two things: + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + +-8. You may not copy, modify, sublicense, link with, or +-distribute the Library except as expressly provided under this +-License. Any attempt otherwise to copy, modify, sublicense, +-link with, or distribute the Library is void, and will +-automatically terminate your rights under this License. +-However, parties who have received copies, or rights, from you +-under this License will not have their licenses terminated so +-long as such parties remain in full compliance. +- +-9. You are not required to accept this License, since you have +-not signed it. However, nothing else grants you permission to +-modify or distribute the Library or its derivative works. These +-actions are prohibited by law if you do not accept this +-License. Therefore, by modifying or distributing the Library +-(or any work based on the Library), you indicate your acceptance +-of this License to do so, and all its terms and conditions for +-copying, distributing or modifying the Library or works based on +-it. +- +-10. Each time you redistribute the Library (or any work based on +-the Library), the recipient automatically receives a license +-from the original licensor to copy, distribute, link with or +-modify the Library subject to these terms and conditions. You +-may not impose any further restrictions on the recipients' +-exercise of the rights granted herein. You are not responsible +-for enforcing compliance by third parties to this License. +- +-11. If, as a consequence of a court judgment or allegation of +-patent infringement or for any other reason (not limited to +-patent issues), 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 distribute so as to satisfy +-simultaneously your obligations under this License and any other +-pertinent obligations, then as a consequence you may not +-distribute the Library at all. For example, if a patent license +-would not permit royalty-free redistribution of the Library by +-all those who receive copies directly or indirectly through you, +-then the only way you could satisfy both it and this License +-would be to refrain entirely from distribution of the Library. +- +-If any portion of this section is held invalid or unenforceable +-under any particular circumstance, the balance of the section is +-intended to apply, and the section as a whole is intended to +-apply in other circumstances. +- +-It is not the purpose of this section to induce you to infringe +-any patents or other property right claims or to contest +-validity of any such claims; this section has the sole purpose +-of protecting the integrity of the free software distribution +-system which is implemented by public license practices. Many +-people have made generous contributions to the wide range of +-software distributed through that system in reliance on +-consistent application of that system; it is up to the +-author/donor to decide if he or she is willing to distribute +-software through any other system and a licensee cannot impose +-that choice. +- +-This section is intended to make thoroughly clear what is +-believed to be a consequence of the rest of this License. +- +-12. If the distribution and/or use of the Library is restricted +-in certain countries either by patents or by copyrighted +-interfaces, the original copyright holder who places the Library +-under this License may add an explicit geographical distribution +-limitation excluding those countries, so that distribution is +-permitted only in or among countries not thus excluded. In such +-case, this License incorporates the limitation as if written in +-the body of this License. +- +-13. The Free Software Foundation may publish revised and/or new +-versions of the Library 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 +-Library specifies a version number of this License which applies +-to it and "any later version", you have the option of following +-the terms and conditions either of that version or of any later +-version published by the Free Software Foundation. If the +-Library does not specify a license version number, you may +-choose any version ever published by the Free Software +-Foundation. +- +-14. If you wish to incorporate parts of the Library into other +-free programs whose distribution conditions are incompatible +-with these, write to the author to ask for permission. For +-software which is copyrighted by the Free Software Foundation, +-write to the Free Software Foundation; we sometimes make +-exceptions for this. Our decision will be guided by the two +-goals of preserving the free status of all derivatives of our +-free software and of promoting the sharing and reuse of software +-generally. +- +- NO WARRANTY ++ 8. You may not copy, modify, sublicense, link with, or distribute ++the Library except as expressly provided under this License. Any ++attempt otherwise to copy, modify, sublicense, link with, or ++distribute the Library is void, and will automatically terminate your ++rights under this License. However, parties who have received copies, ++or rights, from you under this License will not have their licenses ++terminated so long as such parties remain in full compliance. ++ ++ 9. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Library or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Library (or any work based on the ++Library), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Library or works based on it. ++ ++ 10. Each time you redistribute the Library (or any work based on the ++Library), the recipient automatically receives a license from the ++original licensor to copy, distribute, link with or modify the Library ++subject to these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 11. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++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 ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Library at all. For example, if a patent ++license would not permit royalty-free redistribution of the Library by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Library. ++ ++If any portion of this section is held invalid or unenforceable under any ++particular circumstance, the balance of the section is intended to apply, ++and the section as a whole is intended to apply in other circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 12. If the distribution and/or use of the Library is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Library under this License may add ++an explicit geographical distribution limitation excluding those countries, ++so that distribution is permitted only in or among countries not thus ++excluded. In such case, this License incorporates the limitation as if ++written in the body of this License. ++ ++ 13. The Free Software Foundation may publish revised and/or new ++versions of the Library 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 Library ++specifies a version number of this License which applies to it and ++"any later version", you have the option of following the terms and ++conditions either of that version or of any later version published by ++the Free Software Foundation. If the Library does not specify a ++license version number, you may choose any version ever published by ++the Free Software Foundation. ++ ++ 14. If you wish to incorporate parts of the Library into other free ++programs whose distribution conditions are incompatible with these, ++write to the author to ask for permission. For software which is ++copyrighted by the Free Software Foundation, write to the Free ++Software Foundation; we sometimes make exceptions for this. Our ++decision will be guided by the two goals of preserving the free status ++of all derivatives of our free software and of promoting the sharing ++and reuse of software generally. ++ ++ NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, +-EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE ++OTHER PARTIES PROVIDE THE LIBRARY "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 + LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +@@ -460,29 +426,28 @@ THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY + AND/OR REDISTRIBUTE THE LIBRARY 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 ++FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR ++CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE + LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ++SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH ++DAMAGES. + +- END OF TERMS AND CONDITIONS ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Libraries + +- Appendix: How to Apply These Terms to Your New Libraries ++ If you develop a new library, and you want it to be of the greatest ++possible use to the public, we recommend making it free software that ++everyone can redistribute and change. You can do so by permitting ++redistribution under these terms (or, alternatively, under the terms of the ++ordinary General Public License). + +-If you develop a new library, and you want it to be of the +-greatest possible use to the public, we recommend making it free +-software that everyone can redistribute and change. You can do +-so by permitting redistribution under these terms (or, +-alternatively, under the terms of the ordinary General Public +-License). +- +-To apply these terms, attach the following notices to the +-library. It is safest to attach them to the start of each +-source file to most effectively convey the exclusion of +-warranty; and each file should have at least the "copyright" +-line and a pointer to where the full notice is found. ++ To apply these terms, attach the following notices to the library. It is ++safest to attach them to the start of each source file to most effectively ++convey 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) +@@ -498,8 +463,8 @@ line and a pointer to where the full notice is found. + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public +- License along with this library; if not, write to the Free +- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Also add information on how to contact you by electronic and paper mail. + +@@ -514,4 +479,3 @@ necessary. Here is a sample; alter the names: + Ty Coon, President of Vice + + That's all there is to it! +- diff --git a/wx-config b/wx-config index 35c0c7d..6f65808 100644 --- a/wx-config +++ b/wx-config @@ -5,6 +5,8 @@ # Usage: wx-config [--arch ] # +version=3.1 + if [ $# -ge 2 ]; then if [ $1 = "--arch" ]; then arch=$2 @@ -17,10 +19,10 @@ if [ -z $arch ]; then fi case $arch in - i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel) + i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel|riscv32) libdir=/usr/lib ;; - x86_64|ppc64|ppc64le|s390x|sparc64|aarch64|mips64*) + x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|mips64*|riscv64) libdir=/usr/lib64 ;; *) @@ -29,10 +31,16 @@ case $arch in ;; esac -wxconfig=$libdir/wx/config/gtk2-unicode-release-2.8 +wxconfig=$libdir/wx/config/gtk3-unicode-$version +if [ ! -f $wxconfig ]; then + wxconfig=$libdir/wx/config/gtk2-unicode-$version +fi # special case when using 32-bit userspace and 64-bit kernel if [ ! -f $wxconfig -a \( $arch = ppc64 -o $arch = sparc64 \) ]; then - wxconfig=/usr/lib/wx/config/gtk2-unicode-release-2.8 + wxconfig=/usr/lib/wx/config/gtk3-unicode-$version + if [ ! -f $wxconfig ]; then + wxconfig=/usr/lib/wx/config/gtk2-unicode-$version + fi fi if [ -x $wxconfig ]; then diff --git a/wxGTK-2.8.12-abicheck.patch b/wxGTK-2.8.12-abicheck.patch deleted file mode 100644 index 97055ba..0000000 --- a/wxGTK-2.8.12-abicheck.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp ---- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 -+++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 -@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con - msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); - -- wxLogFatalError(msg.c_str()); -- -- // normally wxLogFatalError doesn't return -- return false; -+ wxLogWarning(msg.c_str()); - } - #undef wxCMP - diff --git a/wxGTK-2.8.12-char.patch b/wxGTK-2.8.12-char.patch deleted file mode 100644 index 1d39a7b..0000000 --- a/wxGTK-2.8.12-char.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -up wxGTK-2.8.12/src/gtk/bdiag.xbm.char wxGTK-2.8.12/src/gtk/bdiag.xbm ---- wxGTK-2.8.12/src/gtk/bdiag.xbm.char 2011-03-22 13:19:01.000000000 +0100 -+++ wxGTK-2.8.12/src/gtk/bdiag.xbm 2016-02-20 10:38:50.000000000 +0100 -@@ -1,6 +1,6 @@ - #define bdiag_width 16 - #define bdiag_height 16 --static char bdiag_bits[] = { -+static unsigned char bdiag_bits[] = { - 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, - 0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, - 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01}; -diff -up wxGTK-2.8.12/src/gtk/cdiag.xbm.char wxGTK-2.8.12/src/gtk/cdiag.xbm ---- wxGTK-2.8.12/src/gtk/cdiag.xbm.char 2011-03-22 13:19:01.000000000 +0100 -+++ wxGTK-2.8.12/src/gtk/cdiag.xbm 2016-02-20 10:38:50.000000000 +0100 -@@ -1,6 +1,6 @@ - #define cdiag_width 16 - #define cdiag_height 16 --static char cdiag_bits[] = { -+static unsigned char cdiag_bits[] = { - 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, - 0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, - 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81}; -diff -up wxGTK-2.8.12/src/gtk/cross.xbm.char wxGTK-2.8.12/src/gtk/cross.xbm ---- wxGTK-2.8.12/src/gtk/cross.xbm.char 2011-03-22 13:19:01.000000000 +0100 -+++ wxGTK-2.8.12/src/gtk/cross.xbm 2016-02-20 10:38:50.000000000 +0100 -@@ -1,6 +1,6 @@ - #define cross_width 15 - #define cross_height 15 --static char cross_bits[] = { -+static unsigned char cross_bits[] = { - 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, - 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, - 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10}; -diff -up wxGTK-2.8.12/src/gtk/dcclient.cpp.char wxGTK-2.8.12/src/gtk/dcclient.cpp ---- wxGTK-2.8.12/src/gtk/dcclient.cpp.char 2016-02-20 10:38:50.000000000 +0100 -+++ wxGTK-2.8.12/src/gtk/dcclient.cpp 2016-02-20 10:49:11.000000000 +0100 -@@ -427,13 +427,24 @@ void wxWindowDC::SetUpDC() - - if (!hatch_bitmap) - { -+#define CREATE_FROM_XBM_DATA(name) \ -+ gdk_bitmap_create_from_data \ -+ ( \ -+ NULL, \ -+ reinterpret_cast(name ## _bits), \ -+ name ## _width, \ -+ name ## _height \ -+ ) -+ - hatch_bitmap = hatches; -- hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height ); -- hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height ); -- hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height ); -- hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height ); -- hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height ); -- hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height ); -+ hatch_bitmap[0] = CREATE_FROM_XBM_DATA(bdiag); -+ hatch_bitmap[1] = CREATE_FROM_XBM_DATA(cdiag); -+ hatch_bitmap[2] = CREATE_FROM_XBM_DATA(fdiag); -+ hatch_bitmap[3] = CREATE_FROM_XBM_DATA(cross); -+ hatch_bitmap[4] = CREATE_FROM_XBM_DATA(horiz); -+ hatch_bitmap[5] = CREATE_FROM_XBM_DATA(verti); -+ -+#undef CREATE_FROM_XBM_DATA - } - } - -diff -up wxGTK-2.8.12/src/gtk/fdiag.xbm.char wxGTK-2.8.12/src/gtk/fdiag.xbm ---- wxGTK-2.8.12/src/gtk/fdiag.xbm.char 2011-03-22 13:19:01.000000000 +0100 -+++ wxGTK-2.8.12/src/gtk/fdiag.xbm 2016-02-20 10:38:50.000000000 +0100 -@@ -1,6 +1,6 @@ - #define fdiag_width 16 - #define fdiag_height 16 --static char fdiag_bits[] = { -+static unsigned char fdiag_bits[] = { - 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, - 0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, - 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80}; -diff -up wxGTK-2.8.12/src/gtk/horiz.xbm.char wxGTK-2.8.12/src/gtk/horiz.xbm ---- wxGTK-2.8.12/src/gtk/horiz.xbm.char 2011-03-22 13:19:01.000000000 +0100 -+++ wxGTK-2.8.12/src/gtk/horiz.xbm 2016-02-20 10:38:50.000000000 +0100 -@@ -1,6 +1,6 @@ - #define horiz_width 15 - #define horiz_height 15 --static char horiz_bits[] = { -+static unsigned char horiz_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00}; -diff -up wxGTK-2.8.12/src/gtk/verti.xbm.char wxGTK-2.8.12/src/gtk/verti.xbm ---- wxGTK-2.8.12/src/gtk/verti.xbm.char 2011-03-22 13:19:02.000000000 +0100 -+++ wxGTK-2.8.12/src/gtk/verti.xbm 2016-02-20 10:38:50.000000000 +0100 -@@ -1,6 +1,6 @@ - #define verti_width 15 - #define verti_height 15 --static char verti_bits[] = { -+static unsigned char verti_bits[] = { - 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, - 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, - 0x84, 0x10, 0x84, 0x10, 0x84, 0x10}; diff --git a/wxGTK-2.8.12-test.patch b/wxGTK-2.8.12-test.patch deleted file mode 100644 index 2664872..0000000 --- a/wxGTK-2.8.12-test.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- wxGTK-2.8.12.orig/tests/test.cpp 2011-03-22 13:18:05.000000000 +0100 -+++ wxGTK-2.8.12/tests/test.cpp 2011-04-14 10:35:44.000000000 +0200 -@@ -86,11 +86,11 @@ void TestApp::OnInitCmdLine(wxCmdLinePar - { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"), - _T("list the test cases, do not run them"), - wxCMD_LINE_VAL_NONE, 0 }, -- { wxCMD_LINE_SWITCH, "d", "detail", -- "print the test case names, run them (not implemented)", -+ { wxCMD_LINE_SWITCH, _T("d"), _T("detail"), -+ _T("print the test case names, run them (not implemented)"), - wxCMD_LINE_VAL_NONE, 0 }, -- { wxCMD_LINE_SWITCH, "t", "timing", -- "print names and mesure running time of individual test, run them (not implemented)", -+ { wxCMD_LINE_SWITCH, _T("t"), _T("timing"), -+ _T("print names and mesure running time of individual test, run them (not implemented)"), - wxCMD_LINE_VAL_NONE, 0 }, - { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING, - wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE }, diff --git a/wxGTK-3.0.3-abicheck.patch b/wxGTK-3.0.3-abicheck.patch new file mode 100644 index 0000000..03ddcd5 --- /dev/null +++ b/wxGTK-3.0.3-abicheck.patch @@ -0,0 +1,14 @@ +--- wxWidgets-3.0.2/src/common/appbase.cpp.abicheck 2015-05-28 12:36:40.697163073 +0900 ++++ wxWidgets-3.0.2/src/common/appbase.cpp 2015-05-28 12:38:30.597154298 +0900 +@@ -762,10 +762,7 @@ + msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + + return true; diff --git a/wxGTK.spec b/wxGTK.spec index 1d6be69..a5ffc82 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,81 +1,141 @@ +%global srcname wxWidgets +%global wxbasename wxBase +%global gtk3dir bld_gtk3 +%global sover 3 + Name: wxGTK -Version: 2.8.12 -Release: 31%{?dist} -Summary: GTK2 port of the wxWidgets GUI library +Version: 3.1.3 +Release: 1%{?dist} +Summary: GTK port of the wxWidgets GUI library License: wxWidgets -Group: System Environment/Libraries -URL: http://www.wxwidgets.org/ -Source0: http://downloads.sf.net/wxwindows/%{name}-%{version}.tar.bz2 -Source1: wx-config -Patch0: %{name}-%{version}-test.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1200611 +URL: https://www.wxwidgets.org/ + +Source0: https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.bz2 +Source10: wx-config +# https://bugzilla.redhat.com/show_bug.cgi?id=1225148 # remove abort when ABI check fails -Patch1: %{name}-%{version}-abicheck.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1308243 -# backported from https://github.com/wxWidgets/wxWidgets/commit/1780a38b7bc9a9c04d33775a3176fe8516465f50 -Patch2: %{name}-%{version}-char.patch +# Backport from wxGTK +Patch0: %{name}-3.0.3-abicheck.patch +Patch1: disable-tests-failing-mock.patch +Patch2: update-license-text.patch BuildRequires: gcc-c++ -BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 -BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: expat-devel, SDL-devel -BuildRequires: libGL-devel, libGLU-devel +BuildRequires: gtk3-devel +BuildRequires: webkit2gtk3-devel +BuildRequires: zlib-devel +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel +BuildRequires: libtiff-devel +BuildRequires: expat-devel +BuildRequires: SDL2-devel +BuildRequires: libGLU-devel BuildRequires: libSM-devel -BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10 +BuildRequires: gstreamer1-plugins-base-devel BuildRequires: GConf2-devel -BuildRequires: autoconf, gettext -#BuildRequires: cppunit-devel +BuildRequires: gettext +BuildRequires: cppunit-devel +BuildRequires: libmspack-devel +BuildRequires: doxygen +BuildRequires: graphviz -Requires: wxBase = %{version}-%{release} -Provides: bundled(scintilla) = 1.70 +Provides: %{srcname} = %{version}-%{release} +Provides: bundled(scintilla) = 3.7.2 +Requires: %{wxbasename}%{?_isa} = %{version}-%{release} +Requires: %{name}-i18n = %{version}-%{release} %description -wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + +%package -n %{wxbasename}-devel +Summary: Development files for the wxBase3 library +Requires: %{wxbasename}%{?_isa} = %{version}-%{release} +Requires(post): /usr/sbin/update-alternatives +Requires(postun): /usr/sbin/update-alternatives + +%description -n %{wxbasename}-devel +This package include files needed to link with the wxBase3 library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. %package devel -Group: Development/Libraries -Summary: Development files for the wxGTK2 library -Requires: %{name} = %{version}-%{release} +Summary: Development files for the wxGTK library +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-gl = %{version}-%{release} Requires: %{name}-media = %{version}-%{release} -Requires: wxBase = %{version}-%{release} -Requires: gtk2-devel -Requires: libGL-devel, libGLU-devel -Requires: bakefile -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires: %{name}-webview = %{version}-%{release} +Requires: %{wxbasename} = %{version}-%{release} +Requires: %{wxbasename}-devel%{?_isa} = %{version}-%{release} +Requires: gtk3-devel +Requires: libGLU-devel +Provides: %{srcname}-devel = %{version}-%{release} %description devel -This package include files needed to link with the wxGTK2 library. +This package include files needed to link with the wxGTK library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. %package gl Summary: OpenGL add-on for the wxWidgets library -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description gl OpenGL (a 3D graphics API) add-on for the wxWidgets library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + +%package i18n +Summary: i18n message catalogs for the wxWidgets library +BuildArch: noarch + +%description i18n +i18n message catalogs for the wxWidgets library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. %package media Summary: Multimedia add-on for the wxWidgets library -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description media Multimedia add-on for the wxWidgets library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + +%package webview +Summary: WebView add-on for the wxWidgets library +Requires: %{name}%{?_isa} = %{version}-%{release} -%package -n wxBase +%description webview +WebView add-on for the wxWidgets library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + +%package -n %{wxbasename} Summary: Non-GUI support classes from the wxWidgets library -Group: System Environment/Libraries -%description -n wxBase +%description -n %{wxbasename} Every wxWidgets application must link against this library. It contains mandatory classes that any wxWidgets code depends on (like wxString) and portability classes that abstract differences between platforms. wxBase can @@ -83,588 +143,156 @@ be used to develop console mode applications -- it does not require any GUI libraries or the X Window System. +%package docs +Summary: Documentation for the wxGTK library +Requires: %{name} = %{version}-%{release} +Provides: %{srcname}-docs = %{version}-%{release} +BuildArch: noarch + +%description docs +This package provides documentation for the %{srcname} library. + + %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .test -%patch1 -p1 -b .abicheck -%patch2 -p1 -b .char +%autosetup -n %{srcname}-%{version} -p1 -sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure +# patch some installed files to avoid conflicts with 2.8.* +sed -i -e 's|aclocal)|aclocal/wxwin31.m4)|' Makefile.in +sed -i -e 's|wxstd.mo|wxstd31.mo|' Makefile.in +sed -i -e 's|wxmsw.mo|wxmsw31.mo|' Makefile.in # fix plugin dir for 64-bit +sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp -# fix permissions for sources -chmod a-x include/wx/{msgout.h,dcgraph.h,graphics.h} -chmod a-x src/common/msgout.cpp - %build +%global _configure ../configure -export GDK_USE_XFT=1 - -# this code dereferences type-punned pointers like there's no tomorrow. -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - -# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden -# (see OPTIMISE in configure). +mkdir %{gtk3dir} +pushd %{gtk3dir} %configure \ + --with-gtk=3 \ --with-opengl \ --with-sdl \ - --without-gnomeprint \ - --enable-shared \ - --enable-soname \ - --disable-optimise \ - --enable-debug_info \ + --with-libmspack \ --enable-intl \ - --enable-unicode \ - --enable-no_deps \ --disable-rpath \ - --enable-geometry \ - --enable-graphics_ctx \ - --enable-sound \ - --enable-mediactrl \ - --enable-display \ - --enable-timer \ - --enable-compat24 \ - --disable-catch_segvs + --enable-ipv6 -make %{?_smp_mflags} -make %{?_smp_mflags} -C contrib/src/stc -make %{?_smp_mflags} -C contrib/src/ogl -make %{?_smp_mflags} -C contrib/src/gizmos -make %{?_smp_mflags} -C contrib/src/svg +%make_build +popd -# Why isn't this this part of the main build? Need to investigate. -make %{?_smp_mflags} -C locale allmo +#Docs +WX_SKIP_DOXYGEN_VERSION_CHECK=1 docs/doxygen/regen.sh html +mv docs/doxygen/out/html . %install -%makeinstall - -%makeinstall -C contrib/src/stc -%makeinstall -C contrib/src/ogl -%makeinstall -C contrib/src/gizmos -%makeinstall -C contrib/src/svg - +pushd %{gtk3dir} +%make_install +popd # install our multilib-aware wrapper +##Remove installed rm %{buildroot}%{_bindir}/wx-config -install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/wx-config-2.0 +##Install new and symlink +install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config +sed -i -e 's|=/usr|=%{_prefix}|' %{buildroot}%{_libexecdir}/%{name}/wx-config +ln -s ../..%{_libexecdir}/%{name}/wx-config %{buildroot}%{_bindir}/wx-config-3.1 touch %{buildroot}%{_bindir}/wx-config #Alternatives setup with wxrc -mv %{buildroot}%{_bindir}/wxrc %{buildroot}%{_bindir}/wxrc-2 +mv %{buildroot}%{_bindir}/wxrc* %{buildroot}%{_libexecdir}/%{name} +ln -s ../..%{_libexecdir}/%{name}/wxrc-3.1 %{buildroot}%{_bindir}/wxrc-3.1 touch %{buildroot}%{_bindir}/wxrc -%find_lang wxstd -%find_lang wxmsw -cat wxmsw.lang >> wxstd.lang +# move bakefiles to avoid conflicts with 2.8.* +mkdir %{buildroot}%{_datadir}/bakefile/presets/wx31 +mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx31 + +%find_lang wxstd31 +%find_lang wxmsw31 +cat wxmsw31.lang >> wxstd31.lang %check -pushd tests -#make test +pushd %{gtk3dir}/tests +make %{?_smp_mflags} +LD_LIBRARY_PATH=%{buildroot}%{_libdir} TZ=UTC ./test popd - -%ldconfig_scriptlets - -%ldconfig_scriptlets gl - -%ldconfig_scriptlets media - -%ldconfig_scriptlets -n wxBase - -%post devel +%post -n %{wxbasename}-devel if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then rm %{_bindir}/wx-config fi -%{_sbindir}/update-alternatives --install %{_bindir}/wx-config \ - wx-config %{_bindir}/wx-config-2.0 2 -%{_sbindir}/update-alternatives --install %{_bindir}/wxrc \ - wxrc %{_bindir}/wxrc-2 2 +/usr/sbin/update-alternatives --install %{_bindir}/wx-config \ + wx-config %{_libexecdir}/%{name}/wx-config 25 +/usr/sbin/update-alternatives --install %{_bindir}/wxrc \ + wxrc %{_libexecdir}/%{name}/wxrc 25 -%postun devel +%postun -n %{wxbasename}-devel if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove wx-config %{_bindir}/wx-config-2.0 - %{_sbindir}/update-alternatives --remove wxrc %{_bindir}/wxrc-2 + /usr/sbin/update-alternatives --remove wx-config %{_libexecdir}/%{name}/wx-config + /usr/sbin/update-alternatives --remove wxrc %{_libexecdir}/%{name}/wxrc fi -%files -f wxstd.lang -%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt -%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt -%{_libdir}/libwx_gtk2u_adv-*.so.* -%{_libdir}/libwx_gtk2u_aui-*.so.* -%{_libdir}/libwx_gtk2u_core-*.so.* -%{_libdir}/libwx_gtk2u_gizmos-*.so.* -%{_libdir}/libwx_gtk2u_gizmos_xrc*.so.* -%{_libdir}/libwx_gtk2u_html-*.so.* -%{_libdir}/libwx_gtk2u_ogl-*.so.* -%{_libdir}/libwx_gtk2u_qa-*.so.* -%{_libdir}/libwx_gtk2u_richtext-*.so.* -%{_libdir}/libwx_gtk2u_stc-*.so.* -%{_libdir}/libwx_gtk2u_svg-*.so.* -%{_libdir}/libwx_gtk2u_xrc-*.so.* - -%files devel +%files +%doc docs/changes.txt docs/readme.txt +%license docs/gpl.txt docs/lgpl.txt docs/licence.txt docs/licendoc.txt +%license docs/preamble.txt +%{_libdir}/libwx_gtk3u_adv-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_aui-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_core-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_html-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_propgrid-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_qa-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_ribbon-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_richtext-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_stc-*.so.%{sover}* +%{_libdir}/libwx_gtk3u_xrc-*.so.%{sover}* + +%files -n %{wxbasename}-devel %ghost %{_bindir}/wx-config %ghost %{_bindir}/wxrc -%{_bindir}/wx-config-2.0 -%{_bindir}/wxrc-* -%{_includedir}/wx-2.8 -%{_libdir}/libwx_*.so +%{_bindir}/wxrc-3.1 +%{_bindir}/wx-config-3.1 +%{_includedir}/wx-3.1 +%{_libdir}/libwx_baseu*.so %dir %{_libdir}/wx -%dir %{_libdir}/wx/include -%{_libdir}/wx/include/gtk2* %dir %{_libdir}/wx/config -%{_libdir}/wx/config/gtk2* -%{_datadir}/aclocal/* -%{_datadir}/bakefile/presets/* +%dir %{_libdir}/wx/include +%{_datadir}/aclocal/wxwin31.m4 +%{_datadir}/bakefile/presets/wx31 +%{_libexecdir}/%{name} + +%files devel +%{_libdir}/libwx_gtk3u_*.so +%{_libdir}/wx/config/gtk3-unicode-3.1 +%{_libdir}/wx/include/gtk3-unicode-3.1 %files gl -%{_libdir}/libwx_gtk2u_gl-*.so.* +%{_libdir}/libwx_gtk3u_gl-*.so.%{sover}* + +%files i18n -f wxstd31.lang %files media -%{_libdir}/libwx_gtk2u_media-*.so.* +%{_libdir}/libwx_gtk3u_media-*.so.%{sover}* + +%files webview +%{_libdir}/libwx_gtk3u_webview-*.so.%{sover}* +%dir %{_libdir}/wx +%{_libdir}/wx/%{version} -%files -n wxBase -%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt -%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt +%files -n %{wxbasename} +%doc docs/changes.txt docs/readme.txt +%license docs/gpl.txt docs/lgpl.txt docs/licence.txt docs/licendoc.txt +%license docs/preamble.txt %{_libdir}/libwx_baseu-*.so.* -%{_libdir}/libwx_baseu_net-*.so.* -%{_libdir}/libwx_baseu_xml-*.so.* +%{_libdir}/libwx_baseu_net-*.so.%{sover}* +%{_libdir}/libwx_baseu_xml-*.so.%{sover}* +%files docs +%doc html %changelog -* Sat Jul 14 2018 Fedora Release Engineering - 2.8.12-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.8.12-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.8.12-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.8.12-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.8.12-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Sep 29 2016 Jeremy Newton -- Spec cleanup, fixed broken download link - -* Mon Sep 19 2016 Jeremy Newton - 2.8.12-26 -- Workaround for alternatives: remove wx-config if it's not a symlink - -* Sun Sep 18 2016 Jeremy Newton - 2.8.12-25 -- Missing update-alternatives requirement for devel package - -* Sun Aug 28 2016 Jeremy Newton - 2.8.12-24 -- Fix alternatives with wxGTK3 (#1128365) - -* Sat Feb 20 2016 Dan Horák - 2.8.12-23 -- fix FTBFS (#1308243) -- skip tests as they depend on cppunit-config which was removed from cppunit-devel - -* Fri Feb 05 2016 Fedora Release Engineering - 2.8.12-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Dec 30 2015 Michal Toman - 2.8.12-21 -- Add support for MIPS to wx-config - -* Wed Nov 25 2015 Yaakov Selkowitz - 2.8.12-20 -- Disable gnomeprint support (retired prior to F23) - -* Fri Jun 19 2015 Fedora Release Engineering - 2.8.12-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 04 2015 Jason L Tibbitts III - 2.8.12-18 -- Indicate that this package bundles scintilla 1.70. - -* Sat May 02 2015 Kalev Lember - 2.8.12-17 -- Rebuilt for GCC 5 C++11 ABI change - -* Thu Mar 12 2015 Dan Horák - 2.8.12-16 -- only warn on ABI mismatch (#1200611) - -* Wed Feb 25 2015 Petr Pisar - 2.8.12-15 -- Rebuild for reverted GCC 5.0 C++ ABI signature - -* Tue Feb 10 2015 Petr Pisar - 2.8.12-14 -- Rebuild for new GCC 5.0 C++ ABI signature (bug #1190971) - -* Mon Aug 18 2014 Fedora Release Engineering - 2.8.12-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.8.12-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Jan 17 2014 Dan Horák - 2.8.12-11 -- Add ppc64le (#1054411) - -* Tue Jan 14 2014 Peter Robinson 2.8.12-10 -- Add aarch64, clean up spec - -* Sun Aug 04 2013 Fedora Release Engineering - 2.8.12-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 2.8.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 2.8.12-7 -- rebuild due to "jpeg8-ABI" feature drop - -* Fri Dec 21 2012 Adam Tkac - 2.8.12-6 -- rebuild against new libjpeg - -* Sun Jul 22 2012 Fedora Release Engineering - 2.8.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 2.8.12-4 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 2.8.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 2.8.12-2 -- Rebuild for new libpng - -* Thu Apr 14 2011 Dan Horák - 2.8.12-1 -- updated to 2.8.12 - -* Mon Feb 07 2011 Fedora Release Engineering - 2.8.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 29 2010 Dan Horák - 2.8.11-3 -- added fix for crashes during DnD (#626012) -- bakefiles are included in devel subpackage (#626314) - -* Thu Jul 1 2010 Dan Horák - 2.8.11-2 -- rebuilt without the internal crash handler - -* Thu Apr 15 2010 Dan Horák - 2.8.11-1 -- updated to 2.8.11 - -* Wed Nov 25 2009 Dan Horák - 2.8.10-9 -- updated the wrapper script (#541087) - -* Fri Nov 20 2009 Dan Horák - 2.8.10-8 -- added multilib-aware wrapper for wx-config - -* Tue Nov 10 2009 Dan Horák - 2.8.10-7 -- added fix for html tables rendering (#534030) -- removed the long time disabled odbc subpackage - -* Sun Oct 25 2009 Dan Horák - 2.8.10-6 -- add fix for wrong menubar height when using larger system font (#528376) - -* Fri Oct 16 2009 Dan Horák - 2.8.10-5 -- add fix for excessive CPU usage (#494425) - -* Mon Jul 27 2009 Fedora Release Engineering - 2.8.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 15 2009 Dan Horák - 2.8.10-3 -- add fix for CVE-2009-2369 (#511279) - -* Thu Jun 11 2009 Dan Horák - 2.8.10-2 -- fix build with glib >= 2.21 - -* Sat Mar 21 2009 Dan Horák - 2.8.10-1 -- update to 2.8.10 -- fix default plugin path for 64 bit arches - -* Wed Feb 25 2009 Fedora Release Engineering - 2.8.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Dec 4 2008 Dan Horák - 2.8.9-3 -- remove support for bakefiles, fixes directory ownership (#474594) - -* Thu Dec 4 2008 Dan Horak - 2.8.9-2 -- drop all the Obsoletes/Provides used for upgrading from the wxGTK 2.6 era -- drop using of x11libdir pointing to X11R6 -- create media subpackage for more precise package dependencies - -* Mon Sep 22 2008 Dan Horak - 2.8.9-1 -- update to 2.8.9 - -* Sat Sep 6 2008 Tom "spot" Callaway - 2.8.8-2 -- fix license tag - -* Thu Jul 31 2008 Dan Horak - 2.8.8-1 -- update to 2.8.8 (rh bug #457406) - -* Tue Apr 1 2008 Dan Horak - 2.8.7-2 -- added fix for a race condition (rh bug #440011) - -* Wed Feb 20 2008 Matthew Miller - 2.8.7-1 -- update to 2.8.7 (rh bug #369621, etc.) -- split base libs into separate wxBase package (rh bug #357961) -- okay, so, wxPython 2.8.7.1 seems to work fine against this version of the - library, so I'm dropping the kludgy-patch-to-2.8.7.1 thing. Please report - any compatibility problems with wxPython 2.8.7.1 and I'll fix them as they - come up. - -* Tue Feb 19 2008 Fedora Release Engineering - 2.8.4-7 -- Autorebuild for GCC 4.3 - -* Tue Aug 28 2007 Hans de Goede - 2.8.4-6 -- Rebuild for new expat 2.0 - -* Fri Aug 3 2007 Matthew Miller - 2.8.4-5 -- obsolete all compat-wxGTK subpackages properly (bug #250687) - -* Mon Jul 16 2007 Matthew Miller - 2.8.4-4 -- patch from svn to fix rh bug #247414 - -* Thu Jul 12 2007 Matthew Miller - 2.8.4-3 -- include libwx_gtk2u_media, since I'm now listing the - buildreqs properly. - -* Thu Jul 12 2007 Matthew Miller - 2.8.4-2 -- buildrequires for libSM-devel, gstreamer-plugins-base-devel, - and GConf2-devel - -* Wed Jul 11 2007 Matthew Miller - 2.8.4-1 -- update to 2.8.4 -- obsolete compat-wxGTK -- add -fno-strict-aliasing - -* Sun Apr 15 2007 Matthew Miller - 2.8.3-2 -- gratuitously bump release number. - -* Sun Apr 15 2007 Matthew Miller - 2.8.3-1 -- update to 2.8.3. - -* Sun Dec 17 2006 Matthew Miller - 2.8.0-2.8.0.1.3 -- add --enable-timer to build wxTimer class for XaraLX. -- NOTE: if anyone else needs any non-default classes or features enabled, - let me know. Thanks! - -* Fri Dec 15 2006 Matthew Miller - 2.8.0-2.8.0.1.2 -- buildrequires gettext - -* Thu Dec 14 2006 Matthew Miller - 2.8.0-2.8.0.1.1 -- patch to 2.8.0.1 wxPython subrelease (following upstream wxPython) - from wxWidgets CVS - -* Thu Dec 14 2006 Matthew Miller - 2.8.0-2.8.0.0.1 -- update to 2.8.0 release -- gtk2 is now the default (and gtk1.2 gone -- about time!) -- compatibility with wxWidgets 2.2 is now gone; add flag to build 2.4 with - compatibility, though (now off by default) -- added "--enable-no_deps" for faster builds -- added "--enable-intl", because that seems like a good idea -- added disable-rpath, enable-geometry, enable-graphics_ctx, enable-sound, - enable-mediactrl, and enable-display to better match upstream wxPython - package. -- buildrequires: gstreamer-devel -- "animate" contributed module no longer exists. -- enable the svg contributed module -- build the .mo files explicitly -- not sure why that's not happening - automatically. -- minor -- location of doc files in src tarball has changed - -* Mon Aug 28 2006 Matthew Miller - 2.6.3-2.6.3.2.3 -- bump release for FC6 rebuild - -* Mon Jul 3 2006 Matthew Miller - 2.6.3-2.6.3.2.2 -- add libGL-devel and libGLU-devel requires to wxGTK-devel package - (see bug #197501). - -* Thu Apr 13 2006 Matthew Miller - 2.6.3-2.6.3.2.1 -- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel - -* Thu Apr 13 2006 Matthew Miller - 2.6.3-2.6.3.2.0 -- patch to cvs subrelease 2.6.3.2 (matches wxPython) - -* Sat Mar 25 2006 Matthew Miller - 2.6.3-1 -- 2.6.3 final -- remove the locale_install thing -- that was just an issue with using the - release candidate. - -* Tue Mar 21 2006 Matthew Miller - 2.6.3-0.rc2 -- update to 2.6.3-rc2 package -- all patches now upstream -- removing 'em. -- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one, - since that's all there is for the release candidate. I'm operating under - the assumption that we'll have a wxGTK source tarball in the future -- - otherwise, I'm going to eventually have to change the name of this - package again. :) -- add ODBC support via unixODBC as subpackage (see bug #176950) -- wait, no; comment out ODBC support as it doesn't build... -- add explicit make locale_install; apparently not done as part of - the general 'make install' anymore. - -* Mon Feb 13 2006 Matthew Miller - 2.6.2-5 -- rebuild in preparation for FC5 - -* Mon Feb 06 2006 Matthew Miller - 2.6.2-4 -- add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see - bugzilla bug #178184 -- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on - FC5 devel w/ gcc-4.1. - -* Wed Nov 30 2005 Matthew Miller - 2.6.2-3 -- add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other - issues (see bug #154618 comment #47) -- obsolete wxGTK2 < 2.6.2-1 specifically, at Matthias Saou's suggestion - -* Mon Nov 28 2005 Matthew Miller - 2.6.2-2 -- implemented some suggestions from Matthias Saou: -- removed extraneous / from last line of ./configure -- removed -n from setup macro, since we're now actually using the - standard name -- don't use summary macro in opengl subpackage, as it's not clear which - summary should get used -- don't bother setting CC, CXX, etc., as configure script does that -- move libdir/wx to devel subpackage - -* Thu Nov 24 2005 Matthew Miller - 2.6.2-1 -- ready for actually putting into Extras -- update mesa buildreqs for new split-up xorg packaging -- libgnomeprint22-devel -> libgnomeprintui22-devel - -* Tue Oct 04 2005 Toshio Kuratomi - 2.6.2-0.1 -- Update to 2.6.2. -- Include the sample wx bakefiles. -- Include new .mo files. -- From Paul Johnson: - Change license to wxWidgets due to concerns over trademark infringement. - Add dist tag. -- From Tom Callaway: Build and include libwx_gtk2u_animate-2.6. - -* Thu Apr 28 2005 Matthew Miller 2.6.1-0.1 -- update to 2.6.1 -- from Michael Schwendt in 2.4.2-11 package: build-require - xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU - deps aren't provided in FC3, so not using that). -- from Thorsten Leemhuis in 2.4.2-12 package: sed -i -e - 's|/usr/lib\b|%%{_libdir}|' in configure also to fix x86_64 -- properly include older 2.4.x changelog - -* Wed Apr 27 2005 Matthew Miller - 2.6.0-0.1 -- include libwx_gtk2u_gizmos_xrc in file listing - -* Wed Apr 27 2005 Matthew Miller - 2.6.0-0.0 -- update to 2.6.0 final release -- configure now wants "--with-gtk=2" instead of "--enable-gtk2". - -* Wed Apr 13 2005 Matthew Miller - 2.5.5-0.2 -- removed provides: wxWidgets/wxWidgets devel -- handy for compatibility - with unmodified generic source packages, but not so good for - repeatable builds. - -* Wed Apr 13 2005 Matthew Miller - 2.5.5-0.1 -- whoops -- forgot to remove a reference to the "common" package -- version-release for obsoletes/provides - -* Tue Apr 12 2005 Matthew Miller - 2.5.5-0 -- remove BU-specific oddities for fedora an idea for a simplied future.... - -* Tue Apr 12 2005 Matthew Miller - 2.5.5-bu45.2 -- whoops -- forgot "Provides: wxGTK2-devel". - -* Tue Apr 12 2005 Matthew Miller - 2.5.5-bu45.1 -- update to 2.5.5 - -* Sat Mar 5 2005 Matthew Miller - 2.5.4-bu45.3 -- Obsolete & provide GTK-xrc, wxGTK-stc, to provide clean upgrade path - -* Tue Mar 1 2005 Matthew Miller - 2.5.4-bu45.2 -- enable wxWindows 2.2 compatibility (for compatibility with 2.4 rpm, - ironically). - -* Tue Mar 1 2005 Matthew Miller - 2.5.4-bu45.1 -- update to 2.5.4 -- the devel version is where all the fun is. -- rebase to updated FE 2.4.2 package -- license isn't "BSD" -- it's "wxWindows Library Licence". -- make gtk2-only -- gtk 1.0.x is no longer supported, and 1.2.x is - being phased out. 2.x is the way to go. -- all current patches no longer necessary (upstream) -- roll "common" subpackage in to main package -- no longer makes sense - to split it out with gtk+ gone -- use SDL, which will make this use Alsa for sound. I believe. -- add gnomeprint support -- add enable-debug_info for debuginfo package -- enable unicode -- use GDK_USE_XFT to enable Pango and fontconfig -- xrc moved from contrib to base -- making it no longer a subpackage -- making stc part of base too -- it's tiny, and doesn't introduce any - additional deps -- leaving gl as a subpackage, though, since it's the only part that - requires GL libs. -- add 'ogl' 2d drawing lib from contrib (needed for wxPython) -- add 'gizmos' from contrib (needed for wxPython) -- make wx-config actually part of the package, since there's no need - to mess with moving it around -- the various afm fonts are gone in 2.5.... -- use configure macro -- add provides for wxWidgets and wxWidgets-devel, because that - seems like a good idea. - -* Sun Jan 23 2005 Ville Skyttä - 2.4.2-8 -- Fix wx-config for x86_64 (#145508). -- Honor $RPM_OPT_FLAGS better, as well as %%{__cc} and %%{__cxx}. - -* Mon Dec 6 2004 Ville Skyttä - 2.4.2-7 -- Patch to avoid aclocal >= 1.8 warnings from wxwin.m4. -- Move unversioned *.so links for -gl, -stc and -xrc to -devel, make -devel - require them. - -* Wed Nov 10 2004 Matthias Saou 2.4.2-6 -- Bump release to provide Extras upgrade path. -- Fix spaces/tabs in spec. -- Remove unneeded zero epochs. -- Add full source URL. - -* Tue Jun 22 2004 Ville Skyttä - 0:2.4.2-0.fdr.2 -- s/wxWindows/wxWidgets/ -- Fix release tag. - -* Sat May 22 2004 Noa Resare - 0:2.4.2-0.fdr.1.3 -- Merged fix from wxGTK cvs head, now works with recent gtk2 - -* Sat Oct 11 2003 Ville Skyttä - 0:2.4.2-0.fdr.1 -- Update to 2.4.2. - -* Mon Aug 4 2003 Ville Skyttä - 0:2.4.1-0.fdr.4 -- Borrow Matthias Saou's -gl and -stc subpackages. - -* Mon Jun 16 2003 Dams 0:2.4.1-0.fdr.3 -- Removed libwx_gtk2_xrc*so* from wxGTK2/wxGTK2-devel packages - -* Sun Jun 15 2003 Dams 0:2.4.1-0.fdr.2 -- Removed *-devel postun scriptlets (from Ville Skyttä) - -* Sat Jun 14 2003 Dams 0:2.4.1-0.fdr.1 -- Updated to 2.4.1 - -* Wed May 28 2003 Dams 0:2.4.0-0.fdr.7 -- Added xrc contrib in separate packages - -* Wed May 21 2003 Dams 0:2.4.0-0.fdr.6 -- Corrected typo in postun devel - -* Wed May 21 2003 Ville Skyttä - 0:2.4.0-0.fdr.5 -- Make -devel packages require the corresponding GTK devel package. -- Save .spec in UTF-8. -- Fixes from Dams: -- Don't build --with-unicode, it breaks stuff (as was already noted by Dams). -- Don't remove wx-config symlinks on upgrades. -- Remove duplicates from docs. - -* Tue May 20 2003 Ville Skyttä - 0:2.4.0-0.fdr.4 -- Split into subpackages, spec file rewrite. -- Use bzipped upstream tarball. -- Clean up BuildRequirement versions. - -* Fri May 9 2003 Dams 0:2.4.0-0.fdr.3 -- Now build/include both gtk/gtk2 libs -- buildroot -> RPM_BUILD_ROOT - -* Mon Mar 3 2003 Dams -- Initial build. -- Disable unicode as it breaks lmule -- use the %%find_lang macro for locale +* Tue Mar 03 2020 Scott Talbert - 3.1.3-1 +- Initial packaging of wxWidgets 3.1.x (dev version) (#1714714)