packages: digikam/digikam-link.patch, digikam/digikam.spec - rel 2; fix lin...

arekm arekm at pld-linux.org
Sun Dec 5 19:43:32 CET 2010


Author: arekm                        Date: Sun Dec  5 18:43:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix linking with libgphoto_port

---- Files affected:
packages/digikam:
   digikam-link.patch (1.2 -> 1.3) , digikam.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: packages/digikam/digikam-link.patch
diff -u packages/digikam/digikam-link.patch:1.2 packages/digikam/digikam-link.patch:1.3
--- packages/digikam/digikam-link.patch:1.2	Fri Dec  3 23:16:08 2010
+++ packages/digikam/digikam-link.patch	Sun Dec  5 19:43:27 2010
@@ -4,7 +4,23 @@
          ${STRIGI_LIBRARIES}
          ${LCMS_LIBRARIES}
          ${GPHOTO2_LIBRARIES}
-+	khtml
++        khtml
+ )
+ 
+ IF(KDEPIMLIBS_FOUND)
+--- digikam/CMakeLists.txt~	2010-11-22 18:47:39.000000000 +0100
++++ digikam/CMakeLists.txt	2010-12-05 19:36:00.781721964 +0100
+@@ -238,12 +238,12 @@
+         ${QT_QT3SUPPORT_LIBRARY}
+         ${STRIGI_LIBRARIES}
+         ${LCMS_LIBRARIES}
+-        ${GPHOTO2_LIBRARIES}
+         digikamcore
+         digikamdatabase
+         advancedrename
+         queuemanager
+         cameragui
++        ${GPHOTO2_LIBRARIES}
  )
  
  IF(KDEPIMLIBS_FOUND)

================================================================
Index: packages/digikam/digikam.spec
diff -u packages/digikam/digikam.spec:1.128 packages/digikam/digikam.spec:1.129
--- packages/digikam/digikam.spec:1.128	Fri Dec  3 23:15:55 2010
+++ packages/digikam/digikam.spec	Sun Dec  5 19:43:27 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Interfejs KDE do gphoto2
 Name:		digikam
 Version:	1.6.0
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
@@ -166,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2010/12/05 18:43:27  arekm
+- rel 2; fix linking with libgphoto_port
+
 Revision 1.128  2010/12/03 22:15:55  rotom
 - 1.6.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/digikam/digikam-link.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/digikam/digikam.spec?r1=1.128&r2=1.129&f=u



More information about the pld-cvs-commit mailing list