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

Currently displaying revision 63 , Show latest

39
 
1
diff -urN aMule-2.3.3.20250105.4a1b78a2a.orig/src/amule-gui.cpp aMule-2.3.3.20250105.4a1b78a2a/src/amule-gui.cpp
2
--- aMule-2.3.3.20250105.4a1b78a2a.orig/src/amule-gui.cpp   2025-02-14 13:18:35.786799500 +0800
3
+++ aMule-2.3.3.20250105.4a1b78a2a/src/amule-gui.cpp    2025-02-14 13:18:54.401214405 +0800
4
@@ -102,7 +102,7 @@
5
    // Disable these checks for now.  The code really needs updating to
6
    // eliminate these inconsistent flag uses, but these checks are new
7
    // since wx3.0, and this should just return us to what 3.0 did.
8
-   wxSizerFlags::DisableConsistencyChecks();
9
+   // wxSizerFlags::DisableConsistencyChecks();
10
 
11
    amuledlg = NULL;
12
 }
13
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
14
--- aMule-2.3.3.20250105.4a1b78a2a.orig/src/utils/aLinkCreator/src/alcframe.cpp 2025-02-14 13:18:35.846791775 +0800
15
+++ aMule-2.3.3.20250105.4a1b78a2a/src/utils/aLinkCreator/src/alcframe.cpp  2025-02-14 13:19:51.262981812 +0800
16
@@ -253,18 +253,18 @@
17
   m_toolbar->SetToolBitmapSize (wxSize (32, 32));
18
   m_toolbar->SetMargins (2, 2);
19
 
20
-  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), wxBitmapBundle(m_toolBarBitmaps[0]),
21
+  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), m_toolBarBitmaps[0],
22
                       _("Open a file to compute its eD2k link"));
23
 
24
-  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), wxBitmapBundle(m_toolBarBitmaps[1]),
25
+  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), m_toolBarBitmaps[1],
26
                       _("Copy computed eD2k link to clipboard"));
27
 
28
-  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), wxBitmapBundle(m_toolBarBitmaps[2]),
29
+  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), m_toolBarBitmaps[2],
30
                       _("Save computed eD2k link to file"));
31
 
32
   m_toolbar->AddSeparator ();
33
 
34
-  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), wxBitmapBundle(m_toolBarBitmaps[3]),
35
+  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), m_toolBarBitmaps[3],
36
                       _("About aLinkCreator"));
37
 
38
   m_toolbar->Realize ();
39