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

rename

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1632 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-12-05 13:17:57 +00:00
parent 857f325ad8
commit 572ced7c3f
23 changed files with 876 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net-misc/ifolder3/files/desktop-file-categories.patch Normal file
View File

@@ -0,0 +1,10 @@
--- src/LinuxClient/application/ifolder.desktop.in 2006-04-06 01:22:33.000000000 -0600
+++ src/LinuxClient/application/ifolder.desktop.in.new 2006-04-07 00:05:00.000000000 -0600
@@ -1,6 +1,6 @@
[Desktop Entry]
X-SuSE-translate=false
-Categories=Application;Utility;Filesystem;
+Categories=Application;Network;
Name=iFolder 3
GenericName=Collaborative File Sharing
Comment=Backup, synchronize, and share files with others

22
net-misc/ifolder3/files/iFolderViewGroup.cs_log.diff Normal file
View File

@@ -0,0 +1,22 @@
Index: src/UI/Linux/LinuxClient/library/iFolderViewGroup.cs
===================================================================
--- src/UI/Linux/LinuxClient/library/iFolderViewGroup.cs (Revision 6730)
+++ src/UI/Linux/LinuxClient/library/iFolderViewGroup.cs (Arbeitskopie)
@@ -496,7 +496,7 @@
{
if( (null == model) || (null == items) || (null == table) )
{
- iFolderViewGroup.log.Info("NULL Reference Exception: Object, model is -{0}-items is-{1}-table is -{2}-",model,items,table);
+ //iFolderViewGroup.log.Info("NULL Reference Exception: Object, model is -{0}-items is-{1}-table is -{2}-",model,items,table);
return; // prevent null pointer exception
}
@@ -544,7 +544,7 @@
iFolderViewItem item = new iFolderViewItem(holder, this, iter, ItemMaxWidth);
if(null == item)
{
- iFolderViewGroup.log.Info("NULL Reference Exception: Object item is NULL");
+ //iFolderViewGroup.log.Info("NULL Reference Exception: Object item is NULL");
return; //prevent null pointer exception
}

56
net-misc/ifolder3/files/ifolder-3.6.use_system_gsoap.patch Normal file
View File

@@ -0,0 +1,56 @@
diff -uNr ifolder.orig/src/libifolder/Makefile.am ifolder/src/libifolder/Makefile.am
--- ifolder.orig/src/libifolder/Makefile.am 2009-02-21 17:10:23.648059042 +0100
+++ ifolder/src/libifolder/Makefile.am 2009-02-21 17:11:44.226735427 +0100
@@ -15,7 +15,7 @@
override CFLAGS =
libifolderclient_la_SOURCES = \
- iFolderClientLib.c stdsoap2.h ifolder.c ifolder.h
+ iFolderClientLib.c ifolder.c ifolder.h
libifolderclient_la_CFLAGS = \
$(SIMIAS_CLIENT_C_CFLAGS) \
@@ -28,18 +28,15 @@
# > $(srcdir)/env.h
# $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
-$(srcdir)/stdsoap2.h:
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
-
#$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.c $(IFOLDER_CLIENT_WSDL)
-$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.h $(IFOLDER_CLIENT_WSDL)
- $(GSOAP_PATH)/wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL)
+$(srcdir)/iFolderClient.h: $(IFOLDER_CLIENT_WSDL)
+ wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL)
$(srcdir)/iFolderClientLib.c: $(srcdir)/iFolderClient.h
> $(srcdir)/env.h
- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
- $(GSOAP_PATH)/soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h
+ soapcpp2 -c -penv $(srcdir)/env.h
+ soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h
install-exec-hook:
if !WINDOWS
@@ -51,19 +48,17 @@
$(mkinstalldirs) $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) iFolderStub.h $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) iFolder.nsmap $(DESTDIR)$(includedir)/ifolder3
- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) iFolderH.h $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) ifolder.h $(DESTDIR)$(includedir)/ifolder3
uninstall-local:
rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderStub.h
rm -f $(DESTDIR)$(includedir)/ifolder3/iFolder.nsmap
- rm -f $(DESTDIR)$(includedir)/ifolder3/stdsoap2.h
rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderH.h
rm -f $(DESTDIR)$(includedir)/ifolder3/ifolder.h
clean-local:
- rm -f stdsoap2.* *.xml iFolder* env* soap*
+ rm -f *.xml iFolder* env* soap*
rm -rf $(COMMON_CLEAN_FILES)
distclean-local:

