Skip to content

Commit

Permalink
Fix KF5 issues
Browse files Browse the repository at this point in the history
basket-notepads#33 Library has wrong versioning (libbasketcommon.so.SOVERSION)
basket-notepads#34 Translations are not properly used
basket-notepads#35 Documentation still requires kdelibs4support for dtd/ktex.dtd
  • Loading branch information
Gleb Baryshev committed Aug 13, 2017
1 parent 8de0345 commit 26e8fe5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ ENDIF(GPGME_FOUND)

#TODO: find meinproc

#Make libbasketcommon search for translations in basket.mo
ADD_DEFINITIONS(-DTRANSLATION_DOMAIN=\"basket\")

CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})

Expand Down
4 changes: 2 additions & 2 deletions doc/en/index.docbook
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!ENTITY basket "<application>BasKet</application>">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
Expand Down Expand Up @@ -92,7 +92,7 @@
<para></para>
<sect1>
<title>Version Sync</title>
<para>When enabled, Version Sync puts your baskets and notes under version control. Currently this is an experimental feature and only very basic functions are implemented,  so it may require additional software and some manual setup. These are some of the things that can be done using external tools (but not Basket interface yet):</para>
<para>When enabled, Version Sync puts your baskets and notes under version control. Currently this is an experimental feature and only very basic functions are implemented, so it may require additional software and some manual setup. These are some of the things that can be done using external tools (but not Basket interface yet):</para>
<itemizedlist>
<listitem>
<para>check out old revisions and revert the changes</para>
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ IF(HAVE_BALOO)
list(INSERT basketcommon_LIB_SRCS 10 nepomukintegration.cpp)
ENDIF(HAVE_BALOO)

qt5_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
ki18n_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)

QT5_ADD_DBUS_ADAPTOR(basketcommon_LIB_SRCS org.basket.BNPView.xml bnpview.h BNPView)

Expand Down Expand Up @@ -93,7 +93,7 @@ IF(HAVE_BALOO)
target_link_libraries(basketcommon KF5::BalooFiles)
ENDIF(HAVE_BALOO)

set_target_properties(basketcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
set_target_properties(basketcommon PROPERTIES VERSION ${Qt5Core_VERSION} SOVERSION ${Qt5Core_VERSION_MAJOR})

install(TARGETS basketcommon DESTINATION ${LIB_INSTALL_DIR})

Expand Down

0 comments on commit 26e8fe5

Please sign in to comment.