SOURCES: aethera-libs.patch - use some local lib paths

glen glen at pld-linux.org
Sun Nov 5 12:19:02 CET 2006


Author: glen                         Date: Sun Nov  5 11:19:02 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use some local lib paths

---- Files affected:
SOURCES:
   aethera-libs.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/aethera-libs.patch
diff -u SOURCES/aethera-libs.patch:1.1 SOURCES/aethera-libs.patch:1.2
--- SOURCES/aethera-libs.patch:1.1	Sun Nov  5 11:58:39 2006
+++ SOURCES/aethera-libs.patch	Sun Nov  5 12:18:57 2006
@@ -20,25 +20,25 @@
  
  homeplugin.path   = $$AETHERA_DIR/plugins/
  homeplugin.files  = lib*.so.1.0.0
---- aethera-1.2.1/aethera/libs/plugins/komcontactsplugin/komcontactsplugin.pro~	2005-03-30 12:49:26.000000000 +0300
-+++ aethera-1.2.1/aethera/libs/plugins/komcontactsplugin/komcontactsplugin.pro	2006-11-05 12:54:06.536999303 +0200
+--- aethera-1.2.1/aethera/libs/plugins/komcontactsplugin/komcontactsplugin.pro	2006-11-05 12:54:06.536999303 +0200
++++ aethera-1.2.1/aethera/libs/plugins/komcontactsplugin/komcontactsplugin.pro	2006-11-05 13:13:44.043557887 +0200
 @@ -141,7 +141,7 @@
  }
  
  unix {
 -  LIBS  += -L../../aethera -L../../tino -L/usr/local/lib -laethera -lkore -ltino -ltkcbase
-+  LIBS  += -L../../aethera -L../../tino -laethera -lkore -ltino -ltkcbase
++  LIBS  += -L../../aethera -L../../tino -L../../../../tkcbase -laethera -lkore -ltino -ltkcbase
    
  contactsplugin.path   = $$AETHERA_DIR/plugins/
  contactsplugin.files  = lib*.so.1.0.0
---- aethera-1.2.1/aethera/libs/plugins/kommailplugin/kommailplugin.pro~	2005-03-30 12:49:26.000000000 +0300
-+++ aethera-1.2.1/aethera/libs/plugins/kommailplugin/kommailplugin.pro	2006-11-05 12:54:36.587677583 +0200
+--- aethera-1.2.1/aethera/libs/plugins/kommailplugin/kommailplugin.pro	2006-11-05 12:54:36.587677583 +0200
++++ aethera-1.2.1/aethera/libs/plugins/kommailplugin/kommailplugin.pro	2006-11-05 13:08:24.906364223 +0200
 @@ -155,7 +155,7 @@
  }
  
  unix {
 -  LIBS  += -L../../aethera -L../../tino -L/usr/local/lib -laethera -lkore -ltino -ltkcbase
-+  LIBS  += -L../../aethera -L../../tino -laethera -lkore -ltino -ltkcbase
++  LIBS  += -L../../aethera -L../../tino -L../../../../tkcbase -laethera -lkore -ltino -ltkcbase
    
  mailplugin.path    = $$AETHERA_DIR/plugins/
  mailplugin.files   = lib*.so.1.0.0
@@ -53,14 +53,14 @@
    
  language.path  = $$AETHERA_DIR/plugins/
  language.files = notes_language/ 
---- aethera-1.2.1/aethera/libs/plugins/mailimport/mailimport.pro~	2005-03-30 12:49:26.000000000 +0300
-+++ aethera-1.2.1/aethera/libs/plugins/mailimport/mailimport.pro	2006-11-05 12:55:24.628761902 +0200
+--- aethera-1.2.1/aethera/libs/plugins/mailimport/mailimport.pro	2006-11-05 12:55:24.628761902 +0200
++++ aethera-1.2.1/aethera/libs/plugins/mailimport/mailimport.pro	2006-11-05 13:16:20.397082018 +0200
 @@ -59,7 +59,7 @@
  }
  
  unix {
 -  LIBS  += -L../../aethera -L../../tino -L/usr/local/lib -laethera -lkore -ltino -ltkcbase
-+  LIBS  += -L../../aethera -L../../tino -laethera -lkore -ltino -ltkcbase
++  LIBS  += -L../../aethera -L../../tino -L../../../../tkcbase -laethera -lkore -ltino -ltkcbase
    
  mailimportlib.path    = $$AETHERA_DIR/plugins/
  mailimportlib.files   = lib*.so.1.0.0
@@ -75,13 +75,15 @@
  
  tino.path          = $$TINO_LIB/
  tino.files         = libtino.so.1.0.0
---- aethera-1.2.1/aethera/src/src.pro~	2005-03-30 12:49:26.000000000 +0300
-+++ aethera-1.2.1/aethera/src/src.pro	2006-11-05 12:56:12.959852735 +0200
-@@ -89,7 +89,7 @@
+--- aethera-1.2.1/aethera/src/src.pro	2006-11-05 12:56:12.959852735 +0200
++++ aethera-1.2.1/aethera/src/src.pro	2006-11-05 13:17:47.829052630 +0200
+@@ -88,8 +88,8 @@
+ 
  LIBS  += -L../libs/aethera -laethera
  LIBS  += -L../libs/tino -ltino
- LIBS  += -L$$AETHERA_LIB -ltkcbase -ltkcssl
+-LIBS  += -L$$AETHERA_LIB -ltkcbase -ltkcssl
 -LIBS  += -L/usr/local/lib -lkore
++LIBS  += -L$$AETHERA_LIB -ltkcbase -L../../tkcssl -ltkcssl
 +LIBS  += -lkore
  
  # Installing...
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/aethera-libs.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list