File FTBFS-aMule-leap-15.6.patch of Package aMule

File FTBFS-aMule-leap-15.6.patch of Package aMule (Revision 69)

Currently displaying revision 69 , Show latest

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_toolBarBitmaps[0]),
+  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), m_toolBarBitmaps[0],
                       _("Open a file to compute its eD2k link"));
 
-  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), wxBitmapBundle(m_toolBarBitmaps[1]),
+  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), m_toolBarBitmaps[1],
                       _("Copy computed eD2k link to clipboard"));
 
-  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), wxBitmapBundle(m_toolBarBitmaps[2]),
+  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), m_toolBarBitmaps[2],
                       _("Save computed eD2k link to file"));
 
   m_toolbar->AddSeparator ();
 
-  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), wxBitmapBundle(m_toolBarBitmaps[3]),
+  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), m_toolBarBitmaps[3],
                       _("About aLinkCreator"));
 
   m_toolbar->Realize ();