From 0233a7aae09c5c066b09e188649ccc10676fc1dc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 28 Jan 2013 10:26:42 -0600
Subject: [PATCH] Fix up remaining references to -lkio

---
 libreoffice/3.3.2/patches/libreoffice-trinity.diff          | 4 ++--
 libreoffice/3.3.3/patches/libreoffice-trinity.diff          | 4 ++--
 libreoffice/3.6.0/patches/libreoffice-trinity.diff          | 2 +-
 libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | 4 ++--
 libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 35715cb..497aad9 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -7808,7 +7808,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++APP1TARGET=$(TARGET)
 ++APP1OBJS=$(SLOFILES)
 ++APP1RPATH=BRAND
-++APP1LINKFLAGS=$(TDE_LIBS) -lkio -lX11
+++APP1LINKFLAGS=$(TDE_LIBS) -ltdeio -lX11
 ++APP1STDLIBS=$(SALLIB)
 ++
 ++.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_TDE)" != "TRUE"
@@ -11386,7 +11386,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 ++
 ++SHL1IMPLIB=i$(SHL1TARGET)
-++SHL1LINKFLAGS+=$(TDE_LIBS) -lkio
+++SHL1LINKFLAGS+=$(TDE_LIBS) -ltdeio
 ++SHL1STDLIBS=    \
 ++        $(CPPUHELPERLIB) \
 ++        $(CPPULIB) \
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index 6839de0..9e26dfd 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -7808,7 +7808,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++APP1TARGET=$(TARGET)
 ++APP1OBJS=$(SLOFILES)
 ++APP1RPATH=BRAND
-++APP1LINKFLAGS=$(TDE_LIBS) -lkio -lX11
+++APP1LINKFLAGS=$(TDE_LIBS) -ltdeio -lX11
 ++APP1STDLIBS=$(SALLIB)
 ++
 ++.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_TDE)" != "TRUE"
@@ -11386,7 +11386,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 ++
 ++SHL1IMPLIB=i$(SHL1TARGET)
-++SHL1LINKFLAGS+=$(TDE_LIBS) -lkio
+++SHL1LINKFLAGS+=$(TDE_LIBS) -ltdeio
 ++SHL1STDLIBS=    \
 ++        $(CPPUHELPERLIB) \
 ++        $(CPPULIB) \
diff --git a/libreoffice/3.6.0/patches/libreoffice-trinity.diff b/libreoffice/3.6.0/patches/libreoffice-trinity.diff
index 4451807..a49dcee 100644
--- a/libreoffice/3.6.0/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.6.0/patches/libreoffice-trinity.diff
@@ -18,7 +18,7 @@
  
 +$(eval $(call gb_Library_add_libs,tdebe1,\
 +    $$(TDE_LIBS) \
-+        -lkio \
++        -ltdeio \
 +))
 +
  $(eval $(call gb_Library_use_libraries,tdebe1,\
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
index 139b439..f697fb6 100644
--- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
@@ -1678,7 +1678,7 @@ index 265a3b6..69329fa 100644
 +        $(CPPULIB) \
 +        $(SALLIB) \
 +        $(TDE_LIBS) \
-+        -lkio
++        -ltdeio
 +
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
@@ -1911,7 +1911,7 @@ index 0000000..a92bb5e
 +
 +$(eval $(call gb_Executable_add_libs,tdefilepicker,\
 +	$(TDE_LIBS) \
-+	-lkio -lX11 \
++	-ltdeio -lX11 \
 +))
 +
 +$(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 4da7df0..984ccfa 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -8038,7 +8038,7 @@ index 1548d7b..768c946 100644
  APP1OBJS=$(SLOFILES)
 -APP1RPATH=OOO
 +APP1RPATH=BRAND
- APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
+ APP1LINKFLAGS=$(KDE_LIBS) -ltdeio -lX11
  APP1STDLIBS=$(SALLIB)
  
 diff --git a/fpicker/source/unx/tde/makefile.mk b/fpicker/source/unx/tde/makefile.mk
@@ -8114,7 +8114,7 @@ index 0000000..26d7979
 +APP1TARGET=$(TARGET)
 +APP1OBJS=$(SLOFILES)
 +APP1RPATH=OOO
-+APP1LINKFLAGS=$(TDE_LIBS) -lkio -lX11
++APP1LINKFLAGS=$(TDE_LIBS) -ltdeio -lX11
 +APP1STDLIBS=$(SALLIB)
 +
 +.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_TDE)" != "TRUE"
@@ -12351,7 +12351,7 @@ index 0000000..5243da4
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +
 +SHL1IMPLIB=i$(SHL1TARGET)
-+SHL1LINKFLAGS+=$(TDE_LIBS) -lkio
++SHL1LINKFLAGS+=$(TDE_LIBS) -ltdeio
 +SHL1STDLIBS=    \
 +        $(CPPUHELPERLIB) \
 +        $(CPPULIB) \