From e27dbb3b7971c77c178e0e6d523aa9f09b98b41e Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 26 Jan 2021 12:45:31 +0100 Subject: build: Use PACKAGE_URL variable --- Makefile.am | 12 +++++++++--- configure.ac | 1 + mate-terminal.appdata.xml.in | 43 ----------------------------------------- mate-terminal.appdata.xml.in.in | 43 +++++++++++++++++++++++++++++++++++++++++ meson.build | 8 +++++++- po/POTFILES.in | 2 +- src/terminal-window.c | 2 +- 7 files changed, 62 insertions(+), 49 deletions(-) delete mode 100644 mate-terminal.appdata.xml.in create mode 100644 mate-terminal.appdata.xml.in.in diff --git a/Makefile.am b/Makefile.am index e10f2e5..95f078e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,8 +11,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ CFLAGS='-Wno-deprecated-declarations' appdatadir = $(datadir)/metainfo -appdata_in_files = mate-terminal.appdata.xml.in -appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_DATA = mate-terminal.appdata.xml +appdata_in_files = $(appdata_DATA:.xml=.xml.in) +appdata_in_in_files = $(appdata_in_files:.xml.in=.xml.in.in) $(appdata_DATA): $(appdata_in_files) $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ @@ -31,15 +32,20 @@ EXTRA_DIST = \ xmldocs.make \ omf.make \ mate-terminal.wrapper \ - $(appdata_in_files) \ + $(appdata_in_in_files) \ $(man_MANS) \ $(NULL) CLEANFILES = \ mate-terminal.appdata.xml \ + $(appdata_DATA) \ $(desktop_DATA) \ $(NULL) +DISTCLEANFILES = \ + $(appdata_in_files) \ + $(NULL) + MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ $(srcdir)/aclocal.m4 \ diff --git a/configure.ac b/configure.ac index c15986c..c053d14 100644 --- a/configure.ac +++ b/configure.ac @@ -146,6 +146,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) AC_CONFIG_FILES([ Makefile +mate-terminal.appdata.xml.in mate-terminal.desktop.in src/Makefile src/mate-submodules/Makefile diff --git a/mate-terminal.appdata.xml.in b/mate-terminal.appdata.xml.in deleted file mode 100644 index dee6309..0000000 --- a/mate-terminal.appdata.xml.in +++ /dev/null @@ -1,43 +0,0 @@ - - - - mate-terminal.desktop - CC0-1.0 - GPL-3.0+ - MATE Terminal - A terminal emulator for the MATE desktop environment - -

- MATE Terminal is a terminal emulation application that you can use - to access a UNIX shell in the MATE environment. MATE Terminal emulates - the xterm program developed by the X Consortium. It supports translucent - backgrounds, opening multiple terminals in a single window (tabs) and - clickable URLs. -

-

- MATE Terminal is a fork of GNOME Terminal and part of the MATE Desktop Environment. - If you would like to know more about MATE and MATE Terminal, please visit the - project's home page. -

- - - - - https://alexpl.fedorapeople.org/AppData/mate-terminal/screens/mate-terminal_01.png - - - - - https://alexpl.fedorapeople.org/AppData/mate-terminal/screens/mate-terminal_02.png - - - - - https://alexpl.fedorapeople.org/AppData/mate-terminal/screens/mate-terminal_03.png - - - - https://mate-desktop.org - mate-dev@ml.mate-desktop.org - MATE - diff --git a/mate-terminal.appdata.xml.in.in b/mate-terminal.appdata.xml.in.in new file mode 100644 index 0000000..e987ed9 --- /dev/null +++ b/mate-terminal.appdata.xml.in.in @@ -0,0 +1,43 @@ + + + + mate-terminal.desktop + CC0-1.0 + GPL-3.0+ + MATE Terminal + A terminal emulator for the MATE desktop environment + +

+ MATE Terminal is a terminal emulation application that you can use + to access a UNIX shell in the MATE environment. MATE Terminal emulates + the xterm program developed by the X Consortium. It supports translucent + backgrounds, opening multiple terminals in a single window (tabs) and + clickable URLs. +

+

+ MATE Terminal is a fork of GNOME Terminal and part of the MATE Desktop Environment. + If you would like to know more about MATE and MATE Terminal, please visit the + project's home page. +

+ + + + + https://alexpl.fedorapeople.org/AppData/mate-terminal/screens/mate-terminal_01.png + + + + + https://alexpl.fedorapeople.org/AppData/mate-terminal/screens/mate-terminal_02.png + + + + + https://alexpl.fedorapeople.org/AppData/mate-terminal/screens/mate-terminal_03.png + + + + @PACKAGE_URL@ + mate-dev@ml.mate-desktop.org + MATE + diff --git a/meson.build b/meson.build index d734ab7..102107a 100644 --- a/meson.build +++ b/meson.build @@ -202,9 +202,15 @@ endif install_man('mate-terminal.1') +appdata_file_configured = configure_file( + input: 'mate-terminal.appdata.xml.in.in', + output: 'mate-terminal.appdata.xml.in', + configuration: config_h, +) + appdata_file = i18n.merge_file( 'appdata-file', - input: 'mate-terminal.appdata.xml.in', + input: appdata_file_configured, output: 'mate-terminal.appdata.xml', type: 'xml', po_dir: join_paths(srcdir, 'po'), diff --git a/po/POTFILES.in b/po/POTFILES.in index c053d31..f64836d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -mate-terminal.appdata.xml.in +mate-terminal.appdata.xml.in.in mate-terminal.desktop.in.in src/confirm-close-dialog.ui src/mate-submodules/libegg/eggsmclient.c diff --git a/src/terminal-window.c b/src/terminal-window.c index 9ca8cd6..dc7a495 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -4448,7 +4448,7 @@ help_about_callback (GtkAction *action, "wrap-license", TRUE, "translator-credits", _("translator-credits"), "logo-icon-name", MATE_TERMINAL_ICON_NAME, - "website", "https://mate-desktop.org", + "website", PACKAGE_URL, NULL); g_free (comments); -- cgit v1.2.1