Projects
Extra
aMule
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 36
View file
aMule.spec
Changed
@@ -1,6 +1,6 @@ Name: aMule Summary: Another eMule file-sharing program -Version: 2.3.1+git20160125.1804 +Version: 2.3.1+git20160212.1136 Release: 0 License: GPL-2.0+ Group: Productivity/Networking/Other
View file
update.diff.xz
Changed
@@ -0,0 +1,1028 @@ +diff --git a/docs/Changelog b/docs/Changelog +index 1b53b40..1dedb12 100644 +--- a/docs/Changelog ++++ b/docs/Changelog +@@ -25,6 +25,7 @@ Version 2.4.0 - The river knows. + the locale has been set + * Fix Crypto++ detection routine happily using build library + for host when cross-compiling ++ * Fix bug #1711: Kad Info tab should display my own user ID + + iz0bbz: + * Fix WinSock library version detection with MinGW-w64 +diff --git a/m4/boost.m4 b/m4/boost.m4 +index 928a3d6..9acd270 100644 +--- a/m4/boost.m4 ++++ b/m4/boost.m4 +@@ -585,27 +585,79 @@ LDFLAGS=$boost_filesystem_save_LDFLAGS + # BOOST_CONTEXT([PREFERRED-RT-OPT]) + # ----------------------------------- + # Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the +-# documentation of BOOST_FIND_LIB above. This library was introduced in Boost +-# 1.51.0 ++# documentation of BOOST_FIND_LIB above. ++# ++# * This library was introduced in Boost 1.51.0 ++# * The signatures of make_fcontext() and jump_fcontext were changed in 1.56.0 ++# * A dependency on boost_thread appears in 1.57.0 + BOOST_DEFUN([Context], +-[BOOST_FIND_LIB([context], [$1], ++[boost_context_save_LIBS=$LIBS ++ boost_context_save_LDFLAGS=$LDFLAGS ++if test $boost_major_version -ge 157; then ++ BOOST_THREAD([$1]) ++ m4_pattern_allow([^BOOST_THREAD_(LIBS|LDFLAGS)$])dnl ++ LIBS="$LIBS $BOOST_THREAD_LIBS" ++ LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS" ++fi ++BOOST_FIND_LIB([context], [$1], + [boost/context/all.hpp],[[ ++ + // creates a stack + void * stack_pointer = new void*[4096]; + std::size_t const size = sizeof(void*[4096]); + +-// context fc uses f() as context function +-// fcontext_t is placed on top of context stack +-// a pointer to fcontext_t is returned ++#if BOOST_VERSION <= 105100 ++ctx::make_fcontext(&fc, f); ++return ctx::jump_fcontext(&fcm, &fc, 3) == 6; ++ ++#else ++ + fc = ctx::make_fcontext(stack_pointer, size, f); +-return ctx::jump_fcontext(&fcm, fc, 3) == 6;]],[dnl ++return ctx::jump_fcontext(&fcm, fc, 3) == 6; ++ ++#endif ++ ++ ++]],[dnl ++ ++#include <boost/version.hpp> ++#if BOOST_VERSION <= 105100 ++ ++namespace ctx = boost::ctx; ++ ++static ctx::fcontext_t fcm, fc; ++ ++static void f(intptr_t i) { ++ ctx::jump_fcontext(&fc, &fcm, i * 2); ++} ++ ++#elif BOOST_VERSION <= 105500 ++ + namespace ctx = boost::context; ++ + // context + static ctx::fcontext_t fcm, *fc; ++ + // context-function + static void f(intptr_t i) { + ctx::jump_fcontext(fc, &fcm, i * 2); +-}]) ++} ++ ++#else ++ ++namespace ctx = boost::context; ++ ++// context ++static ctx::fcontext_t fcm, fc; ++ ++// context-function ++static void f(intptr_t i) { ++ ctx::jump_fcontext(&fc, fcm, i * 2); ++} ++#endif ++]) ++LIBS=$boost_context_save_LIBS ++LDFLAGS=$boost_context_save_LDFLAGS + ])# BOOST_CONTEXT + + +@@ -637,10 +689,21 @@ m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)]) + LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS" + LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS" + +-BOOST_FIND_LIB([coroutine], [$1], +- [boost/coroutine/coroutine.hpp], +- [boost::coroutines::coroutine< int(int) > coro; coro.empty();]) +- ++# in 1.53 coroutine was a header only library ++if test $boost_major_version -eq 153; then ++ BOOST_FIND_HEADER([boost/coroutine/coroutine.hpp]) ++else ++ BOOST_FIND_LIB([coroutine], [$1], ++ [boost/coroutine/coroutine.hpp], ++ [ ++ #include <boost/version.hpp> ++ #if BOOST_VERSION <= 105500 ++ boost::coroutines::coroutine<int(int)> coro; coro.get(); ++ #else ++ boost::coroutines::asymmetric_coroutine<int>::pull_type coro; coro.get(); ++ #endif ++ ]) ++fi + # Link-time dependency from coroutine to context, existed only in 1.53, in 1.54 + # coroutine doesn't use context from its headers but from its library. + if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then +@@ -752,8 +815,19 @@ BOOST_DEFUN([Geometry], + # Look for Boost.Graphs. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. + BOOST_DEFUN([Graph], +-[BOOST_FIND_LIB([graph], [$1], ++[boost_graph_save_LIBS=$LIBS ++boost_graph_save_LDFLAGS=$LDFLAGS ++# Link-time dependency from graph to regex was added as of 1.40.0. ++if test $boost_major_version -ge 140; then ++ BOOST_REGEX([$1]) ++ m4_pattern_allow([^BOOST_REGEX_(LIBS|LDFLAGS)$])dnl ++ LIBS="$LIBS $BOOST_REGEX_LIBS" ++ LDFLAGS="$LDFLAGS $BOOST_REGEX_LDFLAGS" ++fi ++BOOST_FIND_LIB([graph], [$1], + [boost/graph/adjacency_list.hpp], [boost::adjacency_list<> g;]) ++LIBS=$boost_graph_save_LIBS ++LDFLAGS=$boost_graph_save_LDFLAGS + ])# BOOST_GRAPH + + +@@ -786,9 +860,21 @@ BOOST_DEFUN([Lambda], + # -------------- + # Look for Boost.Locale + BOOST_DEFUN([Locale], +-[BOOST_FIND_LIB([locale], [$1], ++[ ++boost_locale_save_LIBS=$LIBS ++boost_locale_save_LDFLAGS=$LDFLAGS ++# require SYSTEM for boost-1.50.0 and up ++if test $boost_major_version -ge 150; then ++ BOOST_SYSTEM([$1]) ++ m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl ++ LIBS="$LIBS $BOOST_SYSTEM_LIBS" ++ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" ++fi # end of the Boost.System check. ++BOOST_FIND_LIB([locale], [$1], + [boost/locale.hpp], + [[boost::locale::generator gen; std::locale::global(gen(""));]]) ++LIBS=$boost_locale_save_LIBS ++LDFLAGS=$boost_locale_save_LDFLAGS + ])# BOOST_LOCALE + + # BOOST_LOG([PREFERRED-RT-OPT]) +@@ -796,9 +882,19 @@ BOOST_DEFUN([Locale], + # Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. + BOOST_DEFUN([Log], +-[BOOST_FIND_LIB([log], [$1], ++[boost_log_save_LIBS=$LIBS ++boost_log_save_LDFLAGS=$LDFLAGS ++BOOST_SYSTEM([$1]) ++BOOST_FILESYSTEM([$1]) ++BOOST_DATE_TIME([$1]) ++m4_pattern_allow([^BOOST_(SYSTEM|FILESYSTEM|DATE_TIME)_(LIBS|LDFLAGS)$])dnl ++LIBS="$LIBS $BOOST_DATE_TIME_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS" ++LDFLAGS="$LDFLAGS $BOOST_DATE_TIME_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS $BOOST_SYSTEM_LDFLAGS" ++BOOST_FIND_LIB([log], [$1], + [boost/log/core/core.hpp], + [boost::log::attribute a; a.get_value();]) ++LIBS=$boost_log_save_LIBS ++LDFLAGS=$boost_log_save_LDFLAGS + ])# BOOST_LOG + + +@@ -807,10 +903,17 @@ BOOST_DEFUN([Log], + # Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. + BOOST_DEFUN([Log_Setup],
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.