diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /net-p2p/amule/files | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'net-p2p/amule/files')
-rw-r--r-- | net-p2p/amule/files/amule-2.2.6-fallocate.diff | 23 | ||||
-rw-r--r-- | net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch | 50 |
2 files changed, 50 insertions, 23 deletions
diff --git a/net-p2p/amule/files/amule-2.2.6-fallocate.diff b/net-p2p/amule/files/amule-2.2.6-fallocate.diff deleted file mode 100644 index 8d1485a67786..000000000000 --- a/net-p2p/amule/files/amule-2.2.6-fallocate.diff +++ /dev/null @@ -1,23 +0,0 @@ -Disable fallocate #562992 - -This is only a workaround to fix FTBFS, the configure check is wrong and needs to be fixed: -http://www.amule.org/abugs/view.php?id=1572 - ---- a/src/ThreadTasks.cpp -+++ b/src/ThreadTasks.cpp -@@ -506,6 +506,15 @@ void CCompletionTask::OnExit() - #include <stdlib.h> - #include <errno.h> - -+// #562992 -+#if defined(__alpha__) || defined(__hppa__) -+#undef HAVE_FALLOCATE -+#endif -+ -+#if defined(__hppa__) -+#undef HAVE_SYS_FALLOCATE -+#endif -+ - CAllocateFileTask::CAllocateFileTask(CPartFile *file, bool pause) - // GetPrintable is used to improve the readability of the log. - : CThreadTask(wxT("Allocating"), file->GetFullName().RemoveExt().GetPrintable(), ETP_High), diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch new file mode 100644 index 000000000000..81e0ef7b6296 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch @@ -0,0 +1,50 @@ +From 110a056fa4bcfc0fe8c1f8eadcc2bd5df0bbf5e1 Mon Sep 17 00:00:00 2001 +From: xinhuang <xinhuang.abc@gmail.com> +Date: Thu, 4 Jan 2018 00:44:35 -0800 +Subject: [PATCH] fix crash when shared files changed on Shared files tab + +--- + src/extern/wxWidgets/listctrl.cpp | 10 ---------- + src/extern/wxWidgets/listctrl.h | 5 ----- + 2 files changed, 15 deletions(-) + +diff --git a/src/extern/wxWidgets/listctrl.cpp b/src/extern/wxWidgets/listctrl.cpp +index 18a30f205..460700691 100644 +--- a/src/extern/wxWidgets/listctrl.cpp ++++ b/src/extern/wxWidgets/listctrl.cpp +@@ -5803,16 +5803,6 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) + #endif + } + +-void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const +-{ +- m_mainWin->DoClientToScreen(x, y); +-} +- +-void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const +-{ +- m_mainWin->DoScreenToClient(x, y); +-} +- + void wxGenericListCtrl::SetFocus() + { + // The test in window.cpp fails as we are a composite +diff --git a/src/extern/wxWidgets/listctrl.h b/src/extern/wxWidgets/listctrl.h +index b18a61866..e72f7eaf0 100644 +--- a/src/extern/wxWidgets/listctrl.h ++++ b/src/extern/wxWidgets/listctrl.h +@@ -232,11 +232,6 @@ public: + protected: + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + +- // take into account the coordinates difference between the container +- // window and the list control window itself here +- virtual void DoClientToScreen( int *x, int *y ) const; +- virtual void DoScreenToClient( int *x, int *y ) const; +- + virtual wxSize DoGetBestSize() const; + + // return the text for the given column of the given item +-- +2.21.0 + |