Date: Tuesday, March 26, 2019 @ 08:55:36 Author: arojas Revision: 443542
wxgtk 3.1 rebuild Added: amule/trunk/amule-wxgtk-3.1.patch Modified: amule/trunk/PKGBUILD -----------------------+ PKGBUILD | 13 ++++++++++--- amule-wxgtk-3.1.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-26 07:49:12 UTC (rev 443541) +++ PKGBUILD 2019-03-26 08:55:36 UTC (rev 443542) @@ -7,7 +7,7 @@ pkgname=amule pkgver=11004 -pkgrel=4 +pkgrel=5 pkgdesc="An eMule-like client for ed2k p2p network" arch=(x86_64) url="http://www.amule.org" @@ -15,13 +15,20 @@ depends=(wxgtk2 gd geoip libupnp crypto++ boost-libs) makedepends=(git ccache boost) source=("git://repo.or.cz/amule.git#tag=amule-svn-r$pkgver" - amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles) + amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles + amule-wxgtk-3.1.patch) sha256sums=('SKIP' '20ac6b60c5f3bf49c0b080dfc02409da3c9d01b154344188008c6a75ca69681e' 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2' 'c4ca658ab4105b3b90e0bb3efcc8121eca1c4d873787db1ed4f637925c16d502' - 'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d') + 'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d' + '2486059f4358e6c3cc1b42c8ca2494dca5e86321663ac13c3d2a8f4c1fe23fd2') +prepare() { + cd amule + patch -p1 -i ../amule-wxgtk-3.1.patch # Fix build with wxgtk 3.1 +} + build() { cd amule ./configure --prefix=/usr \ Added: amule-wxgtk-3.1.patch =================================================================== --- amule-wxgtk-3.1.patch (rev 0) +++ amule-wxgtk-3.1.patch 2019-03-26 08:55:36 UTC (rev 443542) @@ -0,0 +1,26 @@ +diff --git a/src/amuleDlg.cpp b/src/amuleDlg.cpp +index 03bc83c3..a1dc07b2 100644 +--- a/src/amuleDlg.cpp ++++ b/src/amuleDlg.cpp +@@ -1380,7 +1380,7 @@ void CamuleDlg::Create_Toolbar(bool orientation) + if (!m_wndToolbar) { + m_wndToolbar = CreateToolBar( + (orientation ? wxTB_VERTICAL : wxTB_HORIZONTAL) | +- wxNO_BORDER | wxTB_TEXT | wxTB_3DBUTTONS | ++ wxNO_BORDER | wxTB_TEXT | + wxTB_FLAT | wxCLIP_CHILDREN | wxTB_NODIVIDER); + + +diff --git a/src/extern/wxWidgets/listctrl.cpp b/src/extern/wxWidgets/listctrl.cpp +index 46070069..4483d0f1 100644 +--- a/src/extern/wxWidgets/listctrl.cpp ++++ b/src/extern/wxWidgets/listctrl.cpp +@@ -4860,7 +4860,7 @@ void wxListMainWindow::SortItems( MuleListCtrlCompare fn, long data ) + void wxListMainWindow::OnScroll(wxScrollWinEvent& event) + { + // FIXME +-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__) ++#if ( defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__) + wxScrolledWindow::OnScroll(event); + #else + HandleOnScroll( event );