From e2fcecb886016bffff57297aff3c581670f5232bde0b0b34a99e62c8ad7a8f76 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 4 Jul 2019 19:29:09 +0000 Subject: [PATCH 1/2] Accepting request 713482 from home:Vogtinator:noqt5gst - Add patch to not install devel links for internal libraries - Disable building the GStreamer backend OBS-URL: https://build.opensuse.org/request/show/713482 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/artikulate?expand=0&rev=97 --- ...nternal-libraries-with-NAMELINK_SKIP.patch | 51 +++++++++++++++++++ artikulate.changes | 10 ++++ artikulate.spec | 16 +++--- 3 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 0001-Install-internal-libraries-with-NAMELINK_SKIP.patch diff --git a/0001-Install-internal-libraries-with-NAMELINK_SKIP.patch b/0001-Install-internal-libraries-with-NAMELINK_SKIP.patch new file mode 100644 index 0000000..5f44587 --- /dev/null +++ b/0001-Install-internal-libraries-with-NAMELINK_SKIP.patch @@ -0,0 +1,51 @@ +From 66611f64ee98a4ffb7bac26b8c4f153c8102bae9 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +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 + diff --git a/artikulate.changes b/artikulate.changes index 8ab4ef6..f2063f1 100644 --- a/artikulate.changes +++ b/artikulate.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jul 4 18:27:27 UTC 2019 - Fabian Vogt + +- Add patch to not install devel links for internal libraries + +------------------------------------------------------------------- +Thu Jul 4 18:05:18 UTC 2019 - Fabian Vogt + +- Disable building the GStreamer backend + ------------------------------------------------------------------- Fri Jun 07 12:51:51 UTC 2019 - lbeltrame@kde.org diff --git a/artikulate.spec b/artikulate.spec index b531807..5a30446 100644 --- a/artikulate.spec +++ b/artikulate.spec @@ -28,9 +28,10 @@ License: LGPL-3.0-or-later AND GPL-2.0-only AND BSD-3-Clause Group: Amusements/Teaching/Other URL: http://edu.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch100: 0001-Install-internal-libraries-with-NAMELINK_SKIP.patch BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: fdupes -BuildRequires: gstreamer-plugins-qt5-devel BuildRequires: karchive-devel BuildRequires: kconfig-devel BuildRequires: kcrash-devel @@ -53,19 +54,14 @@ BuildRequires: pkgconfig(Qt5XmlPatterns) Requires: kqtquickcharts >= %{_kapp_version} Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -%if %{with lang} -Recommends: %{name}-lang -%endif %description Improve your pronunciation by listening to native speakers. -%if %{with lang} %lang_package -%endif %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build @@ -94,9 +90,9 @@ Improve your pronunciation by listening to native speakers. %doc %lang(en) %{_kf5_htmldir}/en/artikulate/ %{_kf5_iconsdir}/hicolor/*/*/artikulate*.* %{_kf5_iconsdir}/hicolor/*/actions/language-artikulate.* -%{_kf5_libdir}/libartikulatecore.so* -%{_kf5_libdir}/libartikulatelearnerprofile.so* -%{_kf5_libdir}/libartikulatesound.so* +%{_kf5_libdir}/libartikulatecore.so.* +%{_kf5_libdir}/libartikulatelearnerprofile.so.* +%{_kf5_libdir}/libartikulatesound.so.* %{_kf5_plugindir}/artikulate/ %{_kf5_sharedir}/artikulate/ From 29110c006acbe097812c047161b29649522f3255289cb46fc9243a923b3f00a5 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 4 Jul 2019 19:53:54 +0000 Subject: [PATCH 2/2] - Add patch to not install devel links for internal libraries: * 0001-Install-internal-libraries-with-NAMELINK_SKIP.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/artikulate?expand=0&rev=98 --- artikulate.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/artikulate.changes b/artikulate.changes index f2063f1..62cc34e 100644 --- a/artikulate.changes +++ b/artikulate.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Thu Jul 4 18:27:27 UTC 2019 - Fabian Vogt -- Add patch to not install devel links for internal libraries +- 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