r32628 - in /desktop/unstable/libxklavier/debian: changelog libxklavier16.symbols patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Feb 22 01:29:37 UTC 2012 

Author: biebl
Date: Wed Feb 22 01:29:36 2012
New Revision: 32628

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32628
Log:
Only export those symbols which are supposed to be public. Patch
cherry-picked from upstream Git.

Added:
    desktop/unstable/libxklavier/debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch
Modified:
    desktop/unstable/libxklavier/debian/changelog
    desktop/unstable/libxklavier/debian/libxklavier16.symbols
    desktop/unstable/libxklavier/debian/patches/series

Modified: desktop/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/changelog?rev=32628&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/changelog [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/changelog [utf-8] Wed Feb 22 01:29:36 2012
@@ -4,9 +4,11 @@
   * Remove debian/patches/00git_gir_build_include.patch, merged upstream.
   * debian/control.in: Remove alternative dependency on xkb-data-legacy.
   * Add symbols file for libxklavier16.
+  * Only export those symbols which are supposed to be public. Patch
+    cherry-picked from upstream Git.
   * debian/rules: Rebuild gtk-doc API documentation.
 
- -- Michael Biebl <biebl at debian.org>  Tue, 21 Feb 2012 21:23:44 +0100
+ -- Michael Biebl <biebl at debian.org>  Wed, 22 Feb 2012 02:28:16 +0100
 
 libxklavier (5.2-1) unstable; urgency=low
 

Modified: desktop/unstable/libxklavier/debian/libxklavier16.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/libxklavier16.symbols?rev=32628&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/libxklavier16.symbols [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/libxklavier16.symbols [utf-8] Wed Feb 22 01:29:36 2012
@@ -1,6 +1,5 @@
 libxklavier.so.16 libxklavier16 #MINVER#
  _xkl_debug at Base 5.0
- _xkl_state_copy at Base 5.1
  xkl_config_item_get_type at Base 5.0
  xkl_config_item_new at Base 5.0
  xkl_config_item_set_description at Base 5.1
@@ -12,22 +11,14 @@
  xkl_config_rec_get_from_backup at Base 5.0
  xkl_config_rec_get_from_root_window_property at Base 5.0
  xkl_config_rec_get_from_server at Base 5.0
- xkl_config_rec_get_full_from_server at Base 5.0
  xkl_config_rec_get_type at Base 5.0
- xkl_config_rec_merge_layouts at Base 5.0
- xkl_config_rec_merge_options at Base 5.0
- xkl_config_rec_merge_variants at Base 5.0
  xkl_config_rec_new at Base 5.0
  xkl_config_rec_reset at Base 5.0
  xkl_config_rec_set_layouts at Base 5.1
  xkl_config_rec_set_options at Base 5.1
  xkl_config_rec_set_to_root_window_property at Base 5.0
  xkl_config_rec_set_variants at Base 5.1
- xkl_config_rec_split_layouts at Base 5.0
- xkl_config_rec_split_options at Base 5.0
- xkl_config_rec_split_variants at Base 5.0
  xkl_config_rec_write_to_file at Base 5.0
- xkl_config_registry_class_term at Base 5.0
  xkl_config_registry_find_layout at Base 5.0
  xkl_config_registry_find_model at Base 5.0
  xkl_config_registry_find_option at Base 5.0
@@ -35,9 +26,6 @@
  xkl_config_registry_find_variant at Base 5.0
  xkl_config_registry_foreach_country at Base 5.0
  xkl_config_registry_foreach_country_variant at Base 5.0
- xkl_config_registry_foreach_in_xpath at Base 5.0
- xkl_config_registry_foreach_in_xpath_with_param at Base 5.0
- xkl_config_registry_foreach_iso_variant at Base 5.0
  xkl_config_registry_foreach_language at Base 5.0
  xkl_config_registry_foreach_language_variant at Base 5.0
  xkl_config_registry_foreach_layout at Base 5.0
@@ -45,27 +33,18 @@
  xkl_config_registry_foreach_model at Base 5.0
  xkl_config_registry_foreach_option at Base 5.0
  xkl_config_registry_foreach_option_group at Base 5.0
- xkl_config_registry_free at Base 5.0
  xkl_config_registry_get_instance at Base 5.0
  xkl_config_registry_get_type at Base 5.0
  xkl_config_registry_load at Base 5.0
- xkl_config_registry_load_from_file at Base 5.0
- xkl_config_registry_load_helper at Base 5.0
  xkl_config_registry_search_by_pattern at Base 5.1
- xkl_debug_level at Base 5.0
  xkl_default_log_appender at Base 5.0
  xkl_engine_INT__LONG_LONG at Base 5.0
  xkl_engine_VOID__FLAGS_INT_BOOLEAN at Base 5.0
- xkl_engine_add_toplevel_window at Base 5.0
  xkl_engine_allow_one_switch_to_secondary_group at Base 5.0
  xkl_engine_backup_names_prop at Base 5.0
  xkl_engine_delete_state at Base 5.0
- xkl_engine_dump_xkb_desc at Base 5.0
- xkl_engine_ensure_vtable_inited at Base 5.0
  xkl_engine_features_get_type at Base 5.0
  xkl_engine_filter_events at Base 5.0
- xkl_engine_find_toplevel_window at Base 5.0
- xkl_engine_find_toplevel_window_bottom_to_top at Base 5.0
  xkl_engine_get_backend_name at Base 5.0
  xkl_engine_get_current_state at Base 5.0
  xkl_engine_get_current_window at Base 5.0
@@ -80,117 +59,34 @@
  xkl_engine_get_next_group at Base 5.0
  xkl_engine_get_num_groups at Base 5.0
  xkl_engine_get_prev_group at Base 5.0
- xkl_engine_get_registered_parent at Base 5.0
- xkl_engine_get_ruleset_name at Base 5.0
  xkl_engine_get_secondary_groups_mask at Base 5.0
  xkl_engine_get_state at Base 5.0
- xkl_engine_get_toplevel_window_state at Base 5.0
  xkl_engine_get_type at Base 5.0
  xkl_engine_get_window_title at Base 5.0
  xkl_engine_grab_key at Base 5.0
- xkl_engine_if_window_has_wm_state at Base 5.0
  xkl_engine_is_group_per_toplevel_window at Base 5.0
- xkl_engine_is_one_switch_to_secondary_group_allowed at Base 5.0
- xkl_engine_is_toplevel_window_transparent at Base 5.0
  xkl_engine_is_window_from_same_toplevel_window at Base 5.0
  xkl_engine_is_window_transparent at Base 5.0
  xkl_engine_listen_modes_get_type at Base 5.0
- xkl_engine_load_subtree at Base 5.0
- xkl_engine_load_window_tree at Base 5.0
  xkl_engine_lock_group at Base 5.0
- xkl_engine_one_switch_to_secondary_group_performed at Base 5.0
  xkl_engine_pause_listen at Base 5.0
- xkl_engine_process_create_window_evt at Base 5.0
- xkl_engine_process_focus_in_evt at Base 5.0
- xkl_engine_process_focus_out_evt at Base 5.0
- xkl_engine_process_property_evt at Base 5.0
- xkl_engine_process_state_modification at Base 5.0
- xkl_engine_query_tree at Base 5.0
- xkl_engine_remove_toplevel_window_state at Base 5.0
- xkl_engine_reset_all_info at Base 5.0
  xkl_engine_resume_listen at Base 5.0
  xkl_engine_save_state at Base 5.0
- xkl_engine_save_toplevel_window_state at Base 5.0
- xkl_engine_select_input at Base 5.0
- xkl_engine_select_input_merging at Base 5.0
  xkl_engine_set_default_group at Base 5.0
  xkl_engine_set_group_per_toplevel_window at Base 5.0
  xkl_engine_set_indicators_handling at Base 5.0
  xkl_engine_set_secondary_groups_mask at Base 5.0
- xkl_engine_set_toplevel_window_transparent at Base 5.0
  xkl_engine_set_window_transparent at Base 5.0
  xkl_engine_start_listen at Base 5.0
  xkl_engine_state_change_get_type at Base 5.0
  xkl_engine_stop_listen at Base 5.0
- xkl_engine_try_call_state_func at Base 5.0
  xkl_engine_ungrab_key at Base 5.0
- xkl_engine_update_current_state at Base 5.0
- xkl_event_get_name at Base 5.0
  xkl_get_country_name at Base 5.1
- xkl_get_debug_window_title at Base 5.0
  xkl_get_language_name at Base 5.1
  xkl_get_last_error at Base 5.0
- xkl_get_the_engine at Base 5.0
- xkl_last_error_message at Base 5.0
- xkl_process_error at Base 5.0
- xkl_read_config_item at Base 5.0
  xkl_restore_names_prop at Base 5.0
  xkl_set_debug_level at Base 5.0
  xkl_set_log_appender at Base 5.0
  xkl_state_get_type at Base 5.1
- xkl_strings_concat_comma_separated at Base 5.0
- xkl_strings_split_comma_separated at Base 5.0
- xkl_toplevel_window_prev at Base 5.0
- xkl_xkb_activate_config_rec at Base 5.0
  xkl_xkb_config_native_cleanup at Base 5.0
  xkl_xkb_config_native_prepare at Base 5.0
- xkl_xkb_event_get_name at Base 5.0
- xkl_xkb_free_all_info at Base 5.0
- xkl_xkb_get_groups_names at Base 5.0
- xkl_xkb_get_indicators_names at Base 5.0
- xkl_xkb_get_max_num_groups at Base 5.0
- xkl_xkb_get_num_groups at Base 5.0
- xkl_xkb_get_server_state at Base 5.0
- xkl_xkb_if_cached_info_equals_actual at Base 5.0
- xkl_xkb_init at Base 5.0
- xkl_xkb_init_config_registry at Base 5.0
- xkl_xkb_load_all_info at Base 5.0
- xkl_xkb_load_config_registry at Base 5.0
- xkl_xkb_lock_group at Base 5.0
- xkl_xkb_multiple_layouts_supported at Base 5.0
- xkl_xkb_pause_listen at Base 5.0
- xkl_xkb_process_x_error at Base 5.0
- xkl_xkb_process_x_event at Base 5.0
- xkl_xkb_resume_listen at Base 5.0
- xkl_xkb_set_indicator at Base 5.0
- xkl_xkb_set_indicators at Base 5.0
- xkl_xkb_term at Base 5.0
- xkl_xkb_write_config_rec_to_file at Base 5.0
- xkl_xmm_activate_config_rec at Base 5.0
- xkl_xmm_actualize_group at Base 5.0
- xkl_xmm_find_switch_option at Base 5.0
- xkl_xmm_free_all_info at Base 5.0
- xkl_xmm_get_groups_names at Base 5.0
- xkl_xmm_get_indicators_names at Base 5.0
- xkl_xmm_get_max_num_groups at Base 5.0
- xkl_xmm_get_num_groups at Base 5.0
- xkl_xmm_get_server_state at Base 5.0
- xkl_xmm_grab_ignoring_indicators at Base 5.0
- xkl_xmm_if_cached_info_equals_actual at Base 5.0
- xkl_xmm_init at Base 5.0
- xkl_xmm_init_config_registry at Base 5.0
- xkl_xmm_init_switch_options at Base 5.0
- xkl_xmm_load_all_info at Base 5.0
- xkl_xmm_load_config_registry at Base 5.0
- xkl_xmm_lock_group at Base 5.0
- xkl_xmm_pause_listen at Base 5.0
- xkl_xmm_process_x_event at Base 5.0
- xkl_xmm_resume_listen at Base 5.0
- xkl_xmm_set_indicators at Base 5.0
- xkl_xmm_shortcut_get_current at Base 5.0
- xkl_xmm_shortcut_get_current_option_name at Base 5.0
- xkl_xmm_shortcuts_grab at Base 5.0
- xkl_xmm_shortcuts_ungrab at Base 5.0
- xkl_xmm_term at Base 5.0
- xkl_xmm_term_switch_options at Base 5.0
- xkl_xmm_ungrab_ignoring_indicators at Base 5.0

Added: desktop/unstable/libxklavier/debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch?rev=32628&op=file
==============================================================================
--- desktop/unstable/libxklavier/debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch (added)
+++ desktop/unstable/libxklavier/debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch [utf-8] Wed Feb 22 01:29:36 2012
@@ -1,0 +1,133 @@
+From 28cb7b7e1bdf2213c4b980d52b03dd5762f39214 Mon Sep 17 00:00:00 2001
+From: "Sergey V. Udaltsov" <svu at gnome.org>
+Date: Tue, 21 Feb 2012 21:44:06 +0000
+Subject: [PATCH] Explicitly exporting only the symbols that are really
+ required
+
+https://bugs.freedesktop.org/show_bug.cgi?id=46416
+---
+ libxklavier/Makefile.am        |    4 +-
+ libxklavier/libxklavier.public |   91 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 93 insertions(+), 2 deletions(-)
+ create mode 100644 libxklavier/libxklavier.public
+
+diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
+index c53ff6d..63c5d8d 100644
+--- a/libxklavier/Makefile.am
++++ b/libxklavier/Makefile.am
+@@ -37,13 +37,13 @@ libxklavier_la_SOURCES = $(xklavier_built_cfiles) xklavier.c xklavier_evt.c xkla
+ 	xklavier_xmm.c xklavier_xmm_opts.c xklavier_evt_xmm.c xklavier_config_xmm.c \
+ 	xklavier_util.c xklavier_props.c xklavier_dump.c xkl_engine_marshal.c \
+ 	$(noinst_HEADERS) $(xklavierinc_HEADERS) 
+-libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
++libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-symbols $(srcdir)/libxklavier.public
+ libxklavier_la_LIBADD = \
+  $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \
+  $(LIBXKBFILE_PRESENT_LDFLAGS) \
+  $(X_LIBS) -lX11 $(LIBICONV) 
+ 
+-EXTRA_DIST=marshal.list
++EXTRA_DIST=marshal.list libxklavier.public
+ 
+ GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ 
+diff --git a/libxklavier/libxklavier.public b/libxklavier/libxklavier.public
+new file mode 100644
+index 0000000..ae5c5b8
+--- /dev/null
++++ b/libxklavier/libxklavier.public
+@@ -0,0 +1,91 @@
++xkl_config_item_get_type
++xkl_config_item_new
++xkl_config_item_set_description
++xkl_config_item_set_name
++xkl_config_item_set_short_description
++xkl_config_rec_activate
++xkl_config_rec_dump
++xkl_config_rec_equals
++xkl_config_rec_get_from_backup
++xkl_config_rec_get_from_root_window_property
++xkl_config_rec_get_from_server
++xkl_config_rec_get_type
++xkl_config_rec_new
++xkl_config_rec_reset
++xkl_config_rec_set_layouts
++xkl_config_rec_set_options
++xkl_config_rec_set_to_root_window_property
++xkl_config_rec_set_variants
++xkl_config_rec_write_to_file
++xkl_config_registry_find_layout
++xkl_config_registry_find_model
++xkl_config_registry_find_option
++xkl_config_registry_find_option_group
++xkl_config_registry_find_variant
++xkl_config_registry_foreach_country
++xkl_config_registry_foreach_country_variant
++xkl_config_registry_foreach_language
++xkl_config_registry_foreach_language_variant
++xkl_config_registry_foreach_layout
++xkl_config_registry_foreach_layout_variant
++xkl_config_registry_foreach_model
++xkl_config_registry_foreach_option
++xkl_config_registry_foreach_option_group
++xkl_config_registry_get_instance
++xkl_config_registry_get_type
++xkl_config_registry_load
++xkl_config_registry_search_by_pattern
++_xkl_debug
++xkl_default_log_appender
++xkl_engine_allow_one_switch_to_secondary_group
++xkl_engine_backup_names_prop
++xkl_engine_delete_state
++xkl_engine_features_get_type
++xkl_engine_filter_events
++xkl_engine_get_backend_name
++xkl_engine_get_current_state
++xkl_engine_get_current_window
++xkl_engine_get_current_window_group
++xkl_engine_get_default_group
++xkl_engine_get_features
++xkl_engine_get_groups_names
++xkl_engine_get_indicators_handling
++xkl_engine_get_indicators_names
++xkl_engine_get_instance
++xkl_engine_get_max_num_groups
++xkl_engine_get_next_group
++xkl_engine_get_num_groups
++xkl_engine_get_prev_group
++xkl_engine_get_secondary_groups_mask
++xkl_engine_get_state
++xkl_engine_get_type
++xkl_engine_get_window_title
++xkl_engine_grab_key
++xkl_engine_INT__LONG_LONG
++xkl_engine_is_group_per_toplevel_window
++xkl_engine_is_window_from_same_toplevel_window
++xkl_engine_is_window_transparent
++xkl_engine_listen_modes_get_type
++xkl_engine_lock_group
++xkl_engine_pause_listen
++xkl_engine_resume_listen
++xkl_engine_save_state
++xkl_engine_set_default_group
++xkl_engine_set_group_per_toplevel_window
++xkl_engine_set_indicators_handling
++xkl_engine_set_secondary_groups_mask
++xkl_engine_set_window_transparent
++xkl_engine_start_listen
++xkl_engine_state_change_get_type
++xkl_engine_stop_listen
++xkl_engine_ungrab_key
++xkl_engine_VOID__FLAGS_INT_BOOLEAN
++xkl_get_country_name
++xkl_get_language_name
++xkl_get_last_error
++xkl_restore_names_prop
++xkl_set_debug_level
++xkl_set_log_appender
++xkl_state_get_type
++xkl_xkb_config_native_cleanup
++xkl_xkb_config_native_prepare
+-- 
+1.7.9.1
+

Modified: desktop/unstable/libxklavier/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/patches/series?rev=32628&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/patches/series [utf-8] Wed Feb 22 01:29:36 2012
@@ -1,0 +1,1 @@
+0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch

More information about the pkg-gnome-commits mailing list