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

0001 diff --git a/CMakeLists.txt b/CMakeLists.txt
0002 index 1706c0d..746696d 100644
0003 --- a/CMakeLists.txt
0004 +++ b/CMakeLists.txt
0005 @@ -56,13 +56,13 @@ find_package(KF${KF_MAJOR_VERSION}I18n ${KF5_VERSION} REQUIRED)
0006
0007  if (NOT WIN32)
0008      find_package(KF${KF_MAJOR_VERSION}WidgetsAddons ${KF5_VERSION} REQUIRED)
0009 -    find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF5_VERSION} REQUIRED)
0010 +#    find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF5_VERSION} REQUIRED)
0011
0012      # Optional KF5 frameworks
0013 -    find_package(KF${KF_MAJOR_VERSION}Wallet ${KF5_VERSION})
0014 -    set_package_properties(KF${KF_MAJOR_VERSION}Wallet PROPERTIES DESCRIPTION "Safe desktop-wide storage for passwords" TYPE OPTIONAL
0015 -        PURPOSE "Required to have permanent storage of passwords for scanners"
0016 -    )
0017 +#    find_package(KF${KF_MAJOR_VERSION}Wallet ${KF5_VERSION})
0018 +#    set_package_properties(KF${KF_MAJOR_VERSION}Wallet PROPERTIES DESCRIPTION "Safe desktop-wide storage for passwords" TYPE OPTIONAL
0019 +#        PURPOSE "Required to have permanent storage of passwords for scanners"
0020 +#    )
0021
0022      # Check if sane API is available.
0023      find_package(KSaneCore "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}" REQUIRED)
0024 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
0025 index cc00d4e..f827d60 100644
0026 --- a/src/CMakeLists.txt
0027 +++ b/src/CMakeLists.txt
0028 @@ -51,7 +51,7 @@ target_link_libraries(KF5Sane
0029      PRIVATE
0030          KF${KF_MAJOR_VERSION}::I18n
0031          KF${KF_MAJOR_VERSION}::WidgetsAddons
0032 -        KF${KF_MAJOR_VERSION}::TextWidgets
0033 +#        KF${KF_MAJOR_VERSION}::TextWidgets
0034          KSane::Core
0035  )
0036
0037 diff --git a/src/widgets/labeledslider.cpp b/src/widgets/labeledslider.cpp
0038 index 9f71f90..486dfb4 100644
0039 --- a/src/widgets/labeledslider.cpp
0040 +++ b/src/widgets/labeledslider.cpp
0041 @@ -10,10 +10,12 @@
0042
0043  #include <QLabel>
0044  #include <QSlider>
0045 +#include <QSpinBox>
0046
0047  // KDE includes
0048
0049 -#include <KPluralHandlingSpinBox>
0050 +//#include <KPluralHandlingSpinBox>
0051 +#include <klocalizedstring.h>
0052  #include <Option>
0053
0054  namespace KSaneIface
0055 @@ -90,7 +92,7 @@ void LabeledSlider::initSlider(int minValue, int maxValue, int stepValue)
0056      m_slider->setMaximum(maxValue);
0057      m_slider->setSingleStep(m_step);
0058
0059 -    m_spinb = new KPluralHandlingSpinBox(this);
0060 +    m_spinb = new QSpinBox(this);
0061      m_spinb->setMinimum(minValue);
0062      m_spinb->setMaximum(maxValue);
0063      m_slider->setSingleStep(m_step);
0064 @@ -114,7 +116,7 @@ void LabeledSlider::initSlider(int minValue, int maxValue, int stepValue)
0065
0066  void LabeledSlider::setSuffix(const KLocalizedString &text)
0067  {
0068 -    m_spinb->setSuffix(text);
0069 +    m_spinb->setSuffix(text.toString());
0070  }
0071
0072  void LabeledSlider::setValue(const QVariant &val)
0073 diff --git a/src/widgets/labeledslider.h b/src/widgets/labeledslider.h
0074 index fe1bd4c..b9f5460 100644
0075 --- a/src/widgets/labeledslider.h
0076 +++ b/src/widgets/labeledslider.h
0077 @@ -10,7 +10,8 @@
0078
0079  #include "ksaneoptionwidget.h"
0080
0081 -class QSlider;
0082 +#include <QSlider>
0083 +#include <QSpinBox>
0084
0085  /**
0086    *@author Kåre Särs
0087 @@ -78,7 +79,7 @@ Q_SIGNALS:
0088  private:
0089      void initSlider(int minValue, int maxValue, int stepValue);
0090      QSlider   *m_slider;
0091 -    KPluralHandlingSpinBox  *m_spinb;
0092 +    QSpinBox  *m_spinb;
0093      int        m_step;
0094  };
0095