commit tilix for openSUSE:Factory

Hello community, here is the log from the commit of package tilix for openSUSE:Factory checked in at 2019-06-03 18:51:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tilix (Old) and /work/SRC/openSUSE:Factory/.tilix.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tilix" Mon Jun 3 18:51:00 2019 rev:18 rq:706929 version:1.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/tilix/tilix.changes 2019-06-01 09:51:18.679287179 +0200 +++ /work/SRC/openSUSE:Factory/.tilix.new.5148/tilix.changes 2019-06-03 18:51:01.844523565 +0200 @@ -1,0 +2,11 @@ +Thu May 30 21:54:45 UTC 2019 - Matthias Eliasson + +- Major changes in build + * Add patch (fix-meson-build.patch) to fix meson and start to use it for Tumbleweed + (upstream is heading this way) + * Switch to ldc as d-compiler for Tumbleweed. ldc have better architectures support + than dmd and its easier just to support one. + * Start to use gtkd in repos for Tumbleweed so we don't need to staticly link it to tilix + * Make tilix build on Leap 42.3 + +------------------------------------------------------------------- New: ---- fix-meson-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tilix.spec ++++++ --- /var/tmp/diff_new_pack.gUxnUk/_old 2019-06-03 18:51:02.504523338 +0200 +++ /var/tmp/diff_new_pack.gUxnUk/_new 2019-06-03 18:51:02.504523338 +0200 @@ -18,11 +18,14 @@ %define gtkd_version 3.8.5 # DMD is available only on x86*. Use LDC with dub otherwise. +# For Tumbleweed move to only use LDC +%if 0%{?suse_version} < 1550 %ifarch %{ix86} x86_64 %bcond_without dcompiler_dmd %else %bcond_with dcompiler_dmd %endif +%endif Name: tilix Version: 1.9.3 Release: 0 @@ -37,20 +40,38 @@ Patch0: gnome-ssh-agent.patch Patch1: dynamic-link.patch Patch2: fix-ldc-link.patch -BuildRequires: dub -BuildRequires: hicolor-icon-theme +# PATCH-FIX-UPSTREAM fix-meson-build.patch +Patch3: fix-meson-build.patch +BuildRequires: appstream-glib +BuildRequires: desktop-file-utils BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: xdg-utils BuildRequires: pkgconfig(dconf) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gmodule-export-2.0) +BuildRequires: pkgconfig(gmodule-no-export-2.0) +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libunwind) BuildRequires: pkgconfig(vte-2.91) -Requires: dconf -Requires: gtk3 -Requires: libvted-3-0 -Requires: vte +BuildRequires: pkgconfig(x11) Conflicts: nautilus-extension-terminix Conflicts: terminix +%if 0%{?suse_version} > 1500 +BuildRequires: ldc +BuildRequires: ldc-phobos-devel +BuildRequires: meson +BuildRequires: pkgconfig(gtkd-3) >= 3.8.5 +BuildRequires: pkgconfig(vted-3) >= 3.8.5 +%else +BuildRequires: dub +%endif +%if 0%{?suse_version} < 1550 %if %{with dcompiler_dmd} BuildRequires: dmd BuildRequires: phobos-devel @@ -58,6 +79,7 @@ BuildRequires: ldc BuildRequires: ldc-phobos-devel %endif +%endif %description A tiling terminal emulator for Linux using GTK+ 3 @@ -77,13 +99,22 @@ %prep %setup -q -a 1 %patch0 -p 1 +%if 0%{?suse_version} < 1550 %if %{with dcompiler_dmd} %patch1 -p 1 %else %patch2 -p 1 %endif +%endif +%if 0%{?suse_version} > 1500 +%patch3 -p 1 +%endif %build +%if 0%{?suse_version} > 1500 +%meson +%meson_build +%else # Register local GtkD repository in dub dub add-local GtkD-%{gtkd_version} %{gtkd_version} @@ -92,40 +123,59 @@ # De-register local GtkD repository in dub dub remove-local GtkD-%{gtkd_version} - +%endif # Rename license files so that we can include them in %%license # Both x11 and icons use LGPL-3.0-only. cp -a data/icons/LICENSE LICENSE-data-icons cp -a source/x11/LICENSE LICENSE-source-x11 %install +%if 0%{?suse_version} > 1500 +%meson_install +%else ./install.sh %{buildroot}%{_prefix} rm %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled +%endif %find_lang %{name} %{?no_lang_C} %files %license LICENSE* %doc README.md -%{_bindir}/%{name} -%{_datadir}/%{name} -%{_datadir}/%{name}/resources/ -%{_datadir}/%{name}/resources/tilix.gresource -%{_datadir}/%{name}/schemes/ -%{_datadir}/%{name}/scripts/ -%attr(755, -, -) %{_datadir}/%{name}/scripts/tilix_int.sh -%{_mandir}/man1/tilix.1%{?ext_man} -%{_datadir}/metainfo/ +%{_bindir}/tilix +%{_datadir}/applications/com.gexperts.Tilix.desktop +%if 0%{?sle_version} == 120300 && 0%{?is_opensuse} +%dir %{_datadir}/metainfo +%endif %{_datadir}/metainfo/com.gexperts.Tilix.appdata.xml -%{_datadir}/icons/hicolor/scalable/apps/com.gexperts.Tilix-symbolic.svg +%dir %{_datadir}/tilix +%dir %{_datadir}/tilix/resources +%{_datadir}/tilix/resources/tilix.gresource +%dir %{_datadir}/tilix/schemes +%{_datadir}/tilix/schemes/base16-twilight-dark.json +%{_datadir}/tilix/schemes/linux.json +%{_datadir}/tilix/schemes/material.json +%{_datadir}/tilix/schemes/monokai.json +%{_datadir}/tilix/schemes/orchis.json +%{_datadir}/tilix/schemes/solarized-dark.json +%{_datadir}/tilix/schemes/solarized-light.json +%{_datadir}/tilix/schemes/tango.json +%dir %{_datadir}/tilix/scripts +%{_datadir}/tilix/scripts/tilix_int.sh %{_datadir}/icons/hicolor/scalable/apps/com.gexperts.Tilix.svg -%{_datadir}/applications/com.gexperts.Tilix.desktop -%{_datadir}/dbus-1/services/com.gexperts.Tilix.service +%if 0%{?suse_version} > 1500 +%{_datadir}/icons/hicolor/symbolic/apps/com.gexperts.Tilix-symbolic.svg +%else +%{_datadir}/icons/hicolor/scalable/apps/com.gexperts.Tilix-symbolic.svg +%{_mandir}/man1/tilix.1%{?ext_man} +%{_datadir}/tilix/schemes/yaru.json +%endif %{_datadir}/glib-2.0/schemas/com.gexperts.Tilix.gschema.xml +%{_datadir}/dbus-1/services/com.gexperts.Tilix.service %files -n nautilus-extension-tilix -%{_datadir}/nautilus-python/ -%{_datadir}/nautilus-python/extensions/ +%dir %{_datadir}/nautilus-python +%dir %{_datadir}/nautilus-python/extensions %{_datadir}/nautilus-python/extensions/open-tilix.py %files lang -f %{name}.lang ++++++ fix-meson-build.patch ++++++

