dbp/ifolder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

www-apps/ifolder3-enterprise: build with gmcs and remove dependency on provided libs

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1874 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-01-28 17:21:42 +00:00
parent 069ddad0b6
commit 01cdbb7aca
5 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www-apps/ifolder3-enterprise/ChangeLog
View File

@ -1,7 +1,13 @@
# ChangeLog for www-apps/ifolder-server
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
28 Jan 2010; Mario Fetka <mario.fetka@gmail.com>
files/simias-1.8-mono22-4.patch,
+files/simias-1.8.3.9328.1-system_xsp-1.patch,
ifolder3-enterprise-3.8.0.9328.1.ebuild:
build with gmcs and remove dependency on provided libs
06 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
ifolder3-enterprise-3.8.0.9328.1.ebuild:
remove mono patch

7
www-apps/ifolder3-enterprise/Manifest
View File

@ -28,11 +28,12 @@ AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c
AUX simias-1.8-mono22-1.patch 7492 RMD160 4a09f05ecee38b52ec7b3f60cc2c6e6e55e15fc1 SHA1 45797cd0f9b72747e4ab72fc02ee301446bb3c4b SHA256 3460a484bb46bf2f121f343e24a16d792c3819d114807714c4198cb10ad023db
AUX simias-1.8-mono22-2.patch 7676 RMD160 0bef41dfea10ced43fb8b84cc727dd08b7593e30 SHA1 37fe4586026cb98873697a4bb965e55dd17ed7a4 SHA256 ace9c67f7260e68f1f2fe96fa1ee9af1680442e86462d5b271095f3d55c543d9
AUX simias-1.8-mono22-3.patch 1371 RMD160 07223bd3ff49b33a61e5460e76e1109e6a9ae5b4 SHA1 d84821690f1a256b9e3a4db60e6c5674715d657b SHA256 d9d9cc4d2c9b71a9b6febbbea62a7b4acd6e25d768340a28b664b3e4734d3dbe
AUX simias-1.8-mono22-4.patch 1306 RMD160 5eb17a2661953671ba9b9f142a747bfc47acca92 SHA1 e7181aa25814457a4e85b38667f99b06c239d2cc SHA256 03892c1cba2b23e4f705783e34e7f67bb5a2c7a146bee14280d427c9456e04c2
AUX simias-1.8-mono22-4.patch 1306 RMD160 a282c4efb9b5e0ec41ade40ef8f9e8a581556599 SHA1 b7a23b7f23d5c1b8eb68b7409c7330f23ed0cac9 SHA256 618af5d51877d4fc77ee9f13584ae14bf6e76fdf1b402d072273a3da84b8e1fd
AUX simias-1.8-server-setup-1.diff 2383 RMD160 a62a76a5c755ffbfdf0615bfc2fb2adccf1c4e1f SHA1 8f19357b150a000c6090ebed8831fcabe7ba2bac SHA256 405a734a85f2cc2148cba11cca6f318ac4a4bd25c7fab0006516435a8b24a439
AUX simias-1.8-server-setup.diff 1840 RMD160 b5f648fe50ff9cee4a0053eb6929d28362c0707f SHA1 27fb693f52d8d259eedc7867eaec262233bbf897 SHA256 5af21b3c71a507e5def0cbaf0aba0ebaf1be4eadb665bc62eb22c313ebb343e6
AUX simias-1.8-use_system_gsoap-2.patch 2431 RMD160 17bbd1ba7db59b2b83f79a4dfb9801a860c585bc SHA1 eec1afc346bbcce296e8118eae20771315a38636 SHA256 f76e52c10107e62ef71f249d291a82b56fb13a5217c494ea2b48ac6267d2a549
AUX simias-1.8.3-server-setup-1.diff 2706 RMD160 6cf51563434889a8d6f2252714776cc8c6d7502d SHA1 43f78ae25feed6795404b448500aefe4eea8ef99 SHA256 836e9665893a4d99b4cbbe650b24f4a3357f50aadfb485e47bcf54d5e32350b8
AUX simias-1.8.3.9328.1-system_xsp-1.patch 2256 RMD160 13303b758dcf27bf5b0c3596700c2997df18b022 SHA1 0e86aee0c9d63077c16a8742b65a5cf908070a11 SHA256 a75191361ee845124cef3384b66d5568c07ec88eed46e0b04e436f6bda61cb31
AUX simias-1.8.use_system_gsoap.patch 3026 RMD160 3a63dafb8767b36ff9f99009d1749f07b2b82232 SHA1 3cae95bbab594e84eb41b3dee9e37fc9d1644404 SHA256 4b176aa58b40799c270a91889e22a2a8603e256b9f8415bda665071de7cd5b4e
AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778
AUX simias-bash.dpatch 4540 RMD160 35a754408252415667aa13bc46f78a94842e83c1 SHA1 12df994febdddcd5f06fb6b9437ff9ed828eceb4 SHA256 44a142f060bdfb4dd276e81e878822998819516e37cd30f7a255be98ba446d3b
@ -47,7 +48,7 @@ AUX simias-trunk_mod_rewrite-and-mods-enabled.patch 1727 RMD160 06ddc3f3fffc38ea
AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b
AUX webaccess-browse.patch 1001 RMD160 6262f046567d6736fb4193913cc4b4d0bb764792 SHA1 e33cb643b63ded940f9029fe7a79d3accf800450 SHA256 8517e52d6ac974de169fafe01705e1f9a6b8834b2f493ef485477398029b2353
DIST ifolder3-enterprise-3.8.0.9328.1.tar.gz 27791071 RMD160 b0a3b677802722a89e37600ff2bc414ce94ae5ca SHA1 75bba166ec219314db85dde103b5d73481854cbe SHA256 0da6caa6511c6d37d77099b4aaa47914c8069a4d72fba39326ea92ee69b63748
EBUILD ifolder3-enterprise-3.8.0.9328.1.ebuild 4912 RMD160 0e8f23498f6948274e4a62987801187cffacaa74 SHA1 e21b6f9b766758784a755c552267565fa6b15190 SHA256 52acf794883eb7ee5e612d2891b2dfa6451072775b322c98a2b8e55847a5267e
EBUILD ifolder3-enterprise-3.8.0.9328.1.ebuild 4992 RMD160 7df73986a7f0bffc2872c94de799a99fbf32cf71 SHA1 98e753ab4b8a741a82481b05229bd90c494ded1a SHA256 ada57e5548898b5025e8e1460cad68ea68200903b6abdb239338be5cf8561680
EBUILD ifolder3-enterprise-3.8_pre7061.ebuild 4733 RMD160 4f5146ffff9f4679b949762b8adb873105c3503f SHA1 9804a9ab487f1e78db9fe99a28cabaf7023bf552 SHA256 2fe29bf2293839b6595d97b65c64c76c350afd69999454bd86c3c9d6dcd95f8c
MISC ChangeLog 3596 RMD160 a8ec4b317b255791fa064735b59f62a3fb7a4ecb SHA1 15eb1284df88da03b739982309814911106bf563 SHA256 7aa1413590c944b034d1f8b6556557cd473976758e861c33053c6b1a79c19f0c
MISC ChangeLog 3832 RMD160 5c51ab2d47b07f1090934b6a9b185790b845761c SHA1 b32f8f31e248bae84121f1e093b2eb9417c04308 SHA256 59e72d284b00e47d0e868771762f5f5fbe9a810e1cc35b5ead6b4b111de4f7f4
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

