diff -Nru amule-2.3.3/debian/amule-32.xpm amule-2.3.3/debian/amule-32.xpm --- amule-2.3.3/debian/amule-32.xpm 2021-10-01 03:26:49.000000000 +0000 +++ amule-2.3.3/debian/amule-32.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,387 +0,0 @@ -/* XPM */ -static char * amule_xpm[] = { -"32 32 352 2", -" c None", -". c #B09570", -"+ c #B49C76", -"@ c #834D04", -"# c #CEC3AF", -"$ c #A0641F", -"% c #86520E", -"& c #9F743C", -"* c #BA7736", -"= c #895E23", -"- c #B5A38B", -"; c #B5A180", -"> c #B7A58A", -", c #B77839", -"' c #B2712D", -") c #9B7B50", -"! c #B7A893", -"~ c #764503", -"{ c #A77E4B", -"] c #C8BEAD", -"^ c #9C723B", -"/ c #D2935F", -"( c #A2641C", -"_ c #A48B6A", -": c #856335", -"< c #844F0D", -"[ c #AB6D2A", -"} c #AD916E", -"| c #9C621E", -"1 c #D39662", -"2 c #92580F", -"3 c #A8947A", -"4 c #B4A997", -"5 c #6D4206", -"6 c #A2641D", -"7 c #BD7E42", -"8 c #A4835A", -"9 c #A56723", -"0 c #C8874D", -"a c #824D06", -"b c #8B765A", -"c c #724304", -"d c #B37432", -"e c #CDAA83", -"f c #A38966", -"g c #BAA795", -"h c #AD9E8A", -"i c #9F621E", -"j c #B1702C", -"k c #896431", -"l c #655135", -"m c #7E4B07", -"n c #BF8F59", -"o c #A46F32", -"p c #80571E", -"q c #85581D", -"r c #8A530D", -"s c #8C540C", -"t c #968063", -"u c #4A3A25", -"v c #754401", -"w c #864F07", -"x c #B4722F", -"y c #CC874E", -"z c #C78B54", -"A c #A8814F", -"B c #8B6E46", -"C c #525150", -"D c #673B00", -"E c #A96922", -"F c #D08951", -"G c #D38C55", -"H c #D38C56", -"I c #CB8C56", -"J c #885818", -"K c #7D4901", -"L c #AC6C26", -"M c #CF8850", -"N c #D48F5A", -"O c #E6C5A9", -"P c #AA8556", -"Q c #A38258", -"R c #F7F0E9", -"S c #E0B490", -"T c #E3B794", -"U c #FEFEFE", -"V c #F9F4F0", -"W c #CCC3B9", -"X c #FDFDFD", -"Y c #D8D3D0", -"Z c #D69563", -"` c #C8AA94", -" . c #858585", -".. c #9F8D77", -"+. c #BAAEA0", -"@. c #E9E9E9", -"#. c #4E4E4E", -"$. c #E2C4AC", -"%. c #D7C1AF", -"&. c #C5C4C3", -"*. c #FDFCFB", -"=. c #C09D7D", -"-. c #B6997B", -";. c #F8F4F0", -">. c #EAE8E4", -",. c #E1DCD4", -"'. c #E3E1DB", -"). c #DEDEDA", -"!. c #D6D2CC", -"~. c #C0B6AC", -"{. c #979792", -"]. c #C8BCAF", -"^. c #CDCAC4", -"/. c #CCCCC9", -"(. c #D7D7D5", -"_. c #DCDCDA", -":. c #D8D8D6", -"<. c #C2C2C0", -"[. c #5E6163", -"}. c #AAACAB", -"|. c #838380", -"1. c #767A7C", -"2. c #9FA0A0", -"3. c #AFAFAE", -"4. c #ABABAA", -"5. c #A7A7A6", -"6. c #A3A3A3", -"7. c #575C60", -"8. c #BEBFBB", -"9. c #ACACA6", -"0. c #A5A5A2", -"a. c #979B9B", -"b. c #626569", -"c. c #979899", -"d. c #939597", -"e. c #909294", -"f. c #8D8F92", -"g. c #898C90", -"h. c #8C9090", -"i. c #BFBFB6", -"j. c #B8B8AE", -"k. c #ACACA5", -"l. c #C2C2BA", -"m. c #878B8B", -"n. c #7F8489", -"o. c #7E8388", -"p. c #7A8085", -"q. c #777D83", -"r. c #737A80", -"s. c #A6A8A1", -"t. c #A4A6A0", -"u. c #9A9D98", -"v. c #535353", -"w. c #656565", -"x. c #696969", -"y. c #755F49", -"z. c #6B502C", -"A. c #938976", -"B. c #ADAEA6", -"C. c #A8AAA2", -"D. c #818688", -"E. c #686F76", -"F. c #656B72", -"G. c #5F656A", -"H. c #5C6065", -"I. c #84898A", -"J. c #808689", -"K. c #776448", -"L. c #78511B", -"M. c #93673C", -"N. c #7C7B7A", -"O. c #7B7B7B", -"P. c #A79889", -"Q. c #BD8048", -"R. c #9B5E11", -"S. c #805214", -"T. c #888882", -"U. c #848A8B", -"V. c #6F7376", -"W. c #525456", -"X. c #4F5152", -"Y. c #4D4E4F", -"Z. c #4C4D4E", -"`. c #646167", -" + c #74503E", -".+ c #744301", -"++ c #93570A", -"@+ c #C07C3D", -"#+ c #AB8057", -"$+ c #A6A5A4", -"%+ c #626262", -"&+ c #8C8C8C", -"*+ c #917C66", -"=+ c #BC814D", -"-+ c #A5661D", -";+ c #824C00", -">+ c #6C430B", -",+ c #715A39", -"'+ c #675946", -")+ c #55493A", -"!+ c #5E4E3D", -"~+ c #695138", -"{+ c #7A252C", -"]+ c #B32B3F", -"^+ c #C7494D", -"/+ c #784600", -"(+ c #9B5D11", -"_+ c #BA804C", -":+ c #8F8070", -"<+ c #8F8E8E", -"[+ c #525252", -"}+ c #626567", -"|+ c #666A6E", -"1+ c #837060", -"2+ c #B06F2A", -"3+ c #804D07", -"4+ c #693F06", -"5+ c #804A00", -"6+ c #935607", -"7+ c #A46622", -"8+ c #B27236", -"9+ c #BA7A40", -"0+ c #C84336", -"a+ c #D82C45", -"b+ c #E45B6E", -"c+ c #784708", -"d+ c #8E5A1E", -"e+ c #927053", -"f+ c #5A5F65", -"g+ c #5B6064", -"h+ c #444649", -"i+ c #464B50", -"j+ c #474747", -"k+ c #524434", -"l+ c #302F2C", -"m+ c #673F08", -"n+ c #884F01", -"o+ c #A5651C", -"p+ c #C58144", -"q+ c #D5905B", -"r+ c #D69663", -"s+ c #D6855B", -"t+ c #DA2B3A", -"u+ c #D1584C", -"v+ c #865310", -"w+ c #3A3D40", -"x+ c #383B3E", -"y+ c #404040", -"z+ c #414141", -"A+ c #413E3C", -"B+ c #4C3A28", -"C+ c #4F3614", -"D+ c #4D391B", -"E+ c #473112", -"F+ c #794600", -"G+ c #8E5304", -"H+ c #B06F29", -"I+ c #D08A52", -"J+ c #D79865", -"K+ c #DAA172", -"L+ c #D89D6D", -"M+ c #D5945E", -"N+ c #C38042", -"O+ c #9E6014", -"P+ c #493211", -"Q+ c #4C3310", -"R+ c #483315", -"S+ c #493621", -"T+ c #3F403E", -"U+ c #3B3C39", -"V+ c #818181", -"W+ c #9D9993", -"X+ c #A97D53", -"Y+ c #B2702C", -"Z+ c #935708", -"`+ c #704000", -" @ c #D08B52", -".@ c #D99D6D", -"+@ c #D5925E", -"@@ c #C47F42", -"#@ c #9C5F14", -"$@ c #704100", -"%@ c #7F4A00", -"&@ c #935608", -"*@ c #AF7F53", -"=@ c #9B958D", -"-@ c #888888", -";@ c #5E5E5E", -">@ c #999083", -",@ c #AA7440", -"'@ c #B97635", -")@ c #9A5D10", -"!@ c #844D00", -"~@ c #754300", -"{@ c #724200", -"]@ c #A5661C", -"^@ c #D69662", -"/@ c #D69460", -"(@ c #D08B53", -"_@ c #B77532", -":@ c #854F0A", -"<@ c #844C00", -"[@ c #9A5C0F", -"}@ c #B27741", -"|@ c #9A8D7E", -"1@ c #6F6F6F", -"2@ c #646566", -"3@ c #7E7F80", -"4@ c #7F766F", -"5@ c #B87C46", -"6@ c #A6661E", -"7@ c #8C5202", -"8@ c #7D4800", -"9@ c #925608", -"0@ c #AD6C26", -"a@ c #C27E40", -"b@ c #CB864B", -"c@ c #C98448", -"d@ c #B97735", -"e@ c #925914", -"f@ c #BF7E43", -"g@ c #85776B", -"h@ c #808081", -"i@ c #717172", -"j@ c #3A3D3F", -"k@ c #565B61", -"l@ c #545A60", -"m@ c #8D694C", -"n@ c #8C5925", -"o@ c #633F10", -"p@ c #483112", -"q@ c #3B2C17", -"r@ c #422F17", -"s@ c #553812", -"t@ c #6E471C", -"u@ c #744D23", -"v@ c #5B3C1A", -"w@ c #4C3A24", -"x@ c #3C2D18", -"y@ c #4C3413", -"z@ c #684211", -"A@ c #915C26", -"B@ c #A4734B", -"C@ c #555A61", -"D@ c #575C62", -"E@ c #3F4346", -"F@ c #333738", -"G@ c #363836", -"H@ c #4E4D4C", -"I@ c #404243", -"J@ c #404347", -"K@ c #2B2C2E", -" . ", -" + @ ", -" # $ % ", -" & * = ", -" - ; > , ' ) ", -" ! ~ { ] ^ / ( _ ", -" : < [ } | 1 2 3 ", -" 4 5 6 7 8 9 0 a ", -" b c d e f g h i j k ", -" l m n o p q r s t ", -" u v w x y z A B ", -" C D E F G H I J ", -" K L M G N O P ", -" Q R S G T U V ", -" W X Y Z ` .U .. ", -" +.@.#.$.%.&.*.=. ", -" -.;.>.,.'.).!.~.{. ", -" ].^./.(._.:.<.[.}.|. ", -" 1.2.3.4.5.6.2.7.8.9. ", -" 0.a.b.c.d.e.f.g.h.i.j. ", -" k.l.m.n.o.p.q.r.s.t.u.v. ", -" w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O. ", -" 6.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+ ", -" &+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+ ", -" }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+ ", -" h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+ w+x+ ", -" y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ T+U+ ", -" V+W+X+Y+Z+5+`+/+G+2+ @J+K+.@+@@@#@$@%@&@Y+*@=@-@ ", -" ;@>@,@'@)@!@~@{@n+]@p+q+^@/@(@_@:@~@<@[@'@}@|@1@ ", -" 2@3@4@5@6@7@8@$@F+9@0@a@b@c@d@e@$@8@7@6@f@g@h@i@ ", -" j@k@l@m@n@o@p@q@ r@s@t@u@v@w@ x@y@z@A@B@C@D@E@ ", -" F@G@ H@I@J@K@ "}; diff -Nru amule-2.3.3/debian/amule.menu amule-2.3.3/debian/amule.menu --- amule-2.3.3/debian/amule.menu 2021-10-01 03:26:49.000000000 +0000 +++ amule-2.3.3/debian/amule.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -?package(amule):needs="X11" section="Applications/Network/File Transfer"\ - title="amule" command="/usr/bin/amule"\ - icon="/usr/share/pixmaps/amule.xpm" - diff -Nru amule-2.3.3/debian/amule-utils-gui.menu amule-2.3.3/debian/amule-utils-gui.menu --- amule-2.3.3/debian/amule-utils-gui.menu 2021-10-01 03:26:49.000000000 +0000 +++ amule-2.3.3/debian/amule-utils-gui.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -?package(amule-utils-gui):needs="X11" section="Applications/Network/File Transfer"\ - title="aMule Stats" command="/usr/bin/wxcas"\ - icon="/usr/share/pixmaps/wxcas.xpm" - -?package(amule-utils-gui):needs="X11" section="Applications/Network/File Transfer"\ - title="aMule Link Creator (alc)" command="/usr/bin/alc"\ - icon="/usr/share/pixmaps/alc.xpm" - -?package(amule-utils-gui):needs="X11" section="Applications/Network/File Transfer"\ - title="aMule GUI" command="/usr/bin/amulegui"\ - icon="/usr/share/pixmaps/amulegui.xpm" - diff -Nru amule-2.3.3/debian/changelog amule-2.3.3/debian/changelog --- amule-2.3.3/debian/changelog 2022-09-15 02:01:41.000000000 +0000 +++ amule-2.3.3/debian/changelog 2023-09-23 18:40:07.000000000 +0000 @@ -1,9 +1,48 @@ -amule (1:2.3.3-2~16.04.sav0) xenial; urgency=medium +amule (1:2.3.3-3build1~16.04.sav0) xenial; urgency=medium * Backport to Xenial + * Revert "Drop transition for old debug package migration" + * Revert "Remove constraints unnecessary since buster (oldstable): + Build-Depends: Drop versioned constraint on libupnp-dev (>= 1:1.6.24-4~)" * debian/control: Set debhelper-compat (= 10) BD (LP highest for Xenial) - -- Rob Savoury Wed, 14 Sep 2022 19:01:41 -0700 + -- Rob Savoury Sat, 23 Sep 2023 11:40:07 -0700 + +amule (1:2.3.3-3build1) mantic; urgency=medium + + * Rebuild against new libupnp17. + + -- Gianfranco Costamagna Thu, 15 Jun 2023 11:35:48 +0200 + +amule (1:2.3.3-3) unstable; urgency=medium + + [ Debian Janitor ] + * Apply multi-arch hints. + + amule-common: Add Multi-Arch: foreign. + * Use secure URI in Homepage field. + * Drop transition for old debug package migration. + * Update standards version to 4.6.0, no changes needed. + * Remove constraints unnecessary since buster (oldstable): + + Build-Depends: Drop versioned constraint on libupnp-dev (>= 1:1.6.24-4~). + + amule: Drop conflict with removed package amule-common (<< + 2.2.0~svn20080525-1) in Replaces. + + amule-common: Drop conflict with removed package amule-daemon (<< 2.1.2-3) + in Replaces. + + amule-common: Drop conflict with removed package amule-utils (<< 2.0.3-4) + in Replaces. + + amule-utils: Drop conflict with removed package amule (<< 2.1.2-1) in + Replaces. + + amule-utils: Drop conflict with removed package amule-common (<< 2.1.2-3) + in Replaces. + + [ Pino Toscano ] + * Drop menu files and their Debian-specific pixmaps, since amule & + amule-utils-gui already provide .desktop files. + + [ Olly Betts ] + * Update to use wxwidgets3.2 - new patch wx3.2.patch; Closes: #1019841 + + -- Sandro Tosi Wed, 01 Mar 2023 01:32:05 -0500 amule (1:2.3.3-2) unstable; urgency=medium diff -Nru amule-2.3.3/debian/control amule-2.3.3/debian/control --- amule-2.3.3/debian/control 2022-09-15 02:01:35.000000000 +0000 +++ amule-2.3.3/debian/control 2023-09-23 18:39:31.000000000 +0000 @@ -16,11 +16,11 @@ libpng-dev, libreadline-dev, libupnp-dev (>= 1:1.6.24-4~), - libwxgtk3.0-gtk3-dev, - wx3.0-i18n, + libwxgtk3.2-dev, + wx3.2-i18n, zlib1g-dev, -Standards-Version: 4.5.1 -Homepage: http://www.amule.org +Standards-Version: 4.6.0 +Homepage: https://www.amule.org Vcs-Git: https://salsa.debian.org/debian/amule.git Vcs-Browser: https://salsa.debian.org/debian/amule @@ -32,7 +32,6 @@ Recommends: amule-utils, unzip, Suggests: amule-utils-gui, -Replaces: amule-common (<< 2.2.0~svn20080525-1), Description: client for the eD2k and Kad networks, like eMule aMule is a peer-to-peer file sharing application, designed to connect to the eDonkey and Kad networks. It has a wide range of features, @@ -55,8 +54,7 @@ Architecture: all Depends: ${misc:Depends}, ${shlibs:Depends}, -Replaces: amule-daemon (<< 2.1.2-3), - amule-utils (<< 2.0.3-4), +Multi-Arch: foreign Description: common files for the rest of aMule packages This package contains localization files, webserver templates and GUI skins for aMule. You probably don't want to install this package alone, but amule, @@ -69,8 +67,6 @@ Recommends: amule-common, fonts-dejavu-core, Suggests: amule-gnome-support, -Replaces: amule (<< 2.1.2-1), - amule-common (<< 2.1.2-3), Breaks: xmule (<= 1.10.0b-1), Description: utilities for aMule (command-line version) This package contains a set of command-line utilities related to aMule, diff -Nru amule-2.3.3/debian/patches/series amule-2.3.3/debian/patches/series --- amule-2.3.3/debian/patches/series 2021-10-01 03:26:49.000000000 +0000 +++ amule-2.3.3/debian/patches/series 2023-03-01 06:32:05.000000000 +0000 @@ -2,3 +2,4 @@ use_xdg-open_as_preview_default.diff version_check.diff #libupnp1.8.patch +wx3.2.patch diff -Nru amule-2.3.3/debian/patches/wx3.2.patch amule-2.3.3/debian/patches/wx3.2.patch --- amule-2.3.3/debian/patches/wx3.2.patch 1970-01-01 00:00:00.000000000 +0000 +++ amule-2.3.3/debian/patches/wx3.2.patch 2023-03-01 06:32:05.000000000 +0000 @@ -0,0 +1,461 @@ +Description: Fixes for wxWidgets 3.2 compatibility + Largely based on patch from Mr Hyde in + https://github.com/amule-project/amule/pull/168 +Author: Olly Betts +Bug: https://github.com/amule-project/amule/issues/340 +Bug-Debian: https://bugs.debian.org/1019841 +Forwarded: no +Last-Update: 2023-01-09 + +--- a/src/ColorFrameCtrl.cpp ++++ b/src/ColorFrameCtrl.cpp +@@ -61,7 +61,7 @@ + ///////////////////////////////////////////////////////////////////////////// + void CColorFrameCtrl::SetFrameBrushColour(const wxColour& colour) + { +- m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID)); ++ m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); + + Refresh(FALSE); + } // SetFrameColor +@@ -70,7 +70,7 @@ + ///////////////////////////////////////////////////////////////////////////// + void CColorFrameCtrl::SetBackgroundBrushColour(const wxColour& colour) + { +- m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID)); ++ m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); + + // clear out the existing garbage, re-start with a clean plot + Refresh(FALSE); +--- a/src/DownloadListCtrl.cpp ++++ b/src/DownloadListCtrl.cpp +@@ -850,7 +850,7 @@ + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + dc->SetPen( colour.Blend(65).GetPen() ); + } else { +- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + dc->SetPen(*wxTRANSPARENT_PEN); + } +@@ -1413,7 +1413,7 @@ + dc->DrawLine( rect.x, rect.y + 2, rect.x + width, rect.y + 2 ); + + // Draw the green line +- dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxSOLID ) )); ++ dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxPENSTYLE_SOLID ) )); + dc->DrawLine( rect.x, rect.y + 1, rect.x + width, rect.y + 1 ); + } + } +--- a/src/GenericClientListCtrl.cpp ++++ b/src/GenericClientListCtrl.cpp +@@ -660,7 +660,7 @@ + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + dc->SetPen( colour.Blend(65).GetPen() ); + } else { +- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + dc->SetPen(*wxTRANSPARENT_PEN); + } +--- a/src/MuleColour.cpp ++++ b/src/MuleColour.cpp +@@ -35,7 +35,7 @@ + std::map wxPenCache; + std::map wxBrushCache; + +-const wxPen& CMuleColour::GetPen(int width, int style) const ++const wxPen& CMuleColour::GetPen(int width, wxPenStyle style) const + { + #if USE_MULE_PEN_CACHE + wxPen* result = NULL; +@@ -61,7 +61,7 @@ + #endif + } + +-const wxBrush& CMuleColour::GetBrush(int style) const ++const wxBrush& CMuleColour::GetBrush(wxBrushStyle style) const + { + #if USE_MULE_BRUSH_CACHE + wxBrush* result = NULL; +--- a/src/MuleColour.h ++++ b/src/MuleColour.h +@@ -27,6 +27,9 @@ + + #include + #include ++#include // needed for wxPenStyle enum values ++#include // needed for wxBrushStyle enum values ++#include // needed for wxFontStyle enum values + #include "Types.h" + + class wxPen; +@@ -95,8 +98,8 @@ + return wxColor(m_red, m_green, m_blue); + } + +- const wxPen& GetPen(int width = 1, int style = wxSOLID) const; +- const wxBrush& GetBrush(int style = wxSOLID) const; ++ const wxPen& GetPen(int width = 1, wxPenStyle style = wxPENSTYLE_SOLID) const; ++ const wxBrush& GetBrush(wxBrushStyle style = wxBRUSHSTYLE_SOLID) const; + + private: + uint8_t m_red; +--- a/src/MuleGifCtrl.cpp ++++ b/src/MuleGifCtrl.cpp +@@ -167,7 +167,7 @@ + int x = (clientsize.GetWidth()-gifsize.GetWidth())/2; + int y = (clientsize.GetHeight()-gifsize.GetHeight())/2; + +- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID))); ++ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID))); + dc.Clear(); + dc.DrawBitmap(m_frame, x, y, true); + } +--- a/src/OScopeCtrl.cpp ++++ b/src/OScopeCtrl.cpp +@@ -74,7 +74,7 @@ + PlotData_t* ppds = pdsTrends; + for(unsigned i=0; icrPlot = (i<15 ? crPreset[i] : *wxWHITE); +- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID)); ++ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID)); + ppds->fPrev = ppds->fLowerLimit = ppds->fUpperLimit = 0.0; + } + +@@ -166,7 +166,7 @@ + if (ppds->crPlot == cr) + return; + ppds->crPlot = cr; +- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID)); ++ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID)); + InvalidateGraph(); + } + +@@ -179,7 +179,7 @@ + } + + m_bgColour = cr; +- brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxSOLID)); ++ brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxBRUSHSTYLE_SOLID)); + InvalidateCtrl() ; + } + +@@ -196,7 +196,7 @@ + + wxMemoryDC dcGrid(m_bmapGrid); + +- wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxSOLID)); ++ wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_SOLID)); + wxString strTemp; + + // fill the grid background +@@ -213,7 +213,7 @@ + dcGrid.SetPen(wxNullPen); + + // create some fonts (horizontal and vertical) +- wxFont axisFont(10, wxSWISS, wxNORMAL, wxNORMAL, false); ++ wxFont axisFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false); + dcGrid.SetFont(axisFont); + + // y max +@@ -320,7 +320,7 @@ + // operation, preventing us from simply blitting the plot on top of + // the grid bitmap. + +- dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxLONG_DASH))); ++ dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_LONG_DASH))); + for (unsigned j = 1; j < (nYGrids + 1); ++j) { + unsigned GridPos = (m_rectPlot.GetHeight())*j/( nYGrids + 1 ) + m_rectPlot.GetTop(); + +--- a/src/SearchListCtrl.cpp ++++ b/src/SearchListCtrl.cpp +@@ -826,7 +826,7 @@ + + // Define the border of the drawn area + if (highlighted) { +- dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxSOLID))); ++ dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxPENSTYLE_SOLID))); + } else { + dc->SetPen(*wxTRANSPARENT_PEN); + dc->SetTextForeground(GetItemTextColour(item)); +@@ -912,7 +912,7 @@ + const int middle = cur_rec.y + ( cur_rec.height + 1 ) / 2; + + // Set up a new pen for drawing the tree +- dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxSOLID)) ); ++ dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxPENSTYLE_SOLID)) ); + + if (file->GetParent()) { + // Draw the line to the filename +--- a/src/ServerListCtrl.cpp ++++ b/src/ServerListCtrl.cpp +@@ -327,7 +327,7 @@ + wxFont font = GetFont(); + + if ( highlight ) { +- font.SetWeight( wxBOLD ); ++ font.SetWeight( wxFONTWEIGHT_BOLD ); + + m_connected = server; + } +--- a/src/extern/wxWidgets/listctrl.cpp ++++ b/src/extern/wxWidgets/listctrl.cpp +@@ -1453,7 +1453,7 @@ + if ( highlighted ) + dc->SetBrush( m_owner->GetHighlightBrush() ); + else +- dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxSOLID))); ++ dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID))); + + dc->SetPen( *wxTRANSPARENT_PEN ); + +@@ -2325,7 +2325,7 @@ + ( + wxSYS_COLOUR_HIGHLIGHT + ), +- wxSOLID ++ wxBRUSHSTYLE_SOLID + )); + + m_highlightUnfocusedBrush = *(wxTheBrushList->FindOrCreateBrush( +@@ -2333,7 +2333,7 @@ + ( + wxSYS_COLOUR_BTNSHADOW + ), +- wxSOLID ++ wxBRUSHSTYLE_SOLID + )); + + SetScrollbars( 0, 0, 0, 0, 0, 0 ); +@@ -2734,7 +2734,7 @@ + + // Ensure an uniform background color, as to avoid differences between + // the automatically cleared parts and the rest of the canvas. +- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + + // We need to clear the DC manually, since we intercept BG-erase events. + // Clearing must be done first thing because caching of the double-buffering causes artifacts otherwise. +@@ -2805,7 +2805,7 @@ + + if ( HasFlag(wxLC_HRULES) ) + { +- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID)); ++ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID)); + wxSize clientSize = GetClientSize(); + + size_t i = visibleFrom; +@@ -2831,7 +2831,7 @@ + // Draw vertical rules if required + if ( HasFlag(wxLC_VRULES) && !IsEmpty() ) + { +- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID)); ++ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID)); + wxRect firstItemRect, lastItemRect; + + GetItemRect(visibleFrom, firstItemRect); +@@ -4859,12 +4859,15 @@ + + void wxListMainWindow::OnScroll(wxScrollWinEvent& event) + { ++ // wxScrolledWindows::OnScroll is deprecated in wx 3.0.0 and it does not exist anymore in 3.1.0. ++ // Please also notice that call to ++ // - wxScrolledWindow::OnScroll ++ // - HandleOnScroll ++ // have been removed in code present in ++ // src/generic/listctrl.cpp, wxListMainWindow::OnScroll ++ // of wxWidgets 3.0 + // FIXME +-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__) +- wxScrolledWindow::OnScroll(event); +-#else + HandleOnScroll( event ); +-#endif + + // update our idea of which lines are shown when we redraw the window the + // next time +--- a/src/extern/wxWidgets/listctrl.h ++++ b/src/extern/wxWidgets/listctrl.h +@@ -16,7 +16,6 @@ + #include + + #define wxLC_OWNERDRAW 0x10000 +-#define WXWIN_COMPATIBILITY_2_8 1 + + #include + +--- a/src/muuli_wdr.cpp ++++ b/src/muuli_wdr.cpp +@@ -77,7 +77,7 @@ + + CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, -1, wxT(""), wxDefaultPosition, wxSize(-1,20), wxTE_MULTILINE ); + item4->SetName( wxT("FastEd2kLinks") ); +- item2->Add( item4, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 ); ++ item2->Add( item4, 1, wxALL|wxEXPAND, 5 ); + + wxButton *item5 = new wxButton( parent, ID_BUTTON_FAST, _("Commit"), wxDefaultPosition, wxDefaultSize, 0 ); + item5->SetToolTip( _("Click here to add the eD2k link in the text control to your download queue.") ); +@@ -474,7 +474,7 @@ + item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); + + CSourceListCtrl *item6 = new CSourceListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER ); +- item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item0->Add( item6, 1, wxGROW, 5 ); + + if (set_sizer) + { +@@ -1048,7 +1048,7 @@ + wxWindow *item3 = new COScopeCtrl(3,1,GRAPH_DOWN,parent); + item3->SetName(wxT("dloadScope")); + wxASSERT( item3 ); +- item1->Add( item3, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item1->Add( item3, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 ); + item4->AddGrowableCol( 0 ); +@@ -1089,7 +1089,7 @@ + + item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); ++ item0->Add( item1, 1, wxGROW|wxBOTTOM, 5 ); + + wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Upload-Speed") ); + wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL ); +@@ -1097,7 +1097,7 @@ + wxWindow *item16 = new COScopeCtrl(3,1,GRAPH_UP,parent); + item16->SetName(wxT("uloadScope")); + wxASSERT( item16 ); +- item14->Add( item16, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item14->Add( item16, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item17 = new wxFlexGridSizer( 2, 0, 0 ); + item17->AddGrowableCol( 0 ); +@@ -1138,7 +1138,7 @@ + + item14->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item14, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); ++ item0->Add( item14, 1, wxGROW|wxBOTTOM, 5 ); + + wxStaticBox *item28 = new wxStaticBox( parent, -1, _("Connections") ); + wxStaticBoxSizer *item27 = new wxStaticBoxSizer( item28, wxVERTICAL ); +@@ -1146,7 +1146,7 @@ + wxWindow *item29 = new COScopeCtrl(3,0,GRAPH_CONN,parent); + item29->SetName(wxT("otherScope")); + wxASSERT( item29 ); +- item27->Add( item29, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item27->Add( item29, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item30 = new wxFlexGridSizer( 2, 0, 0 ); + item30->AddGrowableCol( 0 ); +@@ -1187,16 +1187,15 @@ + + item27->Add( item30, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item27, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item0->Add( item27, 1, wxGROW|wxALL, 5 ); + + wxStaticBox *item41 = new wxStaticBox( parent, -1, _("Statistics Tree") ); + wxStaticBoxSizer *item40 = new wxStaticBoxSizer( item41, wxVERTICAL ); + + wxTreeCtrl *item42 = new wxTreeCtrl( parent, -1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxSUNKEN_BORDER ); + item42->SetName( wxT("statTree") ); +- item40->Add( item42, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); +- +- item0->Add( item40, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item40->Add( item42, 1, wxGROW|wxALL, 5 ); ++ item0->Add( item40, 1, wxGROW|wxALL, 5 ); + + if (set_sizer) + { +@@ -2030,7 +2029,7 @@ + + wxStaticText *item2 = new wxStaticText( parent, -1, _("!!! WARNING !!!"), wxDefaultPosition, wxDefaultSize, 0 ); + item2->SetForegroundColour( *wxRED ); +- item2->SetFont( wxFont( 24, wxROMAN, wxNORMAL, wxNORMAL ) ); ++ item2->SetFont( wxFont( 24, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) ); + item1->Add( item2, 0, wxALIGN_CENTER, 5 ); + + wxStaticText *item3 = new wxStaticText( parent, IDC_AMULE_TWEAKS_WARNING, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); +--- a/src/utils/wxCas/src/wxcasframe.cpp ++++ b/src/utils/wxCas/src/wxcasframe.cpp +@@ -280,11 +280,11 @@ + #ifdef __WINDOWS__ + + memdc. +- SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) ); + #else + + memdc. +- SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) ); + #endif + + memdc. +--- a/src/amuleDlg.cpp ++++ b/src/amuleDlg.cpp +@@ -763,7 +763,7 @@ + if ( (true == skinChanged) || (currentState != s_oldState) ) { + wxWindowUpdateLocker freezer(m_wndToolbar); + +- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONCONNECT); ++ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONCONNECT); + + switch (currentState) { + case ECS_Connecting: +@@ -784,8 +784,6 @@ + toolbarTool->SetNormalBitmap(m_tblist.GetBitmap(0)); + } + +- m_wndToolbar->InsertTool(0, toolbarTool); +- m_wndToolbar->Realize(); + m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady()); + + s_oldState = currentState; +@@ -1416,7 +1414,7 @@ + wxWindowUpdateLocker freezer(this); + #endif + +- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONNETWORKS); ++ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONNETWORKS); + + // set the log windows + wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook); +@@ -1507,12 +1505,9 @@ + + // Tool bar + +- m_wndToolbar->InsertTool(2, toolbarTool); + m_wndToolbar->EnableTool(ID_BUTTONNETWORKS, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia())); + m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady()); + +- m_wndToolbar->Realize(); +- + ShowConnectionState(); // status in the bottom right + m_searchwnd->FixSearchTypes(); + } +--- a/src/amule-gui.cpp ++++ b/src/amule-gui.cpp +@@ -28,6 +28,7 @@ + #include + + #include // Needed for wxClipBoard ++#include + #include // Needed for wxStringTokenizer + + #include "SharedFilesWnd.h" // Needed for CSharedFilesWnd +@@ -98,6 +99,11 @@ + + CamuleGuiBase::CamuleGuiBase() + { ++ // 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(); ++ + amuledlg = NULL; + } + diff -Nru amule-2.3.3/debian/rules amule-2.3.3/debian/rules --- amule-2.3.3/debian/rules 2021-10-01 03:26:49.000000000 +0000 +++ amule-2.3.3/debian/rules 2023-09-23 18:39:52.000000000 +0000 @@ -64,8 +64,6 @@ ln -sf /usr/share/misc/config.sub . ln -sf /usr/share/misc/config.guess . - ln -sf debian/amule-32.xpm amule.xpm - -mkdir $(objdir) cd $(objdir) && \ env CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" LDFLAGS="$(LDFLAGS_DEF)" ../configure $(confflags) @@ -98,8 +96,6 @@ rm -rf $(objdir) rm -f po/*.gmo - rm -f amule.xpm - dh_clean # @@ -139,7 +135,6 @@ dh_installdocs dh_installexamples dh_installmime - dh_installmenu dh_installdebconf dh_installinit dh_bugfiles -A