wxgtk rebuild

This commit is contained in:
Rmys
2022-07-28 00:30:21 +03:00
parent f9143f7e97
commit af4dd92630
10 changed files with 134 additions and 7 deletions
+9 -2
View File
@@ -18,8 +18,8 @@
<Summary>Cross-platform, 3D and historically-based real-time strategy game</Summary>
<Description>Cross-platform, 3D and historically-based real-time strategy game.As the military leader of an ancient civilisation,
you must gather the resources you need to raise a military force capable of dominating your enemies.</Description>
<Archive sha1sum="3c6bb8924d65d17200e6b9475101e7d04f5db13a" type="tarxz">http://releases.wildfiregames.com/0ad-0.0.23b-alpha-unix-build.tar.xz</Archive>
<Archive sha1sum="3e2be1d72e9ed5d413f2cd81de9d48b73b141085" type="tarxz">http://releases.wildfiregames.com/0ad-0.0.23b-alpha-unix-data.tar.xz</Archive>
<Archive sha1sum="130444c15e29c7fa1333b8719ae7c7da36741a26" type="tarxz">http://releases.wildfiregames.com/0ad-0.0.25b-alpha-unix-build.tar.xz</Archive>
<Archive sha1sum="c56cc4b51f13323521318204aa69dd1cb5dd010f" type="tarxz">http://releases.wildfiregames.com/0ad-0.0.25b-alpha-unix-data.tar.xz</Archive>
<BuildDependencies>
<Dependency>zip</Dependency>
<Dependency>nasm</Dependency>
@@ -103,6 +103,13 @@
</Package>
<History>
<Update release="2">
<Date>2022-07-28</Date>
<Version>0.0.25b</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-10-30</Date>
<Version>0.0.23b</Version>
+7
View File
@@ -102,6 +102,13 @@
</Package>
<History>
<Update release="14">
<Date>2022-08-01</Date>
<Version>2020.0.0</Version>
<Comment>Rebuild</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="13">
<Date>2021-10-27</Date>
<Version>2020.0.0</Version>
@@ -0,0 +1,28 @@
From 342c4b588f2f069a2df2157ac166237a54277b3a Mon Sep 17 00:00:00 2001
From: Ian McInerney <ian.s.mcinerney@ieee.org>
Date: Fri, 8 Apr 2022 01:27:52 +0100
Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
image that took a size parameter, it would only take the XPM data
itself.
I don't know how this compiled until now, but it doesn't anymore when
the size is included and built against wx 3.1.6 in Fedora.
---
src/MixerBoard.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
index 54b5f146cc7..7fe81615474 100644
--- a/src/MixerBoard.cpp
+++ b/src/MixerBoard.cpp
@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
wxMemoryDC dc;
for (const auto &data : table) {
- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
dc.SelectObject(*bmp);
AColor::Bevel(dc, false, bev);
mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
@@ -0,0 +1,41 @@
From efc11c4ac50ac51cd71d4dcfa84e63b11000c3f5 Mon Sep 17 00:00:00 2001
From: Ian McInerney <ian.s.mcinerney@ieee.org>
Date: Fri, 8 Apr 2022 01:08:12 +0100
Subject: [PATCH] Remove custom languages in wx 3.1.6 and above
Basque was added as a language with identifier "eu" into wx 3.1.6, so
there is no more need to provide custom languages. Additionally, this
struct changed formatting in 3.1.6, meaning it threw a compile error
when included (so it would have to be fixed if still needed).
---
src/AudacityApp.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index d6e2576bf48..e3979249ceb 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -992,12 +992,10 @@ void AudacityApp::OnTimer(wxTimerEvent& WXUNUSED(event))
#define WL(lang,sublang)
#endif
-#if wxCHECK_VERSION(3, 0, 1)
+#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6)
wxLanguageInfo userLangs[] =
{
- // Bosnian is defined in wxWidgets already
-// { wxLANGUAGE_USER_DEFINED, wxT("bs"), WL(0, SUBLANG_DEFAULT) wxT("Bosnian"), wxLayout_LeftToRight },
-
+ // Included upstream in version 3.1.6
{ wxLANGUAGE_USER_DEFINED, wxT("eu"), WL(0, SUBLANG_DEFAULT) wxT("Basque"), wxLayout_LeftToRight },
};
#endif
@@ -1332,7 +1330,7 @@ bool AudacityApp::OnInit()
//
// TODO: The whole Language initialization really need to be reworked.
// It's all over the place.
-#if wxCHECK_VERSION(3, 0, 1)
+#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6)
for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
{
wxLocale::AddLanguage(userLangs[i]);
+11 -2
View File
@@ -11,9 +11,10 @@
<PartOf>multimedia.sound</PartOf>
<License>GPLv2</License>
<IsA>app:gui</IsA>
<Icon>Audacity</Icon>
<Summary>Multi-track audio editor and recorder</Summary>
<Description>With Audacity, you can cut, copy, splice or mix sounds together; change the speed or pitch of a recording and much more. Editing is very fast and provides unlimited undo/redo. There are digital effects and spectrum analysis tools. Supported file formats include Ogg Vorbis, MP3, WAV, AIFF, and AU..</Description>
<Archive sha1sum="f164b6a2e02947809cee2e313cb61279a60d4829" type="targz">https://github.com/audacity/audacity/archive/Audacity-2.4.1.tar.gz</Archive>
<Archive sha1sum="53dedd778c0e5bf5f3d85e34635e9494660ec5e5" type="targz">https://github.com/audacity/audacity/archive/Audacity-3.1.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>wxGTK3</Dependency>
@@ -42,7 +43,8 @@
<Dependency>jack-audio-connection-kit-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">audacity-2.4.1-fix-vertical-track-resizing.patch</Patch>
<Patch level="1">342c4b588f2f069a2df2157ac166237a54277b3a.patch</Patch>
<Patch level="1">efc11c4ac50ac51cd71d4dcfa84e63b11000c3f5.patch</Patch>
</Patches>
</Source>
@@ -91,6 +93,13 @@
</Package>
<History>
<Update release="7">
<Date>2022-07-28</Date>
<Version>3.1.3</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2020-05-21</Date>
<Version>2.4.1</Version>
+7
View File
@@ -70,6 +70,13 @@
</Package>
<History>
<Update release="3">
<Date>2021-09-12</Date>
<Version>0.2.8</Version>
<Comment>Rebuild wxgtk.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2021-09-12</Date>
<Version>0.2.8</Version>
+9 -2
View File
@@ -14,7 +14,7 @@
<IsA>app:gui</IsA>
<Summary>A free C++ IDE built to meet the most demanding needs of its users</Summary>
<Description>Code::Blocks is a free C++ IDE built to meet the most demanding needs of its users. It is designed to be very extensible and fully configurable.</Description>
<Archive sha1sum="ccd9e13d271a4d1ce7ebed8c0e6d4b45fb6e927d" type="tarxz">https://downloads.sourceforge.net/codeblocks/codeblocks_17.12.tar.xz</Archive>
<Archive sha1sum="d75b2d8820de369be1b574c433a7a6dde7e8b218" type="tarxz">https://sourceforge.net/projects/codeblocks/files/Sources/20.03/codeblocks-20.03.tar.xz</Archive>
<BuildDependencies>
<Dependency>fontconfig-devel</Dependency>
<Dependency>hunspell-devel</Dependency>
@@ -34,7 +34,7 @@
</BuildDependencies>
<Patches>
<!-- https://sourceforge.net/p/codeblocks/code/11739/ -->
<Patch level="1">codeblocks-17.12-scripting.patch</Patch>
<!-- <Patch level="1">codeblocks-17.12-scripting.patch</Patch> -->
<!--
<Patch>desktop.patch</Patch>
<Patch level="1">codeblocks-tinyxml.patch</Patch>
@@ -93,6 +93,13 @@
</Package>
<History>
<Update release="3">
<Date>2022-07-28</Date>
<Version>20.03</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2020-02-24</Date>
<Version>17.12</Version>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="6">
<Date>2022-08-01</Date>
<Version>3.0.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2020-01-31</Date>
<Version>3.0.2.0</Version>
+7
View File
@@ -62,6 +62,13 @@
</Package>
<History>
<Update release="4">
<Date>2022-08-01</Date>
<Version>4.0.7</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3">
<Date>2018-09-09</Date>
<Version>4.0.7</Version>
+8 -1
View File
@@ -37,7 +37,14 @@
</Package>
<History>
<Update release="3">
<Update release="4">
<Date>2020-04-07</Date>
<Version>3.3.1</Version>
<Comment>Rebuild wxgtk</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2020-04-07</Date>
<Version>3.3.1</Version>
<Comment>ver. bump</Comment>