diff options
| author | Robert Tari <robert@tari.in> | 2021-11-18 14:33:18 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-11-18 14:33:18 +0100 |
| commit | 7c5e41b0ee888b01f0dedb5d7fa41eb533f79201 (patch) | |
| tree | d4645a93e6455c39e1eb5198e2364bc8a289f9a6 | |
| parent | 659cc9c15c82deab9e274e8853411c148ee62b6e (diff) | |
| parent | ceb487fedf9c9173e182f85fedff92e1bdc5d77c (diff) | |
| download | libayatana-indicator-7c5e41b0ee888b01f0dedb5d7fa41eb533f79201.tar.gz libayatana-indicator-7c5e41b0ee888b01f0dedb5d7fa41eb533f79201.tar.bz2 libayatana-indicator-7c5e41b0ee888b01f0dedb5d7fa41eb533f79201.zip | |
Merge branch 'sunweaver-pr/dont-export-private-symbols'
Attributes GH PR #62: https://github.com/AyatanaIndicators/libayatana-indicator/pull/62
| -rw-r--r-- | debian/libayatana-indicator3-7.symbols | 5 | ||||
| -rw-r--r-- | debian/libayatana-indicator7.symbols | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/indicator.symbols | 6 |
4 files changed, 7 insertions, 10 deletions
diff --git a/debian/libayatana-indicator3-7.symbols b/debian/libayatana-indicator3-7.symbols index 7973468..a0bc0c3 100644 --- a/debian/libayatana-indicator3-7.symbols +++ b/debian/libayatana-indicator3-7.symbols @@ -2,11 +2,6 @@ libayatana-indicator3.so.7 libayatana-indicator3-7 #MINVER# *Build-Depends-Package: libayatana-indicator3-dev ICON_SIZE@Base 0.6.0 INDICATOR_NAMES_DATA@Base 0.6.0 - _indicator_object_marshal_VOID__POINTER_BOOLEAN@Base 0.8.5 - _indicator_object_marshal_VOID__POINTER_UINT@Base 0.8.5 - _indicator_object_marshal_VOID__POINTER_UINT_ENUM@Base 0.8.5 - _indicator_object_marshal_VOID__POINTER_UINT_UINT@Base 0.8.5 - _indicator_service@Base 0.8.5 #MISSING: 0.8.0# ayatana_menu_item_factory_create_menu_item@Base 0.7.0 #MISSING: 0.8.0# ayatana_menu_item_factory_get_all@Base 0.7.0 #MISSING: 0.8.0# ayatana_menu_item_factory_get_type@Base 0.7.0 diff --git a/debian/libayatana-indicator7.symbols b/debian/libayatana-indicator7.symbols index 7489c2b..66393ab 100644 --- a/debian/libayatana-indicator7.symbols +++ b/debian/libayatana-indicator7.symbols @@ -2,11 +2,6 @@ libayatana-indicator.so.7 libayatana-indicator7 #MINVER# *Build-Depends-Package: libayatana-indicator-dev ICON_SIZE@Base 0.6.0 INDICATOR_NAMES_DATA@Base 0.6.0 - _indicator_object_marshal_VOID__POINTER_BOOLEAN@Base 0.8.5 - _indicator_object_marshal_VOID__POINTER_UINT@Base 0.8.5 - _indicator_object_marshal_VOID__POINTER_UINT_ENUM@Base 0.8.5 - _indicator_object_marshal_VOID__POINTER_UINT_UINT@Base 0.8.5 - _indicator_service@Base 0.8.5 indicator_desktop_shortcuts_get_nicks@Base 0.6.0 indicator_desktop_shortcuts_get_type@Base 0.6.0 indicator_desktop_shortcuts_new@Base 0.6.0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d3fb22..9236617 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -140,6 +140,7 @@ target_compile_definitions("${ayatana_indicator_gtkver}" PUBLIC DG_LOG_DOMAIN="l target_include_directories("${ayatana_indicator_gtkver}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_include_directories("${ayatana_indicator_gtkver}" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories("${ayatana_indicator_gtkver}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_link_options("${ayatana_indicator_gtkver}" PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/indicator.symbols") target_link_libraries("${ayatana_indicator_gtkver}" ${PROJECT_DEPS_LIBRARIES} ${EXTRA_LIBS}) add_dependencies("${ayatana_indicator_gtkver}" "src-generated") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${ayatana_indicator_gtkver}.so" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") diff --git a/src/indicator.symbols b/src/indicator.symbols new file mode 100644 index 0000000..1cb68cd --- /dev/null +++ b/src/indicator.symbols @@ -0,0 +1,6 @@ +{ + global: indicator_*; + INDICATOR_*; + ICON_SIZE*; + local: _indicator_*; +}; |