11
net-misc/ifolder3/files/ifolder-3.7-desktop-file-categories.patch Normal file
View File

@@ -0,0 +1,11 @@
diff -uNr ifolder.orig/src/UI/Linux/LinuxClient/application/ifolder.desktop.in ifolder/src/UI/Linux/LinuxClient/application/ifolder.desktop.in
--- ifolder.orig/src/UI/Linux/LinuxClient/application/ifolder.desktop.in 2009-04-06 11:33:57.236493486 +0200
+++ ifolder/src/UI/Linux/LinuxClient/application/ifolder.desktop.in 2009-04-06 11:35:02.178603367 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
X-SuSE-translate=false
-Categories=Application;Utility;Filesystem;
+Categories=Application;Network;
Name=iFolder 3
GenericName=Collaborative File Sharing
Comment=Backup, synchronize, and share files with others

16
net-misc/ifolder3/files/ifolder-3.7-gnome-hack-1.patch Normal file
View File

@@ -0,0 +1,16 @@
diff -uNr ifolder.orig/src/UI/Linux/LinuxClient/Makefile.am ifolder/src/UI/Linux/LinuxClient/Makefile.am
--- ifolder.orig/src/UI/Linux/LinuxClient/Makefile.am 2009-04-06 11:51:52.324659991 +0200
+++ ifolder/src/UI/Linux/LinuxClient/Makefile.am 2009-04-06 11:52:27.963534276 +0200
@@ -61,9 +61,9 @@
#@INTLTOOL_SCHEMAS_RULE@
#if GCONF_SCHEMAS_INSTALL
-install-data-local:
- GCONF_CONFIG_SOURCE="" \
- $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
+#install-data-local:
+# GCONF_CONFIG_SOURCE="" \
+# $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
#endif
EXTRA_DIST = $(schemas_DATA).in

44
net-misc/ifolder3/files/ifolder-3.7-mono22-1.patch Normal file
View File

@@ -0,0 +1,44 @@
diff -uNr ifolder.orig/configure.in ifolder/configure.in
--- ifolder.orig/configure.in 2009-04-06 11:37:50.085948127 +0200
+++ ifolder/configure.in 2009-04-06 11:38:29.039647854 +0200
@@ -42,8 +42,8 @@
case $host_os in
linux*)
IFOLDER_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=${LIB64} ;;
darwin*)
IFOLDER_OS='darwin'
@@ -68,7 +68,7 @@
AM_CONDITIONAL(LINUX, test "$IFOLDER_OS" = "linux")
AM_CONDITIONAL(WINDOWS, test "$IFOLDER_OS" = "windows")
AM_CONDITIONAL(DARWIN, test "$IFOLDER_OS" = "darwin")
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
@@ -102,7 +102,7 @@
#
# Mono-specific configuration
#
- mcs)
+ gmcs)
CSC_EXEFLAG=/target:exe
CSC_LIBFLAG=/target:library
CSC_WINEXEFLAG=/target:winexe
diff -uNr ifolder.orig/src/common/WebService/Makefile.am ifolder/src/common/WebService/Makefile.am
--- ifolder.orig/src/common/WebService/Makefile.am 2009-04-06 11:37:50.083637002 +0200
+++ ifolder/src/common/WebService/Makefile.am 2009-04-06 11:39:55.331276491 +0200
@@ -25,7 +25,7 @@
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebService_FLAGS) $(SIMIAS_LIBS) $(SIMIAS_CLIENT_LIBS) $(iFolderWebService_LIBS:%=/r:%) $(iFolderWebService_LIBPATH:%=/lib:%) $(iFolderWebService_RESOURCES:%=$(ICON_FLAG)%) $(srcdir)/AssemblyInfo.cs $(iFolderWebService_CSFILES_CSC) $(DOC_FILE_CMD)
../iFolder/iFolderWebService.cs: iFolderWebService.wsdl
- wsdl -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl
+ wsdl2 -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl
iFolderWebService.wsdl: Novell.iFolder.Web.dll GenerateWsdl.exe copy
$(MONO) GenerateWsdl.exe Novell.iFolder.Web.dll Novell.iFolder.Web.iFolderService http://127.0.0.1:8086/simias10/iFolder.asmx $@

36
net-misc/ifolder3/files/ifolder-3.7-mono22-2.patch Normal file
View File