2
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-4.patch
View File

@ -8,7 +8,7 @@ diff -uNr simias.orig/configure.in simias/configure.in
- AC_CHECK_PROG(CSC, mcs, mcs)
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2,wsdl)
+ AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
else
AC_CHECK_PROG(WSDL, wsdl, wsdl,wsdl)
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1

45
www-apps/ifolder3-enterprise/files/simias-1.8.3.9328.1-system_xsp-1.patch Normal file
View File

@ -0,0 +1,45 @@
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
Date: 2010-01-16
Initial Package Version: 1.8.3
Origin: me
Upstream Status: unknown
Description: use system Mono.Webserver.dll instead the provided
diff -Naur simias-1.8.3.9328.1.orig/configure.in simias-1.8.3.9328.1/configure.in
--- simias-1.8.3.9328.1.orig/configure.in 2010-01-16 10:16:48.502483182 +0000
+++ simias-1.8.3.9328.1/configure.in 2010-01-16 10:32:33.695379928 +0000
@@ -226,6 +226,10 @@
AC_SUBST(LOG4NET_PREFIX)
AC_SUBST(LOG4NET_LIBS)
+ PKG_CHECK_MODULES(XSP, xsp >= 2.2)
+ AC_SUBST(XSP_PREFIX)
+ AC_SUBST(XSP_LIBS)
+
PKG_CHECK_MODULES(LIBFLAIM, libflaim >= 4.8.0)
AC_SUBST(LIBFLAIM_PREFIX)
AC_SUBST(LIBFLAIM_LIBS)
diff -Naur simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am
--- simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am 2010-01-16 10:16:48.556215509 +0000
+++ simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am 2010-01-16 10:35:22.899098129 +0000
@@ -7,7 +7,7 @@
SYSTEM_INSTALLER_LIB =
endif
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
+MONO_WEBSERVER_PATH = $(shell pkg-config xsp --variable=assemblies_dir)/
Simias_CSFILES = $(srcdir)/Simias.cs \
$(srcdir)/SimiasAppInstallerClass.cs
diff -Naur simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am simias-1.8.3.9328.1/src/core/WebService/Makefile.am
--- simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am 2010-01-16 10:16:48.583078738 +0000
+++ simias-1.8.3.9328.1/src/core/WebService/Makefile.am 2010-01-16 10:36:27.839193842 +0000
@@ -8,7 +8,7 @@
SimiasWebService_FLAGS = $(CSC_LIBFLAG)
SimiasWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasClient.dll SimiasLib.dll
SimiasWebService_LIBPATH = ../SimiasClient ../SimiasLib.dll $(NOVELL_SECURITY_DIR)
-WebServerDir = ../../../external/Mono.WebServer/
+WebServerDir = $(shell pkg-config xsp --variable=assemblies_dir)/
EXTRA_DIST = win.server.web.config mono.server.web.config win.web.config mono.web.config Global.asax Simias.asmx Simias.wsdl $(SimiasWebService_CSFILES) AssemblyInfo.cs.in
if MAKE_DOC_FILE

