Skip to content

Commit

Permalink
Merge pull request #907 from kiwix/version_2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mgautierfr committed Nov 30, 2022
2 parents b40185a + 7cd4a02 commit 840b731
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
kiwix-destkop 2.3.1
===================

* Fix the AppImage packaging. Now published AppImages work correctly on recent
distrubution (@mgautierfr #905)
* Improve zim file picker (@kelson42 #886)
* Do not show ServiceWorker zim file from the remote catalog (@kelson42 #887)

kiwix-desktop 2.3.0
===================

Expand Down
6 changes: 3 additions & 3 deletions kiwix-desktop.pro
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
QMAKE_LFLAGS += -std=c++11

# Also change resources/org.kiwix.desktop.appdata.xml
DEFINES += VERSION="2.3.0"
DEFINES += VERSION="2.3.1"

# The following define makes your compiler emit warnings if you use
# any feature of Qt which has been marked as deprecated (the exact warnings
Expand Down Expand Up @@ -154,12 +154,12 @@ unix {
INSTALLS += mime_file
}

PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION \"kiwix >= 11.0.0 libzim >= 8.0.0\")
PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION \"kiwix >= 12.0.0 libzim >= 8.0.0\")

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

LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION \"kiwix >= 11.0.0 libzim >= 8.0.0\")
LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION \"kiwix >= 12.0.0 libzim >= 8.0.0\")

RESOURCES += \
resources/kiwix.qrc \
Expand Down
2 changes: 1 addition & 1 deletion resources/org.kiwix.desktop.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</p>
</description>
<releases>
<release version="2.3.0" date="2022-09-07" />
<release version="2.3.1" date="2022-11-30" />
</releases>
<content_rating type="oars-1.0" />
<launchable type="desktop-id">org.kiwix.desktop.desktop</launchable>
Expand Down

0 comments on commit 840b731

Please sign in to comment.