anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libsigc++-1.0.3: you will need to ./autogen.sh ; ./configure

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1943 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2001-04-20 01:43:28 +00:00
parent 1df42757ed
commit 9a95625922
12 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/sigc++.m4
View File

@ -62,7 +62,7 @@ dnl
SIGC_CFLAGS=`$SIGC_CONFIG $sigc_config_args --cflags`
SIGC_LIBS=`$SIGC_CONFIG $sigc_config_args --libs`
SIGC_MACROS=`$SIGC_CONFIG $sigc_config_args --libs`
SIGC_MACROS=`$SIGC_CONFIG $sigc_config_args --macros`
sigc_major_version=`echo $sigc_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`

7
development/ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-17 Allan Rae <rae@lyx.org>
* tools/makeLyXsigc.sh: put the important local changes into sed
scripts. Outlining of inline code is lost -- feel free to add the
necessary script or patch to get them back again if they annoy you.
Or send a patch to Karl and get the changes into libsigc++.
2001-04-03 Kayvan Sylvan <kayvan@sylvan.com>
* lyx.spec.in: fix handling of reLyX with RPM relocation.

21
development/tools/makeLyXsigc.sh
View File

@ -157,6 +157,12 @@ echo "Creating custom sigc++/configure.in"
#
# Move sigc++config.h out of the now removed config/.
#
# -e 's/--dis\(able-threads\)/--en\1/' \
# -e 's;dis\(ables.*threading\);en\1;' \
# -e 's;\(^enable.*threads=\"\)yes;\1no;' \
#
# Don't use threads.
#
# -e '/.*\.spec.*/d' \
# -e '\%.*sigc++/Makefile.*%d' \
# -e '\%.*config/Makefile.*%d'
@ -231,6 +237,9 @@ done\
LYX_FIX_MAKEFILE_IN%' \
-e 's%\(AUX_DIR(\)scripts%\1../config%' \
-e 's%config/\(sigc++config\.h\)%\1%' \
-e 's/--dis\(able-threads\)/--en\1/' \
-e 's;dis\(ables.*threading\);en\1;' \
-e 's;\(^enable.*threads=\"\)yes;\1no;' \
-e '/.*\.spec.*/d' \
-e '\%.*sigc++/Makefile.*%d' \
-e '\%.*config/Makefile.*%d' \
@ -303,6 +312,12 @@ echo "Modifying sigc++/Makefile.am"
#
# We don't want the extra bits that libsigc++ does.
#
# -e 's/\(libsigc_la_SOURCES=\)\(.*\)/\1 $(BUILT_SOURCES)\2/' \
# -e '/%.h:/i\
#Makefile: $(BUILT_SOURCES)\
#'
# Make sure the built sources are built.
#
( cd $package/sigc++;
sed < Makefile.am > Makefile.tmp \
-e 's%\(SUBDIRS =\)\(.*\)config\(.*\)%\1\2\3\
@ -318,7 +333,11 @@ ETAGS_ARGS = --lang=c++%' \
-e 's/\(LTLIB\)/noinst_\1/' \
-e '/EXTRA_DIST.*/d' \
-e 's/-version-info.*ION)//' \
-e 's/-release.*EASE)//';
-e 's/-release.*EASE)//' \
-e 's/\(libsigc_la_SOURCES=\)\(.*\)/\1 $(BUILT_SOURCES)\2/' \
-e '/%.h:/i\
Makefile: $(BUILT_SOURCES)\
';
rm -f Makefile.am ;
mv Makefile.tmp Makefile.am )

6
sigc++/ChangeLog
View File

@ -1,3 +1,9 @@
2001-04-17 Allan Rae <rae@lyx.org>
* libsigc++-1.0.3 and important local changes kept. Outlining of
inline functions has been lost -- modify ../development/tools/
makeLyXsigc.sh if you want them back again.
2001-02-07 Lars Gullik Bjřnnes <larsbj@lyx.org>
* configure.in (AC_ARG_ENABLE(threads)): disable threads by default.

4
sigc++/configure.in
View File

@ -33,7 +33,7 @@ dnl
dnl Source packaging numbers
SIGC_MAJOR_VERSION=1
SIGC_MINOR_VERSION=0
SIGC_MICRO_VERSION=1
SIGC_MICRO_VERSION=3
dnl Library extension
SIGC_RELEASE=1.0
@ -87,7 +87,7 @@ else
AC_SUBST(USE_INCLUDED_SIGC)
AC_ARG_ENABLE(threads,
[ --enable-threads enable support threading.],
[ --enable-threads enables support threading.],
enable_threads=$enableval,enable_threads="no")
AC_ARG_ENABLE(checks,
[ --disable-checks disables unnecessary tests needed for bug reports.],

1
sigc++/handle.h
View File

@ -84,7 +84,6 @@ template <class Obj,class Scope_>
Obj *o=handle.obj();
scope_.set(o,o,false);
}
};
#define HANDLE_CTORS(X,T,P) \

2
sigc++/macros/basic_signal.h.m4
View File

@ -77,7 +77,7 @@ define([BASIC_SIGNAL],
****************************************************************/
LINE(]__line__[)dnl
template <LIST(class R,1,ARG_CLASS($1),[$1],[typename Marsh=class Marshal<R> ],1)>
template <LIST(class R,1,ARG_CLASS($1),[$1],[typename Marsh=Marshal<R> ],1)>
class [Signal]NUM($1):public Signal_
{
public:

6
sigc++/macros/convert.h.m4
View File

@ -98,14 +98,14 @@ struct [AdaptorConvertSlot]NUM($2)[_]NUM($3): public AdaptorSlot_
typedef __SLOT__($1,[$2]) SlotType;
typedef __SLOT__(R2,[$3]) InSlotType;
typedef typename InSlotType::Callback Callback;
typedef RType (*Func) (Callback*,ARG_TYPE($2));
typedef $1 (*InFunc)(Callback*,ARG_TYPE($2));
typedef RType (*Func) (LIST(Callback*,1,ARG_TYPE($2),[$2]));
typedef $1 (*InFunc)(LIST(Callback*,1,ARG_TYPE($2),[$2]));
typedef CallDataObj3<typename SlotType::Func,Callback,Func> CallData;
static RType callback(LIST(void* d,1,ARG_BOTH($2),[$2]))
{
CallData* data=(CallData*)d;
ifelse($1,void,,return) (data->func)(data->obj,ARG_NAME($2));
ifelse($1,void,,return) (data->func)(LIST(data->obj,1,ARG_NAME($2),[$2]));
}
static SlotData* create(SlotData *s,InFunc func)

4
sigc++/scope.cc
View File

@ -225,10 +225,6 @@ ScopeIterator_ ScopeList::erase(Iterator pos)
return tmp;
}
ScopeIterator_::ScopeIterator_(const ScopeIterator_ & n)
: node_(n.node_)
{}
void ScopeList::swap_elements(Iterator p1,Iterator p2)
{
NodeType *loc1=p1.node();

3
sigc++/scope.h
View File

@ -246,8 +246,7 @@ struct LIBSIGC_API ScopeIterator_
return *this;
}
ScopeIterator_(const ScopeIterator_ &n);
//:node_(n.node_) {}
ScopeIterator_(const ScopeIterator_ &n):node_(n.node_) {}
ScopeIterator_(NodeType *n):node_(n) {}
ScopeIterator_():node_(0) {}
};

13
sigc++/thread.cc
View File

@ -53,7 +53,7 @@ Condition::~Condition()
int Condition::signal() {return pthread_cond_signal(&cond_);}
int Condition::broadcast() {return pthread_cond_broadcast(&cond_);}
int Condition::wait(Mutex &m) {return pthread_cond_wait(&cond_,m);}
int Condition::wait(Mutex &m, struct timespec* spec)
int Condition::wait(Mutex &m,struct timespec* spec)
{return pthread_cond_timedwait(&cond_,m,spec);}
int Condition::destroy() {return pthread_cond_destroy(&cond_);}
@ -135,13 +135,6 @@ void Private_::destroy()
#endif
}
Private<int>::operator int&()
{
int * value = static_cast<int*>(get());
if (!value)
set(static_cast<void*>(value = new int(0)));
return *(value);
}
#ifdef SIGC_PTHREAD_DCE
MutexAttr Mutex::Default={pthread_mutexattr_default};
@ -155,8 +148,8 @@ ThreadAttr Thread::Default={0};
#ifdef SIGC_CXX_NAMESPACES
};
};
}
}
#endif
#endif

16
sigc++/thread.h
View File

@ -121,7 +121,7 @@ struct Condition
// unlocks a mutex while waiting on a condition, then reaquires lock
// with a fixed maximum duration.
int wait(Mutex &m, struct timespec* spec);
int wait(Mutex &m,struct timespec* spec);
};
@ -191,13 +191,13 @@ class Private<int> : private Private_
int& operator =(const int& t)
{return (((int&)*this)=t);}
operator int& ();
//{
// int *value=(int*)get();
// if (!value)
// set((void*)(value=new int(0)));
// return *(value);
//}
operator int& ()
{
int *value=(int*)get();
if (!value)
set((void*)(value=new int(0)));
return *(value);
}
Private() { create(&dtor); }
~Private() { destroy(); }