Accepting request 760004 from home:luke_nukem:branches:X11:terminals

- Update to 0.4.0
  * Clean up spec file
  * Minimum rust version is now >= 1.36
  * Include the config example as documentation
  * Add _service file to enable easy updates of vendored sources
  * Include a README.suse-maint
- Added:
  * Block selection mode when Control is held while starting a selection
  * Allow setting general window class on X11 using CLI or config (window.class.general)
  * Config option window.gtk_theme_variant to set GTK theme variant
  * Completions for --class and -t (short title)
  * Change the mouse cursor when hovering over the message bar and its close button
  * Support combined bold and italic text (with font.bold_italic to customize it)
  * Extra bindings for F13-F20
  * Terminal escape bindings with combined modifiers
  * Bindings for ScrollToTop and ScrollToBottom actions
  * ReceiveChar key binding action to insert the key's text character
  * New CLI flag --hold for keeping Alacritty opened after its child process exits
  * Escape sequence to save and restore window title from stack
  * Alternate scroll escape sequence (CSI ? 1007 h / CSI ? 1007 l)
  * Print name of launch command if Alacritty failed to execute it
  * Live reload font settings from config
  * UTF-8 mouse mode escape sequence (CSI ? 1005 h / CSI ? 1005 l)
  * Escape for reading clipboard (OSC 52 ; <s / p / c> ; ? BEL)
  * Set selection clipboard (OSC 52 ; <s / p> ; <BASE64> BEL)
- Changed:
  * Scroll lines out of the visible region instead of deleting them when clearing the screen
- Fixed:
  * GUI programs launched by Alacritty starting in the background on X11
  * Text Cursor position when scrolling
  * Performance issues while resizing Alacritty
  * First unfullscreen action ignored on window launched in fullscreen mode
  * The window is now filled with the background color before displaying
  * Cells sometimes not getting cleared correctly
  * X11 clipboard hanging when mime type is set
  * Debug ref tests are now written to disk regardless of shutdown method
  * Cursor color setting with escape sequence
  * Override default bindings with subset terminal mode match
  * On Linux, respect fontconfig's embeddedbitmap configuration option
  * Selecting trailing tab with semantic expansion
  * URL parser incorrectly handling Markdown URLs and angled brackets
  * Intermediate bytes of CSI sequences not checked
  * Wayland clipboard integration
  * Use text mouse cursor when mouse mode is temporarily disabled with shift
  * Wayland primary selection clipboard not storing text when selection is stopped outside of the window
  * Block URL highlight while a selection is active
  * Bindings for Alt + F1-F12
  * Discard scrolling region escape with bottom above top
  * Opacity always applying to cells with their background color matching the teriminal background
  * Allow semicolons when setting titles using an OSC
  * Background always opaque on X11
  * Skipping redraws on PTY update
  * Not redrawing while resizing on Windows/macOS
  * Decorations none launching an invisible window on Windows
  * Alacritty turning transparent when opening another window on macOS with chunkwm
  * Startup mode Maximized having no effect on Windows
  * Inserting Emojis using Super+. or compose sequences on Windows
  * Change mouse cursor depending on mode with Wayland
  * Hide mouse cursor when typing if the mouse.hide_when_typing option is set on Wayland
  * Glitches when DPI changes on Windows
  * Crash when resuming after suspension
  * Crash when trying to start on X11 with a Wayland compositor running
  * Crash with a virtual display connected on X11
  * Use \ instead of \\ as path separators on Windows for logging config file location
  * Underline/strikeout drawn above visual bell
  * Terminal going transparent during visual bell
  * Selection not being cleared when sending chars through a binding
  * Mouse protocols/encodings not being mutually exclusive within themselves
  * Escape CSI Ps M deleting lines above cursor when at the bottom of the viewport
  * Cell reset not clearing underline, strikeout and foreground color
  * Escape CSI Ps c honored with a wrong Ps
  * Ignore ESC escapes with invalid intermediates
  * Blank lines after each line when pasting from GTK apps on Wayland
- Removed:
  * Bindings for Super/Command + F1-F12
  * Automatic config generation
  * Deprecated scrolling.faux_multiplier, the alternate scroll
    escape can now be used to disable it and scrolling.multiplier
    controls the number of scrolled lines

OBS-URL: https://build.opensuse.org/request/show/760004
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/alacritty?expand=0&rev=21

.gitattributes

@@ -21,5 +21,3 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
-## Specific LFS patterns
-alacritty.ico filter=lfs diff=lfs merge=lfs -text

