Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-gtk for openSUSE:Factory checked in at 2022-09-22 14:49:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-gtk (Old) and /work/SRC/openSUSE:Factory/.fcitx5-gtk.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-gtk" Thu Sep 22 14:49:51 2022 rev:5 rq:1005231 version:5.0.18 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-gtk/fcitx5-gtk.changes 2022-07-05 12:10:29.856644408 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx5-gtk.new.2275/fcitx5-gtk.changes 2022-09-22 14:50:11.418476633 +0200 @@ -1,0 +2,10 @@ +Wed Sep 21 13:57:15 UTC 2022 - Marguerite Su <[email protected]> + +- update version 5.0.18 + * Fix the order of add_subdirectory, subdirectory need to be added + after set required variables + * Hide non public function +- change in 5.0.17 + * Add an option for build only im module + +------------------------------------------------------------------- Old: ---- fcitx5-gtk-5.0.16.tar.xz New: ---- fcitx5-gtk-5.0.18.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-gtk.spec ++++++ --- /var/tmp/diff_new_pack.QYekCw/_old 2022-09-22 14:50:11.938477952 +0200 +++ /var/tmp/diff_new_pack.QYekCw/_new 2022-09-22 14:50:11.942477962 +0200 @@ -17,7 +17,7 @@ Name: fcitx5-gtk -Version: 5.0.16 +Version: 5.0.18 Release: 0 Summary: Gtk im module for fcitx5 and glib based dbus client library License: LGPL-2.1-or-later ++++++ fcitx5-gtk-5.0.16.tar.xz -> fcitx5-gtk-5.0.18.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-gtk-5.0.16/CMakeLists.txt new/fcitx5-gtk-5.0.18/CMakeLists.txt --- old/fcitx5-gtk-5.0.16/CMakeLists.txt 2022-07-03 19:55:31.059709800 +0200 +++ new/fcitx5-gtk-5.0.18/CMakeLists.txt 2022-08-30 04:17:34.478459400 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6) -project(fcitx5-gtk VERSION 5.0.16) +project(fcitx5-gtk VERSION 5.0.18) find_package(ECM REQUIRED 1.0.0) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) @@ -16,6 +16,7 @@ option(ENABLE_GTK3_IM_MODULE "Enable GTK3 IM Module" ON) option(ENABLE_GTK4_IM_MODULE "Enable GTK4 IM Module" ON) option(ENABLE_SNOOPER "Enable Key Snooper for gtk app" ON) +option(BUILD_ONLY_PLUGIN "Build only IM Module" OFF) set(NO_SNOOPER_APPS ".*chrome.*,.*chromium.*,firefox.*,Do.*" CACHE STRING "Disable Key Snooper for following app by default.") @@ -30,12 +31,19 @@ pkg_check_modules(Gio2 REQUIRED IMPORTED_TARGET "gio-2.0") pkg_check_modules(GioUnix2 REQUIRED IMPORTED_TARGET "gio-unix-2.0") pkg_check_modules(GObject2 REQUIRED IMPORTED_TARGET "gobject-2.0") -add_subdirectory(fcitx-gclient) set(CMAKE_C_VISIBILITY_PRESET default) include(cmake/CompilerSettings.cmake) +if (BUILD_ONLY_PLUGIN) + set(GCLIENT_LIBRARY_TYPE STATIC) +else() + set(GCLIENT_LIBRARY_TYPE SHARED) +endif() + +add_subdirectory(fcitx-gclient) + set(NEED_X11 FALSE) if (ENABLE_GTK2_IM_MODULE) pkg_check_modules(Gtk2 REQUIRED IMPORTED_TARGET "gtk+-2.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-gtk-5.0.16/fcitx-gclient/CMakeLists.txt new/fcitx5-gtk-5.0.18/fcitx-gclient/CMakeLists.txt --- old/fcitx5-gtk-5.0.16/fcitx-gclient/CMakeLists.txt 2021-01-22 05:54:02.663828100 +0100 +++ new/fcitx5-gtk-5.0.18/fcitx-gclient/CMakeLists.txt 2022-07-31 03:53:39.983822300 +0200 @@ -33,13 +33,14 @@ ${PROJECT_SOURCE_DIR}/gtk-common/marshall.list > marshall.h DEPENDS ${PROJECT_SOURCE_DIR}/gtk-common/marshall.list) -add_library(Fcitx5GClient SHARED ${FCITX_GCLIENT_SOURCES} +add_library(Fcitx5GClient ${GCLIENT_LIBRARY_TYPE} ${FCITX_GCLIENT_SOURCES} ${FCITX_GCLIENT_BUILT_SOURCES} ${FCITX_GCLIENT_BUILT_HEADERS}) set_target_properties(Fcitx5GClient PROPERTIES VERSION ${Fcitx5GClient_VERSION} SOVERSION ${Fcitx5GClient_SOVERSION} EXPORT_NAME GClient C_VISIBILITY_PRESET default + POSITION_INDEPENDENT_CODE ON ) target_include_directories(Fcitx5GClient PUBLIC @@ -51,44 +52,48 @@ ) target_link_libraries(Fcitx5GClient LINK_PRIVATE PkgConfig::Gio2 PkgConfig::GLib2 PkgConfig::GObject2) -configure_file(Fcitx5GClient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClient.pc @ONLY) +add_library(Fcitx5::GClient ALIAS Fcitx5GClient) -install(TARGETS Fcitx5GClient EXPORT Fcitx5GClientTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClient.pc - DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -install(FILES ${FCITX_GCLIENT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5/GClient/fcitx-gclient") +if (NOT BUILD_ONLY_PLUGIN) + configure_file(Fcitx5GClient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClient.pc @ONLY) -add_library(Fcitx5::GClient ALIAS Fcitx5GClient) + install(TARGETS Fcitx5GClient EXPORT Fcitx5GClientTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClient.pc + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install(FILES ${FCITX_GCLIENT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5/GClient/fcitx-gclient") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Fcitx5GClientConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClientConfig.cmake" - INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Fcitx5GClient -) -install(EXPORT Fcitx5GClientTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Fcitx5GClient FILE Fcitx5GClientTargets.cmake NAMESPACE Fcitx5::) + configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Fcitx5GClientConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClientConfig.cmake" + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Fcitx5GClient + ) + + install(EXPORT Fcitx5GClientTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Fcitx5GClient FILE Fcitx5GClientTargets.cmake NAMESPACE Fcitx5::) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClientConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClientConfigVersion.cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Fcitx5GClient + COMPONENT Devel ) + + if(ENABLE_GIR) + include(GObjectIntrospection) + gobject_introspection( + FILENAME FcitxG-1.0.gir + NSVERSION 1.0 + INCLUDE Gio-2.0 GObject-2.0 GLib-2.0 + PACKAGE_EXPORT Fcitx5GClient + LIBRARY Fcitx5GClient + NAMESPACE FcitxG + SCANNER_ARGS --warn-all --add-include-path=${CMAKE_CURRENT_SOURCE_DIR} + COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}" + SYMBOL_PREFIXES fcitx_g + SOURCES ${FCITX_GCLIENT_SOURCES} ${FCITX_GCLIENT_HEADERS} + QUIET + ) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FcitxG-1.0.gir" + DESTINATION "${GOBJECT_INTROSPECTION_GIRDIR}") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FcitxG-1.0.typelib" + DESTINATION "${GOBJECT_INTROSPECTION_TYPELIBDIR}") + endif() -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClientConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClientConfigVersion.cmake" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Fcitx5GClient - COMPONENT Devel ) - -if(ENABLE_GIR) - include(GObjectIntrospection) - gobject_introspection( - FILENAME FcitxG-1.0.gir - NSVERSION 1.0 - INCLUDE Gio-2.0 GObject-2.0 GLib-2.0 - PACKAGE_EXPORT Fcitx5GClient - LIBRARY Fcitx5GClient - NAMESPACE FcitxG - SCANNER_ARGS --warn-all --add-include-path=${CMAKE_CURRENT_SOURCE_DIR} - COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}" - SYMBOL_PREFIXES fcitx_g - SOURCES ${FCITX_GCLIENT_SOURCES} ${FCITX_GCLIENT_HEADERS} - QUIET - ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FcitxG-1.0.gir" - DESTINATION "${GOBJECT_INTROSPECTION_GIRDIR}") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FcitxG-1.0.typelib" - DESTINATION "${GOBJECT_INTROSPECTION_TYPELIBDIR}") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-gtk-5.0.16/fcitx-gclient/fcitxgclient.c new/fcitx5-gtk-5.0.18/fcitx-gclient/fcitxgclient.c --- old/fcitx5-gtk-5.0.16/fcitx-gclient/fcitxgclient.c 2022-02-21 05:57:07.740442800 +0100 +++ new/fcitx5-gtk-5.0.18/fcitx-gclient/fcitxgclient.c 2022-08-30 04:17:34.668460400 +0200 @@ -569,8 +569,8 @@ } } -gboolean _fcitx_g_client_handle_process_key_reply(FcitxGClient *self, - GVariant *result) { +static gboolean _fcitx_g_client_handle_process_key_reply(FcitxGClient *self, + GVariant *result) { gboolean ret = FALSE; if (self->priv->version > 0) { @@ -903,7 +903,7 @@ g_free(item); } -void buildFormattedTextArray(GPtrArray *array, GVariantIter *iter) { +static void buildFormattedTextArray(GPtrArray *array, GVariantIter *iter) { gchar *string; int type; while (g_variant_iter_next(iter, "(si)", &string, &type)) { @@ -915,7 +915,7 @@ g_variant_iter_free(iter); } -void buildCandidateArray(GPtrArray *array, GVariantIter *iter) { +static void buildCandidateArray(GPtrArray *array, GVariantIter *iter) { gchar *label, *candidate; while (g_variant_iter_next(iter, "(ss)", &label, &candidate)) { FcitxGCandidateItem *item = g_malloc0(sizeof(FcitxGCandidateItem)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-gtk-5.0.16/fcitx-gclient/fcitxgwatcher.c new/fcitx5-gtk-5.0.18/fcitx-gclient/fcitxgwatcher.c --- old/fcitx5-gtk-5.0.16/fcitx-gclient/fcitxgwatcher.c 2022-05-14 07:55:31.279727000 +0200 +++ new/fcitx5-gtk-5.0.18/fcitx-gclient/fcitxgwatcher.c 2022-08-30 04:17:34.721794000 +0200 @@ -170,10 +170,11 @@ return FALSE; } -void _fcitx_g_watcher_connection_closed( - GDBusConnection *connection G_GNUC_UNUSED, - gboolean remote_peer_vanished G_GNUC_UNUSED, GError *error G_GNUC_UNUSED, - gpointer user_data) { +static void +_fcitx_g_watcher_connection_closed(GDBusConnection *connection G_GNUC_UNUSED, + gboolean remote_peer_vanished G_GNUC_UNUSED, + GError *error G_GNUC_UNUSED, + gpointer user_data) { g_return_if_fail(user_data != NULL); g_return_if_fail(FCITX_G_IS_WATCHER(user_data));