@@ -0,0 +1,36 @@
diff -uNr ifolder.orig/configure.in ifolder/configure.in
--- ifolder.orig/configure.in 2009-04-20 09:39:10.046498537 +0200
+++ ifolder/configure.in 2009-04-20 09:40:14.824256335 +0200
@@ -46,11 +46,11 @@
case $host_os in
linux*)
IFOLDER_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=${LIB64}
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2)
;;
darwin*)
IFOLDER_OS='darwin'
@@ -75,7 +75,7 @@
AM_CONDITIONAL(LINUX, test "$IFOLDER_OS" = "linux")
AM_CONDITIONAL(WINDOWS, test "$IFOLDER_OS" = "windows")
AM_CONDITIONAL(DARWIN, test "$IFOLDER_OS" = "darwin")
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
@@ -109,7 +109,7 @@
#
# Mono-specific configuration
#
- mcs)
+ gmcs)
CSC_EXEFLAG=/target:exe
CSC_LIBFLAG=/target:library
CSC_WINEXEFLAG=/target:winexe

56
net-misc/ifolder3/files/ifolder-3.7-use_system_gsoap.patch Normal file
View File

@@ -0,0 +1,56 @@
diff -uNr ifolder.orig/src/common/libifolder/Makefile.am ifolder/src/common/libifolder/Makefile.am
--- ifolder.orig/src/common/libifolder/Makefile.am 2009-04-06 11:47:20.475212616 +0200
+++ ifolder/src/common/libifolder/Makefile.am 2009-04-06 11:49:30.729802612 +0200
@@ -15,7 +15,7 @@
override CFLAGS =
libifolderclient_la_SOURCES = \
- iFolderClientLib.c stdsoap2.h ifolder.c ifolder.h
+ iFolderClientLib.c ifolder.c ifolder.h
libifolderclient_la_CFLAGS = \
$(SIMIAS_CLIENT_C_CFLAGS) \
@@ -28,18 +28,15 @@
# > $(srcdir)/env.h
# $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
-$(srcdir)/stdsoap2.h:
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
-
#$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.c $(IFOLDER_CLIENT_WSDL)
-$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.h $(IFOLDER_CLIENT_WSDL)
- $(GSOAP_PATH)/wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL)
+$(srcdir)/iFolderClient.h: $(IFOLDER_CLIENT_WSDL)
+ wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL)
$(srcdir)/iFolderClientLib.c: $(srcdir)/iFolderClient.h
> $(srcdir)/env.h
- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
- $(GSOAP_PATH)/soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h
+ soapcpp2 -c -penv $(srcdir)/env.h
+ soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h
install-exec-hook:
if !WINDOWS
@@ -51,19 +48,17 @@
$(mkinstalldirs) $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) iFolderStub.h $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) iFolder.nsmap $(DESTDIR)$(includedir)/ifolder3
- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) iFolderH.h $(DESTDIR)$(includedir)/ifolder3
$(INSTALL_PROGRAM) ifolder.h $(DESTDIR)$(includedir)/ifolder3
uninstall-local:
rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderStub.h
rm -f $(DESTDIR)$(includedir)/ifolder3/iFolder.nsmap
- rm -f $(DESTDIR)$(includedir)/ifolder3/stdsoap2.h
rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderH.h
rm -f $(DESTDIR)$(includedir)/ifolder3/ifolder.h
clean-local:
- rm -f stdsoap2.* *.xml iFolder* env* soap*
+ rm -f *.xml iFolder* env* soap*
rm -rf $(COMMON_CLEAN_FILES)
distclean-local:

19
net-misc/ifolder3/files/ifolder-disambiguate_process.dpatch Executable file
View File

