From 3271d04d64a9a57aa0a51f641e03c6a9f806f78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 22 Oct 2025 07:07:37 +0700 Subject: [PATCH] build: drop intltool requirement --- data/cinnamon-wayland.desktop.in.in | 4 +- data/cinnamon.desktop.in.in | 4 +- data/cinnamon2d.desktop.in.in | 4 +- data/meson.build | 18 +- makepot | 12 +- meson.build | 1 - po/POTFILES.in | 358 ++++++++++++++++++++++++++-- 7 files changed, 356 insertions(+), 45 deletions(-) diff --git a/data/cinnamon-wayland.desktop.in.in b/data/cinnamon-wayland.desktop.in.in index 79a3ee5662..bd5cfbe636 100644 --- a/data/cinnamon-wayland.desktop.in.in +++ b/data/cinnamon-wayland.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application -_Name=Cinnamon (Wayland session) -_Comment=Window management and application launching +Name=Cinnamon (Wayland session) +Comment=Window management and application launching Exec=cinnamon --replace X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=cinnamon diff --git a/data/cinnamon.desktop.in.in b/data/cinnamon.desktop.in.in index 56c057e578..692085ceba 100644 --- a/data/cinnamon.desktop.in.in +++ b/data/cinnamon.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application -_Name=Cinnamon -_Comment=Window management and application launching +Name=Cinnamon +Comment=Window management and application launching Exec=@bindir@/cinnamon-launcher X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=cinnamon diff --git a/data/cinnamon2d.desktop.in.in b/data/cinnamon2d.desktop.in.in index a387f8ff7b..bf815432ab 100644 --- a/data/cinnamon2d.desktop.in.in +++ b/data/cinnamon2d.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application -_Name=Cinnamon 2D -_Comment=Window management and application launching +Name=Cinnamon 2D +Comment=Window management and application launching Exec=@bindir@/cinnamon2d Categories=GNOME;GTK;System;Core; OnlyShowIn=X-Cinnamon; diff --git a/data/meson.build b/data/meson.build index 01c529462d..58e2e03822 100644 --- a/data/meson.build +++ b/data/meson.build @@ -28,17 +28,15 @@ if get_option('wayland') endif foreach desktop_file : desktop_files - desktop = configure_file( - input: desktop_file + '.in.in', - output: desktop_file + '.in', - configuration: desktop_conf, - ) - - custom_target( - desktop_file, - input: desktop, + i18n.merge_file( + type: 'desktop', + input: configure_file( + input: desktop_file + '.in.in', + output: desktop_file + '.in', + configuration: desktop_conf, + ), output: desktop_file, - command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'], + po_dir: po_dir, install: true, install_dir: desktopdir, ) diff --git a/makepot b/makepot index 128549d6d5..c24a1e3e7a 100755 --- a/makepot +++ b/makepot @@ -1,14 +1,8 @@ #!/bin/bash -find files/usr/share/cinnamon -name "*.ui" -exec intltool-extract --type=gettext/glade {} \; +xgettext -cTranslators -cTRANSLATORS --keyword=_ --keyword=N_ --from-code=UTF-8 \ + --files-from=po/POTFILES.in --output=cinnamon.pot +xgettext -c --language=Python --keyword=_ --output=cinnamon.pot --join-existing files/usr/bin/* -xgettext --language=C --keyword=_ --keyword=N_ --output=cinnamon.pot src/*.c src/*/*.c - -find files/usr/share/cinnamon -name "*.ui.h" -exec xgettext --language=C --keyword=_ --keyword=N_ --output=cinnamon.pot --join-existing {} \; - -xgettext -cTranslators --language=JavaScript --keyword=_ --keyword=N_ --output=cinnamon.pot --join-existing --from-code=UTF-8 js/*/*.js files/usr/share/cinnamon/*/*/*.js -xgettext -c --language=Python --keyword=_ --output=cinnamon.pot --join-existing generate_additional_files.py files/usr/share/cinnamon/*/*.py files/usr/share/cinnamon/*/*/*.py files/usr/bin/* files/usr/bin/cinnamon-xlet-makepot -j -p -m -o cinnamon.pot files/usr/share/cinnamon/applets/ files/usr/bin/cinnamon-xlet-makepot -j -p -m -o cinnamon.pot files/usr/share/cinnamon/desklets/ - -find files/usr/share/cinnamon -name "*.ui.h" -exec rm -f {} \; diff --git a/meson.build b/meson.build index 018788e4e2..2a943bf463 100644 --- a/meson.build +++ b/meson.build @@ -79,7 +79,6 @@ message('Building recorder: @0@'.format(get_option('build_recorder'))) cc = meson.get_compiler('c') math = cc.find_library('m', required: false) -intltool_merge = find_program('intltool-merge') python = find_program('python3') # generate config.h diff --git a/po/POTFILES.in b/po/POTFILES.in index d25e44e27a..bcc6d12822 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,28 +1,348 @@ +data/wayland_sessions/cinnamon-wayland.desktop.in +data/xsessions/cinnamon.desktop.in +data/xsessions/cinnamon2d.desktop.in +data/cinnamon-wayland.desktop.in.in data/cinnamon.desktop.in.in -data/org.cinnamon.gschema.xml.in +data/cinnamon2d.desktop.in.in + +# data/search_providers/google.xml +# data/search_providers/wikipedia.xml +# data/cinnamon-osk-layouts.gresource.xml +# data/cldr2json/test/data/fr-t-k0-android.xml +# data/org.cinnamon.gestures.gschema.xml +# data/org.cinnamon.gschema.xml + +src/cinnamon-touchegg-client.c +src/cinnamon-doc-system.c +src/cinnamon-tray-manager.c +src/cinnamon-window-tracker.c +src/cinnamon-perf-helper.c +src/cinnamon-slicer.c +src/cinnamon-tray-icon.c +src/cinnamon-stack.c +src/cinnamon-util.c +src/cinnamon-wm.c +src/main.c +src/hotplug-sniffer/cinnamon-mime-sniffer.c +src/hotplug-sniffer/hotplug-sniffer.c +src/run-js-test.c +src/st/st-scroll-view-fade.c +src/st/st-shadow.c +src/st/st-border-image.c +src/st/st-box-layout-child.c +src/st/st-private.c +src/st/st-scroll-bar.c +src/st/st-table-child.c +src/st/st-theme.c +src/st/st-focus-manager.c +src/st/st-group.c +src/st/st-icon-colors.c +src/st/st-widget.c +src/st/st-scroll-view.c +src/st/st-texture-cache.c +src/st/st-scrollable.c +src/st/st-viewport.c +src/st/st-table.c +src/st/st-theme-context.c +src/st/st-theme-node-drawing.c +src/st/st-theme-node-transition.c +src/st/st-theme-node.c +src/st/test-theme.c +src/st/croco/cr-additional-sel.c +src/st/croco/cr-attr-sel.c +src/st/croco/cr-cascade.c +src/st/croco/cr-declaration.c +src/st/croco/cr-doc-handler.c +src/st/croco/cr-enc-handler.c +src/st/croco/cr-fonts.c +src/st/croco/cr-input.c +src/st/croco/cr-num.c +src/st/croco/cr-om-parser.c +src/st/croco/cr-parser.c +src/st/croco/cr-parsing-location.c +src/st/croco/cr-prop-list.c +src/st/croco/cr-pseudo.c +src/st/croco/cr-rgb.c +src/st/croco/cr-selector.c +src/st/croco/cr-simple-sel.c +src/st/croco/cr-statement.c +src/st/croco/cr-string.c +src/st/croco/cr-stylesheet.c +src/st/croco/cr-term.c +src/st/croco/cr-tknzr.c +src/st/croco/cr-token.c +src/st/croco/cr-utils.c +src/st/st-adjustment.c +src/st/st-background-effect.c +src/st/st-bin.c +src/st/st-box-layout.c +src/st/st-button.c +src/st/st-clipboard.c +src/st/st-debug.c +src/st/st-drawing-area.c +src/st/st-entry.c +src/st/st-icon.c +src/st/st-image-content.c +src/st/st-label.c +src/st/st-password-entry.c +src/st/st-polygon.c +src/st/st-settings.c +src/test-recorder.c +src/tray/na-tray-child.c +src/tray/na-tray-manager.c +src/cinnamon-app-system.c +src/cinnamon-app.c +src/cinnamon-embedded-window.c +src/cinnamon-generic-container.c +src/cinnamon-global.c +src/cinnamon-glsl-effect.c +src/cinnamon-gtk-embed.c +src/cinnamon-keyring-prompt.c +src/cinnamon-network-agent.c +src/cinnamon-perf-log.c +src/cinnamon-plugin.c +src/cinnamon-polkit-authentication-agent.c +src/cinnamon-recorder-src.c +src/cinnamon-recorder.c +src/cinnamon-screen.c +src/cinnamon-screenshot.c +src/cinnamon-secure-text-buffer.c + +files/usr/share/cinnamon/cinnamon-desktop-editor/directory-editor.ui +files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui +files/usr/share/cinnamon/cinnamon-menu-editor/cinnamon-menu-editor.ui +files/usr/share/cinnamon/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui +files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.ui +files/usr/share/cinnamon/cinnamon-settings/bin/input-sources-list.ui +files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.ui +files/usr/share/cinnamon/cinnamon-settings/themes.ui +files/usr/share/cinnamon/desklets/launcher@cinnamon.org/editorDialog.ui + +js/misc/docInfo.js +js/misc/modemManager.js +js/misc/params.js +js/misc/screenSaver.js +js/misc/timers.js +js/misc/fileDialog.js +js/misc/fileUtils.js +js/misc/gnomeSession.js +js/misc/gridNavigator.js +js/misc/history.js +js/misc/ibusManager.js +js/misc/inputMethod.js +js/misc/interfaces.js +js/misc/pointerTracker.js +js/misc/portalHandlers.js +js/misc/signalManager.js +js/misc/signalTracker.js js/misc/util.js +js/misc/windowUtils.js +js/perf/core.js js/ui/appFavorites.js -js/ui/autorunManager.js -js/ui/calendar.js -js/ui/endSessionDialog.js -js/ui/extensionSystem.js -js/ui/keyboard.js +js/ui/appSwitcher/timelineSwitcher.js +js/ui/appSwitcher/appSwitcher.js +js/ui/appSwitcher/appSwitcher3D.js +js/ui/appSwitcher/classicSwitcher.js +js/ui/appSwitcher/coverflowSwitcher.js +js/ui/locatePointer.js js/ui/lookingGlass.js +js/ui/magnifier.js js/ui/messageTray.js -js/ui/networkAgent.js +js/ui/monitorLabeler.js js/ui/notificationDaemon.js -js/ui/overview.js -js/ui/panel.js -js/ui/polkitAuthenticationAgent.js +js/ui/overrides.js +js/ui/pageIndicators.js +js/ui/placesManager.js js/ui/popupMenu.js +js/ui/radioButton.js js/ui/runDialog.js -js/ui/cinnamonEntry.js +js/ui/screenshot.js +js/ui/settings.js +js/ui/startupAnimation.js +js/ui/tooltips.js +js/ui/virtualKeyboard.js +js/ui/windowMenu.js +js/ui/wmGtkDialogs.js +js/ui/magnifierDBus.js +js/ui/search.js +js/ui/slider.js +js/ui/statusIconDispatcher.js +js/ui/userWidget.js js/ui/windowAttentionHandler.js -src/gvc/gvc-mixer-control.c -src/main.c -src/cinnamon-app.c -src/cinnamon-app-system.c -src/cinnamon-global.c -src/cinnamon-mobile-providers.c -src/cinnamon-polkit-authentication-agent.c -src/cinnamon-util.c +js/ui/workspace.js +js/ui/searchProviderManager.js +js/ui/separator.js +js/ui/slideshowManager.js +js/ui/themeManager.js +js/ui/workspacesView.js +js/ui/xdndHandler.js +js/ui/accessibility.js +js/ui/applet.js +js/ui/appletManager.js +js/ui/audioDeviceSelection.js +js/ui/backgroundManager.js +js/ui/barLevel.js +js/ui/boxpointer.js +js/ui/checkBox.js +js/ui/cinnamonDBus.js +js/ui/cinnamonEntry.js +js/ui/closeDialog.js +js/ui/dbusMenu.js +js/ui/desklet.js +js/ui/deskletManager.js +js/ui/dialog.js +js/ui/dnd.js +js/ui/edgeFlip.js +js/ui/endSessionDialog.js +js/ui/environment.js +js/ui/expo.js +js/ui/expoThumbnail.js +js/ui/extension.js +js/ui/extensionSystem.js +js/ui/flashspot.js +js/ui/gestures/ToucheggTypes.js +js/ui/gestures/actions.js +js/ui/gestures/gesturesManager.js +js/ui/gestures/mprisController.js +js/ui/hotCorner.js +js/ui/ibusCandidatePopup.js +js/ui/iconGrid.js +js/ui/keybindings.js +js/ui/keyboardManager.js +js/ui/keyringPrompt.js +js/ui/layout.js +js/ui/lightbox.js +js/ui/main.js +js/ui/modalDialog.js +js/ui/networkAgent.js +js/ui/osdWindow.js +js/ui/overview.js +js/ui/panel.js +js/ui/polkitAuthenticationAgent.js +js/ui/ripples.js +js/ui/screenRecorder.js +js/ui/soundManager.js +js/ui/systray.js +js/ui/tweener.js +js/ui/windowManager.js +js/ui/workspaceOsd.js +files/usr/share/cinnamon/applets/a11y@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js +files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js +files/usr/share/cinnamon/applets/expo@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/appGroup.js +files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/constants.js +files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/menus.js +files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/state.js +files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/workspace.js +files/usr/share/cinnamon/applets/inhibit@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/menu@cinnamon.org/appUtils.js +files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/on-screen-keyboard@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/recent@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/removable-drives@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/scale@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/separator@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/settings-example@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/settings@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/show-desktop@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/slideshow@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/spacer@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/systray@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/trash@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/window-list@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/windows-quick-list@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/workspace-switcher@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/xapp-status@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/cornerbar@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/favorites@cinnamon.org/applet.js +files/usr/share/cinnamon/applets/nightlight@cinnamon.org/applet.js +files/usr/share/cinnamon/desklets/clock@cinnamon.org/desklet.js +files/usr/share/cinnamon/desklets/launcher@cinnamon.org/desklet.js +files/usr/share/cinnamon/desklets/photoframe@cinnamon.org/desklet.js + +generate_additional_files.py +files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/utils.py +files/usr/share/cinnamon/applets/printers@cinnamon.org/lpstat-a.py +files/usr/share/cinnamon/applets/printers@cinnamon.org/cancel-print-dialog.py +files/usr/share/cinnamon/applets/settings-example@cinnamon.org/CustomWidget.py +files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py +files/usr/share/cinnamon/cinnamon-looking-glass/pageutils.py +files/usr/share/cinnamon/cinnamon-looking-glass/cinnamon-looking-glass.py +files/usr/share/cinnamon/cinnamon-looking-glass/lookingglass_proxy.py +files/usr/share/cinnamon/cinnamon-looking-glass/page_extensions.py +files/usr/share/cinnamon/cinnamon-looking-glass/page_inspect.py +files/usr/share/cinnamon/cinnamon-looking-glass/page_log.py +files/usr/share/cinnamon/cinnamon-looking-glass/page_results.py +files/usr/share/cinnamon/cinnamon-looking-glass/page_windows.py +files/usr/share/cinnamon/cinnamon-menu-editor/cme/__init__.py +files/usr/share/cinnamon/cinnamon-menu-editor/cme/config.py +files/usr/share/cinnamon/cinnamon-menu-editor/cme/MainWindow.py +files/usr/share/cinnamon/cinnamon-menu-editor/cme/MenuEditor.py +files/usr/share/cinnamon/cinnamon-menu-editor/cme/util.py +files/usr/share/cinnamon/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py +files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +files/usr/share/cinnamon/cinnamon-settings/bin/__init__.py +files/usr/share/cinnamon/cinnamon-settings/bin/proxygsettings.py +files/usr/share/cinnamon/cinnamon-settings/bin/AddKeyboardLayout.py +files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py +files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py +files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py +files/usr/share/cinnamon/cinnamon-settings/bin/InputSources.py +files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py +files/usr/share/cinnamon/cinnamon-settings/bin/KeybindingWidgets.py +files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py +files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py +files/usr/share/cinnamon/cinnamon-settings/bin/TreeListWidgets.py +files/usr/share/cinnamon/cinnamon-settings/bin/capi.py +files/usr/share/cinnamon/cinnamon-settings/bin/eyedropper.py +files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py +files/usr/share/cinnamon/cinnamon-settings/bin/tweenEquations.py +files/usr/share/cinnamon/cinnamon-settings/bin/util.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_fonts.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_accessibility.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_actions.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_applets.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_calendar.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_desklets.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_desktop.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_display.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_effects.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_extensions.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_general.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_gestures.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_hotcorner.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_mouse.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_nightlight.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_panel.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_privacy.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_screensaver.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_thunderbolt.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_windows.py +files/usr/share/cinnamon/cinnamon-settings/modules/cs_workspaces.py +files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py +files/usr/share/cinnamon/cinnamon-settings/config.py +files/usr/share/cinnamon/cinnamon-settings/xlet-settings.py +files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py +files/usr/share/cinnamon/desklets/launcher@cinnamon.org/editorDialog.py