net-misc/simias: gcc 4.3 / libtool 2.2 / mono 2.2
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@798 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
33f4bf4543
commit
e5ea06bbdd
|
|
@ -1,7 +1,16 @@
|
|||
# ChangeLog for net-misc/simias
|
||||
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
|
||||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
21 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/simias-1.6.use_system_gsoap.patch,
|
||||
+files/simias-libflaim_shared-1.patch, +files/flex_in_lib64.diff,
|
||||
+files/simias_make_gcc43_happy.diff, +files/simias-libtool22-1.patch,
|
||||
+files/simias-mono22-1.patch,
|
||||
+files/configure.in-xsp-check-by-dl9pf-version3.diff,
|
||||
+files/eval_gacd_mono_webserver_true.diff, +simias-1.6.7303.1-r1.ebuild:
|
||||
gcc 4.3 / libtool 2.2 / mono 2.2
|
||||
|
||||
26 Jan 2008; Mario Fetka <mario-fetka@gmx.at> +metadata.xml:
|
||||
initial ifolder import from http://trac.one-gear.com/chaos/wiki
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,17 @@
|
|||
AUX SimiasSetup.cs.in.patch 896 RMD160 355df8559dca6f592db7a6d8cecf30078dc536f0 SHA1 57ac4cf5183adfc2299d34e10d5e6d4c20e26ec6 SHA256 a355d866883c4e8353192c394da9f034c354f1e3617d0e5fc750ba7f53dd29c9
|
||||
MD5 2c74c6c74bcc7ed8946a14855c8ce286 files/SimiasSetup.cs.in.patch 896
|
||||
RMD160 355df8559dca6f592db7a6d8cecf30078dc536f0 files/SimiasSetup.cs.in.patch 896
|
||||
SHA256 a355d866883c4e8353192c394da9f034c354f1e3617d0e5fc750ba7f53dd29c9 files/SimiasSetup.cs.in.patch 896
|
||||
AUX configure.in-xsp-check-by-dl9pf-version3.diff 3030 RMD160 2ffd1183ae56b2b9389bb5fc366ae4f2b74006f9 SHA1 9e5c6e5eb9e38f7c131d0a8aac49e3cebff89093 SHA256 f241ff570abf445a1839b7dbb28b097010524a91e9a361336f25f8b2207eb738
|
||||
AUX eval_gacd_mono_webserver_true.diff 534 RMD160 3f73082ec35ae91d2031380bcfa434759476e2b9 SHA1 163fd3c6f98edd85b4b725e3e35877fb0962653a SHA256 c68a20ada4b170b1fb04cf9dbaae6a49074e672cdfdf00cab87922d86fe1ca7e
|
||||
AUX flex_in_lib64.diff 435 RMD160 c884f5b5b8b11fbbde50efe0f33ecc14b9c7c7aa SHA1 362b8742f0f69bfabd7bd1b1ba0a8b55615ca4a5 SHA256 a8e62c614c07189ad8b4c5dd5c52ee9748a0fbb0f1aade12e3570669a4ca30cc
|
||||
AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c19aa833736 SHA1 fa49d2d34f210919590838c9d302315a304ff037 SHA256 e8432f7883b161c8f68c16f7a99da4ade7eab5b41f8391e7f99b3f92474c74c0
|
||||
AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778
|
||||
MD5 5fa4972c53bcf8d82ed4d577d4a8e5c6 files/simias-Makefile-in-generate.diff 245
|
||||
RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 files/simias-Makefile-in-generate.diff 245
|
||||
SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778 files/simias-Makefile-in-generate.diff 245
|
||||
AUX simias-libflaim_shared-1.patch 749 RMD160 a8c402e4c822cf7961068308e46dbfea4e69ffea SHA1 37aed1ec52275c2d3e3cdfe37e2b122e07781c43 SHA256 9a9918fcaa7a6e528b8f15f9c719b886b51af3264bb89fd59859f0023eb9050f
|
||||
AUX simias-libtool22-1.patch 498 RMD160 3c6c621765382c3bbf66877217aef55301e6c337 SHA1 04affadf85f3f731b530acdc54659e83c08b0942 SHA256 156f539e59b62592a2e83902b063f7b941940bb93294eb2bd8d99146302d888b
|
||||
AUX simias-mono22-1.patch 7625 RMD160 c79c85338af4385b3f6a15eec868af2537a2800a SHA1 212ba89d751446723a281e38b36adf658a0e9ef1 SHA256 f60a542b26e31c0dc907c730eaa6b7f7474c95565f44b72eb0dc196b270286e9
|
||||
AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b
|
||||
AUX webdir-prefix.patch 316 RMD160 06e9d5a4bfddd47b875a2671e94929bc8de05557 SHA1 4bd98462535961c954962541cc59c5e3d8ac8f87 SHA256 ef4441812bfc7bcdb6746f9145e36f21c30bde769a1dece2eca23bd9d3b3870f
|
||||
MD5 43557030efeec13bebb27799cf7f8786 files/webdir-prefix.patch 316
|
||||
RMD160 06e9d5a4bfddd47b875a2671e94929bc8de05557 files/webdir-prefix.patch 316
|
||||
SHA256 ef4441812bfc7bcdb6746f9145e36f21c30bde769a1dece2eca23bd9d3b3870f files/webdir-prefix.patch 316
|
||||
AUX wildcard.patch 406 RMD160 6dbb732fe8d47a67b2f14d0f3ab90b58ce0d7486 SHA1 9f13dc82a32eeac01b5f69aa606e1ea68a0a4535 SHA256 ce872b394d9e002521e1b6d546086c59337278f5983cb36faa55d8d1a2995032
|
||||
MD5 3627d2f2d17d24149413c49875bb0082 files/wildcard.patch 406
|
||||
RMD160 6dbb732fe8d47a67b2f14d0f3ab90b58ce0d7486 files/wildcard.patch 406
|
||||
SHA256 ce872b394d9e002521e1b6d546086c59337278f5983cb36faa55d8d1a2995032 files/wildcard.patch 406
|
||||
DIST simias-1.6.7303.1.tar.gz 21072448 RMD160 9ced659b4bccf24c84b8a85b15de108da436b1f7 SHA1 6c08b208f6bae9771e6ca2722700f1ba24db32f3 SHA256 894ed8f1e5a00fa0773c105993ba82e62dc7db3ec32d09335d071be80f7feca7
|
||||
EBUILD simias-1.6.7303.1.ebuild 1113 RMD160 37434f81943ba011cd728bc4cdc2e9adee9d4670 SHA1 2fbb443d4022f0765ea93a54bc8a6d124a4a2cc7 SHA256 63b31c2435ac140e01ec92610cb77bc9ef6149980e9f328c80c90baa65e489e6
|
||||
MD5 45d8c8fd50543411e6960fa6bb3730b7 simias-1.6.7303.1.ebuild 1113
|
||||
RMD160 37434f81943ba011cd728bc4cdc2e9adee9d4670 simias-1.6.7303.1.ebuild 1113
|
||||
SHA256 63b31c2435ac140e01ec92610cb77bc9ef6149980e9f328c80c90baa65e489e6 simias-1.6.7303.1.ebuild 1113
|
||||
MISC ChangeLog 246 RMD160 18bb91fe57f67f2d727e96c5d20eaeeb3b0c4dc4 SHA1 a90be1d394529a75b6535d0f5ea77ec79e628f02 SHA256 bf92d8bfdb3011ed937b7f1601ffaefccbd7ba5ccb9c415059a3b0db0b98cb47
|
||||
MD5 e071b44699234be242f07964b56ee417 ChangeLog 246
|
||||
RMD160 18bb91fe57f67f2d727e96c5d20eaeeb3b0c4dc4 ChangeLog 246
|
||||
SHA256 bf92d8bfdb3011ed937b7f1601ffaefccbd7ba5ccb9c415059a3b0db0b98cb47 ChangeLog 246
|
||||
EBUILD simias-1.6.7303.1-r1.ebuild 1054 RMD160 69aea43abad0fe77163e8bc5c6ad31ef9c807485 SHA1 009b5fb09bfcb58438c5b4960dcaa9e768b5b75f SHA256 c13467a5d0e85d8bb923148d01265f65732ba3059acb0c8b954849c102d08dd6
|
||||
EBUILD simias-1.6.7303.1.ebuild 1112 RMD160 8365e168ccc0b0d4c7ca79e817a260b6b82f2951 SHA1 d0acae886aba342082063935f1ac06df0da61fbf SHA256 f90e8de280424a1ce92ba032455fed06634429ff88a5ed58349b06cd1972efdb
|
||||
MISC ChangeLog 680 RMD160 a089d45bcf6eab686817926a167db1e54239ca45 SHA1 694091e46f05f2ac8645c8a989108ccd6a37153e SHA256 50c2a8e2704ee1b8481e6d3e361083ca3bff558fe1c5c9e1eab5fd9e6b8a18be
|
||||
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
|
||||
MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
|
||||
RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
|
||||
SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
|
||||
MD5 3913f30dddcd2d8a3b4b8e522acf70ad files/digest-simias-1.6.7303.1 259
|
||||
RMD160 db3b2e8a1f137f6c05ffc8768eae5b4ed1548104 files/digest-simias-1.6.7303.1 259
|
||||
SHA256 04a8179e0c2ff821356bda9e393e9d7cc4bfa8c660b76dd95a50afb0c2e8bd8e files/digest-simias-1.6.7303.1 259
|
||||
|
|
|
|||
|
|
@ -0,0 +1,94 @@
|
|||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (Revision 6873)
|
||||
+++ configure.in (Arbeitskopie)
|
||||
@@ -607,8 +607,87 @@
|
||||
# Configure MONO_WEBSERVER
|
||||
#
|
||||
MONO_WEBSERVER="no"
|
||||
-if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then
|
||||
- MONO_WEBSERVER="yes"
|
||||
+if test "$SIMIAS_OS" = "linux"; then
|
||||
+ # If we have xsp in our $PATH, then we have xsp installed
|
||||
+ AC_CHECK_PROG(HAVE_XSP, xsp, yes)
|
||||
+ AC_CHECKING([whether xsp version is >= 1.1.13.8])
|
||||
+ if test "$HAVE_XSP" = "yes"; then
|
||||
+ # Get the version info and check if we have a version >= 1.1.18
|
||||
+ # 1st: Get the version string
|
||||
+ XSP_EXE_VER=`LANG="C" xsp --version | head -n 1 | cut -d" " -f2`
|
||||
+
|
||||
+ # We have to look at a minimum of 3 digits (mono-W.X.Y.Z)
|
||||
+ DIGIT_W=`echo $XSP_EXE_VER | cut -d"." -f1` # major
|
||||
+ DIGIT_X=`echo $XSP_EXE_VER | cut -d"." -f2` # minor
|
||||
+ DIGIT_Y=`echo $XSP_EXE_VER | cut -d"." -f3` # sub
|
||||
+ DIGIT_Z=`echo $XSP_EXE_VER | cut -d"." -f4` # extra
|
||||
+
|
||||
+ # We want to require a minimum of 1.1.18 (no z, setting "0")
|
||||
+ REQ_MAJOR="1"
|
||||
+ REQ_MINOR="1"
|
||||
+ REQ_SUB="13"
|
||||
+ REQ_EXTRA="7"
|
||||
+
|
||||
+ # Lets compare things
|
||||
+ echo " M M S E"
|
||||
+ echo " A I U X"
|
||||
+ echo " J N B T"
|
||||
+ echo " O O R"
|
||||
+ echo " R R A"
|
||||
+ echo " - - - "
|
||||
+ echo "DEBUG $DIGIT_W - $DIGIT_X - $DIGIT_Y - $DIGIT_Z"
|
||||
+ echo "DEBUG $REQ_MAJOR - $REQ_MINOR - $REQ_SUB - $REQ_EXTRA"
|
||||
+
|
||||
+XSP_ERROR_MSG="
|
||||
+* Your xsp version seems to be $DIGIT_W.$DIGIT_X.$DIGIT_Y.$DIGIT_Z
|
||||
+* You need to install xsp >= $REQ_MAJOR.$REQ_MINOR.$REQ_SUB to run simias
|
||||
+"
|
||||
+
|
||||
+ if [[[ -n $DIGIT_W && $DIGIT_W -ge $REQ_MAJOR ]]] ; then
|
||||
+ echo "MAJOR OK"
|
||||
+ # MAJOR IS OK, NOW CHECK MINOR
|
||||
+ if [[[ -n $DIGIT_X && $DIGIT_X -gt $REQ_MINOR ]]] ; then
|
||||
+ echo "MINOR GREATER"
|
||||
+ # MINOR IS GREATER, SKIP CHECK SUB
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ if [[[ -n $DIGIT_X && $DIGIT_X -eq $REQ_MINOR ]]] ; then
|
||||
+ echo "MINOR EQUAL"
|
||||
+ # MINOR IS EQUAL, CHECK SUB
|
||||
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -gt $REQ_SUB ]]] ; then
|
||||
+ echo "SUB OK"
|
||||
+ # SUB IS GREATER - SKIP CHECK EXTRA
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -eq $REQ_SUB ]]] ; then
|
||||
+ echo "SUB OK"
|
||||
+ # SUB IS EQUAL, CHECK EXTRA
|
||||
+ if [[[ -n $DIGIT_Z && $DIGIT_Z -ge $REQ_EXTRA ]]] ; then
|
||||
+ echo "EXTRA OK"
|
||||
+ # EXTRA IS GREATER/EQUAL
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ echo "EXTRA NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "SUB NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "MINOR NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "MAJOR NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ echo "DEBUG MONO_WEBSERVER=yes"
|
||||
+ else
|
||||
+ AC_MSG_ERROR(* xsp command not found)
|
||||
+ fi
|
||||
fi
|
||||
|
||||
AC_SUBST(MONO_WEBSERVER)
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Index: src/core/SimiasApp/Makefile.am
|
||||
===================================================================
|
||||
--- src/core/SimiasApp/Makefile.am (Revision 6873)
|
||||
+++ src/core/SimiasApp/Makefile.am (Arbeitskopie)
|
||||
@@ -7,7 +7,8 @@
|
||||
SYSTEM_INSTALLER_LIB =
|
||||
endif
|
||||
|
||||
-MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
|
||||
|
||||
Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
|
||||
$(srcdir)/Simias.cs \
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur simias/tools/gsoap/gsoap-linux-2.7/src/Makefile simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile
|
||||
--- simias/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-01 22:32:04.000000000 +0200
|
||||
+++ simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-02 19:34:26.000000000 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
YACC=bison
|
||||
# For static linkage with Flex use:
|
||||
ifndef (lib)
|
||||
-lib=lib
|
||||
+lib=lib64
|
||||
endif
|
||||
|
||||
LIBS=/usr/$(lib)/libfl.a
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
diff -uNr simias.orig/Makefile.am simias/Makefile.am
|
||||
--- simias.orig/Makefile.am 2009-02-21 15:54:46.573843452 +0100
|
||||
+++ simias/Makefile.am 2009-02-21 15:55:03.186687971 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
rm -rf `find $(distdir) -name CVS`
|
||||
rm -rf `find $(distdir) -name ".svn"`
|
||||
|
||||
-EXTRA_DIST = iFolder.snk tools/aclocal tools/gsoap external/libflaim external/log4net external/Mono.WebServer
|
||||
+EXTRA_DIST = iFolder.snk tools/aclocal external/libflaim external/log4net external/Mono.WebServer
|
||||
|
||||
all:
|
||||
|
||||
diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am
|
||||
--- simias.orig/src/core/libsimias/Makefile.am 2009-02-21 15:54:46.492830527 +0100
|
||||
+++ simias/src/core/libsimias/Makefile.am 2009-02-21 15:55:52.874747286 +0100
|
||||
@@ -6,7 +6,6 @@
|
||||
dist-hook:
|
||||
rm -rf `find $(distdir) |grep simiasClientLib.c`
|
||||
rm -rf `find $(distdir) |grep envC.c`
|
||||
- rm -rf `find $(distdir) |grep stdsoap2.c`
|
||||
|
||||
|
||||
lib_LTLIBRARIES = libsimias.la
|
||||
@@ -14,7 +13,7 @@
|
||||
override CFLAGS =
|
||||
|
||||
libsimias_la_SOURCES = \
|
||||
- envC.c simiasClientLib.c stdsoap2.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
+ envC.c simiasClientLib.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
|
||||
libsimias_la_CFLAGS = \
|
||||
$(XML2_CFLAGS) -DWITH_NONAMESPACES -DWITH_COOKIES
|
||||
@@ -22,19 +21,15 @@
|
||||
libsimias_la_LDFLAGS = \
|
||||
$(XML2_LIBS)
|
||||
|
||||
-envC.c: $(srcdir)/stdsoap2.c
|
||||
+envC.c:
|
||||
> $(srcdir)/env.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
||||
+ soapcpp2 -c -penv $(srcdir)/env.h
|
||||
|
||||
-$(srcdir)/stdsoap2.c:
|
||||
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
||||
- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
||||
-
|
||||
-$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL)
|
||||
- $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
+$(srcdir)/libsimias.h: $(SIMIAS_WSDL)
|
||||
+ wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
|
||||
$(srcdir)/simiasClientLib.c: $(srcdir)/libsimias.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
+ soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
|
||||
install-exec-hook:
|
||||
if !WINDOWS
|
||||
@@ -46,7 +41,6 @@
|
||||
$(mkinstalldirs) $(DESTDIR)$(includedir)
|
||||
$(INSTALL_PROGRAM) simiasStub.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.nsmap $(DESTDIR)$(includedir)/simias
|
||||
- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasH.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasweb.h $(DESTDIR)$(includedir)/simias
|
||||
@@ -54,13 +48,12 @@
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasStub.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.nsmap
|
||||
- rm -f $(DESTDIR)$(includedir)/simias/stdsoap2.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasH.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasweb.h
|
||||
|
||||
clean-local:
|
||||
- rm -f stdsoap2.* *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
+ rm -f *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
rm -rf $(COMMON_CLEAN_FILES)
|
||||
|
||||
distclean-local:
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff -uNr simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am
|
||||
--- simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2007-10-16 17:56:05.000000000 +0200
|
||||
+++ simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009-02-21 13:50:24.654598727 +0100
|
||||
@@ -92,9 +92,9 @@
|
||||
lib=@LIB64@
|
||||
|
||||
# NOTE: The following is a _hack_.
|
||||
-LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
+# LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
|
||||
-libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS_HACK)
|
||||
+libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS)
|
||||
|
||||
install-exec-local: libFlaimWrapper.la
|
||||
$(mkinstalldirs) $(DESTDIR)$(webbindir)
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-02-21
|
||||
Initial Package Version: 1.6.7303.1
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: make it littool 2.2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-02-21 10:43:03.000000000 +0000
|
||||
+++ simias/configure.in 2009-02-21 11:06:19.641171546 +0000
|
||||
@@ -8,6 +8,7 @@
|
||||
VERSION=$VERSION.$BUILDNUM.1
|
||||
AM_MAINTAINER_MODE
|
||||
AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
m4_pattern_allow(PKG_CONFIG)
|
||||
|
||||
#
|
||||
|
|
@ -0,0 +1,164 @@
|
|||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-02-21
|
||||
Initial Package Version: 1.6.7303.1
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: make it mono 2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-02-21 11:13:16.000000000 +0000
|
||||
+++ simias/configure.in 2009-02-21 11:23:28.589302092 +0000
|
||||
@@ -17,22 +17,22 @@
|
||||
case $host_os in
|
||||
linux*)
|
||||
SIMIAS_OS='linux'
|
||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
|
||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
||||
PKG_CONFIG_DIR='lib'
|
||||
;;
|
||||
darwin*)
|
||||
SIMIAS_OS='darwin'
|
||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
|
||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
||||
export PKG_CONFIG_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
PKG_CONFIG_DIR='lib'
|
||||
;;
|
||||
cygwin*)
|
||||
SIMIAS_OS='windows'
|
||||
AC_CHECK_PROG(CSC, csc, csc)
|
||||
- test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor mcs found in \$PATH])
|
||||
+ test -z "$CSC" && AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor gmcs found in \$PATH])
|
||||
PKG_CONFIG_DIR='.'
|
||||
;;
|
||||
*)
|
||||
@@ -43,7 +43,7 @@
|
||||
AM_CONDITIONAL(LINUX, test "$SIMIAS_OS" = "linux")
|
||||
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
|
||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||||
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
#
|
||||
# Mono-specific configuration
|
||||
#
|
||||
- mcs)
|
||||
+ gmcs)
|
||||
CSC_EXEFLAG=/target:exe
|
||||
CSC_LIBFLAG=/target:library
|
||||
CSC_WINEXEFLAG=/target:winexe
|
||||
diff -uNr simias.orig/src/admin/Makefile.am simias/src/admin/Makefile.am
|
||||
--- simias.orig/src/admin/Makefile.am 2007-10-16 17:55:39.000000000 +0200
|
||||
+++ simias/src/admin/Makefile.am 2009-02-21 13:00:37.456573254 +0100
|
||||
@@ -128,7 +128,7 @@
|
||||
all: Novell.iFolderAdmin.dll
|
||||
|
||||
iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
Novell.iFolderAdmin.dll: $(srcdir)/AssemblyInfo.cs iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(srcdir)/AssemblyInfo.cs $(iFolderAdmin_CSFILES_CSC)
|
||||
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2007-10-16 17:55:49.000000000 +0200
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-02-21 13:02:44.947848486 +0100
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
$(srcdir)/SimiasService.cs: $(srcdir)/../WebService/Simias.wsdl
|
||||
if WINDOWS
|
||||
- wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
+ wsdl2 /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
endif
|
||||
if LINUX
|
||||
- -wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
+ -wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
endif
|
||||
if DARWIN
|
||||
- wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
+ wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
endif
|
||||
|
||||
SimiasClient.dll: $(srcdir)/AssemblyInfo.cs $(SimiasClient_CSFILES) $(SimiasClient_RESOURCES)
|
||||
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2007-10-16 17:56:12.000000000 +0200
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-02-21 13:00:58.569994200 +0100
|
||||
@@ -28,7 +28,7 @@
|
||||
all: Novell.iFolder.Enterprise.Reports.Proxy.dll
|
||||
|
||||
iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
Novell.iFolder.Enterprise.Reports.Proxy.dll: iFolderReportsProxy.cs $(iFolderReportsProxy_CSFILES) $(iFolderReportsProxy_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderReportsProxy_FLAGS) $(iFolderReportsProxy_LIBS:%=/r:%) $(iFolderReportsProxy_LIBPATH:%=/lib:%) $(iFolderReportsProxy_CSFILES_CSC) /doc:iFolderReportsProxy.doc.xml
|
||||
diff -uNr simias.orig/src/utils/usercmd/Makefile.am simias/src/utils/usercmd/Makefile.am
|
||||
--- simias.orig/src/utils/usercmd/Makefile.am 2007-10-16 17:55:08.000000000 +0200
|
||||
+++ simias/src/utils/usercmd/Makefile.am 2009-02-21 13:01:09.111656943 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
all: UserCmd.exe
|
||||
|
||||
AdminService.cs: ../../webservices/iFolderAdmin.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
UserCmd.exe: $(srcdir)/AssemblyInfo.cs $(UserCmd_CSFILES) $(UserCmd_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(UserCmd_FLAGS) $(SIMIAS_LIBS) $(UserCmd_LIBS:%=/r:%) $(UserCmd_LIBPATH:%=/lib:%) $(UserCmd_RESOURCES:%=$(ICON_FLAG)%) $(UserCmd_CSFILES_CSC) $(DOC_FILE_CMD)
|
||||
diff -uNr simias.orig/src/webaccess/Makefile.am simias/src/webaccess/Makefile.am
|
||||
--- simias.orig/src/webaccess/Makefile.am 2007-10-16 17:55:07.000000000 +0200
|
||||
+++ simias/src/webaccess/Makefile.am 2009-02-21 13:01:14.940358254 +0100
|
||||
@@ -121,7 +121,7 @@
|
||||
all: Novell.iFolderWeb.dll
|
||||
|
||||
iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
Novell.iFolderWeb.dll: $(srcdir)/AssemblyInfo.cs $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml
|
||||
diff -uNr simias.orig/src/webservices/Makefile.am simias/src/webservices/Makefile.am
|
||||
--- simias.orig/src/webservices/Makefile.am 2007-10-16 17:55:15.000000000 +0200
|
||||
+++ simias/src/webservices/Makefile.am 2009-02-21 13:04:56.399191235 +0100
|
||||
@@ -101,10 +101,10 @@
|
||||
cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll .
|
||||
|
||||
iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
|
||||
- wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
||||
+ wsdl2 /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
||||
|
||||
iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
|
||||
- wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
||||
+ wsdl2 /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
||||
|
||||
iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
|
||||
$(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@
|
||||
diff -uNr simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs.
|
||||
--- simias.orig/src/core/Notifications/Notification.cs 2007-10-16 17:56:09.000000000 +0200
|
||||
+++ simias/src/core/Notifications/Notification.cs 2009-02-21 13:28:38.493601028 +0100
|
||||
@@ -33,6 +33,8 @@
|
||||
using Simias.Service;
|
||||
using Simias.Sync;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
+
|
||||
namespace Simias.Storage
|
||||
{
|
||||
/// <summary>
|
||||
diff -uNr simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
||||
--- simias.orig/src/core/Sync/SyncClient.cs 2007-10-16 18:10:06.000000000 +0200
|
||||
+++ simias/src/core/Sync/SyncClient.cs 2009-02-21 13:37:17.039134110 +0100
|
||||
@@ -39,6 +39,7 @@
|
||||
using Simias.Client.Event;
|
||||
using Simias.DomainServices;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
|
||||
namespace Simias.Sync
|
||||
{
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
commit 3fd0a202d298e633e00f1756405c82e4b794de25
|
||||
Author: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
Date: Tue Aug 19 08:51:41 2008 +0200
|
||||
|
||||
Make gcc4.3 happy (added 2* #include <cstring>)
|
||||
|
||||
Signed-off-by: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
index d47944d..16f87c0 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
*
|
||||
***********************************************************************/
|
||||
#include "CSPObjectIterator.h"
|
||||
+#include <cstring>
|
||||
|
||||
CSPObjectIterator::CSPObjectIterator(HFCURSOR cursor, int count, FLMBOOL includeColId) :
|
||||
m_Count(count),
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
index 616435f..58e4f92 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
@@ -22,6 +22,7 @@
|
||||
***********************************************************************/
|
||||
#ifndef _CSTYPE_H_
|
||||
#define _CSTYPE_H_
|
||||
+#include <cstring>
|
||||
|
||||
#define MAX_INT_STRING 21
|
||||
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
# Copyright 1999-2009 Gentoo Technologies, Inc.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
WANT_AUTOMAKE=1.9
|
||||
inherit eutils mono autotools
|
||||
|
||||
DESCRIPTION="Simias SimpleServer"
|
||||
HOMEPAGE="http://www.ifolder.com/"
|
||||
SRC_URI="http://distfiles.one-gear.com/distfiles/${P}.tar.gz"
|
||||
RESTRICT="mirror"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~x86 ~ppc ~amd64"
|
||||
|
||||
DEPEND=">=dev-lang/mono-1.2.2.1
|
||||
>=dev-dotnet/xsp-1.2.1
|
||||
>=dev-dotnet/log4net-1.2.9
|
||||
>=dev-db/libflaim-4.9.617
|
||||
>=net-libs/gsoap-2.7.1"
|
||||
|
||||
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
|
||||
epatch "${FILESDIR}"/simias-libtool22-1.patch
|
||||
epatch "${FILESDIR}"/simias-mono22-1.patch
|
||||
epatch "${FILESDIR}"/simias_make_gcc43_happy.diff
|
||||
epatch "${FILESDIR}"/simias-libflaim_shared-1.patch
|
||||
epatch "${FILESDIR}"/simias-1.6.use_system_gsoap.patch
|
||||
eautoreconf || die "eautoreconf failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --with-runasclient || die "configure failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make DESTDIR=${D} install
|
||||
}
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Copyright 1999-2004 Gentoo Technologies, Inc.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
|
|
|||
Loading…
Reference in New Issue