Skip to content

Commit

Permalink
Merge pull request #1044 from kiwix/maximum-dependency-version
Browse files Browse the repository at this point in the history
Specify max dependence versions
  • Loading branch information
kelson42 committed Feb 27, 2024
2 parents 7d06bdc + 1cc9dd1 commit ef14891
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion debian/control
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
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
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

0 comments on commit ef14891

Please sign in to comment.