mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 15:08:57 +02:00
digikam: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -4,11 +4,11 @@ application that runs on Linux, Windows, and MacOS. The application provides \
|
||||
a comprehensive set of tools for importing, managing, editing, and sharing \
|
||||
photos and RAW files."
|
||||
HOMEPAGE="https://digikam.org/"
|
||||
COPYRIGHT="2010-2022 KDE Organisation"
|
||||
COPYRIGHT="2010-2024 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="5"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digiKam-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641"
|
||||
CHECKSUM_SHA256="2f7fcb559b123ed9ecae5a5aef6f4560eee5f49206d9d1746dec9ab6c8fb38bf"
|
||||
SOURCE_DIR="digikam-$portVersion"
|
||||
PATCHES="digikam-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
@@ -29,10 +29,6 @@ PROVIDES="
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libavcodec$secondaryArchSuffix
|
||||
lib:libavdevice$secondaryArchSuffix
|
||||
lib:libavformat$secondaryArchSuffix
|
||||
lib:libavutil$secondaryArchSuffix
|
||||
lib:libexiv2$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
@@ -40,6 +36,7 @@ REQUIRES="
|
||||
lib:libglib_2.0${secondaryArchSuffix}
|
||||
lib:libgomp$secondaryArchSuffix
|
||||
lib:libgphoto2$secondaryArchSuffix
|
||||
lib:libheif$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libjasper$secondaryArchSuffix
|
||||
@@ -49,6 +46,7 @@ REQUIRES="
|
||||
lib:libKF5Archive$secondaryArchSuffix
|
||||
lib:libKF5Auth$secondaryArchSuffix
|
||||
lib:libKF5Bookmarks$secondaryArchSuffix
|
||||
lib:libKF5CalendarCore$secondaryArchSuffix
|
||||
lib:libKF5Codecs$secondaryArchSuffix
|
||||
lib:libKF5Completion$secondaryArchSuffix
|
||||
lib:libKF5ConfigCore$secondaryArchSuffix
|
||||
@@ -85,23 +83,24 @@ REQUIRES="
|
||||
lib:liblensfun$secondaryArchSuffix
|
||||
lib:liblqr_1$secondaryArchSuffix
|
||||
lib:libMagick++_7.Q16HDRI$secondaryArchSuffix
|
||||
lib:libopenal$secondaryArchSuffix
|
||||
lib:libopencv_core$secondaryArchSuffix
|
||||
lib:libopencv_imgcodecs$secondaryArchSuffix
|
||||
lib:libopencv_imgproc$secondaryArchSuffix
|
||||
lib:libopencv_objdetect$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libqtav$secondaryArchSuffix
|
||||
lib:libqtavwidgets$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5DBus$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5PrintSupport$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
lib:libQt5WebKit$secondaryArchSuffix
|
||||
lib:libQt5WebKitWidgets$secondaryArchSuffix
|
||||
lib:libQt5WebEngine$secondaryArchSuffix
|
||||
lib:libQt5WebEngineCore$secondaryArchSuffix
|
||||
lib:libQt5WebEngineWidgets$secondaryArchSuffix
|
||||
lib:libQt5Xml$secondaryArchSuffix
|
||||
lib:libtiff$secondaryArchSuffix
|
||||
lib:libx265$secondaryArchSuffix
|
||||
lib:libxml2$secondaryArchSuffix
|
||||
lib:libxslt$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
@@ -109,19 +108,20 @@ REQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
extra_cmake_modules$secondaryArchSuffix >= 5.93
|
||||
extra_cmake_modules$secondaryArchSuffix
|
||||
devel:eigen$secondaryArchSuffix
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libGLU$secondaryArchSuffix
|
||||
devel:libavcodec$secondaryArchSuffix >=58.54.100
|
||||
devel:libavformat$secondaryArchSuffix >= 58.29.100
|
||||
devel:libavutil$secondaryArchSuffix >= 56.31.100
|
||||
devel:libboost_system$secondaryArchSuffix
|
||||
devel:libavcodec$secondaryArchSuffix >= 59
|
||||
devel:libavformat$secondaryArchSuffix >= 59
|
||||
devel:libavutil$secondaryArchSuffix >= 57
|
||||
devel:libboost_system$secondaryArchSuffix >= 1.83.0
|
||||
devel:libexiv2$secondaryArchSuffix
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libglib_2.0$secondaryArchSuffix
|
||||
devel:libgomp$secondaryArchSuffix
|
||||
devel:libgphoto2$secondaryArchSuffix
|
||||
devel:libheif$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libjasper$secondaryArchSuffix
|
||||
@@ -131,6 +131,7 @@ BUILD_REQUIRES="
|
||||
devel:libKF5Archive$secondaryArchSuffix
|
||||
devel:libKF5Auth$secondaryArchSuffix
|
||||
devel:libKF5Bookmarks$secondaryArchSuffix
|
||||
devel:libKF5CalendarCore$secondaryArchSuffix
|
||||
devel:libKF5Codecs$secondaryArchSuffix
|
||||
devel:libKF5Completion$secondaryArchSuffix
|
||||
devel:libKF5ConfigCore$secondaryArchSuffix
|
||||
@@ -168,23 +169,23 @@ BUILD_REQUIRES="
|
||||
devel:liblensfun$secondaryArchSuffix
|
||||
devel:liblqr_1$secondaryArchSuffix
|
||||
devel:libMagick++_7.Q16HDRI$secondaryArchSuffix
|
||||
devel:libopenal$secondaryArchSuffix
|
||||
devel:libopencv_core$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libqtav$secondaryArchSuffix
|
||||
devel:libqtavwidgets$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5WebKitWidgets$secondaryArchSuffix
|
||||
devel:libQt5WebEngine$secondaryArchSuffix
|
||||
devel:libtiff$secondaryArchSuffix
|
||||
devel:libx265$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix
|
||||
devel:libxslt$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
digikam${secondaryArchSuffix}_devel = $portVersion compat >= 7
|
||||
devel:libdigikamcore$secondaryArchSuffix = $portVersion compat >= 7
|
||||
devel:libdigikamdatabase$secondaryArchSuffix = $portVersion compat >= 7
|
||||
devel:libdigikamgui$secondaryArchSuffix = $portVersion compat >= 7
|
||||
digikam${secondaryArchSuffix}_devel = $portVersion compat >= 8
|
||||
devel:libdigikamcore$secondaryArchSuffix = $portVersion compat >= 8
|
||||
devel:libdigikamdatabase$secondaryArchSuffix = $portVersion compat >= 8
|
||||
devel:libdigikamgui$secondaryArchSuffix = $portVersion compat >= 8
|
||||
"
|
||||
REQUIRES_devel="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -196,6 +197,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:flex
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:git
|
||||
cmd:lrelease$secondaryArchSuffix >= 5
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
@@ -222,15 +224,17 @@ BUILD()
|
||||
-DENABLE_DBUS=OFF \
|
||||
-DENABLE_MEDIAPLAYER=ON \
|
||||
-DENABLE_APPSTYLES=ON \
|
||||
-DENABLE_QWEBENGINE=OFF \
|
||||
-DENABLE_QWEBENGINE=ON \
|
||||
-Wno-dev
|
||||
|
||||
LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/bin \
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/bin \
|
||||
make install
|
||||
|
||||
mv $appsDir/digiKam/bin/digikam $appsDir/digiKam/digiKam
|
||||
@@ -1,14 +1,14 @@
|
||||
From 73d39a7ac7cfe45f281a939bd3e0c2c2188066e4 Mon Sep 17 00:00:00 2001
|
||||
From bdd570ab3d97781ea250599fe8065d5a33460112 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 12 May 2022 13:47:35 +1000
|
||||
Date: Thu, 14 Mar 2024 22:51:39 +1000
|
||||
Subject: Fix build for Haiku
|
||||
|
||||
|
||||
diff --git a/core/app/DigikamTarget.cmake b/core/app/DigikamTarget.cmake
|
||||
index 1ba46f2..b73f998 100644
|
||||
index 3bd9e07..1734256 100644
|
||||
--- a/core/app/DigikamTarget.cmake
|
||||
+++ b/core/app/DigikamTarget.cmake
|
||||
@@ -66,6 +66,10 @@ target_link_libraries(digikam
|
||||
@@ -77,6 +77,10 @@ target_link_libraries(digikam
|
||||
digikamgui
|
||||
)
|
||||
|
||||
@@ -20,7 +20,7 @@ index 1ba46f2..b73f998 100644
|
||||
|
||||
target_link_libraries(digikam
|
||||
diff --git a/core/app/main/digikamapp_setup.cpp b/core/app/main/digikamapp_setup.cpp
|
||||
index 179efd9..05940c8 100644
|
||||
index 8b46324..72a4547 100644
|
||||
--- a/core/app/main/digikamapp_setup.cpp
|
||||
+++ b/core/app/main/digikamapp_setup.cpp
|
||||
@@ -1,3 +1,4 @@
|
||||
@@ -28,7 +28,7 @@ index 179efd9..05940c8 100644
|
||||
/* ============================================================
|
||||
*
|
||||
* This file is a part of digiKam project
|
||||
@@ -801,9 +802,9 @@ void DigikamApp::setupActions()
|
||||
@@ -874,9 +875,9 @@ void DigikamApp::setupActions()
|
||||
loadCameras();
|
||||
|
||||
// Load Themes
|
||||
@@ -41,10 +41,10 @@ index 179efd9..05940c8 100644
|
||||
|
||||
registerPluginsActions();
|
||||
diff --git a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h
|
||||
index f067389..b541bc4 100644
|
||||
index c90a816..f80994a 100644
|
||||
--- a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h
|
||||
+++ b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptConfig.h
|
||||
@@ -136,6 +136,11 @@
|
||||
@@ -141,6 +141,11 @@
|
||||
#define NPT_CONFIG_HAVE_GETADDRINFO
|
||||
#endif
|
||||
|
||||
@@ -71,10 +71,10 @@ index 5f20d6c..990927f 100644
|
||||
#include <sys/ioctl.h>
|
||||
#include <netinet/in.h>
|
||||
diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
|
||||
index 96ab291..b8cf522 100644
|
||||
index 0a03644..e308e75 100644
|
||||
--- a/core/libs/dimg/filters/curves/curveswidget.cpp
|
||||
+++ b/core/libs/dimg/filters/curves/curveswidget.cpp
|
||||
@@ -32,6 +32,7 @@
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <QPixmap>
|
||||
#include <QPainter>
|
||||
@@ -82,6 +82,19 @@ index 96ab291..b8cf522 100644
|
||||
#include <QPoint>
|
||||
#include <QPen>
|
||||
#include <QEvent>
|
||||
diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
|
||||
index 7814aff..d24c118 100644
|
||||
--- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
|
||||
+++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
|
||||
@@ -27,7 +27,7 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#if qLinux || qiPhone || qAndroid
|
||||
+#if qLinux || qiPhone || qAndroid || __HAIKU__
|
||||
#include <ctype.h> // for isdigit
|
||||
#endif
|
||||
|
||||
diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_types.h b/core/libs/dngwriter/extra/dng_sdk/dng_types.h
|
||||
index 91a45cf..1e92b08 100644
|
||||
--- a/core/libs/dngwriter/extra/dng_sdk/dng_types.h
|
||||
@@ -128,10 +141,10 @@ index ac0708e..3ee990b 100644
|
||||
#define __POSIX__
|
||||
#endif
|
||||
diff --git a/core/libs/settings/applicationsettings_miscs.cpp b/core/libs/settings/applicationsettings_miscs.cpp
|
||||
index ad40d4a..0a77a1c 100644
|
||||
index e4bdd26..d0825b2 100644
|
||||
--- a/core/libs/settings/applicationsettings_miscs.cpp
|
||||
+++ b/core/libs/settings/applicationsettings_miscs.cpp
|
||||
@@ -494,7 +494,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font)
|
||||
@@ -495,7 +495,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font)
|
||||
|
||||
QFont ApplicationSettings::getApplicationFont() const
|
||||
{
|
||||
@@ -142,12 +155,12 @@ index ad40d4a..0a77a1c 100644
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool ApplicationSettings::getHelpBoxNotificationSeen() {
|
||||
bool ApplicationSettings::getHelpBoxNotificationSeen()
|
||||
diff --git a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
|
||||
index e6c2c7a..9c429ff 100644
|
||||
index 2d33091..9234195 100644
|
||||
--- a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
|
||||
+++ b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
|
||||
@@ -47,7 +47,7 @@ extern "C"
|
||||
@@ -38,7 +38,7 @@ extern "C"
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
@@ -157,10 +170,10 @@ index e6c2c7a..9c429ff 100644
|
||||
# include <sys/shm.h>
|
||||
#endif
|
||||
diff --git a/core/libs/widgets/mainview/thememanager.cpp b/core/libs/widgets/mainview/thememanager.cpp
|
||||
index d036136..9975eb0 100644
|
||||
index 85955fa..a830501 100644
|
||||
--- a/core/libs/widgets/mainview/thememanager.cpp
|
||||
+++ b/core/libs/widgets/mainview/thememanager.cpp
|
||||
@@ -116,6 +116,7 @@ void ThemeManager::setCurrentTheme(const QString& name)
|
||||
@@ -82,6 +82,7 @@ void ThemeManager::setCurrentTheme(const QString& name)
|
||||
|
||||
void ThemeManager::slotChangePalette()
|
||||
{
|
||||
@@ -168,15 +181,15 @@ index d036136..9975eb0 100644
|
||||
updateCurrentDesktopDefaultThemePreview();
|
||||
|
||||
QString theme(currentThemeName());
|
||||
@@ -139,6 +140,7 @@ void ThemeManager::slotChangePalette()
|
||||
@@ -105,6 +106,7 @@ void ThemeManager::slotChangePalette()
|
||||
qCDebug(DIGIKAM_WIDGETS_LOG) << theme << " :: " << filePath;
|
||||
|
||||
emit signalThemeChanged();
|
||||
Q_EMIT signalThemeChanged();
|
||||
+#endif
|
||||
}
|
||||
|
||||
void ThemeManager::setThemeMenuAction(QMenu* const action)
|
||||
@@ -165,6 +167,7 @@ void ThemeManager::registerThemeActions(DXmlGuiWindow* const win)
|
||||
@@ -131,6 +133,7 @@ void ThemeManager::registerThemeActions(DXmlGuiWindow* const win)
|
||||
|
||||
void ThemeManager::populateThemeMenu()
|
||||
{
|
||||
@@ -184,7 +197,7 @@ index d036136..9975eb0 100644
|
||||
if (!d->themeMenuAction)
|
||||
{
|
||||
return;
|
||||
@@ -227,6 +230,7 @@ void ThemeManager::populateThemeMenu()
|
||||
@@ -193,6 +196,7 @@ void ThemeManager::populateThemeMenu()
|
||||
|
||||
updateCurrentDesktopDefaultThemePreview();
|
||||
setCurrentTheme(theme);
|
||||
@@ -193,10 +206,10 @@ index d036136..9975eb0 100644
|
||||
|
||||
void ThemeManager::updateCurrentDesktopDefaultThemePreview()
|
||||
diff --git a/core/showfoto/main/showfoto_setup.cpp b/core/showfoto/main/showfoto_setup.cpp
|
||||
index c233de4..9b69828 100644
|
||||
index 48618d4..7f3a387 100644
|
||||
--- a/core/showfoto/main/showfoto_setup.cpp
|
||||
+++ b/core/showfoto/main/showfoto_setup.cpp
|
||||
@@ -28,7 +28,9 @@ namespace ShowFoto
|
||||
@@ -19,7 +19,9 @@ namespace ShowFoto
|
||||
|
||||
void Showfoto::setupActions()
|
||||
{
|
||||
@@ -207,10 +220,10 @@ index c233de4..9b69828 100644
|
||||
|
||||
// Extra 'File' menu actions ---------------------------------------------
|
||||
diff --git a/core/showfoto/main/showfotosettings.cpp b/core/showfoto/main/showfotosettings.cpp
|
||||
index 1ccb923..3c2ed5d 100644
|
||||
index 49414c7..a0a595b 100644
|
||||
--- a/core/showfoto/main/showfotosettings.cpp
|
||||
+++ b/core/showfoto/main/showfotosettings.cpp
|
||||
@@ -398,7 +398,11 @@ QString ShowfotoSettings::getIconTheme() const
|
||||
@@ -396,7 +396,11 @@ QString ShowfotoSettings::getIconTheme() const
|
||||
|
||||
QFont ShowfotoSettings::getApplicationFont() const
|
||||
{
|
||||
@@ -223,13 +236,13 @@ index 1ccb923..3c2ed5d 100644
|
||||
|
||||
bool ShowfotoSettings::getShowSplash() const
|
||||
diff --git a/core/showfoto/setup/showfotosetup.cpp b/core/showfoto/setup/showfotosetup.cpp
|
||||
index 2152f5a..3574688 100644
|
||||
index 1143b02..7f1eece 100644
|
||||
--- a/core/showfoto/setup/showfotosetup.cpp
|
||||
+++ b/core/showfoto/setup/showfotosetup.cpp
|
||||
@@ -196,7 +196,9 @@ ShowfotoSetup::ShowfotoSetup(QWidget* const parent, ShowfotoSetup::Page page)
|
||||
|
||||
@@ -194,7 +194,9 @@ ShowfotoSetup::ShowfotoSetup(QWidget* const parent, ShowfotoSetup::Page page)
|
||||
winId();
|
||||
Digikam::DXmlGuiWindow::restoreWindowSize(windowHandle(), group);
|
||||
DXmlGuiWindow::setGoodDefaultWindowSize(windowHandle());
|
||||
DXmlGuiWindow::restoreWindowSize(windowHandle(), group);
|
||||
+#ifndef Q_OS_HAIKU
|
||||
resize(windowHandle()->size());
|
||||
+#endif
|
||||
@@ -237,10 +250,10 @@ index 2152f5a..3574688 100644
|
||||
|
||||
ShowfotoSetup::~ShowfotoSetup()
|
||||
diff --git a/core/showfoto/setup/showfotosetupmisc.cpp b/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
index 573d574..4282844 100644
|
||||
index 39dd377..cafac03 100644
|
||||
--- a/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
+++ b/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
@@ -83,7 +83,9 @@ public:
|
||||
@@ -79,7 +79,9 @@ public:
|
||||
sortOrderComboBox (nullptr),
|
||||
applicationStyle (nullptr),
|
||||
applicationIcon (nullptr),
|
||||
@@ -248,9 +261,9 @@ index 573d574..4282844 100644
|
||||
applicationFont (nullptr),
|
||||
+#endif
|
||||
systemSettingsWidget (nullptr),
|
||||
settings (ShowfotoSettings::instance())
|
||||
{
|
||||
@@ -110,7 +112,9 @@ public:
|
||||
|
||||
#ifdef HAVE_SONNET
|
||||
@@ -114,7 +116,9 @@ public:
|
||||
QComboBox* sortOrderComboBox;
|
||||
QComboBox* applicationStyle;
|
||||
QComboBox* applicationIcon;
|
||||
@@ -260,7 +273,7 @@ index 573d574..4282844 100644
|
||||
|
||||
SystemSettingsWidget* systemSettingsWidget;
|
||||
|
||||
@@ -301,10 +305,10 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
|
||||
@@ -317,10 +321,10 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
|
||||
{
|
||||
d->applicationIcon->addItem(it.key(), it.value());
|
||||
}
|
||||
@@ -273,7 +286,7 @@ index 573d574..4282844 100644
|
||||
// --------------------------------------------------------
|
||||
|
||||
layout2->setContentsMargins(spacing, spacing, spacing, spacing);
|
||||
@@ -314,7 +318,9 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
|
||||
@@ -330,7 +334,9 @@ ShowfotoSetupMisc::ShowfotoSetupMisc(QWidget* const parent)
|
||||
layout2->addWidget(tabStyleHbox);
|
||||
layout2->addWidget(appStyleHbox);
|
||||
layout2->addWidget(iconThemeHbox);
|
||||
@@ -283,17 +296,18 @@ index 573d574..4282844 100644
|
||||
layout2->addStretch();
|
||||
|
||||
d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance"));
|
||||
@@ -384,7 +390,9 @@ void ShowfotoSetupMisc::readSettings()
|
||||
@@ -424,8 +430,9 @@ void ShowfotoSetupMisc::readSettings()
|
||||
#endif
|
||||
|
||||
d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(d->settings->getIconTheme()));
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->applicationFont->setFont(d->settings->getApplicationFont());
|
||||
-
|
||||
+#endif
|
||||
// NOTE: Spellcheck and Localize read settings is done in widget constructor.
|
||||
}
|
||||
|
||||
void ShowfotoSetupMisc::applySettings()
|
||||
@@ -409,7 +417,9 @@ void ShowfotoSetupMisc::applySettings()
|
||||
@@ -451,7 +458,9 @@ void ShowfotoSetupMisc::applySettings()
|
||||
#endif
|
||||
|
||||
d->settings->setIconTheme(d->applicationIcon->currentData().toString());
|
||||
@@ -301,13 +315,13 @@ index 573d574..4282844 100644
|
||||
d->settings->setApplicationFont(d->applicationFont->font());
|
||||
+#endif
|
||||
d->settings->syncConfig();
|
||||
}
|
||||
|
||||
#ifdef HAVE_SONNET
|
||||
diff --git a/core/utilities/import/backend/gpcamera.cpp b/core/utilities/import/backend/gpcamera.cpp
|
||||
index 696c6eb..cee40fa 100644
|
||||
index 7ce27f6..ad5d588 100644
|
||||
--- a/core/utilities/import/backend/gpcamera.cpp
|
||||
+++ b/core/utilities/import/backend/gpcamera.cpp
|
||||
@@ -67,6 +67,10 @@ extern "C"
|
||||
@@ -58,6 +58,10 @@ extern "C"
|
||||
|
||||
//#define GPHOTO2_DEBUG 1
|
||||
|
||||
@@ -318,96 +332,6 @@ index 696c6eb..cee40fa 100644
|
||||
#ifdef HAVE_GPHOTO2
|
||||
|
||||
// LibGphoto2 includes
|
||||
diff --git a/core/utilities/setup/setupmisc.cpp b/core/utilities/setup/setupmisc.cpp
|
||||
index 8986c23..4949d7b 100644
|
||||
--- a/core/utilities/setup/setupmisc.cpp
|
||||
+++ b/core/utilities/setup/setupmisc.cpp
|
||||
@@ -96,7 +96,9 @@ public:
|
||||
stringComparisonType (nullptr),
|
||||
applicationStyle (nullptr),
|
||||
applicationIcon (nullptr),
|
||||
+#ifndef Q_OS_HAIKU
|
||||
applicationFont (nullptr),
|
||||
+#endif
|
||||
minimumSimilarityBound (nullptr),
|
||||
systemSettingsWidget (nullptr),
|
||||
groupingButtons (QHash<int, QButtonGroup*>())
|
||||
@@ -133,8 +135,9 @@ public:
|
||||
QComboBox* stringComparisonType;
|
||||
QComboBox* applicationStyle;
|
||||
QComboBox* applicationIcon;
|
||||
+#ifndef Q_OS_HAIKU
|
||||
DFontSelect* applicationFont;
|
||||
-
|
||||
+#endif
|
||||
QSpinBox* minimumSimilarityBound;
|
||||
|
||||
SystemSettingsWidget* systemSettingsWidget;
|
||||
@@ -378,9 +381,10 @@ SetupMisc::SetupMisc(QWidget* const parent)
|
||||
d->applicationIcon->addItem(it.key(), it.value());
|
||||
}
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->applicationFont = new DFontSelect(i18n("Application font:"), appearancePanel);
|
||||
d->applicationFont->setToolTip(i18n("Select here the font used to display text in whole application."));
|
||||
-
|
||||
+#endif
|
||||
// --------------------------------------------------------
|
||||
|
||||
layout2->setContentsMargins(spacing, spacing, spacing, spacing);
|
||||
@@ -391,7 +395,9 @@ SetupMisc::SetupMisc(QWidget* const parent)
|
||||
layout2->addWidget(tabStyleHbox);
|
||||
layout2->addWidget(appStyleHbox);
|
||||
layout2->addWidget(iconThemeHbox);
|
||||
+#ifndef Q_OS_HAIKU
|
||||
layout2->addWidget(d->applicationFont);
|
||||
+#endif
|
||||
layout2->addStretch();
|
||||
|
||||
d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance"));
|
||||
@@ -549,7 +555,9 @@ void SetupMisc::applySettings()
|
||||
#endif
|
||||
|
||||
settings->setIconTheme(d->applicationIcon->currentData().toString());
|
||||
+#ifndef Q_OS_HAIKU
|
||||
settings->setApplicationFont(d->applicationFont->font());
|
||||
+#endif
|
||||
settings->saveSettings();
|
||||
}
|
||||
|
||||
@@ -593,7 +601,9 @@ void SetupMisc::readSettings()
|
||||
#endif
|
||||
|
||||
d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(settings->getIconTheme()));
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->applicationFont->setFont(settings->getApplicationFont());
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace Digikam
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From 1493e42c4659de97e186b549048045676567ceeb Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Sun, 13 Aug 2023 17:57:59 +0000
|
||||
Subject: Build fix for isdigit
|
||||
|
||||
|
||||
diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
|
||||
index fa58711..8a58dda 100644
|
||||
--- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
|
||||
+++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#if qiPhone || qAndroid
|
||||
+#if qiPhone || qAndroid || __HAIKU__
|
||||
#include <ctype.h> // for isdigit
|
||||
#endif
|
||||
|
||||
--
|
||||
2.37.3
|
||||
2.43.2
|
||||
|
||||
Reference in New Issue
Block a user