From 66bac8031b5d95121d7e467a89a8961fb10ce8d3 Mon Sep 17 00:00:00 2001 From: Matthias Eliasson Date: Wed, 29 May 2019 19:32:06 +0200 Subject: [PATCH] Make tilix build with meson

--- data/man/meson.build | 1 + data/meson.build | 57 ++++++++++---------- meson.build | 120 ++++++++++++++++++++++-------------------- meson_post_install.py | 4 +- po/LINGUAS | 32 +++++++++++ 5 files changed, 127 insertions(+), 87 deletions(-) create mode 100644 data/man/meson.build create mode 100644 po/LINGUAS diff --git a/data/man/meson.build b/data/man/meson.build new file mode 100644 index 00000000..1681e5cb --- /dev/null +++ b/data/man/meson.build @@ -0,0 +1 @@ +install_man('tilix') \ No newline at end of file diff --git a/data/meson.build b/data/meson.build index 4fdc6ea3..ab3242c7 100644 --- a/data/meson.build +++ b/data/meson.build @@ -2,13 +2,23 @@ # install the icons install_data( 'icons/hicolor/scalable/apps/@0@.svg'.format(meson.project_name()), - install_dir: join_paths(get_option('datadir'), 'icons/hicolor/scalable/apps') + install_dir: iconsdir / 'scalable' / 'apps' ) install_data( 'icons/hicolor/scalable/apps/@0@-symbolic.svg'.format(meson.project_name()), - install_dir: join_paths(get_option('datadir'), 'icons/hicolor/scalable/apps') + install_dir: iconsdir / 'symbolic' / 'apps' ) +# Install the desktop file +desktop_file = i18n.merge_file( + '@0@.desktop'.format(meson.project_name()), + output: '@BASENAME@', + input: 'pkg/desktop/@0@.desktop.in'.format(meson.project_name()), + po_dir: meson.source_root() / 'po', + type: 'desktop', + install: true, + install_dir: appdir +) # Validate desktop file desktop_file_validate = find_program('desktop-file-validate', required:false) @@ -16,18 +26,18 @@ if desktop_file_validate.found() test ( 'Validate desktop file', desktop_file_validate, - args: join_paths(meson.current_build_dir (), '@0@.desktop'.format(meson.project_name())) + args: desktop_file.full_path() ) endif -# Install the desktop file -i18n.merge_file( - output: '@0@.desktop'.format(meson.project_name()), - input: 'pkg/desktop/@0@.desktop.in'.format(meson.project_name()), - po_dir: join_paths(meson.source_root(), 'po'), - type: 'desktop', +# Install the AppData file +appdata_file = i18n.merge_file( + '@0@.appdata.xml'.format(meson.project_name()), + output: '@BASENAME@', + input: 'appdata/@0@.appdata.xml.in'.format(meson.project_name()), + po_dir: meson.source_root() / 'po', install: true, - install_dir: join_paths(get_option('datadir'), 'applications') + install_dir: datadir / 'metainfo' ) # Validate AppData file @@ -36,19 +46,10 @@ if appstream_util.found() test ( 'Validate appdata file', appstream_util, - args: ['validate-relax', '--nonet', join_paths(meson.current_build_dir (), '@0@.appdata.xml'.format(meson.project_name()))] + args: ['validate-relax', '--nonet', appdata_file.full_path()] ) endif -# Install the AppData file -i18n.merge_file( - output: '@0@.appdata.xml'.format(meson.project_name()), - input: 'appdata/@0@.appdata.xml.in'.format(meson.project_name()), - po_dir: join_paths(meson.source_root(), 'po'), - install: true, - install_dir: join_paths(get_option('datadir'), 'metainfo') -) - # Build resources gresource = gnome.compile_resources( 'tilix', @@ -56,13 +57,13 @@ gresource = gnome.compile_resources( gresource_bundle: true, install: true, source_dir: 'resources/', - install_dir: join_paths(get_option('datadir'), 'tilix/resources') + install_dir: pkgdatadir / 'resources' ) # Install GSchemas install_data( 'gsettings/@0@.gschema.xml'.format(meson.project_name()), - install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') + install_dir: schemadir ) # Color schemes @@ -77,28 +78,28 @@ install_data( 'schemes/solarized-light.json', 'schemes/tango.json', ], - install_dir: join_paths(get_option('datadir'), 'tilix/schemes') + install_dir: pkgdatadir / 'schemes' ) # Scripts install_data( 'scripts/tilix_int.sh', - install_dir: join_paths(get_option('datadir'), 'tilix/scripts') + install_dir: pkgdatadir / 'scripts' ) # Copying Nautilus extension install_data( 'nautilus/open-tilix.py', - install_dir: join_paths(get_option('datadir'), 'nautilus-python/extensions') + install_dir: datadir / 'nautilus-python' / 'extensions' ) # Copy D-Bus service descriptor conf = configuration_data() -conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) +conf.set('bindir', bindir) configure_file( input: 'dbus/@0@.service.in'.format(meson.project_name()), - output: 'dbus/@0@.service'.format(meson.project_name()), + output: '@BASENAME@', configuration: conf, - install_dir: join_paths(get_option('datadir'), 'dbus-1/services') + install_dir: datadir / 'dbus-1' / 'services' ) diff --git a/meson.build b/meson.build index feff315a..0fcbe9cb 100644 --- a/meson.build +++ b/meson.build @@ -1,8 +1,9 @@ project( 'com.gexperts.Tilix', 'd', - version: '1.8.5', + version: '1.9.3', license: 'MPL2', - meson_version: '>= 0.48.0' + default_options: 'buildtype=debugoptimized', + meson_version: '>= 0.50.0' ) compiler = meson.get_compiler('d') @@ -24,84 +25,87 @@ endif gnome = import('gnome') i18n = import('i18n') +prefix = get_option('prefix') +bindir = prefix / get_option('bindir') +datadir = prefix / get_option('datadir') +pkgdatadir = datadir / 'tilix' # TODO: this probably should be meson.project_name() eventually +schemadir = datadir / 'glib-2.0' / 'schemas' +iconsdir = datadir / 'icons' / 'hicolor' +appdir = datadir / 'applications' + tilix_sources = [ - 'source/secretc/secrettypes.d', - 'source/secretc/secret.d', - 'source/app.d', - 'source/x11/X.d', - 'source/x11/Xlib.d', - 'source/secret/SchemaAttribute.d', - 'source/secret/Item.d', - 'source/secret/Schema.d', - 'source/secret/Service.d', - 'source/secret/Prompt.d', - 'source/secret/Collection.d', - 'source/secret/Secret.d', - 'source/secret/Value.d', - 'source/gx/util/array.d', - 'source/gx/util/path.d', - 'source/gx/util/string.d', + 'source/gx/gtk/actions.d', 'source/gx/gtk/cairo.d', 'source/gx/gtk/clipboard.d', - 'source/gx/gtk/x11.d', - 'source/gx/gtk/resource.d', - 'source/gx/gtk/vte.d', - 'source/gx/gtk/actions.d', - 'source/gx/gtk/threads.d', + 'source/gx/gtk/color.d', 'source/gx/gtk/dialog.d', + 'source/gx/gtk/resource.d', 'source/gx/gtk/settings.d', + 'source/gx/gtk/threads.d', 'source/gx/gtk/util.d', - 'source/gx/gtk/color.d', - 'source/gx/tilix/appwindow.d', - 'source/gx/tilix/terminal/advpaste.d', - 'source/gx/tilix/terminal/search.d', - 'source/gx/tilix/terminal/regex.d', + 'source/gx/gtk/vte.d', + 'source/gx/gtk/x11.d', + 'source/gx/i18n/l10n.d', + 'source/gx/tilix/bookmark/bmchooser.d', + 'source/gx/tilix/bookmark/bmeditor.d', + 'source/gx/tilix/bookmark/bmtreeview.d', + 'source/gx/tilix/bookmark/manager.d', + 'source/gx/tilix/prefeditor/advdialog.d', + 'source/gx/tilix/prefeditor/bookmarkeditor.d', + 'source/gx/tilix/prefeditor/common.d', + 'source/gx/tilix/prefeditor/prefdialog.d', + 'source/gx/tilix/prefeditor/profileeditor.d', + 'source/gx/tilix/prefeditor/titleeditor.d', 'source/gx/tilix/terminal/actions.d', 'source/gx/tilix/terminal/activeprocess.d', - 'source/gx/tilix/terminal/terminal.d', + 'source/gx/tilix/terminal/advpaste.d', + 'source/gx/tilix/terminal/exvte.d', 'source/gx/tilix/terminal/layout.d', + 'source/gx/tilix/terminal/monitor.d', 'source/gx/tilix/terminal/password.d', + 'source/gx/tilix/terminal/regex.d', + 'source/gx/tilix/terminal/search.d', + 'source/gx/tilix/terminal/terminal.d', 'source/gx/tilix/terminal/util.d', - 'source/gx/tilix/terminal/exvte.d', - 'source/gx/tilix/terminal/monitor.d', - 'source/gx/tilix/sidebar.d', - 'source/gx/tilix/customtitle.d', - 'source/gx/tilix/prefeditor/bookmarkeditor.d', - 'source/gx/tilix/prefeditor/profileeditor.d', - 'source/gx/tilix/prefeditor/common.d', - 'source/gx/tilix/prefeditor/prefdialog.d', - 'source/gx/tilix/prefeditor/titleeditor.d', - 'source/gx/tilix/prefeditor/advdialog.d', - 'source/gx/tilix/preferences.d', 'source/gx/tilix/application.d', - 'source/gx/tilix/shortcuts.d', + 'source/gx/tilix/appwindow.d', + 'source/gx/tilix/closedialog.d', + 'source/gx/tilix/cmdparams.d', 'source/gx/tilix/colorschemes.d', - 'source/gx/tilix/session.d', - 'source/gx/tilix/constants.d', 'source/gx/tilix/common.d', - 'source/gx/tilix/cmdparams.d', + 'source/gx/tilix/constants.d', + 'source/gx/tilix/customtitle.d', 'source/gx/tilix/encoding.d', - 'source/gx/tilix/closedialog.d', - 'source/gx/tilix/bookmark/manager.d', - 'source/gx/tilix/bookmark/bmchooser.d', - 'source/gx/tilix/bookmark/bmeditor.d', - 'source/gx/tilix/bookmark/bmtreeview.d', - 'source/gx/i18n/l10n.d' + 'source/gx/tilix/preferences.d', + 'source/gx/tilix/session.d', + 'source/gx/tilix/shortcuts.d', + 'source/gx/tilix/sidebar.d', + 'source/gx/util/array.d', + 'source/gx/util/path.d', + 'source/gx/util/string.d', + 'source/secret/Collection.d', + 'source/secret/Item.d', + 'source/secret/Prompt.d', + 'source/secret/Schema.d', + 'source/secret/SchemaAttribute.d', + 'source/secret/Secret.d', + 'source/secret/Service.d', + 'source/secret/Value.d', + 'source/secretc/secret.d', + 'source/secretc/secrettypes.d', + 'source/x11/X.d', + 'source/x11/Xlib.d', + 'source/app.d' ] source_root = meson.source_root() sources_dir = include_directories('source/') # Dependencies -# Note relying on dub to fetch and build dependencies before running meson build is temporary due to a bug in Meson 0.48 -# gtkd_dep = dependency('gtkd-3', version: '>= 3.8.5') -# vted_dep = dependency('vted-3', version: '>= 3.8.5') - -gtkd_dep = dependency('gtk-d:gtkd', version: '>=3.8.5', method: 'dub') -vted_dep = dependency('gtk-d:vte', version: '>=3.8.5', method: 'dub') +gtkd_dep = dependency('gtkd-3', version: '>=3.8.5') +vted_dep = dependency('vted-3', version: '>=3.8.5') xlib_dep = dependency('x11') libunwind_dep = dependency('libunwind') -msgfmt = find_program('msgfmt') subdir('po') subdir('data') @@ -130,4 +134,4 @@ executable('tilix', #) #test('tilix_test', tilix_test_exe) -meson.add_install_script('meson_post_install.py') \ No newline at end of file +meson.add_install_script('meson_post_install.py') diff --git a/meson_post_install.py b/meson_post_install.py index b5f7b3d7..1d4c91bb 100644 --- a/meson_post_install.py +++ b/meson_post_install.py @@ -8,4 +8,6 @@ if not environ.get('DESTDIR', ''): print('Updating icon cache...') call(['gtk-update-icon-cache', '-qtf', path.join(DATA_DIR, 'icons/hicolor')]) print("compiling new schemas") - call(["glib-compile-schemas", path.join(DATA_DIR, 'glib-2.0/schemas/')]) \ No newline at end of file + call(["glib-compile-schemas", path.join(DATA_DIR, 'glib-2.0/schemas/')]) + print("Updating desktop database") + call(["update-desktop-database", path.join(DATA_DIR, 'applications')]) \ No newline at end of file diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 00000000..d569cef7 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,32 @@ +ak +ar_MA +ar +bg +cs +de +el +en +eo +es +fi +fr +he +hu +id +it +ja +ko +it +nb_NO +nl +pl +pt_BR +pt_PT +ru +sr +sv +tr +uk +vi +zh_CN +zh_TW \ No newline at end of file -- 2.21.0