Skip to content

Commit

Permalink
kde-misc/basket: Fix soname, docbook
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.19, Repoman-2.3.6
  • Loading branch information
a17r committed Jan 1, 2018
1 parent 52e5028 commit 47acd09
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 0 deletions.
72 changes: 72 additions & 0 deletions kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=6

COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315"
KDE_TEST="true"
KDE_HANDBOOK="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5 vcs-snapshot

DESCRIPTION="A DropDrawers clone. Multiple information organizer"
HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket"
SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

LICENSE="GPL-2"
KEYWORDS="amd64 x86"
IUSE="crypt git"

RDEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kcodecs)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kfilemetadata)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
media-libs/phonon[qt5(+)]
x11-libs/libX11
crypt? ( app-crypt/gpgme )
git? ( dev-libs/libgit2 )
"
DEPEND="${RDEPEND}
$(add_qt_dep qtconcurrent)
"

PATCHES=( "${FILESDIR}/${P}-fixes.patch" )

src_prepare() {
kde5_src_prepare
if ! use test; then
sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die
fi
}

src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package crypt Gpgme)
$(cmake-utils_use_find_package git Libgit2)
)
kde5_src_configure
}
61 changes: 61 additions & 0 deletions kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
From 26e8fe568123cc957ea500c4b747f44fa8193edc Mon Sep 17 00:00:00 2001
From: Gleb Baryshev <[email protected]>
Date: Sun, 13 Aug 2017 21:37:52 +0300
Subject: [PATCH] Fix KF5 issues

#33 Library has wrong versioning (libbasketcommon.so.SOVERSION)
#34 Translations are not properly used
#35 Documentation still requires kdelibs4support for dtd/ktex.dtd
---
CMakeLists.txt | 3 +++
doc/en/index.docbook | 4 ++--
src/CMakeLists.txt | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2997365e..7b54ace3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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})

diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index ddef489a..586014e8 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -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 -->
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9ea886d5..f4cf523f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)

@@ -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})

0 comments on commit 47acd09

Please sign in to comment.