TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix up remaining references to -lkio

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent d6e4c886a4
commit 0233a7aae0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -7808,7 +7808,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++APP1TARGET=$(TARGET) ++APP1TARGET=$(TARGET)
++APP1OBJS=$(SLOFILES) ++APP1OBJS=$(SLOFILES)
++APP1RPATH=BRAND ++APP1RPATH=BRAND
++APP1LINKFLAGS=$(TDE_LIBS) -lkio -lX11 ++APP1LINKFLAGS=$(TDE_LIBS) -ltdeio -lX11
++APP1STDLIBS=$(SALLIB) ++APP1STDLIBS=$(SALLIB)
++ ++
++.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_TDE)" != "TRUE" ++.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 ++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++ ++
++SHL1IMPLIB=i$(SHL1TARGET) ++SHL1IMPLIB=i$(SHL1TARGET)
++SHL1LINKFLAGS+=$(TDE_LIBS) -lkio ++SHL1LINKFLAGS+=$(TDE_LIBS) -ltdeio
++SHL1STDLIBS= \ ++SHL1STDLIBS= \
++ $(CPPUHELPERLIB) \ ++ $(CPPUHELPERLIB) \
++ $(CPPULIB) \ ++ $(CPPULIB) \

4
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -7808,7 +7808,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++APP1TARGET=$(TARGET) ++APP1TARGET=$(TARGET)
++APP1OBJS=$(SLOFILES) ++APP1OBJS=$(SLOFILES)
++APP1RPATH=BRAND ++APP1RPATH=BRAND
++APP1LINKFLAGS=$(TDE_LIBS) -lkio -lX11 ++APP1LINKFLAGS=$(TDE_LIBS) -ltdeio -lX11
++APP1STDLIBS=$(SALLIB) ++APP1STDLIBS=$(SALLIB)
++ ++
++.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_TDE)" != "TRUE" ++.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 ++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++ ++
++SHL1IMPLIB=i$(SHL1TARGET) ++SHL1IMPLIB=i$(SHL1TARGET)
++SHL1LINKFLAGS+=$(TDE_LIBS) -lkio ++SHL1LINKFLAGS+=$(TDE_LIBS) -ltdeio
++SHL1STDLIBS= \ ++SHL1STDLIBS= \
++ $(CPPUHELPERLIB) \ ++ $(CPPUHELPERLIB) \
++ $(CPPULIB) \ ++ $(CPPULIB) \

2
libreoffice/3.6.0/patches/libreoffice-trinity.diff
Unescape View File

@ -18,7 +18,7 @@
+$(eval $(call gb_Library_add_libs,tdebe1,\ +$(eval $(call gb_Library_add_libs,tdebe1,\
+ $$(TDE_LIBS) \ + $$(TDE_LIBS) \
+ -lkio \ + -ltdeio \
+)) +))
+ +
$(eval $(call gb_Library_use_libraries,tdebe1,\ $(eval $(call gb_Library_use_libraries,tdebe1,\

4
libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
Unescape View File

@ -1678,7 +1678,7 @@ index 265a3b6..69329fa 100644
+ $(CPPULIB) \ + $(CPPULIB) \
+ $(SALLIB) \ + $(SALLIB) \
+ $(TDE_LIBS) \ + $(TDE_LIBS) \
+ -lkio + -ltdeio
+ +
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET) +DEF1NAME=$(SHL1TARGET)
@ -1911,7 +1911,7 @@ index 0000000..a92bb5e
+ +
+$(eval $(call gb_Executable_add_libs,tdefilepicker,\ +$(eval $(call gb_Executable_add_libs,tdefilepicker,\
+ $(TDE_LIBS) \ + $(TDE_LIBS) \
+ -lkio -lX11 \ + -ltdeio -lX11 \
+)) +))
+ +
+$(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\ +$(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\

6
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -8038,7 +8038,7 @@ index 1548d7b..768c946 100644
APP1OBJS=$(SLOFILES) APP1OBJS=$(SLOFILES)
-APP1RPATH=OOO -APP1RPATH=OOO
+APP1RPATH=BRAND +APP1RPATH=BRAND
APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11 APP1LINKFLAGS=$(KDE_LIBS) -ltdeio -lX11
APP1STDLIBS=$(SALLIB) APP1STDLIBS=$(SALLIB)
diff --git a/fpicker/source/unx/tde/makefile.mk b/fpicker/source/unx/tde/makefile.mk 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) +APP1TARGET=$(TARGET)
+APP1OBJS=$(SLOFILES) +APP1OBJS=$(SLOFILES)
+APP1RPATH=OOO +APP1RPATH=OOO
+APP1LINKFLAGS=$(TDE_LIBS) -lkio -lX11 +APP1LINKFLAGS=$(TDE_LIBS) -ltdeio -lX11
+APP1STDLIBS=$(SALLIB) +APP1STDLIBS=$(SALLIB)
+ +
+.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_TDE)" != "TRUE" +.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_TDE)" != "TRUE"
@ -12351,7 +12351,7 @@ index 0000000..5243da4
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+ +
+SHL1IMPLIB=i$(SHL1TARGET) +SHL1IMPLIB=i$(SHL1TARGET)
+SHL1LINKFLAGS+=$(TDE_LIBS) -lkio +SHL1LINKFLAGS+=$(TDE_LIBS) -ltdeio
+SHL1STDLIBS= \ +SHL1STDLIBS= \
+ $(CPPUHELPERLIB) \ + $(CPPUHELPERLIB) \
+ $(CPPULIB) \ + $(CPPULIB) \

Write Preview
Loading…
Cancel
Save