Debian Codegraph @

project/bundles/3rdparty/ext_libksane/libksane-common-rules.patch

raw
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index d5c9a73..290f3e3 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -77,13 +77,13 @@ find_package(KF${KF_MAJOR_VERSION}I18n ${KF5_VERSION} REQUIRED)
6
7 if (NOT WIN32)
8 find_package(KF${KF_MAJOR_VERSION}WidgetsAddons ${KF5_VERSION} REQUIRED)
9 - find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF5_VERSION} REQUIRED)
10 +# find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF5_VERSION} REQUIRED)
11
12 # Optional KF5 frameworks
13 - find_package(KF${KF_MAJOR_VERSION}Wallet ${KF5_VERSION})
14 - set_package_properties(KF${KF_MAJOR_VERSION}Wallet PROPERTIES DESCRIPTION "Safe desktop-wide storage for passwords" TYPE OPTIONAL
15 - PURPOSE "Required to have permanent storage of passwords for scanners"
16 - )
17 +# find_package(KF${KF_MAJOR_VERSION}Wallet ${KF5_VERSION})
18 +# set_package_properties(KF${KF_MAJOR_VERSION}Wallet PROPERTIES DESCRIPTION "Safe desktop-wide storage for passwords" TYPE OPTIONAL
19 +# PURPOSE "Required to have permanent storage of passwords for scanners"
20 +# )
21
22 # Check if sane API is available.
23 find_package(${KSANECORE_NAME} "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}" REQUIRED)
24 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
25 index ab07811..48686b7 100644
26 --- a/src/CMakeLists.txt
27 +++ b/src/CMakeLists.txt
28 @@ -73,7 +73,7 @@ target_link_libraries(KSaneWidgets
29 PRIVATE
30 KF${KF_MAJOR_VERSION}::I18n
31 KF${KF_MAJOR_VERSION}::WidgetsAddons
32 - KF${KF_MAJOR_VERSION}::TextWidgets
33 +# KF${KF_MAJOR_VERSION}::TextWidgets
34 ${KSANECORE_TARGET}
35 )
36
37 diff --git a/src/widgets/labeledslider.cpp b/src/widgets/labeledslider.cpp
38 index dc5a39b..312079d 100644
39 --- a/src/widgets/labeledslider.cpp
40 +++ b/src/widgets/labeledslider.cpp
41 @@ -10,10 +10,11 @@
42
43 #include <QLabel>
44 #include <QSlider>
45 +#include <QSpinBox>
46
47 // KDE includes
48
49 -#include <KPluralHandlingSpinBox>
50 +#include <klocalizedstring.h>
51 #include <KSaneCore/Option>
52
53 namespace KSaneIface
54 @@ -90,7 +91,7 @@ void LabeledSlider::initSlider(int minValue, int maxValue, int stepValue)
55 m_slider->setMaximum(maxValue);
56 m_slider->setSingleStep(m_step);
57
58 - m_spinb = new KPluralHandlingSpinBox(this);
59 + m_spinb = new QSpinBox(this);
60 m_spinb->setMinimum(minValue);
61 m_spinb->setMaximum(maxValue);
62 m_slider->setSingleStep(m_step);
63 @@ -114,7 +115,7 @@ void LabeledSlider::initSlider(int minValue, int maxValue, int stepValue)
64
65 void LabeledSlider::setSuffix(const KLocalizedString &text)
66 {
67 - m_spinb->setSuffix(text);
68 + m_spinb->setSuffix(text.toString());
69 }
70
71 void LabeledSlider::setValue(const QVariant &val)
72 diff --git a/src/widgets/labeledslider.h b/src/widgets/labeledslider.h
73 index fe1bd4c..b9f5460 100644
74 --- a/src/widgets/labeledslider.h
75 +++ b/src/widgets/labeledslider.h
76 @@ -10,7 +10,8 @@
77
78 #include "ksaneoptionwidget.h"
79
80 -class QSlider;
81 +#include <QSlider>
82 +#include <QSpinBox>
83
84 /**
85 *@author Kåre Särs
86 @@ -78,7 +79,7 @@ Q_SIGNALS:
87 private:
88 void initSlider(int minValue, int maxValue, int stepValue);
89 QSlider *m_slider;
90 - KPluralHandlingSpinBox *m_spinb;
91 + QSpinBox *m_spinb;
92 int m_step;
93 };
94