Hello community, here is the log from the commit of package tilix for openSUSE:Factory checked in at 2020-06-06 23:38:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tilix (Old) and /work/SRC/openSUSE:Factory/.tilix.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tilix" Sat Jun 6 23:38:27 2020 rev:20 rq:811951 version:1.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/tilix/tilix.changes 2019-12-02 11:37:59.802456330 +0100 +++ /work/SRC/openSUSE:Factory/.tilix.new.3606/tilix.changes 2020-06-06 23:38:44.028789572 +0200 @@ -1,0 +2,18 @@ +Fri Jun 5 23:29:52 UTC 2020 - Matthias Eliasson <[email protected]> + +- Always apply patch 0001-Avoid-calling-values-on-a-shared-object.patch + so we fix builds for all openSUSE distributions + +------------------------------------------------------------------- +Fri Jun 5 22:38:17 UTC 2020 - Matthias Eliasson <[email protected]> + +- Refresh Patch (fix-meson-build.patch) with some minor updates from upstream +- Package man file +- Add patch 0001-Avoid-calling-values-on-a-shared-object.patch to make it build on newer ldc + +------------------------------------------------------------------- +Wed Jun 3 22:20:04 UTC 2020 - Max Lin <[email protected]> + +- Use python3-nautilus for Leap 15.2 since python2-nautilus has been dropped + +------------------------------------------------------------------- New: ---- 0001-Avoid-calling-values-on-a-shared-object.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tilix.spec ++++++ --- /var/tmp/diff_new_pack.1DlL4H/_old 2020-06-06 23:38:46.488797292 +0200 +++ /var/tmp/diff_new_pack.1DlL4H/_new 2020-06-06 23:38:46.492797305 +0200 @@ -1,7 +1,7 @@ # # spec file for package tilix # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,6 @@ Release: 0 Summary: A tiling terminal emulator based on GTK+ 3 License: MPL-2.0 AND LGPL-3.0-only -Group: System/X11/Terminals URL: https://github.com/gnunn1/tilix Source0: https://github.com/gnunn1/tilix/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # See https://github.com/dlang/dub/issues/838 on why we need to have the full source code as dependency @@ -42,6 +41,8 @@ Patch2: fix-ldc-link.patch # PATCH-FIX-UPSTREAM fix-meson-build.patch Patch3: fix-meson-build.patch +# PATCH-FIX-UPSTREAM 0001-Avoid-calling-values-on-a-shared-object.patch gh#gnunn1/tilix#1733 +Patch4: 0001-Avoid-calling-values-on-a-shared-object.patch BuildRequires: appstream-glib BuildRequires: desktop-file-utils BuildRequires: pkgconfig @@ -86,13 +87,12 @@ %package -n nautilus-extension-tilix Summary: Nautilus Extension to Open Tilix in Folders -Group: System/GUI/GNOME -%if 0%{?suse_version} < 1550 -Requires: python-nautilus -%else +Supplements: (nautilus and %{name}) +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 Requires: python3-nautilus +%else +Requires: python-nautilus %endif -Supplements: (nautilus and %{name}) %description -n nautilus-extension-tilix This is a Nautilus extension that allows you to open tilix in @@ -103,6 +103,7 @@ %prep %setup -q -a 1 %patch0 -p 1 +%patch4 -p 1 %if 0%{?suse_version} < 1550 %if %{with dcompiler_dmd} %patch1 -p 1 @@ -171,9 +172,9 @@ %{_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 +%{_mandir}/man1/tilix.1%{?ext_man} %{_datadir}/glib-2.0/schemas/com.gexperts.Tilix.gschema.xml %{_datadir}/dbus-1/services/com.gexperts.Tilix.service ++++++ 0001-Avoid-calling-values-on-a-shared-object.patch ++++++ >From ce11b0bd936fe8fee9c5ac7025ea5864b99ed7d3 Mon Sep 17 00:00:00 2001 From: LuK1337 <[email protected]> Date: Mon, 15 Jul 2019 20:42:21 +0200 Subject: [PATCH] Avoid calling `values()` on a shared object * This fixes a compilation on dmd v2.087.0+ ( I think? ) /usr/include/dmd/druntime/import/object.d(3453,36): Error: cannot implicitly convert expression aa of type shared(ProcessStatus[int]) to const(shared(ProcessStatus)[int]) source/gx/tilix/terminal/monitor.d(46,46): Error: template instance `object.values!(shared(ProcessStatus[int]), shared(ProcessStatus), int)` error instantiating --- source/gx/tilix/terminal/monitor.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/gx/tilix/terminal/monitor.d b/source/gx/tilix/terminal/monitor.d index 2b130efe..affc4b86 100644 --- a/source/gx/tilix/terminal/monitor.d +++ b/source/gx/tilix/terminal/monitor.d @@ -43,7 +43,7 @@ private: bool fireEvents() { synchronized { - foreach(process; processes.values()) { + foreach(process; processes) { if (process.eventType != MonitorEventType.NONE) { onChildProcess.emit(process.eventType, process.gpid, process.activePid, process.activeName); process.eventType = MonitorEventType.NONE; @@ -138,7 +138,7 @@ void monitorProcesses(int sleep, Tid tid) { // all open terminals. We need to get these using shell // PID and will store them to raise events for each terminal. auto activeProcesses = getActiveProcessList(); - foreach(process; processes.values()) { + foreach(process; processes) { auto activeProcess = activeProcesses.get(process.gpid, null); // No need to raise event for same process. if (activeProcess !is null && activeProcess.pid != process.activePid) { ++++++ fix-meson-build.patch ++++++ --- /var/tmp/diff_new_pack.1DlL4H/_old 2020-06-06 23:38:46.524797405 +0200 +++ /var/tmp/diff_new_pack.1DlL4H/_new 2020-06-06 23:38:46.524797405 +0200 @@ -1,18 +1,33 @@ -From 66bac8031b5d95121d7e467a89a8961fb10ce8d3 Mon Sep 17 00:00:00 2001 +From 776019ed1b98d2b573e7040f9f6acef26d92d389 Mon Sep 17 00:00:00 2001 From: Matthias Eliasson <[email protected]> -Date: Wed, 29 May 2019 19:32:06 +0200 +Date: Sat, 6 Jun 2020 00:32:04 +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(-) + .gitignore | 2 - + data/man/meson.build | 1 + + data/man/{tilix => tilix.1} | 0 + data/meson.build | 61 +++++++------- + data/scripts/install-man-pages.sh | 24 ++++++ + meson.build | 133 +++++++++++++++--------------- + meson_post_install.py | 4 +- + po/LINGUAS | 32 +++++++ + 8 files changed, 160 insertions(+), 97 deletions(-) create mode 100644 data/man/meson.build + rename data/man/{tilix => tilix.1} (100%) + create mode 100644 data/scripts/install-man-pages.sh create mode 100644 po/LINGUAS +diff --git a/.gitignore b/.gitignore +index a372875b..5111a71e 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -50,5 +50,3 @@ po/remove-potcdate.sin + po/stamp-po + po/*.gmo + po/remove-potcdate.sed +-# Generated/Updated by install.sh and autogen.sh +-po/LINGUAS diff --git a/data/man/meson.build b/data/man/meson.build new file mode 100644 index 00000000..1681e5cb @@ -21,11 +36,16 @@ @@ -0,0 +1 @@ +install_man('tilix') \ No newline at end of file +diff --git a/data/man/tilix b/data/man/tilix.1 +similarity index 100% +rename from data/man/tilix +rename to data/man/tilix.1 diff --git a/data/meson.build b/data/meson.build -index 4fdc6ea3..ab3242c7 100644 +index 4fdc6ea3..69571b54 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -2,13 +2,23 @@ +@@ -1,14 +1,26 @@ +- # install the icons install_data( 'icons/hicolor/scalable/apps/@[email protected]'.format(meson.project_name()), @@ -48,10 +68,13 @@ + install: true, + install_dir: appdir +) ++ ++# Install manual page ++install_man(['man/tilix.1']) # Validate desktop file desktop_file_validate = find_program('desktop-file-validate', required:false) -@@ -16,18 +26,18 @@ if desktop_file_validate.found() +@@ -16,18 +28,18 @@ if desktop_file_validate.found() test ( 'Validate desktop file', desktop_file_validate, @@ -78,7 +101,7 @@ ) # Validate AppData file -@@ -36,19 +46,10 @@ if appstream_util.found() +@@ -36,19 +48,10 @@ if appstream_util.found() test ( 'Validate appdata file', appstream_util, @@ -99,7 +122,7 @@ # Build resources gresource = gnome.compile_resources( 'tilix', -@@ -56,13 +57,13 @@ gresource = gnome.compile_resources( +@@ -56,13 +59,13 @@ gresource = gnome.compile_resources( gresource_bundle: true, install: true, source_dir: 'resources/', @@ -115,7 +138,7 @@ ) # Color schemes -@@ -77,28 +78,28 @@ install_data( +@@ -77,28 +80,28 @@ install_data( 'schemes/solarized-light.json', 'schemes/tango.json', ], @@ -150,11 +173,41 @@ - install_dir: join_paths(get_option('datadir'), 'dbus-1/services') + install_dir: datadir / 'dbus-1' / 'services' ) +diff --git a/data/scripts/install-man-pages.sh b/data/scripts/install-man-pages.sh +new file mode 100644 +index 00000000..ac354fa4 +--- /dev/null ++++ b/data/scripts/install-man-pages.sh +@@ -0,0 +1,24 @@ ++#!/bin/env sh ++ ++# Determine PREFIX. ++if [ -z "$1" ]; then ++ if [ -n "$PREFIX" ]; then ++ PREFIX='/usr' ++ fi ++else ++ PREFIX="$1" ++fi ++export PREFIX ++ ++echo "Installing man pages" ++install -Dm 644 'data/man/tilix' "$PREFIX/share/man/man1/tilix.1" ++gzip -f "$PREFIX/share/man/man1/tilix.1" ++ ++if type po4a-translate >/dev/null 2>&1; then ++ for f in data/man/po/*.man.po; do ++ LOCALE=$(basename "$f" .man.po) ++ install -d "$PREFIX/share/man/$LOCALE/man1" ++ po4a-translate -k 0 -f man -m data/man/tilix -p "data/man/po/$LOCALE.man.po" -l "$PREFIX/share/man/$LOCALE/man1/tilix.1" ++ gzip -f "$PREFIX/share/man/$LOCALE/man1/tilix.1" ++ done ++fi diff --git a/meson.build b/meson.build -index feff315a..0fcbe9cb 100644 +index feff315a..b83d72b3 100644 --- a/meson.build +++ b/meson.build -@@ -1,8 +1,9 @@ +@@ -1,20 +1,17 @@ project( 'com.gexperts.Tilix', 'd', - version: '1.8.5', @@ -166,7 +219,21 @@ ) compiler = meson.get_compiler('d') -@@ -24,84 +25,87 @@ endif + + message('Using compiler ' + compiler.get_id()) + +-if compiler.get_id() == 'gcc' +- error('Tilix can not be compiled with GDC at time, since the standard library version of all GDC versions is currently (2016) too old. Sorry.') +-endif +- +- if compiler.get_id() == 'llvm' +- extra_args = ['-vcolumns','-d-version=StdLoggerDisableTrace'] ++if compiler.get_id() == 'llvm' ++ extra_args = ['-vcolumns'] + d_link_args = [] + else + extra_args = [] +@@ -24,84 +21,88 @@ endif gnome = import('gnome') i18n = import('i18n') @@ -306,10 +373,23 @@ xlib_dep = dependency('x11') libunwind_dep = dependency('libunwind') -msgfmt = find_program('msgfmt') ++libsecret_dep = dependency('libsecret-1', required: false) subdir('po') subdir('data') -@@ -130,4 +134,4 @@ executable('tilix', +@@ -113,8 +114,10 @@ executable('tilix', + dependencies : [gtkd_dep, + vted_dep, + xlib_dep, +- libunwind_dep], ++ libunwind_dep, ++ libsecret_dep], + d_args: extra_args, ++ d_module_versions: ['StdLoggerDisableTrace'], + link_args: d_link_args, + install : true + ) +@@ -130,4 +133,4 @@ executable('tilix', #) #test('tilix_test', tilix_test_exe) @@ -370,5 +450,5 @@ +zh_TW \ No newline at end of file -- -2.21.0 +2.26.2
