rev 17911 - in kde-extras/digikam/trunk/debian: . patches source
Mark Purcell
msp at alioth.debian.org
Sun May 9 12:39:51 UTC 2010
Author: msp
Date: 2010-05-09 12:39:48 +0000 (Sun, 09 May 2010)
New Revision: 17911
Added:
kde-extras/digikam/trunk/debian/patches/
kde-extras/digikam/trunk/debian/patches/digikam-1.2.0-kde232628.patch
kde-extras/digikam/trunk/debian/patches/find-cimg
kde-extras/digikam/trunk/debian/patches/find-sqlite
kde-extras/digikam/trunk/debian/patches/series
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/source/format
Log:
Fix "Crash just after start" digikam-1.2.0-kde232628.patch (Closes: #580792)
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2010-05-09 09:54:31 UTC (rev 17910)
+++ kde-extras/digikam/trunk/debian/changelog 2010-05-09 12:39:48 UTC (rev 17911)
@@ -1,8 +1,9 @@
digikam (2:1.2.0-3) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Fix "Crash just after start" digikam-1.2.0-kde232628.patch (Closes: #580792)
- -- Mark Purcell <msp at debian.org> Mon, 03 May 2010 19:29:41 +1000
+ -- Mark Purcell <msp at debian.org> Sun, 09 May 2010 22:37:39 +1000
digikam (2:1.2.0-2) unstable; urgency=low
Added: kde-extras/digikam/trunk/debian/patches/digikam-1.2.0-kde232628.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/digikam-1.2.0-kde232628.patch (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/digikam-1.2.0-kde232628.patch 2010-05-09 12:39:48 UTC (rev 17911)
@@ -0,0 +1,11 @@
+--- digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:12 1109176
++++ digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:25 1109177
+@@ -165,7 +165,7 @@
+ void RatingWidget::setFadingValue(int value)
+ {
+ d->fadingValue = value;
+- if (d->fadingValue >= 255)
++ if (d->fadingValue >= 255 && d->fadingTimeLine)
+ {
+ d->fadingTimeLine->stop();
+ }
Added: kde-extras/digikam/trunk/debian/patches/find-cimg
===================================================================
--- kde-extras/digikam/trunk/debian/patches/find-cimg (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/find-cimg 2010-05-09 12:39:48 UTC (rev 17911)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,6 +196,8 @@ ENDIF (${KDE_VERSION} VERSION_GREATER "4
+
+ MACRO_OPTIONAL_FIND_PACKAGE(Doxygen)
+
++PKG_CHECK_MODULES(Cimg cimg>=1.3.3)
++
+ # Set config file depending of optional dependencies
+
+ CONFIGURE_FILE(config-digikam.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-digikam.h)
Added: kde-extras/digikam/trunk/debian/patches/find-sqlite
===================================================================
--- kde-extras/digikam/trunk/debian/patches/find-sqlite (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/find-sqlite 2010-05-09 12:39:48 UTC (rev 17911)
@@ -0,0 +1,127 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,6 +187,11 @@ MACRO_BOOL_TO_01(GLIB2_FOUND HAVE_GLIB2)
+ MACRO_OPTIONAL_FIND_PACKAGE(Lqr-1)
+ MACRO_BOOL_TO_01(LQR-1_FOUND USE_EXT_LIBLQR-1)
+
++MACRO_OPTIONAL_FIND_PACKAGE(Sqlite)
++MACRO_BOOL_TO_01(SQLITE_FOUND USE_EXT_SQLITE)
++PKG_CHECK_MODULES(Sqlite sqlite3>=3.5.9)
++
++
+ MACRO_BOOL_TO_01(ENABLE_THUMBS_DB USE_THUMBS_DB)
+
+ IF (${KDE_VERSION} VERSION_GREATER "4.2.70")
+@@ -301,6 +306,12 @@ ELSE(GLIB2_FOUND)
+ MESSAGE(STATUS "")
+ ENDIF(GLIB2_FOUND)
+
++IF(SQLITE_FOUND)
++ MESSAGE(STATUS " libsqlite library found ................. YES (optional)")
++ELSE(SQLITE_FOUND)
++ MESSAGE(STATUS " libsqlite library found ................. NO (optional - internal version used instead)")
++ ENDIF(SQLITE_FOUND)
++
+ IF(DOXYGEN_FOUND)
+ MESSAGE(STATUS " Doxygen found............................ YES (optional)")
+ ELSE(DOXYGEN_FOUND)
+@@ -961,40 +972,55 @@ IF(DIGIKAM_CAN_BE_COMPILED)
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
+ )
+
+- SET(libsqlite2_SRCS
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/auth.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/btree.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/btree_rb.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/build.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/copy.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/date.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/delete.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/encode.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/expr.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/func.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/hash.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/insert.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/main.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/opcodes.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/os.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/pager.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/parse.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/pragma.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/printf.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/random.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/select.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/shell.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/table.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/tokenize.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/trigger.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/update.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/util.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/vacuum.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/vdbe.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/vdbeaux.c
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/where.c
+- )
++ # =================================================================================================
++ # Sqlite library rules
++
++ IF(SQLITE_FOUND)
++
++ INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIRS})
++ SET(sqlite_LIBS ${SQLITE_LIBRARIES})
++
++ ELSE(SQLITE_FOUND)
++
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2)
++
++ SET(libsqlite2_SRCS
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/auth.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/btree.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/btree_rb.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/build.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/copy.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/date.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/delete.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/encode.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/expr.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/func.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/hash.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/insert.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/main.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/opcodes.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/os.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/pager.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/parse.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/pragma.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/printf.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/random.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/select.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/shell.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/table.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/tokenize.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/trigger.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/update.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/util.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/vacuum.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/vdbe.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/vdbeaux.c
++ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/where.c
++ )
++
++ ENDIF(SQLITE_FOUND)
+
+ SET(libhaar_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/database/haar/haar.cpp
+--- a/digikam/CMakeLists.txt
++++ b/digikam/CMakeLists.txt
+@@ -240,6 +240,7 @@ TARGET_LINK_LIBRARIES(digikamdatabase
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTSQL_LIBRARY}
++ ${sqlite_LIBS}
+ )
+
+ SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
Added: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/series 2010-05-09 12:39:48 UTC (rev 17911)
@@ -0,0 +1,4 @@
+#find-sqlite
+#find-cimg
+
+digikam-1.2.0-kde232628.patch
Modified: kde-extras/digikam/trunk/debian/source/format
===================================================================
--- kde-extras/digikam/trunk/debian/source/format 2010-05-09 09:54:31 UTC (rev 17910)
+++ kde-extras/digikam/trunk/debian/source/format 2010-05-09 12:39:48 UTC (rev 17911)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the pkg-kde-commits
mailing list