From 79d9b66576393149a98023ba1471d934f3ab04e76fb1b19865ff2e8ca7c42ebe Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 26 Mar 2013 11:56:45 +0000 Subject: [PATCH] Accepting request 160728 from home:elvigia:branches:multimedia:libs - libmms-nognetexport.patch: libmms exports functions that belong to gnome's gnet library, that will of course cause symbol clashes. We cannot just link to the system's gnet because it uses and slightly older API, just hide the symbols instead. OBS-URL: https://build.opensuse.org/request/show/160728 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmms?expand=0&rev=10 --- libmms-nognetexport.patch | 17 +++++++++++++++++ libmms.changes | 9 +++++++++ libmms.spec | 4 +++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 libmms-nognetexport.patch diff --git a/libmms-nognetexport.patch b/libmms-nognetexport.patch new file mode 100644 index 0000000..319e14a --- /dev/null +++ b/libmms-nognetexport.patch @@ -0,0 +1,17 @@ +--- src/uri.h.orig ++++ src/uri.h +@@ -27,6 +27,7 @@ + extern "C" { + #endif /* __cplusplus */ + ++#pragma GCC visibility push(hidden) + + /** + * GURI: +@@ -90,5 +91,5 @@ char* gnet_mms_helper(const GURI* ur + #ifdef __cplusplus + } + #endif /* __cplusplus */ +- ++#pragma GCC visibility pop + #endif /* _GNET_URI_H */ diff --git a/libmms.changes b/libmms.changes index ab208ee..1d29820 100644 --- a/libmms.changes +++ b/libmms.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Mar 24 04:43:36 UTC 2013 - crrodriguez@opensuse.org + +- libmms-nognetexport.patch: libmms + exports functions that belong to gnome's gnet + library, that will of course cause symbol clashes. + We cannot just link to the system's gnet because it uses + and slightly older API, just hide the symbols instead. + ------------------------------------------------------------------- Thu Nov 22 18:40:37 UTC 2012 - crrodriguez@opensuse.org diff --git a/libmms.spec b/libmms.spec index b6c19ea..ac8ba83 100644 --- a/libmms.spec +++ b/libmms.spec @@ -1,7 +1,7 @@ # # spec file for package libmms # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,6 +38,7 @@ Source3: baselibs.conf BuildRequires: pkg-config BuildRequires: pkgconfig(glib-2.0) Patch0: libmms-pkgconfig.patch +Patch1: libmms-nognetexport.patch %description LibMMS is a common library for parsing mms:// and mmsh:// type network streams. @@ -67,6 +68,7 @@ Headers and libraries to program against %{name} %prep %setup -q %patch0 +%patch1 %build %configure --disable-static