From 159ad4df6cc48d263b98066ce91f50aaa276e2a1 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 21 Feb 2009 17:25:27 +0000 Subject: [PATCH] net-misc/ifolder: delete not needed patches git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@801 6952d904-891a-0410-993b-d76249ca496b --- net-misc/ifolder/ChangeLog | 7 ++ net-misc/ifolder/Manifest | 7 +- ...figure.in-xsp-check-by-dl9pf-version3.diff | 94 ------------------- net-misc/ifolder/files/flex_in_lib64.diff | 12 --- .../files/new_default_simias.config.diff | 14 --- .../files/no_write_to_etc_during_install.diff | 16 ---- .../files/simias_make_gcc43_happy.diff | 32 ------- 7 files changed, 8 insertions(+), 174 deletions(-) delete mode 100644 net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff delete mode 100644 net-misc/ifolder/files/flex_in_lib64.diff delete mode 100644 net-misc/ifolder/files/new_default_simias.config.diff delete mode 100644 net-misc/ifolder/files/no_write_to_etc_during_install.diff delete mode 100644 net-misc/ifolder/files/simias_make_gcc43_happy.diff diff --git a/net-misc/ifolder/ChangeLog b/net-misc/ifolder/ChangeLog index 4457744..bf74e2d 100644 --- a/net-misc/ifolder/ChangeLog +++ b/net-misc/ifolder/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Feb 2009; Mario Fetka + -files/configure.in-xsp-check-by-dl9pf-version3.diff, + -files/flex_in_lib64.diff, -files/new_default_simias.config.diff, + -files/no_write_to_etc_during_install.diff, + -files/simias_make_gcc43_happy.diff: + delete not needed patches + 21 Feb 2009; Mario Fetka +files/ifolder-gnome-hack-1.patch, +files/ifolder-mono22-1.patch, +files/ifolder-3.6.use_system_gsoap.patch, diff --git a/net-misc/ifolder/Manifest b/net-misc/ifolder/Manifest index 5be09f4..900c046 100644 --- a/net-misc/ifolder/Manifest +++ b/net-misc/ifolder/Manifest @@ -1,9 +1,7 @@ AUX 3.4.6120.1-configure-help.patch 2305 RMD160 e3ca4712829761408b540b9b5a7e770ea63d078c SHA1 1b81fa9d0ef87a74f1f0ce123b1b137a87d16c18 SHA256 cac75e53b0d22b29328c486363805f67858cd1d78b9a431500c85598c0e05094 AUX 3.4.6167.1-configure-help.patch 2305 RMD160 e3ca4712829761408b540b9b5a7e770ea63d078c SHA1 1b81fa9d0ef87a74f1f0ce123b1b137a87d16c18 SHA256 cac75e53b0d22b29328c486363805f67858cd1d78b9a431500c85598c0e05094 AUX configure-help.patch 1659 RMD160 d10d4eca291e9dae2d97659124b1883b245d53d0 SHA1 19c4d12d2d39d076426f84bef73a183785b26ceb SHA256 f6a5cbbdcaea965a41b6f662b545d765682fa7d932c076e262bda18f1309d93b -AUX configure.in-xsp-check-by-dl9pf-version3.diff 3030 RMD160 2ffd1183ae56b2b9389bb5fc366ae4f2b74006f9 SHA1 9e5c6e5eb9e38f7c131d0a8aac49e3cebff89093 SHA256 f241ff570abf445a1839b7dbb28b097010524a91e9a361336f25f8b2207eb738 AUX desktop-file-categories.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 -AUX flex_in_lib64.diff 435 RMD160 c884f5b5b8b11fbbde50efe0f33ecc14b9c7c7aa SHA1 362b8742f0f69bfabd7bd1b1ba0a8b55615ca4a5 SHA256 a8e62c614c07189ad8b4c5dd5c52ee9748a0fbb0f1aade12e3570669a4ca30cc AUX ifolder-3.4.6098.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 AUX ifolder-3.4.6101.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 AUX ifolder-3.4.6120.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 @@ -12,13 +10,10 @@ AUX ifolder-3.4.6214.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b244478 AUX ifolder-3.6.use_system_gsoap.patch 2078 RMD160 d06955a2bd6794d5332ea0967a398aa0d4caf67e SHA1 9532d503a7de2b21e5558ab2d07d6c7fb0864c4c SHA256 3ed5b56a78dcf75d6f0c1564b6b16dafb5f389246404e6f168f3d9768bdf0ac0 AUX ifolder-gnome-hack-1.patch 569 RMD160 41fc4c52b1019070619c6fe711936417fa862d97 SHA1 c9a32b7679672b08788a2e31d79192c4abeff0af SHA256 efe1d83a25cac7305c550394240636f439687e6a38176541274bada575db09ad AUX ifolder-mono22-1.patch 3286 RMD160 46db7651269cf28c4ef485f989275f5e70c1f2a1 SHA1 5cc2389211de7656e0dfaa6f832eb13496285648 SHA256 3b6d785f570d3b3a32c850c9d443c72f1d1c4069d56288acc5701c5fefac0f04 -AUX new_default_simias.config.diff 941 RMD160 92197dcb98f8429636c3d03c3813d3ce2e8b8ffb SHA1 a21205dbad60ddbedfbe1db58dc020813ca0c7e1 SHA256 a7dfc2508c37cf405f1b9b66d3e0e8c913cb4c0277ff8533834948274d685a7d -AUX no_write_to_etc_during_install.diff 916 RMD160 9cd1ee64a3006aad139892010b2ba9a4f0f695be SHA1 a4c1c6ed6ad7be0bbcf75fda1601d7edab843981 SHA256 3c8045848161d34a49f1c1934b1111489e18f48d0b4225e287f83d1407425d7f -AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b AUX tray-icon.patch 701 RMD160 9d1883204e8cc0ba7461106e55be57a3821dfba8 SHA1 cab92019f4e7034e35939302b5c6bd0cdc0e248a SHA256 0fc83bbf8e561e13dc2d046983f93d37e39f883de06ebaa86bffcaf17786dd3e AUX webdir-prefix.patch 286 RMD160 63d8428c3e9f21ead6df1d88bba2b4c6ed2929e1 SHA1 4948761fb7e5fe178d097499f8aa389a26206dda SHA256 edde8ee1044bfaaf5cf24867aad60f51e0364a9c2e3de18ce3d85ca64dcbae27 DIST ifolder3-3.6.7318.1.tar.gz 20848091 RMD160 df7df66641aa1f3a0bb488a1247228fccd2c0a73 SHA1 fafd731a2f18a6d1d36463d5a92c31dc0aa65499 SHA256 4d992f5b29b4c9dae49551d0b6e2b59f0adb972ed9018df0177ad414e74356a9 EBUILD ifolder-3.6.7318.1-r1.ebuild 1083 RMD160 d59b072f633cdc459c62c46b7c2fedd9a8ea9c07 SHA1 bae423d69f8a4b48afdab5f40b69cae30f0af599 SHA256 97992c40c508f800dabc76dd9b917342eca0c5bfeeae96992841435b39fe0bfb EBUILD ifolder-3.6.7318.1.ebuild 1123 RMD160 35caabf9f6fec87724733c2335d4cbecb56bb44e SHA1 6f977900fec54a82204661e8e99f3e4f8e90ed53 SHA256 c21af2fa99ca654a89f4040796c8a0f40529d19f6469ffb0bc7fcb7f24897a11 -MISC ChangeLog 663 RMD160 dbd41ffaf17bf04eb7a78646df33cd9fc09c8035 SHA1 922c7231c1b10b7adb86a660b7c3110aae397fcd SHA256 07b545bb4b1cac3ad74b52ccb407bd4850ddae762442b5ffd56d70238e8be460 +MISC ChangeLog 952 RMD160 14bfc3eaacb29be86742d0a65b2b50ce32d1e973 SHA1 ddf6dc9246ba182932265261799990e297663826 SHA256 81701f50ef4e02fba506eb367f7e5d766dbc24bf56459651dfbcef241fffcd8a MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff b/net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff deleted file mode 100644 index d5d3b06..0000000 --- a/net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff +++ /dev/null @@ -1,94 +0,0 @@ -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) diff --git a/net-misc/ifolder/files/flex_in_lib64.diff b/net-misc/ifolder/files/flex_in_lib64.diff deleted file mode 100644 index 624edd6..0000000 --- a/net-misc/ifolder/files/flex_in_lib64.diff +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/net-misc/ifolder/files/new_default_simias.config.diff b/net-misc/ifolder/files/new_default_simias.config.diff deleted file mode 100644 index 1eedff7..0000000 --- a/net-misc/ifolder/files/new_default_simias.config.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur simias_orig/src/server/Simias.config.in simias/src/server/Simias.config.in ---- simias_orig/src/server/Simias.config.in 2007-10-16 16:19:39.000000000 +0200 -+++ simias/src/server/Simias.config.in 2007-10-30 01:10:50.068278089 +0100 -@@ -6,7 +6,9 @@ - - -
-- -+ -+ -+ -
-
- diff --git a/net-misc/ifolder/files/no_write_to_etc_during_install.diff b/net-misc/ifolder/files/no_write_to_etc_during_install.diff deleted file mode 100644 index 76ba9fe..0000000 --- a/net-misc/ifolder/files/no_write_to_etc_during_install.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur simias/src/server/setup/Makefile.am simias-changed/src/server/setup/Makefile.am ---- simias/src/server/setup/Makefile.am 2007-10-01 22:53:18.000000000 +0200 -+++ simias-changed/src/server/setup/Makefile.am 2007-10-02 08:52:47.000000000 +0200 -@@ -120,9 +120,9 @@ - $(INSTALL_PROGRAM) ifolder-web-setup $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) ifolder-admin-setup $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) utility.exe $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(mkinstalldirs) /etc/ld.so.conf.d -- $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d -- grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf -+# $(mkinstalldirs) /etc/ld.so.conf.d -+# $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d -+# grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf - - - endif diff --git a/net-misc/ifolder/files/simias_make_gcc43_happy.diff b/net-misc/ifolder/files/simias_make_gcc43_happy.diff deleted file mode 100644 index 9950f2f..0000000 --- a/net-misc/ifolder/files/simias_make_gcc43_happy.diff +++ /dev/null @@ -1,32 +0,0 @@ -commit 3fd0a202d298e633e00f1756405c82e4b794de25 -Author: Jan-Simon Möller -Date: Tue Aug 19 08:51:41 2008 +0200 - - Make gcc4.3 happy (added 2* #include ) - - Signed-off-by: Jan-Simon Möller - -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 - - 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 - - #define MAX_INT_STRING 21 -