README.suse-maint

@@ -0,0 +1,4 @@
+When a new tarball release is added you must run the obs service to
+update the vendored sources: obs service disabledrun
+
+In future OBS may be able to do this.

_service

@@ -0,0 +1,4 @@
+<services>
+  <service name="cargo_vendor" mode="disabled">
+  </service>
+</services>

alacritty-0.3.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f5af7e0d143bd2b89f029ad3e3d000d3ceb9922fbf189f7cfe3a59c9626d4519
-size 1347345

alacritty-0.4.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbc0da74f313a806efed02fa863eece4b422c52e24832b553cd8592832c591e3
+size 1522763

alacritty.changes

@@ -1,3 +1,86 @@
+-------------------------------------------------------------------
+Mon Dec 30 03:35:40 UTC 2019 - Luke Jones <luke@ljones.dev>
+
+- Update to 0.4.0
+  * Clean up spec file
+  * Minimum rust version is now >= 1.36
+  * Include the config example as documentation
+  * Add _service file to enable easy updates of vendored sources
+  * Include a README.suse-maint
+- Added:
+  * Block selection mode when Control is held while starting a selection
+  * Allow setting general window class on X11 using CLI or config (window.class.general)
+  * Config option window.gtk_theme_variant to set GTK theme variant
+  * Completions for --class and -t (short title)
+  * Change the mouse cursor when hovering over the message bar and its close button
+  * Support combined bold and italic text (with font.bold_italic to customize it)
+  * Extra bindings for F13-F20
+  * Terminal escape bindings with combined modifiers
+  * Bindings for ScrollToTop and ScrollToBottom actions
+  * ReceiveChar key binding action to insert the key's text character
+  * New CLI flag --hold for keeping Alacritty opened after its child process exits
+  * Escape sequence to save and restore window title from stack
+  * Alternate scroll escape sequence (CSI ? 1007 h / CSI ? 1007 l)
+  * Print name of launch command if Alacritty failed to execute it
+  * Live reload font settings from config
+  * UTF-8 mouse mode escape sequence (CSI ? 1005 h / CSI ? 1005 l)
+  * Escape for reading clipboard (OSC 52 ; <s / p / c> ; ? BEL)
+  * Set selection clipboard (OSC 52 ; <s / p> ; <BASE64> BEL)
+- Changed:
+  * Scroll lines out of the visible region instead of deleting them when clearing the screen
+- Fixed:
+  * GUI programs launched by Alacritty starting in the background on X11
+  * Text Cursor position when scrolling
+  * Performance issues while resizing Alacritty
+  * First unfullscreen action ignored on window launched in fullscreen mode
+  * The window is now filled with the background color before displaying
+  * Cells sometimes not getting cleared correctly
+  * X11 clipboard hanging when mime type is set
+  * Debug ref tests are now written to disk regardless of shutdown method
+  * Cursor color setting with escape sequence
+  * Override default bindings with subset terminal mode match
+  * On Linux, respect fontconfig's embeddedbitmap configuration option
+  * Selecting trailing tab with semantic expansion
+  * URL parser incorrectly handling Markdown URLs and angled brackets
+  * Intermediate bytes of CSI sequences not checked
+  * Wayland clipboard integration
+  * Use text mouse cursor when mouse mode is temporarily disabled with shift
+  * Wayland primary selection clipboard not storing text when selection is stopped outside of the window
+  * Block URL highlight while a selection is active
+  * Bindings for Alt + F1-F12
+  * Discard scrolling region escape with bottom above top
+  * Opacity always applying to cells with their background color matching the teriminal background
+  * Allow semicolons when setting titles using an OSC
+  * Background always opaque on X11
+  * Skipping redraws on PTY update
+  * Not redrawing while resizing on Windows/macOS
+  * Decorations none launching an invisible window on Windows
+  * Alacritty turning transparent when opening another window on macOS with chunkwm
+  * Startup mode Maximized having no effect on Windows
+  * Inserting Emojis using Super+. or compose sequences on Windows
+  * Change mouse cursor depending on mode with Wayland
+  * Hide mouse cursor when typing if the mouse.hide_when_typing option is set on Wayland
+  * Glitches when DPI changes on Windows
+  * Crash when resuming after suspension
+  * Crash when trying to start on X11 with a Wayland compositor running
+  * Crash with a virtual display connected on X11
+  * Use \ instead of \\ as path separators on Windows for logging config file location
+  * Underline/strikeout drawn above visual bell
+  * Terminal going transparent during visual bell
+  * Selection not being cleared when sending chars through a binding
+  * Mouse protocols/encodings not being mutually exclusive within themselves
+  * Escape CSI Ps M deleting lines above cursor when at the bottom of the viewport
+  * Cell reset not clearing underline, strikeout and foreground color
+  * Escape CSI Ps c honored with a wrong Ps
+  * Ignore ESC escapes with invalid intermediates
+  * Blank lines after each line when pasting from GTK apps on Wayland
+- Removed:
+  * Bindings for Super/Command + F1-F12
+  * Automatic config generation
+  * Deprecated scrolling.faux_multiplier, the alternate scroll
+    escape can now be used to disable it and scrolling.multiplier
+    controls the number of scrolled lines
+
 -------------------------------------------------------------------
 Mon Jul 22 13:15:34 UTC 2019 - Xu Zhao <i@xuzhao.net>
 
