From 2b4a89f74651ab518c3ca9f6d93ff17edcda8285392b59f04e93bf17ad7732eb Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 11 Oct 2015 08:13:22 +0000 Subject: [PATCH] Accepting request 337480 from home:alarrosa:branches:KDE:Applications - Add fix-libastro-version-tagging.diff to declare QT_NO_VERSION_TAGGING so that libastro doesn't contain an undefined symbol to qt_version_tag OBS-URL: https://build.opensuse.org/request/show/337480 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=57 --- fix-libastro-version-tagging.diff | 13 +++++++++++++ marble.changes | 6 ++++++ marble.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 fix-libastro-version-tagging.diff diff --git a/fix-libastro-version-tagging.diff b/fix-libastro-version-tagging.diff new file mode 100644 index 0000000..274ea76 --- /dev/null +++ b/fix-libastro-version-tagging.diff @@ -0,0 +1,13 @@ +Index: marble-15.08.1/src/lib/astro/astrolib_export.h +=================================================================== +--- marble-15.08.1.orig/src/lib/astro/astrolib_export.h ++++ marble-15.08.1/src/lib/astro/astrolib_export.h +@@ -11,6 +11,8 @@ + #ifndef ASTROLIB_EXPORT_H + #define ASTROLIB_EXPORT_H + ++#define QT_NO_VERSION_TAGGING 1 ++ + #include + + #ifndef ASTROLIB_EXPORT diff --git a/marble.changes b/marble.changes index 325c62e..ccd5a6f 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 9 13:39:41 UTC 2015 - alarrosa@suse.com + +- Add fix-libastro-version-tagging.diff to declare QT_NO_VERSION_TAGGING + so that libastro doesn't contain an undefined symbol to qt_version_tag + ------------------------------------------------------------------- Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 6d39f63..84351e7 100644 --- a/marble.spec +++ b/marble.spec @@ -25,6 +25,8 @@ License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE fix-libastro-version-tagging.diff alarrosa@suse.com -- Declare QT_NO_VERSION_TAGGING +Patch0: fix-libastro-version-tagging.diff BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: perl @@ -131,6 +133,7 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q +%patch0 -p1 %build %ifarch ppc ppc64