Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump master branch #66

Merged
merged 5 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/arch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RUN pacman -Syu --noconfirm --noprogressbar && \
pacman -Syq --noconfirm --noprogressbar \
cmake \
extra-cmake-modules \
gtest \
libqalculate \
plasma-sdk \
qt6-declarative
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/arch/build_plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ cmake .. \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_FLAGS=-Werror \
-DKDE_INSTALL_LIBDIR=lib \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-DENABLE_TESTS=ON
make
bin/QalculateTests
10 changes: 10 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]


## [0.10.1] - 2024-07-24
### Added
- Initial basic support for assinging variables with the "a = 1" syntax
- Added French translation from Cherkah

### Fixed
- Alignment issue on the configuration window fixed
- Memory leaks from libqalculate fixed


## [0.10.0] - 2024-04-10
### Changed
- Major rework to support Qt/KDE 6
Expand Down
14 changes: 9 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ find_package(PkgConfig)
find_package(Readline)

pkg_check_modules(QALCULATE REQUIRED libqalculate>=3.3.0)
pkg_check_modules(MPFR REQUIRED mpfr)

include(CMakePackageConfigHelpers)
include(ECMQmlModule)
Expand All @@ -29,11 +30,13 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED Qml)
find_package(KF6 ${KF6_MIN_VERSION} REQUIRED I18n)
find_package(Plasma ${PROJECT_DEP_VERSION} REQUIRED)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-error=maybe-uninitialized")
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-error=maybe-uninitialized")
set(APPLET_NAME "com.dschopf.plasma.qalculate")

option(ENABLE_TESTS "Enable unit tests" OFF)
add_feature_info(ENABLE_TESTS ENABLE_TESTS "Enables the building of unit tests.")
add_feature_info(ENABLE_TESTS ENABLE_TESTS
"Enables the building of unit tests.")

plasma_install_package(package ${APPLET_NAME})

Expand All @@ -47,8 +50,9 @@ target_sources(

target_include_directories(qalculateplugin PRIVATE ${Readline_INCLUDE_DIR})

target_link_libraries(qalculateplugin PRIVATE KF6::I18n qalculate Qt::Qml mpfr
${Readline_LIBRARY})
target_link_libraries(
qalculateplugin PRIVATE KF6::I18n ${QALCULATE_LIBRARIES} Qt::Qml
${MPFR_LIBRARIES} ${Readline_LIBRARY})

if(NOT GETTEXT_FOUND)
message(WARNING "msgfmt not found. Translations will *not* be installed")
Expand Down Expand Up @@ -83,7 +87,7 @@ add_dependencies(qalculateplugin translations)
ecm_finalize_qml_module(qalculateplugin)

if(ENABLE_TESTS)
add_subdirectory(plugin/tests)
add_subdirectory(plugin/tests)
endif()

feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Plasma KNewStuff3 system is also available at the [Pling Store](https://store.kd
Install this AUR package: [plasma5-applets-qalculate](https://aur.archlinux.org/packages/plasma5-applets-qalculate/).

```bash
yay -Syu plasma5-applets-qalculate
yay -Syu plasma6-applets-qalculate
```

## Building/Installing from source
Expand Down
2 changes: 1 addition & 1 deletion package/contents/ui/config/General.qml
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ KCM.SimpleKCM {

Label {
visible: !chbHistoryDisabled.checked && qwr.historyFilename() != ""
text: i18n("History entries are stored in this file") + ": " + qwr.historyFilename()
text: i18n("History entries are stored in this file") + ": \n " + qwr.historyFilename()
}
}

Expand Down
32 changes: 13 additions & 19 deletions plugin/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,24 @@ find_package(GTest REQUIRED)

enable_testing()

add_executable(
QalculateTests
helpers.cpp
main.cpp
preprocessor_assign.cpp
../preprocessor.cpp
../qalculate.cpp
)
add_executable(QalculateTests helpers.cpp main.cpp preprocessor_assign.cpp
../preprocessor.cpp ../qalculate.cpp)

target_compile_definitions(QalculateTests PRIVATE ENABLE_TESTS)
target_compile_options(QalculateTests PRIVATE -fsanitize=address)
target_link_options(QalculateTests PRIVATE -fsanitize=address)

# disable ASAN tests until upstream changes are released
#target_compile_options(QalculateTests PRIVATE -fsanitize=address)
#target_link_options(QalculateTests PRIVATE -fsanitize=address)

target_link_libraries(
QalculateTests
PRIVATE
GTest::gtest
GTest::gmock
KF6::I18n
Qt6::Network
qalculate
mpfr
${Readline_LIBRARY}
)
PRIVATE GTest::gtest
GTest::gmock
KF6::I18n
Qt6::Network
${QALCULATE_LIBRARIES}
${MPFR_LIBRARIES}
${Readline_LIBRARY})

include(GoogleTest)
gtest_discover_tests(QalculateTests)
Loading
Loading