@@ -18,7 +101,7 @@ Mon Jul 22 13:15:34 UTC 2019 - Xu Zhao <i@xuzhao.net>
   * Default Window padding to 0x0
   * Moved config option render_timer and persistent_logging to the debug group
   * When the cursor is in the selection, it will be inverted again, making it visible
-  Fixed: 
+  Fixed:
   * Double-width characters in URLs only being highlit on the left half
   * PTY size not getting updated when message bar is shown
   * Text Cursor disappearing
@@ -29,7 +112,7 @@ Mon Jul 22 13:15:34 UTC 2019 - Xu Zhao <i@xuzhao.net>
   * URL parser dropping trailing slashes from valid URLs
   * UTF-8 BOM skipped when reading config file
   * Terminfo backspace escape sequence (kbs)
-  Removed:  
+  Removed:
   * Deprecated mouse.faux_scrollback_lines config field
   * Deprecated custom_cursor_colors config field
   * Deprecated hide_cursor_when_typing config field
@@ -59,7 +142,7 @@ Tue Apr 23 09:37:15 UTC 2019 - Dag Jönsson <dag@jnsson.eu>
   * Subprocess spawning on macros
   * Unnecessary resize at startup
   * Text getting blurry after live-reloading shaders with padding active
-  * Resize events are not send to the shell anymore if dimensions haven't 
+  * Resize events are not send to the shell anymore if dimensions haven't
     changed
   * Minor performance issues with underline and strikeout checks
   * Rare bug which would extend underline and strikeout beyond the end of line
@@ -74,21 +157,21 @@ Tue Apr  9 16:05:59 UTC 2019 - Dag Jönsson <dagjo270@student.liu.se>
 - upate to 0.3.0
   Added:
   * Ability to specify starting position with the --position flag
-  * New configuration field window.position allows specifying the starting 
+  * New configuration field window.position allows specifying the starting
     position
   * Added the ability to change the selection color
   * Text will reflow instead of truncating when resizing Alacritty
-  * Underline text and change cursor when hovering over URLs with required 
+  * Underline text and change cursor when hovering over URLs with required
-    modifiers pressed 
+    modifiers pressed
   Changed:
-  * Clicking on non-alphabetical characters in front of URLs will no longer 
+  * Clicking on non-alphabetical characters in front of URLs will no longer
     open them
   Fixed
   * Slow startup time on some X11 systems
   * On Wayland, the --title flag will set the Window title now
   * Fix start_maximized option on X11
   * Terminfo support for extended capabilities
-  * Crash when decreasing scrollback history in config while scrolled in 
+  * Crash when decreasing scrollback history in config while scrolled in
     history
   * Scrollback history live reload only working when shrinking lines
 - refresh vendor.tar.xz
@@ -150,7 +233,7 @@ Sat Jul 28 15:49:09 UTC 2018 - avindra@opensuse.org
 -------------------------------------------------------------------
 Wed Apr 25 11:33:09 UTC 2018 - guillaume.gardet@opensuse.org
 
-- Remove checksums for config.guess and config.sub for aarch64 
+- Remove checksums for config.guess and config.sub for aarch64
   and ppc64le since they are updated
 
 -------------------------------------------------------------------

alacritty.ico

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db373f294e00fa77c489ec459bb31948d821a5e3d12fccad2111072d5122cf9a
-size 350985

alacritty.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package alacritty
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,11 @@
 #
 
 
+# Use hardening ldflags.
+%global rustflags "-Clink-arg=-Wl,-z,relro,-z,now"
+
 Name:           alacritty
