Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add digikam new kde 5 version

Browse Source
This commit is contained in:
groni
2016-11-11 22:19:03 +01:00
parent d35062be44
commit 63523aa8e1
14 changed files with 677 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/graphics/digikam/files/digikam-3.5.0-panorama-crasher.patch
+28
View File
@@ -0,0 +1,28 @@
diff -up digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp
--- digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher 2013-10-01 08:23:09.000000000 +0200
+++ digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp 2013-12-12 11:50:14.199493306 +0100
@@ -91,11 +91,7 @@ LastPage::LastPage(Manager* const mngr,
QLabel *fileTemplateLabel = new QLabel(i18n("File name template:"), d->saveSettingsGroupBox);
formatVBox->addWidget(fileTemplateLabel);
- QString first = d->mngr->itemsList().front().fileName();
- QString last = d->mngr->itemsList().back().fileName();
-// QString file = "panorama";
- QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
- d->fileTemplateKLineEdit = new KLineEdit(file, d->saveSettingsGroupBox);
+ d->fileTemplateKLineEdit = new KLineEdit("panorama", d->saveSettingsGroupBox);
d->fileTemplateKLineEdit->setToolTip(i18n("Name of the panorama file (without its extension)."));
d->fileTemplateKLineEdit->setWhatsThis(i18n("<b>File name template</b>: Set here the base name of the files that "
"will be saved. For example, if your template is <i>panorama</i> and if "
@@ -146,6 +142,11 @@ LastPage::~LastPage()
void LastPage::resetTitle()
{
+ QString first = d->mngr->itemsList().front().fileName();
+ QString last = d->mngr->itemsList().back().fileName();
+ QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
+ d->fileTemplateKLineEdit->setText(file);
+
slotTemplateChanged(d->fileTemplateKLineEdit->text());
checkFiles();
}
desktop/kde/graphics/digikam/files/digikam-4.4.0-hang.patch
+85
View File
@@ -0,0 +1,85 @@
commit f0400ec7e518e753e0c4ccab4eb2b8b022f91767
Author: Gilles Caulier <caulier.gilles@gmail.com>
Date: Tue Oct 28 15:58:55 2014 +0100
apply patch #89156
BUGS: 337737
FIXED-IN: 4.5.0
diff --git core/libs/widgets/common/databasewidget.cpp b/libs/widgets/common/databasewidget.cpp
index b04355b..858cf40 100644
--- core/libs/widgets/common/databasewidget.cpp
+++ core/libs/widgets/common/databasewidget.cpp
@@ -172,30 +172,21 @@ void DatabaseWidget::setupMainArea()
"<p><b>MySQL</b> backend is a more robust solution especially for remote and shared database storage. "
"It is also more efficient to manage huge collection sizes. "
"Be careful: this one it is still in experimental stage.</p>"));
- setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType());
-
- // --------------------------------------------------------
- adjustSize();
+ setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType());
// --------------------------------------------------------
- connect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
- this, SLOT(slotChangeDatabasePath(KUrl)));
-
- connect(databasePathEdit, SIGNAL(textChanged(QString)),
- this, SLOT(slotDatabasePathEditedDelayed()));
-
connect(databaseType, SIGNAL(currentIndexChanged(int)),
this, SLOT(slotHandleDBTypeIndexChanged(int)));
+ connect(checkDatabaseConnectionButton, SIGNAL(clicked()),
+ this, SLOT(checkDatabaseConnection()));
+
#ifdef HAVE_INTERNALMYSQL
connect(internalServer, SIGNAL(stateChanged(int)),
this, SLOT(slotHandleInternalServerCheckbox(int)));
#endif // HAVE_INTERNALMYSQL
-
- connect(checkDatabaseConnectionButton, SIGNAL(clicked()),
- this, SLOT(checkDatabaseConnection()));
}
QString DatabaseWidget::currentDatabaseType() const
@@ -261,12 +252,24 @@ void DatabaseWidget::setDatabaseInputFields(const QString& currentIndexStr)
d->databasePathLabel->setVisible(true);
databasePathEdit->setVisible(true);
d->expertSettings->setVisible(false);
+
+ connect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
+ this, SLOT(slotChangeDatabasePath(KUrl)));
+
+ connect(databasePathEdit, SIGNAL(textChanged(QString)),
+ this, SLOT(slotDatabasePathEditedDelayed()));
}
else
{
d->databasePathLabel->setVisible(false);
databasePathEdit->setVisible(false);
d->expertSettings->setVisible(true);
+
+ disconnect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
+ this, SLOT(slotChangeDatabasePath(KUrl)));
+
+ disconnect(databasePathEdit, SIGNAL(textChanged(QString)),
+ this, SLOT(slotDatabasePathEditedDelayed()));
}
adjustSize();
@@ -355,9 +358,9 @@ void DatabaseWidget::setParametersFromSettings(const ApplicationSettings* const
password->setText(settings->getDatabasePassword());
- /* Now set the type according the database type from the settings.
- * If no item is found, ignore the setting.
- */
+ // Now set the type according the database type from the settings.
+ // If no item is found, ignore the setting.
+
for (int i=0; i<databaseType->count(); ++i)
{
//kDebug(50003) << "Comparing comboboxentry on index ["<< i <<"] [" << databaseType->itemData(i)
desktop/kde/graphics/digikam/files/digikam-4.4.0-libkexiv2.patch
+53
View File
@@ -0,0 +1,53 @@
commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
Author: Pino Toscano <pino@kde.org>
Date: Tue Oct 14 22:26:19 2014 +0200
fix libkexiv2 version for AltLangStrEdit::textEdit()
it is part of current libkexiv2/master only (i.e. post 4.14.x, which
is 2.3.x)
diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp
index 88413fc..70bdb6d 100644
--- a/libs/imageproperties/captionedit.cpp
+++ b/libs/imageproperties/captionedit.cpp
@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text)
MsgTextEdit* CaptionEdit::textEdit() const
{
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
return d->altLangStrEdit->textEdit();
#else
return 0;
diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp
index ebfbae1..3d12777 100644
--- a/libs/imageproperties/imagedescedittab.cpp
+++ b/libs/imageproperties/imagedescedittab.cpp
@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent)
// Initialize ---------------------------------------------
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
d->titleEdit->textEdit()->installEventFilter(this);
d->captionsEdit->textEdit()->installEventFilter(this);
#endif
@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit()
void ImageDescEditTab::setFocusToTitlesEdit()
{
d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
d->titleEdit->textEdit()->setFocus();
#endif
}
@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit()
void ImageDescEditTab::setFocusToCommentsEdit()
{
d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
d->captionsEdit->textEdit()->setFocus();
#endif
}
desktop/kde/graphics/digikam/files/digikam-4.6.0.install-libs-dev.patch
+88
View File
@@ -0,0 +1,88 @@
diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt
--- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100
+++ digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt 2015-01-03 21:03:21.172580963 +0100
@@ -63,9 +63,6 @@
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/database/dbconfig.xml
DESTINATION ${DATA_INSTALL_DIR}/libkface/database )
-# Check if compilation is done through digiKam SC or not. If yes, do not install header files.
-if(NOT DIGIKAMSC_COMPILE_LIBKFACE)
-
install(FILES facedetector.h
recognitiondatabase.h
identity.h
@@ -76,9 +73,7 @@
)
if(NOT WIN32)
- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc)
- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
endif()
-
-endif()
diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt
--- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100
+++ digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt 2015-01-03 21:03:38.204621741 +0100
@@ -73,9 +73,6 @@
install(TARGETS kgeomap ${INSTALL_TARGETS_DEFAULT_ARGS})
-# Check if compilation is done through digiKam SC or not. If yes, do not install header files.
-if(NOT DIGIKAMSC_COMPILE_LIBKGEOMAP)
-
install(FILES libkgeomap_export.h
abstractmarkertiler.h
dragdrophandler.h
@@ -94,14 +91,12 @@
)
if(NOT WIN32)
- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc)
- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
endif()
# Install find cmake script to the system for client applications.
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindKGeoMap.cmake
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindKGeoMap.cmake
DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
-
-endif()
diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt
--- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100
+++ digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt 2015-01-03 21:03:05.940544498 +0100
@@ -40,9 +40,6 @@
install(TARGETS mediawiki ${INSTALL_TARGETS_DEFAULT_ARGS})
-# Check if compilation is done through digiKam SC or not. If yes, do not install header files.
-if(NOT DIGIKAMSC_COMPILE_LIBMEDIAWIKI)
-
install(FILES image.h
imageinfo.h
mediawiki.h
@@ -68,14 +65,12 @@
DESTINATION ${INCLUDE_INSTALL_DIR}/libmediawiki COMPONENT Devel)
if(NOT WIN32)
- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc)
- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
endif()
# Install find cmake script to the system for client applications.
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindMediawiki.cmake
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindMediawiki.cmake
DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
-
-endif()
desktop/kde/graphics/digikam/files/fix-clapack-cmake.diff
+18
View File
@@ -0,0 +1,18 @@
Index: digikam-1.6.0/cmake/modules/FindCLAPACK.cmake
===================================================================
--- digikam-1.6.0.orig/cmake/modules/FindCLAPACK.cmake
+++ digikam-1.6.0/cmake/modules/FindCLAPACK.cmake
@@ -17,11 +17,11 @@ if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRA
else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
- find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO_DEFAULT_PATH)
+ find_path(CLAPACK_INCLUDE_DIR NAMES f2c.h PATHS /usr/include/clapack NO_DEFAULT_PATH)
if(CLAPACK_INCLUDE_DIR)
message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
else(CLAPACK_INCLUDE_DIR)
- find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack)
+ find_path(CLAPACK_INCLUDE_DIR NAMES f2c.h PATHS /usr/include/clapack)
if(CLAPACK_INCLUDE_DIR)
message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
endif(CLAPACK_INCLUDE_DIR)
desktop/kde/graphics/digikam/files/splash-digikam.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 296 KiB

desktop/kde/graphics/digikam/files/splash-showfoto.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 100 KiB