Accepting request 713489 from KDE:Applications

- Add patch to not install devel links for internal libraries:
  * 0001-Install-internal-libraries-with-NAMELINK_SKIP.patch

- Disable building the GStreamer backend

OBS-URL: https://build.opensuse.org/request/show/713489
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/artikulate?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2019-07-05 11:49:05 +00:00 committed by Git OBS Bridge
commit ef74b62b5c
3 changed files with 68 additions and 10 deletions

View File

@ -0,0 +1,51 @@
From 66611f64ee98a4ffb7bac26b8c4f153c8102bae9 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Thu, 4 Jul 2019 20:26:25 +0200
Subject: [PATCH] Install internal libraries with NAMELINK_SKIP
They don't have any API/ABI guarantees, to the namelink would be mostly
useless anyway.
---
liblearnerprofile/src/CMakeLists.txt | 1 +
libsound/src/CMakeLists.txt | 1 +
src/CMakeLists.txt | 1 +
3 files changed, 3 insertions(+)
diff --git a/liblearnerprofile/src/CMakeLists.txt b/liblearnerprofile/src/CMakeLists.txt
index a15cdef..37ab579 100644
--- a/liblearnerprofile/src/CMakeLists.txt
+++ b/liblearnerprofile/src/CMakeLists.txt
@@ -57,5 +57,6 @@ set_target_properties(
install(
TARGETS artikulatelearnerprofile
+ LIBRARY NAMELINK_SKIP
${INSTALL_TARGETS_DEFAULT_ARGS}
)
diff --git a/libsound/src/CMakeLists.txt b/libsound/src/CMakeLists.txt
index 1ad39ea..4050cf7 100644
--- a/libsound/src/CMakeLists.txt
+++ b/libsound/src/CMakeLists.txt
@@ -55,6 +55,7 @@ set_target_properties(
install(
TARGETS artikulatesound
+ LIBRARY NAMELINK_SKIP
${INSTALL_TARGETS_DEFAULT_ARGS}
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 066341a..11d64fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -93,6 +93,7 @@ set_target_properties(
)
install(
TARGETS artikulatecore
+ LIBRARY NAMELINK_SKIP
DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS}
)
install(FILES artikulate.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
--
2.22.0

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jul 4 18:27:27 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to not install devel links for internal libraries:
* 0001-Install-internal-libraries-with-NAMELINK_SKIP.patch
-------------------------------------------------------------------
Thu Jul 4 18:05:18 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Disable building the GStreamer backend
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 07 12:51:51 UTC 2019 - lbeltrame@kde.org Fri Jun 07 12:51:51 UTC 2019 - lbeltrame@kde.org

View File

@ -28,9 +28,10 @@ License: LGPL-3.0-or-later AND GPL-2.0-only AND BSD-3-Clause
Group: Amusements/Teaching/Other Group: Amusements/Teaching/Other
URL: http://edu.kde.org URL: http://edu.kde.org
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch100: 0001-Install-internal-libraries-with-NAMELINK_SKIP.patch
BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gstreamer-plugins-qt5-devel
BuildRequires: karchive-devel BuildRequires: karchive-devel
BuildRequires: kconfig-devel BuildRequires: kconfig-devel
BuildRequires: kcrash-devel BuildRequires: kcrash-devel
@ -53,19 +54,14 @@ BuildRequires: pkgconfig(Qt5XmlPatterns)
Requires: kqtquickcharts >= %{_kapp_version} Requires: kqtquickcharts >= %{_kapp_version}
Obsoletes: %{name}5 < %{version} Obsoletes: %{name}5 < %{version}
Provides: %{name}5 = %{version} Provides: %{name}5 = %{version}
%if %{with lang}
Recommends: %{name}-lang
%endif
%description %description
Improve your pronunciation by listening to native speakers. Improve your pronunciation by listening to native speakers.
%if %{with lang}
%lang_package %lang_package
%endif
%prep %prep
%setup -q %autosetup -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build
@ -94,9 +90,9 @@ Improve your pronunciation by listening to native speakers.
%doc %lang(en) %{_kf5_htmldir}/en/artikulate/ %doc %lang(en) %{_kf5_htmldir}/en/artikulate/
%{_kf5_iconsdir}/hicolor/*/*/artikulate*.* %{_kf5_iconsdir}/hicolor/*/*/artikulate*.*
%{_kf5_iconsdir}/hicolor/*/actions/language-artikulate.* %{_kf5_iconsdir}/hicolor/*/actions/language-artikulate.*
%{_kf5_libdir}/libartikulatecore.so* %{_kf5_libdir}/libartikulatecore.so.*
%{_kf5_libdir}/libartikulatelearnerprofile.so* %{_kf5_libdir}/libartikulatelearnerprofile.so.*
%{_kf5_libdir}/libartikulatesound.so* %{_kf5_libdir}/libartikulatesound.so.*
%{_kf5_plugindir}/artikulate/ %{_kf5_plugindir}/artikulate/
%{_kf5_sharedir}/artikulate/ %{_kf5_sharedir}/artikulate/