-Version:        0.3.3
+Version:        0.4.0
 Release:        0
 Summary:        A GPU-accelerated terminal emulator
 License:        Apache-2.0
@@ -25,15 +28,15 @@ Group:          System/X11/Terminals
 URL:            https://github.com/jwilm/alacritty/
 Source:         https://github.com/jwilm/alacritty/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.xz
-Source2:        alacritty.ico
+Source2:        cargo_config
+Source3:        README.suse-maint
 BuildRequires:  cargo
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  freetype-devel
-BuildRequires:  icoutils
 BuildRequires:  libxcb-devel
 BuildRequires:  pkgconfig
-BuildRequires:  rust
+BuildRequires:  rust >= 1.36
 BuildRequires:  update-desktop-files
 BuildRequires:  xclip
 BuildRequires:  pkgconfig(fontconfig)
@@ -72,17 +75,9 @@ BuildArch:      noarch
 The official zsh completion script for alacritty.
 
 %prep
-%setup -q -a1
+%setup -qa1
-cp --remove-destination %{S:2} extra/windows/
+mkdir .cargo
-icotool -x -i 1 extra/windows/alacritty.ico -o extra/windows/alacritty.png
+cp %{SOURCE2} .cargo/config
-mkdir cargo-home
-cat >cargo-home/config <<EOF
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "./vendor"
-EOF
 
 %ifarch aarch64 ppc64le
 # Remove checksum of config.guess and config.sub since aarch64 and ppc64le modify them
@@ -91,20 +86,20 @@ sed -i 's#"expat/conftools/config.sub":"523cb028db907d1fbbcecdcac6737f9e2eeba48f
 %endif
 
 %build
-export CARGO_HOME=$PWD/cargo-home
+RUSTFLAGS=%{rustflags} cargo build --release --bin alacritty
-cargo build --release %{?_smp_mflags}
 
 %install
-export CARGO_HOME=$PWD/cargo-home
+mkdir -p "%{buildroot}%{_bindir}"
-cargo install --root=%{buildroot}%{_prefix} --path=./alacritty
+install -D -m 0755 target/release/alacritty %{buildroot}%{_bindir}/alacritty
 
 # rm duplicate license and useless toml file
 rm -fr %{buildroot}%{_datadir}
-rm  %{buildroot}%{_prefix}/.crates.toml
 
 # install man page and completions
 install -Dm 0644 extra/linux/alacritty.desktop %{buildroot}/%{_datadir}/applications/Alacritty.desktop
-install -Dm 0644 extra/windows/alacritty.png %{buildroot}/%{_datadir}/pixmaps/Alacritty.png
+install -Dm 0644 extra/logo/alacritty-simple.svg %{buildroot}/%{_datadir}/pixmaps/Alacritty.svg
+install -Dm 0644 extra/linux/io.alacritty.Alacritty.appdata.xml \
+                 %{buildroot}/%{_datadir}/appdata/io.alacritty.Alacritty.appdata.xml
 install -Dm 0644 extra/%{name}.man %{buildroot}/%{_mandir}/man1/%{name}.1
 install -Dm 0644 extra/completions/%{name}.bash %{buildroot}/%{_datadir}/bash-completion/completions/%{name}
 install -Dm 0644 extra/completions/%{name}.fish %{buildroot}/%{_datadir}/fish/vendor_completions.d/%{name}.fish
@@ -117,10 +112,12 @@ install -Dm 0644 extra/completions/_%{name}  %{buildroot}/%{_datadir}/zsh/site-f
 
 %files
 %license LICENSE-APACHE
+%doc alacritty.yml CHANGELOG.md CONTRIBUTING.md README.md
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1%{?ext_man}
 %{_datadir}/applications/Alacritty.desktop
-%{_datadir}/pixmaps/Alacritty.png
+%{_datadir}/pixmaps/Alacritty.svg
+%{_datadir}/appdata/io.alacritty.Alacritty.appdata.xml
 
 %files bash-completion
 %{_datadir}/bash-completion

cargo_config

@@ -0,0 +1,15 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."https://github.com/chrisduerr/glutin"]
+git = "https://github.com/chrisduerr/glutin"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-windowing/winit"]
+git = "https://github.com/rust-windowing/winit"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"

vendor.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9e7cfc01cdd2ac166d1635f6e72b3af8c4470084a15f325df8b5a5629e4f90f
+oid sha256:fca371d8a6f5b415196463bd20dd1ae104f3a902d6b70a01767a572bd5f7455c
-size 14842684
+size 15217592