@@ -1,4 +1,24 @@

 -------------------------------------------------------------------

+Sun Feb  9 09:05:57 UTC 2025 - Marguerite Su <i@margueirte.su>

+

+- Update to version 2.3.3.20250105.4a1b78a2a

+  * alcframe: fix build with wxWidgets 3.2.6 and --enable-compat28

+  * fix build with boost 1.87 that removes deprecated asio methods

+  * fix some gtk version checks

+  * build: don't support gtk1 and gtk2

+  * remove wxCHECK_VERSION

+  * MuleNotebook: remove deletepage workaround

+  * build: require wxWidgets 3.2.0

+  * Fixes for wxWidgets 3.2 compatibility

+  * FileDataIOTest: fix make check

+  * CFile: show warning trying to seek on closed file

+  * CFile: avoid 'Assert failure' if IsOpened() is false inside doSeek

+  * allow to build with autoconf 2.70 and later

+- add FTBFS-aMule-leap-15.6.patch

+  * wxSizerFlags::DisableConsistencyChecks() was added in wxWidgets 3.1.6

+  * wxBitmapBundle() was added in wxWidgets 3.2.6

+

+-------------------------------------------------------------------

 Thu Jan 23 21:08:15 UTC 2025 - Giacomo Comes <gcomes.obs@gmail.com>

 - use BuildRequires: wxWidgets-3_2-nostl-devel

​

@@ -17,7 +17,7 @@

 Name:           aMule

-Version:        2.3.3.20210426.6d4c03b00

+Version:        2.3.3.20250105.4a1b78a2a

 Release:        0

 Summary:        Another eMule file-sharing program

 License:        GPL-2.0-or-later

@@ -25,6 +25,7 @@

 URL:            https://www.amule.org

 #https://github.com/amule-project/amule

 Source:         %name-%version.tar.xz

+Patch:     FTBFS-%name-leap-15.6.patch

 BuildRequires:  binutils-devel

 BuildRequires:  cmake

 BuildRequires:  fdupes

@@ -60,9 +61,9 @@

 %build

 # remove shebang

 sed -i '/^#!/d' src/utils/xas/xas.pl

-#override version only for source 2.3.3.20210426.6d4c03b00

-if  %version == 2.3.3.20210426.6d4c03b00 ; then

-    sed -i '/VERSION "GIT"/s@.*@set (VERSION "2.3.3")\nset (SVNDATE "git 20210426")@' CMakeLists.txt

+#override version only for source 2.3.3.20250105.4a1b78a2a

+if  %version == 2.3.3.20250105.4a1b78a2a ; then

+    sed -i '/VERSION "GIT"/s@.*@set (VERSION "2.3.3")\nset (SVNDATE "git 20250105")@' CMakeLists.txt

 fi

 %cmake \

@@ -81,6 +82,8 @@

    -DENABLE_UPNP=ON \

    -DCMAKE_BUILD_TYPE=Release \

    -DCMAKE_INSTALL_DOCDIR=%_defaultdocdir/%name

+

+find /usr/include -type f -name "bmpbndl.h" -print

 %cmake_build

 %install

​

@@ -0,0 +1,38 @@

+diff -urN aMule-2.3.3.20250105.4a1b78a2a.orig/src/amule-gui.cpp aMule-2.3.3.20250105.4a1b78a2a/src/amule-gui.cpp

+--- aMule-2.3.3.20250105.4a1b78a2a.orig/src/amule-gui.cpp  2025-02-14 13:18:35.786799500 +0800

++++ aMule-2.3.3.20250105.4a1b78a2a/src/amule-gui.cpp   2025-02-14 13:18:54.401214405 +0800

+@@ -102,7 +102,7 @@

+   // Disable these checks for now.  The code really needs updating to

+   // eliminate these inconsistent flag uses, but these checks are new

+   // since wx3.0, and this should just return us to what 3.0 did.

+-  wxSizerFlags::DisableConsistencyChecks();

++  // wxSizerFlags::DisableConsistencyChecks();

+ 

+   amuledlg = NULL;

+ }

+diff -urN aMule-2.3.3.20250105.4a1b78a2a.orig/src/utils/aLinkCreator/src/alcframe.cpp aMule-2.3.3.20250105.4a1b78a2a/src/utils/aLinkCreator/src/alcframe.cpp

+--- aMule-2.3.3.20250105.4a1b78a2a.orig/src/utils/aLinkCreator/src/alcframe.cpp    2025-02-14 13:18:35.846791775 +0800

++++ aMule-2.3.3.20250105.4a1b78a2a/src/utils/aLinkCreator/src/alcframe.cpp 2025-02-14 13:19:51.262981812 +0800

+@@ -253,18 +253,18 @@

+   m_toolbar->SetToolBitmapSize (wxSize (32, 32));

+   m_toolbar->SetMargins (2, 2);

+ 

+-  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), wxBitmapBundle(m_toolBarBitmaps0),

++  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), m_toolBarBitmaps0,

+                       _("Open a file to compute its eD2k link"));

+ 

+-  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), wxBitmapBundle(m_toolBarBitmaps1),

++  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), m_toolBarBitmaps1,

+                       _("Copy computed eD2k link to clipboard"));

+ 

+-  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), wxBitmapBundle(m_toolBarBitmaps2),

++  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), m_toolBarBitmaps2,

+                       _("Save computed eD2k link to file"));

+ 

+   m_toolbar->AddSeparator ();

+ 

+-  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), wxBitmapBundle(m_toolBarBitmaps3),

++  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), m_toolBarBitmaps3,

+                       _("About aLinkCreator"));

+ 

+   m_toolbar->Realize ();

​