@@ -0,0 +1,19 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 002_disambiguate_process.dpatch by Tan Rui Boon <ruiboon@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad ifolder-3.6~/src/LinuxClient/application/iFolderApplication.cs ifolder-3.6/src/LinuxClient/application/iFolderApplication.cs
--- ifolder-3.6~/src/LinuxClient/application/iFolderApplication.cs 2008-06-04 11:58:33.000000000 +0800
+++ ifolder-3.6/src/LinuxClient/application/iFolderApplication.cs 2008-06-04 12:14:08.000000000 +0800
@@ -1722,7 +1722,7 @@
*/
public static void Main (string[] args)
{
- Process[] processes =
+ System.Diagnostics.Process[] processes =
System.Diagnostics.Process.GetProcessesByName("iFolderClient");
if(processes.Length > 1)

16
net-misc/ifolder3/files/ifolder-gnome-hack-1.patch Normal file
View File

@@ -0,0 +1,16 @@
diff -uNr ifolder.orig/src/LinuxClient/Makefile.am ifolder/src/LinuxClient/Makefile.am
--- ifolder.orig/src/LinuxClient/Makefile.am 2009-02-21 18:13:49.949960199 +0100
+++ ifolder/src/LinuxClient/Makefile.am 2009-02-21 18:14:07.017661288 +0100
@@ -58,9 +58,9 @@
#@INTLTOOL_SCHEMAS_RULE@
#if GCONF_SCHEMAS_INSTALL
-install-data-local:
- GCONF_CONFIG_SOURCE="" \
- $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
+#install-data-local:
+# GCONF_CONFIG_SOURCE="" \
+# $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
#endif
EXTRA_DIST = $(schemas_DATA).in

21
net-misc/ifolder3/files/ifolder-lib_name.dpatch Executable file
View File

@@ -0,0 +1,21 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## gtk.dpatch by Tan Rui Boon <ruiboon@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad ifolder-3.6~/configure.in ifolder-3.6/configure.in
--- ifolder-3.6~/configure.in 2008-06-03 23:32:04.000000000 +0800
+++ ifolder-3.6/configure.in 2008-06-04 00:02:26.000000000 +0800
@@ -498,8 +498,8 @@
# AC_PROG_INTLTOOL
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP2_MINIMUM_VERSION)
- GTK_SHARP_PREFIX=`pkg-config --variable=prefix gtk-sharp`
- GTK_SHARP_VERSION=`pkg-config --modversion gtk-sharp`
+ GTK_SHARP_PREFIX=`pkg-config --variable=prefix gtk-sharp-2.0`
+ GTK_SHARP_VERSION=`pkg-config --modversion gtk-sharp-2.0`
AC_SUBST(GTK_SHARP_PREFIX)
AC_SUBST(GTK_SHARP_LIBS)

61
net-misc/ifolder3/files/ifolder-mono22-1.patch Normal file
View File

@@ -0,0 +1,61 @@
diff -uNr ifolder.orig/configure.in ifolder/configure.in
--- ifolder.orig/configure.in 2009-02-21 17:03:50.447382682 +0100
+++ ifolder/configure.in 2009-02-21 17:04:22.689853328 +0100
@@ -20,21 +20,21 @@
case $host_os in
linux*)
IFOLDER_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*)
IFOLDER_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])
PKG_CONFIG_DIR='lib'
;;
cygwin*)
IFOLDER_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='.'
;;
*)
@@ -47,7 +47,7 @@
AM_CONDITIONAL(LINUX, test "$IFOLDER_OS" = "linux")
AM_CONDITIONAL(WINDOWS, test "$IFOLDER_OS" = "windows")
AM_CONDITIONAL(DARWIN, test "$IFOLDER_OS" = "darwin")
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
#
@@ -80,7 +80,7 @@
#
# Mono-specific configuration
#
- mcs)
+ gmcs)
CSC_EXEFLAG=/target:exe
CSC_LIBFLAG=/target:library
CSC_WINEXEFLAG=/target:winexe
diff -uNr ifolder.orig/src/WebService/Makefile.am ifolder/src/WebService/Makefile.am
--- ifolder.orig/src/WebService/Makefile.am 2009-02-21 17:17:40.134595669 +0100
+++ ifolder/src/WebService/Makefile.am 2009-02-21 17:19:12.055858183 +0100
@@ -25,7 +25,7 @@
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebService_FLAGS) $(SIMIAS_LIBS) $(SIMIAS_CLIENT_LIBS) $(iFolderWebService_LIBS:%=/r:%) $(iFolderWebService_LIBPATH:%=/lib:%) $(iFolderWebService_RESOURCES:%=$(ICON_FLAG)%) $(srcdir)/AssemblyInfo.cs $(iFolderWebService_CSFILES_CSC) $(DOC_FILE_CMD)
../iFolder/iFolderWebService.cs: iFolderWebService.wsdl
- wsdl -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl
+ wsdl2 -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl
iFolderWebService.wsdl: Novell.iFolder.Web.dll GenerateWsdl.exe copy
$(MONO) GenerateWsdl.exe Novell.iFolder.Web.dll Novell.iFolder.Web.iFolderService http://127.0.0.1:8086/simias10/iFolder.asmx $@