summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-12-08 18:43:55 +0100
committerJohannes Huber <johu@gentoo.org>2016-12-08 18:43:55 +0100
commit8203a96a596336e05b490098c109812bb095ea8c (patch)
tree5777d3cac1a12ba527cf87e72048f48263fb1e16 /media-gfx/digikam/files
parentmedia-gfx/digikam: stabilise 5.3.0 on amd64/x86 (diff)
downloadgentoo-8203a96a596336e05b490098c109812bb095ea8c.tar.gz
gentoo-8203a96a596336e05b490098c109812bb095ea8c.tar.bz2
gentoo-8203a96a596336e05b490098c109812bb095ea8c.zip
media-gfx/digikam: Drop slot 4
Package-Manager: portage-2.3.3
Diffstat (limited to 'media-gfx/digikam/files')
-rw-r--r--media-gfx/digikam/files/digikam-4.14.0-lensfun.patch26
-rw-r--r--media-gfx/digikam/files/digikam-4.4.0-hang.patch85
-rw-r--r--media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch53
3 files changed, 0 insertions, 164 deletions
diff --git a/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch b/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch
deleted file mode 100644
index 37776f6e316b..000000000000
--- a/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Mon, 14 Dec 2015 21:41:55 +0000
-Subject: fix compilation with Lensfun 0.3.2
-X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f159981176faa6da701f112bfe557b79804d468
----
-fix compilation with Lensfun 0.3.2
-It still compatible with older lensfun releases.
-BUGS: 356672
-FIXED-IN: 5.0.0
----
-
-
---- a/libs/dimg/filters/lens/lensfuniface.h
-+++ b/libs/dimg/filters/lens/lensfuniface.h
-@@ -24,10 +24,7 @@
-
- // Lib LensFun includes
-
--extern "C"
--{
- #include <lensfun.h>
--}
-
- // Local includes
-
-
diff --git a/media-gfx/digikam/files/digikam-4.4.0-hang.patch b/media-gfx/digikam/files/digikam-4.4.0-hang.patch
deleted file mode 100644
index 2757a4a5947b..000000000000
--- a/media-gfx/digikam/files/digikam-4.4.0-hang.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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 a/libs/widgets/common/databasewidget.cpp b/libs/widgets/common/databasewidget.cpp
-index b04355b..858cf40 100644
---- a/core/libs/widgets/common/databasewidget.cpp
-+++ b/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)
diff --git a/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch b/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch
deleted file mode 100644
index 018ce67a57d2..000000000000
--- a/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
- }