8
www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.9328.1.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@ -12,7 +12,7 @@ inherit autotools eutils mono
DESCRIPTION="Enterprise backend for iFolder"
HOMEPAGE="http://www.ifolder.com/"
SRC_URI="mirror://sourceforge/ifolder3/files/iFolder%20Server/3.8.0/11.1/${P}.tar.gz
SRC_URI="mirror://sourceforge/ifolder/files/iFolder%20Server/3.8.0/11.1/${P}.tar.gz
http://ftp.mars.arge.at/ifolder/${P}.tar.gz"
LICENSE="GPL-2"
@ -39,10 +39,11 @@ DEVNULL=/dev/null
src_prepare() {
rm -rf dependencies
# epatch "${FILESDIR}"/WSDLPATCH-1.diff
# epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
# epatch "${FILESDIR}"/simias-libtool22-1.patch
# epatch "${FILESDIR}"/simias-1.8-mono22-4.patch
epatch "${FILESDIR}"/simias-1.8-mono22-4.patch
# epatch "${FILESDIR}"/simias-mononamespace.dpatch
# epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch
# epatch "${FILESDIR}"/simias-bash.dpatch
@ -65,6 +66,7 @@ src_prepare() {
epatch ${FILESDIR}/new_default_simias.config.diff
# epatch ${FILESDIR}/flex_in_lib64.diff
# epatch ${FILESDIR}/${PN}-simias-server-setup.patch
epatch "${FILESDIR}"/simias-1.8.3.9328.1-system_xsp-1.patch
eautoreconf || die "eautoreconf failed"
}