Version the newly added ABI
This commit is contained in:
parent
3186133623
commit
e32a964200
66
0001-libnm-gtk-add-symbol-versions.patch
Normal file
66
0001-libnm-gtk-add-symbol-versions.patch
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
From b05974ad28404db1c677cf5034c2ae6b06f5baf9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||||
|
Date: Wed, 15 Jul 2015 15:42:15 +0200
|
||||||
|
Subject: [PATCH] libnm-gtk: add symbol versions
|
||||||
|
|
||||||
|
We've added new ABI. Nevertheless, we still want to leave the rest unversioned,
|
||||||
|
so that linking against it won't add a versioned symbol dependency.
|
||||||
|
|
||||||
|
(cherry picked from commit 7ae3f7abd239beac314c75cbd5f2ee8153df0929)
|
||||||
|
---
|
||||||
|
src/libnm-gtk/Makefile.am | 7 ++++---
|
||||||
|
src/libnm-gtk/libnm-gtk.ver | 19 +++++++++++++++++++
|
||||||
|
2 files changed, 23 insertions(+), 3 deletions(-)
|
||||||
|
create mode 100644 src/libnm-gtk/libnm-gtk.ver
|
||||||
|
|
||||||
|
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
|
||||||
|
index 54cb0ac..ea15ebb 100644
|
||||||
|
--- a/src/libnm-gtk/Makefile.am
|
||||||
|
+++ b/src/libnm-gtk/Makefile.am
|
||||||
|
@@ -50,9 +50,10 @@ libnm_gtk_la_LIBADD = \
|
||||||
|
$(top_builddir)/src/marshallers/libmarshallers.la \
|
||||||
|
$(top_builddir)/src/wireless-security/libwireless-security.la
|
||||||
|
|
||||||
|
-libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
|
||||||
|
- -export-symbols-regex '^nma_.*'
|
||||||
|
+EXTRA_libnm_gtk_la_DEPENDENCIES = $(srcdir)/libnm-gtk.ver
|
||||||
|
|
||||||
|
+libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
|
||||||
|
+ -Wl,--version-script=$(srcdir)/libnm-gtk.ver
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = libnm-gtk.pc
|
||||||
|
@@ -84,4 +85,4 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
|
||||||
|
CLEANFILES = $(gir_DATA) $(typelib_DATA)
|
||||||
|
endif
|
||||||
|
|
||||||
|
-EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
|
||||||
|
+EXTRA_DIST = libnm-gtk.pc.in libnm-gtk.ver $(ui_DATA)
|
||||||
|
diff --git a/src/libnm-gtk/libnm-gtk.ver b/src/libnm-gtk/libnm-gtk.ver
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..d80cdc0
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/libnm-gtk/libnm-gtk.ver
|
||||||
|
@@ -0,0 +1,19 @@
|
||||||
|
+libnm_gtk_1_0_0 {
|
||||||
|
+local:
|
||||||
|
+ [^n]*;
|
||||||
|
+ n[^m]*;
|
||||||
|
+ nm[^a]*;
|
||||||
|
+ nma[^_]*;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+libnm_gtk_1_0_6 {
|
||||||
|
+global:
|
||||||
|
+ nma_utils_menu_to_secret_flags;
|
||||||
|
+ nma_utils_setup_password_storage;
|
||||||
|
+ nma_utils_update_password_storage;
|
||||||
|
+ nma_vpn_password_dialog_focus_password_ternary;
|
||||||
|
+ nma_vpn_password_dialog_get_password_ternary;
|
||||||
|
+ nma_vpn_password_dialog_set_password_ternary;
|
||||||
|
+ nma_vpn_password_dialog_set_password_ternary_label;
|
||||||
|
+ nma_vpn_password_dialog_set_show_password_ternary;
|
||||||
|
+} libnm_gtk_1_0_0;
|
||||||
|
--
|
||||||
|
2.4.3
|
||||||
|
|
@ -12,7 +12,7 @@
|
|||||||
Name: network-manager-applet
|
Name: network-manager-applet
|
||||||
Summary: A network control and status applet for NetworkManager
|
Summary: A network control and status applet for NetworkManager
|
||||||
Version: %{realversion}
|
Version: %{realversion}
|
||||||
Release: 1%{snapshot}%{git_sha}%{?dist}
|
Release: 2%{snapshot}%{git_sha}%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.gnome.org/projects/NetworkManager/
|
URL: http://www.gnome.org/projects/NetworkManager/
|
||||||
@ -22,6 +22,7 @@ Source: https://download.gnome.org/sources/network-manager-applet/1.0/%{name}-%{
|
|||||||
Patch0: nm-applet-no-notifications.patch
|
Patch0: nm-applet-no-notifications.patch
|
||||||
Patch1: nm-applet-wifi-dialog-ui-fixes.patch
|
Patch1: nm-applet-wifi-dialog-ui-fixes.patch
|
||||||
Patch2: applet-ignore-deprecated.patch
|
Patch2: applet-ignore-deprecated.patch
|
||||||
|
Patch3: 0001-libnm-gtk-add-symbol-versions.patch
|
||||||
|
|
||||||
Requires: NetworkManager >= %{nm_version}
|
Requires: NetworkManager >= %{nm_version}
|
||||||
Requires: NetworkManager-glib >= %{nm_version}
|
Requires: NetworkManager-glib >= %{nm_version}
|
||||||
@ -100,6 +101,7 @@ nm-applet, nm-connection-editor, and the GNOME control center.
|
|||||||
%patch0 -p1 -b .no-notifications
|
%patch0 -p1 -b .no-notifications
|
||||||
%patch1 -p1 -b .applet-wifi-ui
|
%patch1 -p1 -b .applet-wifi-ui
|
||||||
%patch2 -p1 -b .no-deprecated
|
%patch2 -p1 -b .no-deprecated
|
||||||
|
%patch3 -p1 -b .libnm-gtk-add-symbol-versions
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -i -f
|
autoreconf -i -f
|
||||||
@ -213,6 +215,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
|||||||
%{_datadir}/gir-1.0/NMGtk-1.0.gir
|
%{_datadir}/gir-1.0/NMGtk-1.0.gir
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 15 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.0.4-2
|
||||||
|
- Version the newly added ABI
|
||||||
|
|
||||||
* Tue Jul 14 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.0.4-1
|
* Tue Jul 14 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.0.4-1
|
||||||
- Update to 1.0.4 release
|
- Update to 1.0.4 release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user