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.

Sign up for GitHub

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

Jump to bottom

Specify max dependence versions #1044

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Specify max dependence versions #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae32843
New libzim/libkiwix version reqs. in kiwix-desktop.pro
kelson42 Feb 25, 2024
1cc9dd1
Update dependences in deb 'control'
kelson42 Feb 25, 2024
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
5 changes: 4 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Build-Depends: debhelper-compat (= 13),
pkg-config,
qtbase5-dev,
qtwebengine5-dev,
libkiwix-dev (>= 11.0.0~)
libkiwix-dev (>= 13.0.0), libkiwix-dev (<< 14.0.0),
libzim-dev (>= 9.0.0), libzim-dev (<< 10.0.0),
Standards-Version: 4.5.0
kelson42 marked this conversation as resolved.
Show resolved Hide resolved
Homepage: https://www.kiwix.org/
Rules-Requires-Root: no
Expand All @@ -16,6 +17,8 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: offline Wikipedia reader
Kiwix is an offline reader and manager for online content
like Wikipedia, Project Gutenberg, or TED Talks.
Kiwix allows you to read and search through offline content
as they were online. Similar to a browser, Kiwix works with
the highly compressed ZIM file format.
Expand Down
4 changes: 2 additions & 2 deletions kiwix-desktop.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@ unix {
INSTALLS += mime_file
}

PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION \"kiwix >= 13.0.0 libzim >= 8.0.0\")
PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION \"kiwix >= 13.0.0 kiwix < 14.0.0 libzim >= 9.0.0 libzim < 10.0.0\")

QMAKE_CXXFLAGS += $$PKGCONFIG_CFLAGS
QMAKE_CFLAGS += $$PKGCONFIG_CFLAGS

LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION \"kiwix >= 13.0.0 libzim >= 8.0.0\")
LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION \"kiwix >= 13.0.0 kiwix < 14.0.0 libzim >= 9.0.0 libzim < 10.0.0\")

RESOURCES += \
resources/kiwix.qrc \
Expand Down
Loading