From 2adcc5dca5a2c0b0b10208700641c1c1b7140554 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 25 Dec 2017 16:05:09 +0000
Subject: WinGui: Toolbar Consistency #833

---
 win/CS/HandBrakeWPF/Views/MainView.xaml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 9d6e28452..f4fffe924 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -179,20 +179,6 @@
 
                 </Button>
 
-                <Button Name="ShowQueue" AutomationProperties.Name="Show Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
-                    <StackPanel Orientation="Horizontal">
-                        <Image Width="32"
-                               Height="32"
-                               SnapsToDevicePixels="True"
-                               Source="Images/Queue_small.png"/>
-                        <Label Margin="8,0,0,0"
-                               VerticalAlignment="Center"
-                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_ShowQueue}'}"/>
-                    </StackPanel>
-                </Button>
-
-                <Separator />
-
                 <Button Name="Start" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_StartEncode}"
                         cal:Message.Attach="[Event Click] = [Action StartEncode]"
                         Visibility="{Binding IsEncoding,
@@ -242,7 +228,19 @@
 
                 <Separator />
 
-                <Button Name="Preview" AutomationProperties.Name="Preview Encode" cal:Message.Attach="[Event Click] = [Action OpenPreviewWindow]" >
+                <Button Name="ShowQueue" AutomationProperties.Name="Show Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               SnapsToDevicePixels="True"
+                               Source="Images/Queue_small.png"/>
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_ShowQueue}'}"/>
+                    </StackPanel>
+                </Button>
+
+                <Button Name="Preview" AutomationProperties.Name="Preview Picture Preview Window" cal:Message.Attach="[Event Click] = [Action OpenPreviewWindow]" >
                     <StackPanel Orientation="Horizontal">
                         <Image Width="32"
                                Height="32"
@@ -250,7 +248,7 @@
                                Source="Images/picture_small.png"/>
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="Preview"/>
+                               Content="{x:Static Properties:ResourcesUI.MainView_ShowPreview}"/>
                     </StackPanel>
                 </Button>
 
-- 
cgit v1.2.3


From 903ceebfcd0eb6cd8b4c6651b3ec93520c25d18e Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 25 Dec 2017 16:05:52 +0000
Subject: WinGui: Toolbar Consistency pt2 #833

---
 .../Subtitles/CanBurnSubtitleConverter.cs          | 47 ++++++++++++++++++++++
 .../Properties/ResourcesUI.Designer.cs             |  9 +++++
 win/CS/HandBrakeWPF/Properties/ResourcesUI.resx    |  3 ++
 3 files changed, 59 insertions(+)
 create mode 100644 win/CS/HandBrakeWPF/Converters/Subtitles/CanBurnSubtitleConverter.cs

diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/CanBurnSubtitleConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/CanBurnSubtitleConverter.cs
new file mode 100644
index 000000000..36bd40892
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Converters/Subtitles/CanBurnSubtitleConverter.cs
@@ -0,0 +1,47 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="CanBurnSubtitleConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Subtitle Behaviour Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Subtitles
+{
+    using System;
+    using System.Globalization;
+    using System.Windows.Data;
+
+    using HandBrakeWPF.Services.Encode.Model;
+    using HandBrakeWPF.Services.Encode.Model.Models;
+
+    public class CanBurnSubtitleConverter : IMultiValueConverter
+    {
+     
+
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length >= 1)
+            {
+                bool sourceTrackCanBurn = (bool)values[0];
+                SubtitleType type = (SubtitleType)values[1];
+                EncodeTask task = values[2] as EncodeTask;
+
+                if (task != null && OutputFormat.Mp4.Equals(task.OutputFormat) && SubtitleType.PGS.Equals(type))
+                {
+                    return false;
+                }
+
+                return sourceTrackCanBurn;
+            }
+
+            return true;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 089502218..4868b37f5 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1005,6 +1005,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show Preview.
+        /// </summary>
+        public static string MainView_ShowPreview {
+            get {
+                return ResourceManager.GetString("MainView_ShowPreview", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show Queue.
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 0b8c69afa..8379ecb7d 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -1019,4 +1019,7 @@ This will not affect your current settings in the Subtitle tab.</value>
   <data name="MainView_SaveNewPreset" xml:space="preserve">
     <value>Save New Preset</value>
   </data>
+  <data name="MainView_ShowPreview" xml:space="preserve">
+    <value>Show Preview</value>
+  </data>
 </root>
\ No newline at end of file
-- 
cgit v1.2.3


From 0ee7c489ca5c0408877d304b65cb1d92160af807 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 25 Dec 2017 16:06:19 +0000
Subject: WinGui: Disable Subtitle Burn In Checkbox for PGS + MP4 #1077

---
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj                     |  1 +
 .../Services/Encode/Model/Models/SubtitleTrack.cs           |  4 +++-
 win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs        |  2 +-
 win/CS/HandBrakeWPF/Views/SubtitlesView.xaml                | 13 +++++++++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index dea2d44d0..0e2d5c5ea 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -162,6 +162,7 @@
     <Compile Include="Converters\OptionTabConverter.cs" />
     <Compile Include="Converters\PresetsMenuConverter.cs" />
     <Compile Include="Converters\Queue\PictureSettingsDescConveter.cs" />
+    <Compile Include="Converters\Subtitles\CanBurnSubtitleConverter.cs" />
     <Compile Include="Converters\Subtitles\SubtitleBurnInBehaviourConverter.cs" />
     <Compile Include="Converters\Subtitles\SubtitleBehaviourConverter.cs" />
     <Compile Include="Converters\Video\VideoOptionsTooltipConverter.cs" />
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
index d29709310..e481907bb 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
@@ -171,8 +171,10 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
                 if (this.sourceTrack != null)
                 {
                     this.Track = this.sourceTrack.ToString();
+                    this.SubtitleType = this.sourceTrack.SubtitleType;
                 }
-
+                
+                this.NotifyOfPropertyChange(() => this.SubtitleType);
                 this.NotifyOfPropertyChange(() => this.CanBeBurned);
                 this.NotifyOfPropertyChange(() => this.CanBeForced);
 
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index c05fda5e5..bc8ba1ce2 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -576,7 +576,7 @@ namespace HandBrakeWPF.ViewModels
 
             SubtitleTrack track = new SubtitleTrack
                                       {
-                                          SubtitleType = SubtitleType.VobSub,
+                                          SubtitleType = source.SubtitleType,
                                           SourceTrack = source,
                                       };
 
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 2268d5aaa..2d4d7492d 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -10,12 +10,14 @@
              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"
              xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+             xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"
              d:DesignHeight="350"
              d:DesignWidth="500"
              mc:Ignorable="d"
              x:Name="subTab">
     <UserControl.Resources>
         <Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />
+        <subtitles:CanBurnSubtitleConverter x:Key="canBurnSubtitleConverter" />
 
         <Style x:Key="LongToolTip" TargetType="TextBlock">
             <Setter Property="Width" Value="400" />
@@ -102,7 +104,7 @@
 
         <!-- Row 2 -->
         <ListBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
-                 Margin="10,10,10,10"
+                 Margin="10,10,10,10" x:Name="subtitleListBox"
                  dd:DragDrop.DropHandler="{Binding}"
                  dd:DragDrop.IsDragSource="True"
                  dd:DragDrop.IsDropTarget="True"
@@ -175,7 +177,14 @@
                             <CheckBox Grid.Column="3" Margin="5,0,5,0" VerticalAlignment="Center" IsEnabled="{Binding CanBeForced}" IsChecked="{Binding Forced}" />
                             
                             <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Burn In" />
-                            <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}">
+                            <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" x:Name="burnInCheckbox">
+                                <CheckBox.IsEnabled>
+                                    <MultiBinding Converter="{StaticResource canBurnSubtitleConverter}">
+                                        <Binding Path="CanBeBurned" />
+                                        <Binding Path="SubtitleType" />
+                                        <Binding ElementName="subtitleListBox" Path="DataContext.Task"  />
+                                    </MultiBinding>
+                                </CheckBox.IsEnabled>
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
                                         <cal:ActionMessage MethodName="SetBurnedToFalseForAllExcept">
-- 
cgit v1.2.3


From de47c6c4b9198c951a3160802158aa1c0beff604 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 25 Dec 2017 17:01:17 +0000
Subject: WinGui: Display Source Names in the Title Dropdown (only when open),
 when we are not scanning a DVD / Bluray.

---
 win/CS/HandBrakeWPF/Services/Scan/LibScan.cs     |  3 +-
 win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs | 50 ++++++++++++++++++++++++
 win/CS/HandBrakeWPF/Views/MainView.xaml          | 24 +++++++++---
 3 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
index beceb9361..7558bc163 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
@@ -388,7 +388,8 @@ namespace HandBrakeWPF.Services.Scan
                         MainTitle = titles.MainFeature == title.Index,
                         Playlist = title.Type == 1 ? string.Format(" {0:d5}.MPLS", title.Playlist).Trim() : null,
                         FramerateNumerator = title.FrameRate.Num,
-                        FramerateDenominator = title.FrameRate.Den
+                        FramerateDenominator = title.FrameRate.Den,
+                        Type = title.Type
                     };
 
                 int currentTrack = 1;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
index 32fddb36d..e60520fa7 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
@@ -11,10 +11,14 @@ namespace HandBrakeWPF.Services.Scan.Model
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using System.Linq;
 
     using HandBrake.ApplicationServices.Interop.Model;
 
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.Utilities;
+
     /// <summary>
     /// An object that represents a single Title of a DVD
     /// </summary>
@@ -123,6 +127,52 @@ namespace HandBrakeWPF.Services.Scan.Model
         /// </summary>
         public string SourceName { get; set; }
 
+        public string SourceDisplayName
+        {
+            get
+            {
+                switch (this.Type)
+                {
+                    case 0: // HB_DVD_TYPE
+                    case 1: // HB_BD_TYPE
+                    default:
+                        return string.Empty;
+                    case 2: // HB_STREAM_TYPE
+                    case 3: // HB_FF_STREAM_TYPE
+                        return Path.GetFileNameWithoutExtension(this.SourceName);
+                }
+            }
+        }
+
+        public string ItemDisplayText
+        {
+            get
+            {
+                return string.Format(
+                    "{0}{1} ({2:00}:{3:00}:{4:00}) {5}",
+                    this.TitleNumber,
+                    this.Playlist,
+                    this.Duration.Hours,
+                    this.Duration.Minutes,
+                    this.Duration.Seconds,
+                    this.SourceDisplayName);
+            }
+        }
+
+        public string ItemDisplayTextClosed
+        {
+            get
+            {
+                return string.Format(
+                    "{0}{1} ({2:00}:{3:00}:{4:00})",
+                    this.TitleNumber,
+                    this.Playlist,
+                    this.Duration.Hours,
+                    this.Duration.Minutes,
+                    this.Duration.Seconds);
+            }
+        }
+
         #endregion
 
         /// <summary>
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index f4fffe924..d8e7a27fa 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -304,11 +304,25 @@
                 <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="0,5,0,0">
                     <Label FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />
                     <ComboBox Name="Titles"
-                                  MinWidth="100"
-                                  Margin="17,0,0,0"
-                                  ItemsSource="{Binding ScannedSource.Titles}"
-                                  ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Title}"
-                                  SelectedItem="{Binding Path=SelectedTitle}" />
+                             Width="160"
+                             Margin="17,0,0,0"
+                             ItemsSource="{Binding ScannedSource.Titles}"
+                             ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Title}"
+                             SelectedItem="{Binding Path=SelectedTitle}" >
+
+                        <ComboBox.Style>
+                            <Style TargetType="{x:Type ComboBox}">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Path=IsDropDownOpen, ElementName=Titles}" Value="True">
+                                        <Setter Property="DisplayMemberPath" Value="ItemDisplayText" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding Path=IsDropDownOpen, ElementName=Titles}" Value="False">
+                                        <Setter Property="DisplayMemberPath" Value="ItemDisplayTextClosed" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ComboBox.Style>
+                    </ComboBox>
                     <Label Margin="8,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Angle}" />
 
                     <ComboBox Name="Angles"
-- 
cgit v1.2.3


From d14af8b6d840ddf620a997f8c08a9af1cc1ac86e Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Tue, 26 Dec 2017 16:17:46 -0500
Subject: scripts: Fix sudo invocation in mac-toolchain-build.

---
 scripts/mac-toolchain-build | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/mac-toolchain-build b/scripts/mac-toolchain-build
index fff0ac57f..b175b61c1 100755
--- a/scripts/mac-toolchain-build
+++ b/scripts/mac-toolchain-build
@@ -27,7 +27,7 @@ mkdir -p "${PREFIX}" >/dev/null 2>&1
 if [[ ! -w "${PREFIX}" ]]; then
     if ! sudo -n date >/dev/null 2>&1; then
         echo "sudo is required to install files to ${PREFIX}"
-        sudo -v
+        [[ "${SUDO}" != "" ]] && ${SUDO} -v
     fi
     sudo mkdir -p "${PREFIX}" >/dev/null 2>&1
     if sudo touch "${PREFIX}" >/dev/null 2>&1; then
@@ -71,7 +71,7 @@ printf "Downloading [%02i/%02i] complete.\n" "${TOTAL}" "${TOTAL}"
 # autoconf
 cd "${TEMP_DIR}"
 printf "Building    [%02i/%02i] %s" "1" "${TOTAL}" "autoconf 2.69"
-sudo -v
+[[ "${SUDO}" != "" ]] && ${SUDO} -v
 tar -xf autoconf-2.69.tar.gz >/dev/null 2>&1 || print_fail_and_exit
 cd autoconf-2.69 >/dev/null 2>&1 || print_fail_and_exit
 ./configure --prefix="${PREFIX}" >../autoconf-2.69.log 2>&1 || print_fail_and_exit
@@ -82,7 +82,7 @@ echo -en "${CREL}"
 # automake
 cd "${TEMP_DIR}"
 printf "Building    [%02i/%02i] %s" "2" "${TOTAL}" "automake 1.15.1"
-sudo -v
+[[ "${SUDO}" != "" ]] && ${SUDO} -v
 tar -xf automake-1.15.1.tar.gz >/dev/null 2>&1 || print_fail_and_exit
 cd automake-1.15.1 >/dev/null 2>&1 || print_fail_and_exit
 ./configure --prefix="${PREFIX}" >../automake-1.15.1.log 2>&1 || print_fail_and_exit
@@ -93,7 +93,7 @@ echo -en "${CREL}"
 # cmake
 cd "${TEMP_DIR}"
 printf "Building    [%02i/%02i] %s\n" "3" "${TOTAL}" "cmake 3.9.6"
-sudo -v
+[[ "${SUDO}" != "" ]] && ${SUDO} -v
 echo "You may safely dismiss and ignore any prompt to install Java."
 tar -xf cmake-3.9.6.tar.gz >/dev/null 2>&1 || print_fail_and_exit
 cd cmake-3.9.6 >/dev/null 2>&1 || print_fail_and_exit
@@ -104,7 +104,7 @@ ${SUDO} make install >../cmake-3.9.6.log 2>&1 || print_fail_and_exit
 # libtool
 cd "${TEMP_DIR}"
 printf "Building    [%02i/%02i] %s" "4" "${TOTAL}" "libtool 2.4.6"
-sudo -v
+[[ "${SUDO}" != "" ]] && ${SUDO} -v
 tar -xf libtool-2.4.6.tar.gz >/dev/null 2>&1 || print_fail_and_exit
 cd libtool-2.4.6 >/dev/null 2>&1 || print_fail_and_exit
 ./configure --prefix="${PREFIX}" >../libtool-2.4.6.log 2>&1 || print_fail_and_exit
@@ -115,7 +115,7 @@ echo -en "${CREL}"
 # pkg-config
 cd "${TEMP_DIR}"
 printf "Building    [%02i/%02i] %s" "5" "${TOTAL}" "pkg-config 0.29.2"
-sudo -v
+[[ "${SUDO}" != "" ]] && ${SUDO} -v
 tar -xf pkg-config-0.29.2.tar.gz >/dev/null 2>&1 || print_fail_and_exit
 cd pkg-config-0.29.2 >/dev/null 2>&1 || print_fail_and_exit
 ./configure --prefix="${PREFIX}" --with-internal-glib --disable-host-tool >../pkg-config-0.29.2.log 2>&1 || print_fail_and_exit
@@ -126,7 +126,7 @@ echo -en "${CREL}"
 # yasm
 cd "${TEMP_DIR}"
 printf "Building    [%02i/%02i] %s" "6" "${TOTAL}" "yasm 1.3.0"
-sudo -v
+[[ "${SUDO}" != "" ]] && ${SUDO} -v
 tar -xf yasm-1.3.0.tar.gz >/dev/null 2>&1 || print_fail_and_exit
 cd yasm-1.3.0 >/dev/null 2>&1 || print_fail_and_exit
 ./configure --prefix="${PREFIX}" >../yasm-1.3.0.log 2>&1 || print_fail_and_exit
-- 
cgit v1.2.3


From 7ce5d9ccebbfafc453eaaf04f7c2c6cb0bf441a0 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Tue, 26 Dec 2017 12:28:25 -0500
Subject: contrib: Add universal archiver command for combining x265 libs.

Resolves an issue with GNU vs system libtool on Mac, which also does not support ar -M.
---
 contrib/x265/module.defs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index 78a5cb054..65ec70516 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -42,19 +42,15 @@ X265.SOURCE.libs = \
 	$(X265.BUILD.dir)/10bit/libx265_main10.a \
 	$(X265.BUILD.dir)/12bit/libx265_main12.a
 
-ifeq (darwin, $(BUILD.system))
-    define X265.LINK
-        libtool -static -o $@ $(X265.SOURCE.libs)
-    endef
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    X265.O.ext = .obj
 else
-    X265.arscript = $(X265.BUILD.dir)/script.ar
-    define X265.LINK
-        echo "CREATE $@" > $(X265.arscript)
-        for a in $(X265.SOURCE.libs); do \
-            (echo "ADDLIB $$a" >> $(X265.arscript)); \
-        done
-        echo "SAVE" >> $(X265.arscript)
-        echo "END" >> $(X265.arscript)
-        $(AR.exe) -M < $(X265.arscript)
-    endef
+    X265.O.ext = .o
 endif
+
+define X265.LINK
+    for a in $(X265.SOURCE.libs); do \
+        ($(RM.exe) -rf "$$a"_o && $(MKDIR.exe) -p "$$a"_o && $(AR.exe) x "$$a" && $(MV.exe) *$(X265.O.ext) "$$a"_o && $(AR.exe) cq $@ "$$a"_o/*$(X265.O.ext)); \
+    done
+    $(AR.exe) s $@
+endef
-- 
cgit v1.2.3


From c53403c3ff6b1551af0fdcf933fbb2cb4d62ba8c Mon Sep 17 00:00:00 2001
From: John Stebbins <jstebbins.hb@gmail.com>
Date: Tue, 26 Dec 2017 13:42:59 -0800
Subject: LinGui: remove unused icon files

---
 gtk/src/hb-activity.svg  |  19 ----
 gtk/src/hb-add-queue.svg |  21 -----
 gtk/src/hb-complete.svg  | 112 ------------------------
 gtk/src/hb-edit.svg      | 129 ---------------------------
 gtk/src/hb-pause.svg     | 140 -----------------------------
 gtk/src/hb-picture.svg   |  14 ---
 gtk/src/hb-remove.svg    | 223 -----------------------------------------------
 gtk/src/hb-showqueue.svg |  22 -----
 gtk/src/hb-source.svg    |  16 ----
 gtk/src/hb-start.svg     | 144 ------------------------------
 gtk/src/hb-stop.svg      | 151 --------------------------------
 11 files changed, 991 deletions(-)
 delete mode 100644 gtk/src/hb-activity.svg
 delete mode 100644 gtk/src/hb-add-queue.svg
 delete mode 100644 gtk/src/hb-complete.svg
 delete mode 100644 gtk/src/hb-edit.svg
 delete mode 100644 gtk/src/hb-pause.svg
 delete mode 100644 gtk/src/hb-picture.svg
 delete mode 100644 gtk/src/hb-remove.svg
 delete mode 100644 gtk/src/hb-showqueue.svg
 delete mode 100644 gtk/src/hb-source.svg
 delete mode 100644 gtk/src/hb-start.svg
 delete mode 100644 gtk/src/hb-stop.svg

diff --git a/gtk/src/hb-activity.svg b/gtk/src/hb-activity.svg
deleted file mode 100644
index 13f719a19..000000000
--- a/gtk/src/hb-activity.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="33" y1="10" x2="33" y2="58">
-	<stop  offset="0" style="stop-color:#595959"/>
-	<stop  offset="1" style="stop-color:#333333"/>
-</linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M48.019,38c5.521,0,10,4.478,10,10s-4.479,10-10,10
-	c-5.523,0-10-4.478-10-10S42.495,38,48.019,38z M46,55h4v-8h-4V55z M45.86,43c0,1.182,0.958,2.14,2.14,2.14s2.14-0.958,2.14-2.14
-	c0-1.183-0.958-2.141-2.14-2.141S45.86,41.817,45.86,43z M47.984,36c-6.628,0-12,5.373-12,12c0,3.078,1.168,5.876,3.073,8H12
-	c-2,0-4-2-4-4c0,0,0-38,0-38.022C8,11.953,10,10,12,10h40c2,0,4,2,4,4v25.089C53.874,37.175,51.069,36,47.984,36z M14,16h4v-2h-4V16
-	z M20,16h2v-2h-2V16z M26,16h8v-2h-8V16z M36,16h4v-2h-4V16z M14,22h4v-2h-4V22z M20,22h6v-2h-6V22z M26,26h6c0,0,0-1.334,0-2
-	c-2,0-6,0-6,0V26z M14,26h6v-2h-6V26z M22,26h2v-2h-2V26z M14,36h6v-2h-6V36z M14,32h4v-2h-4V32z M20,32h8v-2h-8V32z M32,32h4v-2h-4
-	V32z M30,22h6v-2h-6V22z M36,36h2v-2h-2V36z M14,42h2v-2h-2V42z M20,42h12v-2H20V42z M14,46h4v-2h-4V46z M20,46h2v-2h-2V46z M24,46
-	h8v-2h-8V46z M14,52h12v-2H14V52z M38,32h10v-2H38V32z M28,36h4v-2h-4V36z M36,26h8v-2h-8V26z M24,36h2v-2h-2V36z M38,22h4v-2h-4V22
-	z M44,22h4v-2h-4V22z M30,52h2v-2h-2V52z M46,26h4v-2h-4V26z M44,16h6v-2h-6V16z"/>
-</svg>
diff --git a/gtk/src/hb-add-queue.svg b/gtk/src/hb-add-queue.svg
deleted file mode 100644
index 2cef9973b..000000000
--- a/gtk/src/hb-add-queue.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="48px" height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48.007 48" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24" y1="6" x2="24" y2="43.5">
-	<stop  offset="0" style="stop-color:#595959"/>
-	<stop  offset="1" style="stop-color:#333333"/>
-</linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M39.005,27.004v-2.251c0,0,0-9.001,0-9.741
-	s-0.75-1.51-1.5-1.51c-0.75,0-26.254,0-27.004,0s-1.5,0.75-1.5,1.5c0,0.75,0,18.752,0,19.502s0.75,1.5,1.5,1.5h19.491l0,0
-	c0,1.054,0.19,2.061,0.523,3c-4.166,0-20.21,0-21.514,0c-1.5,0-3-1.5-3-3c0-1.5,0-3,0-3H4.5c-1.5,0-3-1.5-3-3
-	c0-1.5,0-19.503,0-21.003c0-1.5,1.5-3,3-3c1.5,0,27.004,0,28.504,0c1.5,0,3,1.5,3,3v1.5c0,0,1.5,0,3,0c1.5,0,3,1.5,3,3
-	c0,1.255,0,10.91,0,14.03C41.066,27.197,40.06,27.006,39.005,27.004z M33.004,10.501c0-0.75-0.75-1.5-1.5-1.5s-24.753,0-25.503,0
-	c-0.75,0-1.5,0.75-1.5,1.5c0,0.75,0,17.252,0,18.002c0,0.75,0.75,1.5,1.5,1.5V13.502c0-1.5,1.5-3,3-3H33.004z M15.565,27.006
-	l3.188,2.998l3.75-6.001l4.501,4.5l6-10.501l4.501,7.501c0,0,0,0.681,0,1.633c-3.772,0.629-6.744,3.597-7.378,7.368
-	c-7.537,0-19.626,0-19.626,0L15.565,27.006z M16.509,15.752c2.071,0,3.75,1.679,3.75,3.75s-1.679,3.75-3.75,3.75
-	c-2.072,0-3.751-1.679-3.751-3.75S14.438,15.752,16.509,15.752z M39.019,28.504c4.143,0,7.501,3.358,7.501,7.501
-	c0,4.143-3.358,7.501-7.501,7.501c-4.143,0-7.501-3.358-7.501-7.501C31.518,31.862,34.876,28.504,39.019,28.504z M43.506,37.505h-3
-	v3h-3v-3h-3v-3h3v-3h3v3h3V37.505z"/>
-</svg>
diff --git a/gtk/src/hb-complete.svg b/gtk/src/hb-complete.svg
deleted file mode 100644
index 9ac9261fa..000000000
--- a/gtk/src/hb-complete.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="63.923908"
-   height="63.937237"
-   sodipodi:docname="hb-complete.16.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       id="linearGradient3781">
-      <stop
-         style="stop-color:#1bbf00;stop-opacity:1;"
-         offset="0"
-         id="stop3783" />
-      <stop
-         style="stop-color:#98ff87;stop-opacity:1;"
-         offset="1"
-         id="stop3785" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3781"
-       id="radialGradient3787"
-       cx="38.502785"
-       cy="21.131025"
-       fx="38.502785"
-       fy="21.131025"
-       r="19.893009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.853633,-0.85991642,0.72456011,0.69956651,-7.5185257,44.001085)" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2962"
-     inkscape:window-height="1266"
-     id="namedview4"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="14.75"
-     inkscape:cx="21.380388"
-     inkscape:cy="31.484599"
-     inkscape:window-x="66"
-     inkscape:window-y="248"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#1bbf00;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="path2987"
-     sodipodi:cx="44.305084"
-     sodipodi:cy="19.966103"
-     sodipodi:rx="19.830509"
-     sodipodi:ry="19.830509"
-     d="m 64.135593,19.966103 a 19.830509,19.830509 0 1 1 -39.661018,0 19.830509,19.830509 0 1 1 39.661018,0 z"
-     transform="matrix(1.6086049,0,0,1.608941,-39.307421,-0.1556618)" />
-  <path
-     transform="matrix(1.4482315,0,0,1.475884,-32.269855,2.4331712)"
-     d="m 64.135593,19.966103 a 19.830509,19.830509 0 1 1 -39.661018,0 19.830509,19.830509 0 1 1 39.661018,0 z"
-     sodipodi:ry="19.830509"
-     sodipodi:rx="19.830509"
-     sodipodi:cy="19.966103"
-     sodipodi:cx="44.305084"
-     id="path3779"
-     style="fill:url(#radialGradient3787);fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     sodipodi:type="arc" />
-  <text
-     xml:space="preserve"
-     style="font-size:62.36872864px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fefefe;fill-opacity:1;stroke:none;font-family:Sans"
-     x="8.7644606"
-     y="54.63208"
-     id="text2991"
-     sodipodi:linespacing="125%"
-     transform="scale(0.96989628,1.0310381)"><tspan
-       sodipodi:role="line"
-       id="tspan2993"
-       x="8.7644606"
-       y="54.63208">✔</tspan></text>
-</svg>
diff --git a/gtk/src/hb-edit.svg b/gtk/src/hb-edit.svg
deleted file mode 100644
index 448dddebe..000000000
--- a/gtk/src/hb-edit.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="64.001312"
-   height="63.998154"
-   sodipodi:docname="hb-edit.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1950"
-     inkscape:window-height="1362"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="7.375"
-     inkscape:cx="39.136957"
-     inkscape:cy="20.379049"
-     inkscape:window-x="798"
-     inkscape:window-y="276"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <g
-     id="g3801"
-     transform="matrix(0.91171267,-0.93439754,0.91171267,0.93439754,93.115545,15.138005)">
-    <path
-       sodipodi:type="star"
-       style="fill:#000000;fill-opacity:0.38823529;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3023"
-       sodipodi:sides="3"
-       sodipodi:cx="-52.610168"
-       sodipodi:cy="-20.745764"
-       sodipodi:r1="7.5944309"
-       sodipodi:r2="3.7972155"
-       sodipodi:arg1="3.1237374"
-       sodipodi:arg2="4.170935"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m -60.203389,-20.61017 11.272403,-6.779312 0.234855,13.151843 z"
-       inkscape:transform-center-x="2.8373957"
-       inkscape:transform-center-y="-0.084402081"
-       transform="matrix(1.5424065,0,0,1.2449419,16.819863,1.8438764)" />
-    <rect
-       style="fill:#000000;fill-opacity:0.38823529;stroke:#7d7d80;stroke-width:0.04319459;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3021"
-       width="42.531689"
-       height="16.147442"
-       x="-58.539501"
-       y="-32.141743" />
-    <g
-       transform="translate(4.20339,-20.067796)"
-       id="g3013">
-      <rect
-         style="fill:#6476ae;fill-opacity:1;stroke:#7d7d80;stroke-width:0.03759439;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3003"
-         width="40.129009"
-         height="12.964183"
-         x="-64.060852"
-         y="-11.9738" />
-      <path
-         sodipodi:type="star"
-         style="fill:#e07373;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path3007"
-         sodipodi:sides="3"
-         sodipodi:cx="-52.610168"
-         sodipodi:cy="-20.745764"
-         sodipodi:r1="7.5944309"
-         sodipodi:r2="3.7972155"
-         sodipodi:arg1="3.1237374"
-         sodipodi:arg2="4.170935"
-         inkscape:flatsided="true"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m -60.203389,-20.61017 11.272403,-6.779312 0.234855,13.151843 z"
-         inkscape:transform-center-x="2.677108"
-         inkscape:transform-center-y="-0.067763776"
-         transform="matrix(1.4552737,0,0,0.99951775,7.2302233,15.311997)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#6476ae;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path3009"
-         sodipodi:cx="-61.084747"
-         sodipodi:cy="-19.050848"
-         sodipodi:rx="2.1016948"
-         sodipodi:ry="2.1016948"
-         d="m -58.983052,-19.050848 c 0,1.160734 -0.940961,2.101695 -2.101695,2.101695 -1.160734,0 -2.101695,-0.940961 -2.101695,-2.101695 0,-1.160734 0.940961,-2.101695 2.101695,-2.101695 1.160734,0 2.101695,0.940961 2.101695,2.101695 z"
-         transform="matrix(1.1400463,0,0,0.86093756,-8.0940607,10.93816)" />
-      <path
-         style="fill:#373737;fill-opacity:1;stroke:#7d7d80;stroke-width:0.00420339;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -78.689016,-3.8783433 c -0.542991,-0.168577 -1.233888,-0.857088 -1.32702,-1.322437 -0.202401,-1.011322 0.879053,-1.925354 2.282558,-1.929192 2.891309,-0.0079 3.110593,3.141685 0.231761,3.328793 -0.426937,0.02775 -0.961222,-0.007 -1.187299,-0.07716 z"
-         id="path3011"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/gtk/src/hb-pause.svg b/gtk/src/hb-pause.svg
deleted file mode 100644
index d1aae4174..000000000
--- a/gtk/src/hb-pause.svg
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64.039505"
-   height="63.091442"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hb-pause.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4106">
-      <stop
-         style="stop-color:#98cc69;stop-opacity:1;"
-         offset="0"
-         id="stop4108" />
-      <stop
-         style="stop-color:#98cc69;stop-opacity:0;"
-         offset="1"
-         id="stop4110" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4092">
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:1;"
-         offset="0"
-         id="stop4094" />
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:0;"
-         offset="1"
-         id="stop4096" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4092"
-       id="linearGradient4098"
-       x1="47.222271"
-       y1="25.042967"
-       x2="42.65625"
-       y2="11.961781"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4542086,0,0,2.4207748,-48.773934,985.73331)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4106"
-       id="linearGradient4112"
-       x1="41.413502"
-       y1="12.430531"
-       x2="42.273998"
-       y2="-5.2882195"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-2.963498"
-     inkscape:cy="14.251699"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="2985"
-     inkscape:window-height="1606"
-     inkscape:window-x="169"
-     inkscape:window-y="88"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-33.518748,-986.11151)">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient4112);fill-opacity:1;stroke:#7d7d80;stroke-width:1.04799998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3096"
-       sodipodi:cx="46.578125"
-       sodipodi:cy="13.180531"
-       sodipodi:rx="12.515625"
-       sodipodi:ry="12.515625"
-       d="m 59.09375,13.180531 c 0,6.912188 -5.603436,12.515625 -12.515625,12.515625 -6.912189,0 -12.515625,-5.603437 -12.515625,-12.515625 0,-6.9121893 5.603436,-12.51562545 12.515625,-12.51562545 6.912189,0 12.515625,5.60343615 12.515625,12.51562545 z"
-       transform="matrix(2.4542086,0,0,2.4207748,-48.773934,985.73326)" />
-    <path
-       style="opacity:0;fill:none;stroke:#000000;stroke-width:2.4374342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 37.813612,1027.7016 c 27.609847,-21.2574 55.526469,-19.8956 55.526469,-19.8956"
-       id="path4068"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:url(#linearGradient4098);fill-opacity:1;stroke:#7d7d80;stroke-width:0.07556046;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 63.104846,1046.5393 c -1.150252,-0.1051 -2.87356,-0.3639 -3.834702,-0.5731 -9.131727,-1.9878 -16.778886,-8.1344 -20.584912,-16.5457 -0.381156,-0.8425 -0.413139,-0.9508 -0.23877,-0.808 0.09466,0.078 0.381477,-0.1027 1.706441,-1.0744 4.32925,-3.1744 7.884669,-5.4105 12.50085,-7.8622 8.960431,-4.7591 19.123843,-8.1529 29.049394,-9.7003 3.788721,-0.5905 6.947442,-0.8708 11.005589,-0.9759 l 0.651899,-0.024 0.04003,-0.2647 c 0.03419,-0.2249 0.08725,-0.098 0.362968,0.8698 0.860355,3.0233 1.128237,4.9393 1.126336,8.0567 -0.0013,2.1542 -0.09635,3.3071 -0.420071,5.0954 -0.702826,3.8827 -2.194424,7.5466 -4.439182,10.9045 -3.597826,5.3819 -9.019159,9.476 -15.230031,11.5016 -1.935985,0.6313 -3.637313,1.0097 -5.790398,1.2876 -1.12016,0.1442 -4.77869,0.2102 -5.905439,0.1051 z"
-       id="path4074"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.11172702;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4137"
-       width="7.0125442"
-       height="23.877636"
-       x="57.243675"
-       y="1005.7939" />
-    <rect
-       style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.10703696;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4139"
-       width="6.9940414"
-       height="23.877363"
-       x="68.396469"
-       y="1005.7939" />
-  </g>
-</svg>
diff --git a/gtk/src/hb-picture.svg b/gtk/src/hb-picture.svg
deleted file mode 100644
index eeddbfb7a..000000000
--- a/gtk/src/hb-picture.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="16" y1="5" x2="16" y2="28">
-	<stop  offset="0" style="stop-color:#595959"/>
-	<stop  offset="1" style="stop-color:#333333"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M20,16.5L13,20v-7L20,16.5z M29,7c0,1,0,18,0,19s-1,2-2,2c-2.236,0-19.764,0-22,0c-1,0-2-1-2-2
-	S3,8,3,7s0.5-2,2-2s21,0,22,0S29,6,29,7z M21,9h2V7h-2V9z M17,9h2V7h-2V9z M13,9h2V7h-2V9z M9,9h2V7H9V9z M5,9h2V7H5V9z M7,24H5v2h2
-	V24z M11,24H9v2h2V24z M15,24h-2v2h2V24z M19,24h-2v2h2V24z M23,24h-2v2h2V24z M27,24h-2v2h2V24z M27,11H5v11h22V11z M27,7h-2v2h2V7
-	z"/>
-</svg>
diff --git a/gtk/src/hb-remove.svg b/gtk/src/hb-remove.svg
deleted file mode 100644
index 3884f46cf..000000000
--- a/gtk/src/hb-remove.svg
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg6954"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="63.984646"
-   height="63.995045"
-   sodipodi:docname="hb-remove.svg">
-  <metadata
-     id="metadata6960">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6958">
-    <linearGradient
-       id="linearGradient7588">
-      <stop
-         style="stop-color:#910303;stop-opacity:1;"
-         offset="0"
-         id="stop7590" />
-      <stop
-         style="stop-color:#ffebeb;stop-opacity:1;"
-         offset="1"
-         id="stop7592" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7516">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7518" />
-      <stop
-         id="stop7526"
-         offset="0.8599655"
-         style="stop-color:#414141;stop-opacity:1;" />
-      <stop
-         id="stop7524"
-         offset="0.96385676"
-         style="stop-color:#868686;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop7520" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7516"
-       id="radialGradient7522"
-       cx="75.102837"
-       cy="102.94545"
-       fx="75.102837"
-       fy="102.94545"
-       r="15.520127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6507957,-2.9715901,3.1350878,2.7967413,-434.97784,28.415628)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7588"
-       id="linearGradient7657"
-       gradientUnits="userSpaceOnUse"
-       x1="-25.424635"
-       y1="-78.221901"
-       x2="-55.220131"
-       y2="-77.516251" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7588"
-       id="linearGradient7659"
-       gradientUnits="userSpaceOnUse"
-       x1="-25.424635"
-       y1="-78.221901"
-       x2="-55.220131"
-       y2="-77.516251" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2608"
-     inkscape:window-height="1185"
-     id="namedview6956"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="39.86331"
-     inkscape:cy="65.963829"
-     inkscape:window-x="223"
-     inkscape:window-y="284"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g7646" />
-  <image
-     width="48"
-     height="48"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAADotJREFU aIHVmntsXNWdxz/nzJ0ZP+JX7IzHNrCYJIaQhKxSVgJqJ7ZheUVW0gix0E1Vql01QvlrpWqF0Pa/ pd2uUP/oH92KPyqadFWISDZbUcECSWzyYltAVJg8DIkTiO1xZsb2eJJ53XvPb/849/qROCSwK604 0tEd37n3zPf7e//OsRIRvslD/38D+N+ObzwBZ+EfSqmv8q7CCkADkWCt6ILpBPdDIRnABzzAXTC9 4L4J5k3btIgsJvAVgYegY0AVUA3UBNfq4H40eI4ApAtUgGIwC8G1HMyFZG6KyFclEAKPAvEA8DKg HmgA2oEHgLVAZ0C2LXh3IgA1CnwCvAdcBHLALHA5IFQOiIZEvnSohVHoBia0UOI1AegmoBn4W+Cv gK4b/eBVYwT4E/DvQBaYDsgUsJoKNbLkEJGbIhCaTBRrKnUB8ATwJPDXwO0A0WiUu+66izVr7ub2 2/8CgI6OW0DB2MWLAJy/cIEzp09z8uRJXNcNf+M88DawF7gUEMkDJaw2ljSpmyUQwUq9Giv1FcA6 4EfA3QDt7e089thjrF27lmg0dh15sQCDwnVdPvlkmDfeeIPx8fHwgZPAi8AwkMZqo4jVxjWauBkC ob3XAI1AK7AJ+EdgeVNTE48++ij33X8/SsAXQzabJZ3OkMvNADA7m0cJ1NfXIQoaGxpobmmhpaUF rTVK4MR7J3jzzTeZnp4GmAL+FXgXmARmsCYV+sVNEwjNpjoA3wb0A/8McOedd/L97z9DTU01uVyO s2fPcSmTRnxjje5qhV91T0c0K1pWsHLlHTQ0NFAoFPnNb17mzJkz4SP/BBwCUliTKjJvTjckoLAO WxWATwIPAT8B6OnpYdu271AulXj7nXd4770TALS2trJq9eql8Np7AqIUiPDZZ58yOTkJwH33389D Dz1EVTzOgQMHOHLkSPjK88A7AYlcQMILl/6yPBBKvwbrsBuwNk9PTw9bt32HdDrNq6++wsTEBPWx GCXPI5VK4RvDqjtWIUpQC2hIQEsJfHbuM9KXLhHTmirH4cTx45wfHeVvnnqKbdu2AYQkfoT1hTC0 eswnxDmgVw+Ftf041mkTwD8Ay7u6uhgYGOD86Dn27NnN+Pg4jfE4e3t7+XV3N1GlmEylGPn0DMY3 +L6P7xs832B8H+N7jHx6hslUiqhS/Lq7m729vTTG44yPj7Nn925GR0cZGBigq6sLYHnw2wls9IsH 2OZMZSkCGms+ofS/C9zd0NDAjh07GD03yr59+0in0zTF47yyaRP31NbSn0jwcnc3DpBKpRgZOUPF reAGs1JxGRkZIZVK4QAvd3fTn0hwT20tr2zaRFM8TjqdZt++fZwbHWXHjh00NjaCjXTfDbDUBNj0 QrBLEYhjM2wL8CDAI48+Si6X4z/+8wCZTIameJxXN2/mnpoaOHgQhoboSyTYHZCYnJzk7NmzuK6H 53qcO3eWyclJHGB3dzd9iQQMDcHBg9xTU8OrmzfTFI+TyWQ4cOAAuVyOhx9+JMT0YIBlWYDtugRC 86kKzOd7wG1tbW3c2dXFsWPHyYSS7+1lfW0NcngQyWZhbAw5fJj+ZJI9mzcTVYr0pUuMnh9ldHSU S5cuEVWKPZs3059sg8OHYWwMslnk8GHW19TwSm+vJZFOc+zYcbq6VtPW1gZwW4ClPsA2Z0ZLEXCw obMB2AjQ39/P8CcnKZfLABRcl0w+jzl4CJnKICIYEczEBGZwkP5kK7/t7SWmNdlMhmw2Q0xrftvb y4PJVszhQ5iJFH7wnmSzmEOHyOTzFILsXKlU+OTkSfr7+0NsGwNM1QHGJQksjP0dQFc0GmVFIsGF 8+dBCY1NjRQ9j2eOHuVgdgpfgjpYKUtkYgI5PGg1EZCIac2e3l76k0nM4CB+agKDIEpZ4gIHp7I8 c/QoRc+jsbEJEeHChQusWJEgGo2CrbM6AmzREPtSGgjD52aAO1au5PTpM3iei+/5tCXbaGhooGgM P0A4KIIP+CL4StmCP5XCGxykL5lkd28vu3t76Usm8QYHcSdSGNSid95B+IFA0RgaGhpoa2vD9z08 1+XM6TPcccfKEN/mANt1CSws2tYCdHV1MT5+Ed/4eJ6diUSCurp6iiL8nYQkFEZhryi8VAp3cJDe ZJLeZBJ3aCiQvAVvlNXcwWCNogh1dfUkEq14nofn2RA8Nj5GV9fqEN/aBRpQcG0/EBKIM1/H41Zc FmZsESGRSCBimJ2d5e+Bl5QtkpRakIFTKfyhIQD8iQmb2JRAkOKGEH4oQgmor6+ntdWuCQoj9inf GLSak3NHgG1OA1cTCKNQFFvnM5ubxfd9RGypIWIQARFDS0sLxhguX77MD0X4N63YJBowCBrBIBMp QFBKoUTQKAR4VwnPGgt+2bJlNLe04Pk+WimU0vO1iFLkZnMhvuXMd3nX9YGw66oCKBQLGGOzque7 +L7BGB8/uLd8eTO1tbWUgGd9YVB8fK3xtM37FcBVCk/A1eBpGBTFs74FX1tby/LmZoxvguxt8I2P 7/n4vo/xffL5fIgvzAFzuG/YUuZyOTzPQymFMQKBKRkRMGKjSXDPV8qCJyhYlJrvABRE0AjgacE3 tqgTEYzv20JSKbRS4AeFpVaIkYUErhlLZeJwd6AMUCqWbD3jebaeMWIlYwxGhOmpKQqFAjGteamv j2+3t9s+UCkMOnDuIDop8JSiu72dl/r6iGlNoVAgOzWFMQYJtGrEWA0HWiiVSiG28gJ8SxIIKz0X 21hQKpXwfc+q1vcxxpIwvmFqKkuhUCCqNb/q76eno2NO8h7gaxBtCRhtyYSdek9HB7/q7yeqNcVC gampqXnBGGN/0/gY38wlUGxzs6jhv5qAYE23DIwB+L4XSNtK3AtIzMxMUywWiWrNL/v76W5rJz80 SCmVwgtCqQQLmlALCjwUxVSK2aFButva+GVIolhkZmZmroo1RhBj/c3zvBDfF8xvv8j1NOBim+mT AK5rHdcPTMj3fWZmZubA/6Kvjwfa2sgNDVJKTeIpZU0lMJmjIhwTYxMX9jtfKcqpSXJDQzyQbOMX fX3zJHIzc0LyPKv5Bc3/KRY3+tclUAA+ACgUCjbqBJLJz+YplUpEtebnvb3cl0ySe3eI4mRqbg/E x0r7uBGe8zye8zyOi7EEAF+Bq6AwmSL37hD3JZP8vLeXqNaUSiUu5/O2lzAGEUOxWAzxfcB8f3xD AmeAc57nUS6XAxI+5XIJR2te6OnhW4kEU0eOcDmVwhXroK5SeAjHjfC8581tuT3vehw3JvAPO10U VyZTTB05wrcSCV7o6cEJSHhBCC2WSqEGzgGnme+NlzQhCb4sYnvQPwIUi0XrWMZ2ctWOQ53jkD52 jPylScooKkrZmA+cEOHHnksZu1cUjUYpAz/2XI4bM78xqqGEIj85SfrYMeoch2rHRnbjW2cuzUv/ /QDTIg0s1dRHsY1DK7Cyrq5udz6fX15VVUXEcSiXSnieR63WPBeJsEopHA0OiojAR0Z4wa1QBhzH IR6PA1AuV/A8lzjwfDTKRu3gIXgCHoazIvzU97liDI7jUFVVhed5lEol6urqpvP5/PeAs9itlsuA KyLXzQMV7M5Ypr29/c8WQBkxhmgsRiQS4Yox/IvrMYJQQFM0wnuyGHw0FrP1vhGisSiO41AGfuK6 nBCfgkBRw4jAT12PK8YQiUSIxWL4Zj58tre3fwRkAkwVviQPhARCP5jesGHD3kQikRERu6ARYrEY WmuuIPzM9fjMGP4kwosVCz4SieA4DhIkJ2NsmeBEHCKRCGXgxUqF98XnU2P4medyBUFrTSwWRYxQ KZfDojGzYcOGvdi9oUXmY40+SOdXHTVFsHV3cs2aNfft2rXr947jVACJRCISi8UkHo+L1loAqVZK YtZ/JBKJSDwel1hsfsZjcYnHY/ZzPC6RSEQAiQXvAqK1nls3/N5xHHfXrl2/X79+/f3Yvaka5rfr uZ4JLdLCqVOnxletWvXfW7duPQEERZ2HGCHiOGitKYpQAbTWaK1tnWSrJBCbBK18rDYikQhaa3tQ IFbyTsRBRILYb4PF1q1bj69evfqPH3/88diS0uf6xZxgQ3oZyA8PD789MDBwu4iwf//+TcY3uMZF RyIopXAcBwREWalgZO6zAlBB8Wc/YkRQWuMoPbcBZsTmmtAStm/f/u7AwMDIkSNH3sLafjnAtMhU bmZzNwbUvPbaa09duXJl41tvvXX7/v37HygWi1UEUldBP7x4KK5ebqkT0fBdY6xgq6urS9u3bz/+ 8MMPn6+trf3wiSeeeIX584JrNndvdMg3Z0pHjx79Q2dn59SWLVvO7dy58+3W1tY0MNcrXAtOFvnX UuBF5itbgNbW1vTOnTvf3rJly7nOzs6po0eP/oHrmM6cAG7ygCMCOK+//vrG1tbWJ8bGxqo///zz 2r17964fHh7unJmZaVj0grLSFwnXk/mV5FpNNDY25tatWzf65JNPfnzbbbdd6ejoKKbT6X2PP/74 B8yf0nztA45wRADnww8/7I9Gow+m0+lYKpWqnpiYqPnd7363YXR0tC2bzS7/sgWuHs3NzVOdnZ0T Tz/99J/b2toKyWSyuGLFiorrugc3btx4iP+jI6aFQwORU6dOfbuqquqR6enpWDabjWUymXg2m60a HR2tf//992/54osvVmQymUYR0fl8fhlAXV3dZaWUaWlpmbn11lvT995778XOzs7Z5ubmUktLS7m5 ubnS1NRUKZVK/7VmzZpj3MQh39chAEHfPDIy0tXU1PTE5cuXa2dnZ53Z2dloeC0UCk6xWHTK5bI2 xtgdNK0lHo+b6upqr6amxquvr3fr6+vnrsuWLbsyPT39WldX1wg3ecz6dQnMPT48PNx0yy239AN/ WSqVdLFY1KVSKVIsFnWlUtGu62rf9xVAJBKRaDRqYrGYqa6uNlVVVX5wNcBHFy9ePLRu3brpmwF+ XQLfxPGN/1+JbzyB/wEoV0RS/Ri9LgAAAABJRU5ErkJggg== "
-     id="image6962"
-     x="-254.18425"
-     y="-27.392511" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#000000;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="path6968"
-     sodipodi:cx="111.15254"
-     sodipodi:cy="16.983051"
-     sodipodi:rx="66.203392"
-     sodipodi:ry="66.203392"
-     d="m 177.35593,16.983051 a 66.203392,66.203392 0 1 1 -132.40678,0 66.203392,66.203392 0 1 1 132.40678,0 z"
-     transform="matrix(0.48290299,0,0,0.4828676,-21.685362,23.796319)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:url(#radialGradient7522);fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="path7514"
-     sodipodi:cx="84.610168"
-     sodipodi:cy="84.610168"
-     sodipodi:rx="53.694916"
-     sodipodi:ry="53.694916"
-     d="m 138.30508,84.610168 a 53.694916,53.694916 0 1 1 -107.389827,0 53.694916,53.694916 0 1 1 107.389827,0 z"
-     transform="matrix(0.48290299,0,0,0.4828676,-8.818862,-8.8095221)" />
-  <g
-     id="g7646"
-     transform="translate(-191.3368,11.658336)">
-    <g
-       transform="matrix(0.34146398,-0.34143897,0.34146398,0.34143897,140.08689,112.87016)"
-       id="g7629">
-      <g
-         id="g7596"
-         transform="matrix(0.75502291,-0.88915645,0.7272656,0.88775135,180.26389,29.369646)"
-         inkscape:transform-center-x="62.587435"
-         inkscape:transform-center-y="-16.746278">
-        <rect
-           inkscape:transform-center-x="64.08004"
-           transform="matrix(-0.69656068,0.71749789,-0.70759094,-0.70662229,0,0)"
-           ry="0"
-           y="-113.99992"
-           x="-44.207855"
-           height="81.640587"
-           width="19.558914"
-           id="rect7540"
-           style="fill:url(#linearGradient7657);fill-opacity:1;stroke:#7d7d80;stroke-width:0.03725971;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           inkscape:transform-center-y="32.741891" />
-      </g>
-      <rect
-         inkscape:transform-center-y="58.800787"
-         style="fill:#fb2828;fill-opacity:1;stroke:#7d7d80;stroke-width:0.03569389;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect7627"
-         width="17.948257"
-         height="81.646454"
-         x="-23.650179"
-         y="-297.9545"
-         ry="0"
-         transform="matrix(-0.00292286,0.99999573,-0.99999994,-3.3387877e-4,0,0)"
-         inkscape:transform-center-x="-31.707297" />
-    </g>
-    <g
-       id="g7636"
-       transform="matrix(0.34146398,0.34143897,-0.34146398,0.34143897,130.51304,-62.605357)">
-      <g
-         inkscape:transform-center-y="-16.746278"
-         inkscape:transform-center-x="62.587435"
-         transform="matrix(0.75502291,-0.88915645,0.7272656,0.88775135,180.26389,29.369646)"
-         id="g7638">
-        <rect
-           inkscape:transform-center-y="32.741891"
-           style="fill:url(#linearGradient7659);fill-opacity:1;stroke:#7d7d80;stroke-width:0.03725971;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect7640"
-           width="19.558914"
-           height="81.640587"
-           x="-44.207855"
-           y="-113.99992"
-           ry="0"
-           transform="matrix(-0.69656068,0.71749789,-0.70759094,-0.70662229,0,0)"
-           inkscape:transform-center-x="64.08004" />
-      </g>
-      <rect
-         inkscape:transform-center-x="-31.707297"
-         transform="matrix(-0.00292286,0.99999573,-0.99999994,-3.3387877e-4,0,0)"
-         ry="0"
-         y="-297.9545"
-         x="-23.650179"
-         height="81.646454"
-         width="17.948257"
-         id="rect7642"
-         style="fill:#fc2828;fill-opacity:1;stroke:#7d7d80;stroke-width:0.03569389;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:transform-center-y="58.800787" />
-    </g>
-    <rect
-       inkscape:transform-center-y="8.7721117"
-       style="fill:#fc2727;fill-opacity:1;stroke:#7d7d80;stroke-width:0.01626823;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect7530"
-       width="8.1802607"
-       height="37.212177"
-       x="169.54268"
-       y="-163.1785"
-       ry="0"
-       transform="matrix(0.69865519,0.71545854,-0.69843341,0.71567505,0,0)"
-       inkscape:transform-center-x="-28.868328" />
-  </g>
-</svg>
diff --git a/gtk/src/hb-showqueue.svg b/gtk/src/hb-showqueue.svg
deleted file mode 100644
index af871f9e5..000000000
--- a/gtk/src/hb-showqueue.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="48px" height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24" y1="6" x2="24" y2="43.5">
-	<stop  offset="0" style="stop-color:#595959"/>
-	<stop  offset="1" style="stop-color:#333333"/>
-</linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M43.506,15.002c-0.816,0-3,0-3,0v-1.5c0-1.5-1.5-3-3-3
-	c-1.5,0-3,0-3,0s0,0,0-1.5c0-1.5-1.5-3-3-3s-25.503,0-27.004,0c-1.5,0-3,1.5-3,3c0,1.5,0,16.502,0,18.002s1.5,3,3,3h1.5
-	c0,0,0,1.5,0,3c0,1.5,1.5,3,3,3h1.5c0,0,0,3,0,4.5c0,1.5,1.5,3,3,3c1.5,0,28.504,0,30.004,0c1.5,0,3-1.5,3-3
-	c0-1.5,0-21.003,0-22.503C46.506,16.502,45.006,15.002,43.506,15.002z M6.001,13.502c0,1.5,0,13.502,0,13.502
-	c-0.75,0-1.5-0.75-1.5-1.5c0-0.75,0-14.252,0-15.002c0-0.75,0.75-1.5,1.5-1.5c0.75,0,23.253,0,24.003,0c0.75,0,1.5,0.75,1.5,1.5
-	c0,0-21.003,0-22.503,0C7.501,10.501,6.001,12.002,6.001,13.502z M10.501,18.002c0,1.5,0,15.002,0,15.002c-0.75,0-1.5-0.75-1.5-1.5
-	s0-15.752,0-16.502c0-0.75,0.75-1.5,1.5-1.5s24.753,0,25.503,0s1.5,0.75,1.5,1.5c0,0-22.503,0-24.003,0
-	C12.001,15.002,10.501,16.502,10.501,18.002z M43.506,39.033c0,0.723-0.75,1.473-1.5,1.473s-26.253,0-27.004,0
-	c-0.75,0-1.5-0.75-1.5-1.5c0-0.75,0-18.676,0-19.464s0.75-1.539,1.5-1.539c0.75,0,26.254,0,27.004,0s1.5,0.647,1.5,1.449
-	C43.506,20.253,43.506,38.31,43.506,39.033z M37.505,22.503l4.5,7.501v7.22c0,0.75-1.031,1.781-1.781,1.781l-25.222,0l5.063-7.499
-	l3.188,2.998l3.75-6.001l4.5,4.501L37.505,22.503z M17.259,24.003c0-2.071,1.679-3.75,3.75-3.75s3.75,1.679,3.75,3.75
-	s-1.679,3.75-3.75,3.75S17.259,26.075,17.259,24.003z"/>
-</svg>
diff --git a/gtk/src/hb-source.svg b/gtk/src/hb-source.svg
deleted file mode 100644
index 86e456fd5..000000000
--- a/gtk/src/hb-source.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="16" y1="5" x2="16" y2="29">
-	<stop  offset="0" style="stop-color:#595959"/>
-	<stop  offset="1" style="stop-color:#333333"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M1,7v20c0,1,1,2,2,2h26c1,0,2-1,2-2V7c0-1-1-2-2-2H3C2,5,1,6,1,7z M11,20v3H3v-3H11z M29,23h-8v-3h8
-	V23z M13,14l1.999-3h3L16,14H13z M19,14l1.999-3h3L22,14H19z M25,14l1.999-3h1.751v1.5L28,14H25z M3,27v-3h13v3H3z M20,23h-8v-3h8
-	V23z M3,19v-3h26v3H3z M29,27H17v-3h12V27z M6.999,7h3L12,10H9L6.999,7z M15,10l-2.001-3h3L18,10H15z M21,10l-2.001-3h3L24,10H21z
-	 M28,7l0.75,1.5V10h-1.751L25,7H28z M7,14l1.999-3h3L10,14H7z M4.5,7.24c0.696,0,1.26,0.564,1.26,1.26S5.196,9.76,4.5,9.76
-	S3.24,9.196,3.24,8.5S3.804,7.24,4.5,7.24z M4.5,11.24c0.696,0,1.26,0.564,1.26,1.26s-0.564,1.26-1.26,1.26s-1.26-0.564-1.26-1.26
-	S3.804,11.24,4.5,11.24z"/>
-</svg>
diff --git a/gtk/src/hb-start.svg b/gtk/src/hb-start.svg
deleted file mode 100644
index d718e503f..000000000
--- a/gtk/src/hb-start.svg
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64.03373"
-   height="63.961697"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hb-start.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4106">
-      <stop
-         style="stop-color:#98cc69;stop-opacity:1;"
-         offset="0"
-         id="stop4108" />
-      <stop
-         style="stop-color:#98cc69;stop-opacity:0;"
-         offset="1"
-         id="stop4110" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4092">
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:1;"
-         offset="0"
-         id="stop4094" />
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:0;"
-         offset="1"
-         id="stop4096" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4092"
-       id="linearGradient4098"
-       x1="47.222271"
-       y1="25.042967"
-       x2="42.65625"
-       y2="11.961781"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4539872,0,0,2.454166,-48.760714,984.90034)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4106"
-       id="linearGradient4112"
-       x1="41.413502"
-       y1="12.430531"
-       x2="42.273998"
-       y2="-5.2882195"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-2.8809072"
-     inkscape:cy="30.683019"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="2985"
-     inkscape:window-height="1606"
-     inkscape:window-x="79"
-     inkscape:window-y="82"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-33.524546,-985.28365)">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient4112);fill-opacity:1;stroke:#7d7d80;stroke-width:1.04799998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3096"
-       sodipodi:cx="46.578125"
-       sodipodi:cy="13.180531"
-       sodipodi:rx="12.515625"
-       sodipodi:ry="12.515625"
-       d="m 59.09375,13.180531 c 0,6.912188 -5.603436,12.515625 -12.515625,12.515625 -6.912189,0 -12.515625,-5.603437 -12.515625,-12.515625 0,-6.9121893 5.603436,-12.51562545 12.515625,-12.51562545 6.912189,0 12.515625,5.60343615 12.515625,12.51562545 z"
-       transform="matrix(2.4539873,0,0,2.4541658,-48.760716,984.90019)" />
-    <path
-       style="opacity:0;fill:none;stroke:#000000;stroke-width:2.45407653px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 37.819025,1027.4477 c 27.60736,-21.5508 55.521465,-20.1705 55.521465,-20.1705"
-       id="path4068"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:url(#linearGradient4098);fill-opacity:1;stroke:#7d7d80;stroke-width:0.07607639;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 63.107977,1046.5446 c -1.150144,-0.106 -2.873296,-0.3686 -3.834351,-0.581 -9.130906,-2.0151 -16.777376,-8.2465 -20.583059,-16.7737 -0.381123,-0.8538 -0.413103,-0.9638 -0.238747,-0.8191 0.09467,0.079 0.381441,-0.104 1.706284,-1.0895 4.328861,-3.2178 7.88396,-5.4846 12.499724,-7.9704 8.959623,-4.825 19.122121,-8.2654 29.046775,-9.834 3.788382,-0.5985 6.946818,-0.8829 11.0046,-0.9896 l 0.651841,-0.024 0.04003,-0.2682 c 0.03419,-0.2286 0.08726,-0.097 0.362938,0.882 0.860277,3.0647 1.128136,5.0075 1.126236,8.1676 -0.0013,2.184 -0.09636,3.3525 -0.420036,5.1653 -0.702762,3.9366 -2.194226,7.6509 -4.438785,11.0554 -3.597498,5.456 -9.018342,9.6068 -15.228656,11.6602 -1.93581,0.6399 -3.636986,1.0232 -5.789874,1.3054 -1.120061,0.1463 -4.778261,0.2133 -5.904912,0.1062 z"
-       id="path4074"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="star"
-       style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4116"
-       sodipodi:sides="3"
-       sodipodi:cx="45.59375"
-       sodipodi:cy="10.180531"
-       sodipodi:r1="6.0857315"
-       sodipodi:r2="3.0596068"
-       sodipodi:arg1="2.0803885"
-       sodipodi:arg2="3.0635412"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 42.625001,15.49303 -0.08154,-5.073935 -0.06609,-5.4658267 4.434928,2.4663498 4.766592,2.6756749 -4.353386,2.607586 z"
-       transform="matrix(2.4539873,0,0,2.4541658,-46.153355,991.57212)"
-       inkscape:transform-center-x="-0.45436515"
-       inkscape:transform-center-y="-0.93242328" />
-  </g>
-</svg>
diff --git a/gtk/src/hb-stop.svg b/gtk/src/hb-stop.svg
deleted file mode 100644
index fe6078c63..000000000
--- a/gtk/src/hb-stop.svg
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64.138466"
-   height="64.204422"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hb-stop.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4812">
-      <stop
-         style="stop-color:#f43536;stop-opacity:0.96774191;"
-         offset="0"
-         id="stop4814" />
-      <stop
-         style="stop-color:#ef8283;stop-opacity:0.99641579;"
-         offset="1"
-         id="stop4816" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4796">
-      <stop
-         style="stop-color:#941010;stop-opacity:1;"
-         offset="0"
-         id="stop4798" />
-      <stop
-         style="stop-color:#f03030;stop-opacity:0.99283153;"
-         offset="1"
-         id="stop4800" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4796"
-       id="linearGradient4802"
-       x1="41.226849"
-       y1="24.896255"
-       x2="36.870567"
-       y2="13.563606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.2914188,0,0,2.2834769,328.42436,490.39178)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4812"
-       id="linearGradient4818"
-       x1="38.954006"
-       y1="10.785687"
-       x2="33.934811"
-       y2="2.2940922"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.2914188,0,0,2.2834769,328.42436,490.39178)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-6.9528851"
-     inkscape:cy="29.325436"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="3066"
-     inkscape:window-height="1678"
-     inkscape:window-x="44"
-     inkscape:window-y="76"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-387.73031,-488.0452)">
-    <path
-       sodipodi:type="star"
-       style="fill:#be3232;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4770"
-       sodipodi:sides="8"
-       sodipodi:cx="38.070126"
-       sodipodi:cy="2.5466304"
-       sodipodi:r1="13.571502"
-       sodipodi:r2="12.538433"
-       sodipodi:arg1="1.1768998"
-       sodipodi:arg2="1.5695989"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 43.278725,15.078835 -10.38717,0.01244 -7.353634,-7.3360434 -0.01244,-10.3871703 7.336043,-7.3536336 10.387171,-0.012438 7.353633,7.3360435 0.01244,10.3871702 z"
-       transform="matrix(2.5459342,0,0,2.5459004,322.89492,513.66332)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#f63638;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4786"
-       sodipodi:sides="8"
-       sodipodi:cx="35.229069"
-       sodipodi:cy="5.1982808"
-       sodipodi:r1="9.8153391"
-       sodipodi:r2="9.0681906"
-       sodipodi:arg1="1.1675937"
-       sodipodi:arg2="1.5602928"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 39.080276,14.226519 -7.511921,0.07891 -5.367525,-5.2559363 -0.0789,-7.5119209 5.255936,-5.3675243 7.511921,-0.078905 5.367524,5.2559362 0.07891,7.5119209 z"
-       transform="matrix(3.1320997,0,0,3.0346077,309.47717,504.76027)" />
-    <path
-       style="opacity:0;fill:none;stroke:#000000;stroke-width:2.28744435px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 393.66948,534.19475 c 21.33847,-21.26451 54.32271,-25.44534 54.32271,-25.44534"
-       id="path4788"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient4818);fill-opacity:1;stroke:#7d7d80;stroke-width:0.00223848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 392.22542,532.75113 -0.60356,-0.55698 -0.12491,-11.35308 -0.1249,-11.3531 6.91302,-6.84433 c 3.80215,-3.76439 7.50185,-7.42353 8.22155,-8.13139 l 1.30852,-1.28704 9.39689,-0.10224 c 5.16827,-0.0564 10.45474,-0.10109 11.74771,-0.0994 l 2.35084,0.002 7.69149,7.30539 c 4.23034,4.01795 7.69693,7.33159 7.70356,7.36364 0.007,0.0322 -0.24833,0.10018 -0.5666,0.15154 -1.07427,0.17332 -3.60755,0.67402 -5.06337,1.00081 -12.47298,2.7997 -24.2674,7.45681 -33.99689,13.42388 -4.88606,2.9966 -9.5559,6.57032 -13.3066,10.18321 -0.48898,0.47103 -0.90122,0.85565 -0.91611,0.85473 -0.0149,-9.2e-4 -0.29866,-0.2523 -0.63062,-0.55864 l 0,0 z"
-       id="path4792"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient4802);fill-opacity:1;stroke:#7d7d80;stroke-width:0.00223848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 401.61754,541.67395 c -3.71976,-3.53335 -6.82712,-6.48705 -6.90523,-6.56379 -0.14083,-0.13846 -0.13362,-0.14763 0.868,-1.10069 6.52689,-6.21111 14.60479,-11.45739 24.1762,-15.70147 7.63917,-3.38731 16.44003,-6.14823 24.755,-7.76594 1.69053,-0.3289 3.46205,-0.62203 3.49767,-0.57875 0.0133,0.0161 0.0752,4.88792 0.13774,10.82628 l 0.11366,10.79706 -5.65398,5.59965 c -3.1097,3.07982 -6.80953,6.74043 -8.22185,8.13469 l -2.56785,2.53503 -8.57156,0.0807 c -4.71436,0.0442 -9.98749,0.0988 -11.71809,0.12105 l -3.14651,0.0405 -6.76321,-6.42425 z"
-       id="path4794"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
-- 
cgit v1.2.3


From 0a049afced0407b65bc8e8d348fcb3be2ae8b5c5 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 13:40:07 -0500
Subject: scripts: Export prefix bin path while building Mac deps.

Fixes #1075.
---
 scripts/mac-toolchain-build | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/mac-toolchain-build b/scripts/mac-toolchain-build
index b175b61c1..6bed4e861 100755
--- a/scripts/mac-toolchain-build
+++ b/scripts/mac-toolchain-build
@@ -38,6 +38,8 @@ if [[ ! -w "${PREFIX}" ]]; then
     fi
 fi
 PREFIX=$(cd "${PREFIX}" && pwd -P)
+PATH_ORIG="${PATH}"
+export PATH="${PREFIX}/bin${PATH:+:$PATH}"
 
 # temp dir
 TEMP_DIR=$(mktemp -d "${TMPDIR:-/tmp/}toolchain-XXXXXX")
@@ -142,4 +144,8 @@ if [[ "${PREFIX}" != "/usr/local" ]]; then
     echo "  add to your shell startup script (${HOME}/.bash_profile):"
     echo "    export PATH=\"${PREFIX}/bin:\${PATH}\""
 fi
+
+# restore original PATH
+PATH="${PATH_ORIG}"
+
 exit 0
-- 
cgit v1.2.3


From 84a3acb5e795cea10f2335ac39deec86c2bdddb5 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 13:42:57 -0500
Subject: scripts: Fix typo in 0a049afce. #1075

---
 scripts/mac-toolchain-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mac-toolchain-build b/scripts/mac-toolchain-build
index 6bed4e861..19cc73de8 100755
--- a/scripts/mac-toolchain-build
+++ b/scripts/mac-toolchain-build
@@ -146,6 +146,6 @@ if [[ "${PREFIX}" != "/usr/local" ]]; then
 fi
 
 # restore original PATH
-PATH="${PATH_ORIG}"
+export PATH="${PATH_ORIG}"
 
 exit 0
-- 
cgit v1.2.3


From 0097a6ef2d51d0e44f2201689f5111bdb69932dd Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 14:03:33 -0500
Subject: contrib: Update fribidi download url and hash to GitHub tarball.

fribidi.org is gone.
---
 contrib/fribidi/module.defs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index edb7477b0..45de35d6c 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -5,9 +5,10 @@ endif
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.url    += https://fribidi.org/download/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.sha256  = 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e
+FRIBIDI.FETCH.url      = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.gz
+FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/0.19.7.tar.gz
+FRIBIDI.FETCH.sha256   = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8
+FRIBIDI.FETCH.basename = fribidi-0.19.7.tar.gz
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no
-- 
cgit v1.2.3


From 6686bf047386faa5da52f0a382e327f4c9fcff30 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 14:21:07 -0500
Subject: contrib: Update videolan download url.

Security certificate is missing ftp.videolan.org at the moment, so use download.videolan.org instead.
---
 contrib/x264/module.defs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index f86d076ef..17b1e58ec 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -2,7 +2,7 @@ $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
 X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160920-2245-stable.tar.bz2
-X264.FETCH.url    += https://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2
+X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2
 X264.FETCH.sha256  = 6ba2d848eabbca0d9d2c2a12b263e02f856a81fce87fbc74df52a1097c88e39c
 
 X264.GCC.args.c_std =
-- 
cgit v1.2.3


From 97dd7d2a6830ab3cf952c308b9b1830a7c0fb5c2 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 18:03:01 -0500
Subject: contrib: Fix issues with fribidi.

The source tarball isn't exactly the same as the release tarball found on fribidi.org before it shuttered. Needs a little extra care and an anvil dropped on Mr. Horrible.
---
 contrib/fribidi/A02-remove-horrible-hack.patch | 18 ++++++++++++++++++
 contrib/fribidi/A03-no-doc.patch               | 12 ++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 contrib/fribidi/A02-remove-horrible-hack.patch
 create mode 100644 contrib/fribidi/A03-no-doc.patch

diff --git a/contrib/fribidi/A02-remove-horrible-hack.patch b/contrib/fribidi/A02-remove-horrible-hack.patch
new file mode 100644
index 000000000..16280a0f4
--- /dev/null
+++ b/contrib/fribidi/A02-remove-horrible-hack.patch
@@ -0,0 +1,18 @@
+diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
+--- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
++++ fribidi-0.19.7/Makefile.am	2017-12-27 17:43:06.000000000 -0500
+@@ -36,13 +36,7 @@
+ 		$(srcdir)/ltmain.sh \
+ 		$(srcdir)/missing \
+ 		$(srcdir)/mkinstalldirs \
+-		$(srcdir)/ChangeLog \
+-		`find "$(srcdir)" -type f -name Makefile.in -print` \
+-		`$(srcdir)/bootstrap --write-configure`
+-# The last line above is a horrible hack.
+-# GNU Coding Standards recommends that `make maintainer-clean' should not 
+-# remove the configure script.
+-# We instead make configure call bootstrap.
++		$(srcdir)/ChangeLog
+ 
+ # Indent all C source and header files, using indent(1):
+ 
diff --git a/contrib/fribidi/A03-no-doc.patch b/contrib/fribidi/A03-no-doc.patch
new file mode 100644
index 000000000..838e5f7d7
--- /dev/null
+++ b/contrib/fribidi/A03-no-doc.patch
@@ -0,0 +1,12 @@
+diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
+--- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
++++ fribidi-0.19.7/Makefile.am	2017-12-27 17:53:09.000000000 -0500
+@@ -11,7 +11,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ ## The order of subdirs is important, don't change without a reason.
+-SUBDIRS = gen.tab charset lib bin doc test
++SUBDIRS = gen.tab charset lib bin test
+ 
+ EXTRA_DIST = bootstrap ChangeLog.old
+ 
-- 
cgit v1.2.3


From 5452ab68c3d87250ea582a04d01bfc897001d80e Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 19:13:28 -0500
Subject: Revert "contrib: Fix issues with fribidi."

This reverts commit 97dd7d2a6830ab3cf952c308b9b1830a7c0fb5c2.
---
 contrib/fribidi/A02-remove-horrible-hack.patch | 18 ------------------
 contrib/fribidi/A03-no-doc.patch               | 12 ------------
 2 files changed, 30 deletions(-)
 delete mode 100644 contrib/fribidi/A02-remove-horrible-hack.patch
 delete mode 100644 contrib/fribidi/A03-no-doc.patch

diff --git a/contrib/fribidi/A02-remove-horrible-hack.patch b/contrib/fribidi/A02-remove-horrible-hack.patch
deleted file mode 100644
index 16280a0f4..000000000
--- a/contrib/fribidi/A02-remove-horrible-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
---- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
-+++ fribidi-0.19.7/Makefile.am	2017-12-27 17:43:06.000000000 -0500
-@@ -36,13 +36,7 @@
- 		$(srcdir)/ltmain.sh \
- 		$(srcdir)/missing \
- 		$(srcdir)/mkinstalldirs \
--		$(srcdir)/ChangeLog \
--		`find "$(srcdir)" -type f -name Makefile.in -print` \
--		`$(srcdir)/bootstrap --write-configure`
--# The last line above is a horrible hack.
--# GNU Coding Standards recommends that `make maintainer-clean' should not 
--# remove the configure script.
--# We instead make configure call bootstrap.
-+		$(srcdir)/ChangeLog
- 
- # Indent all C source and header files, using indent(1):
- 
diff --git a/contrib/fribidi/A03-no-doc.patch b/contrib/fribidi/A03-no-doc.patch
deleted file mode 100644
index 838e5f7d7..000000000
--- a/contrib/fribidi/A03-no-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
---- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
-+++ fribidi-0.19.7/Makefile.am	2017-12-27 17:53:09.000000000 -0500
-@@ -11,7 +11,7 @@
- ACLOCAL_AMFLAGS = -I m4
- 
- ## The order of subdirs is important, don't change without a reason.
--SUBDIRS = gen.tab charset lib bin doc test
-+SUBDIRS = gen.tab charset lib bin test
- 
- EXTRA_DIST = bootstrap ChangeLog.old
- 
-- 
cgit v1.2.3


From 8ed85cd66d89a076fcf1009ddbc3d20cc36cc07e Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 19:13:49 -0500
Subject: Revert "contrib: Update fribidi download url and hash to GitHub
 tarball."

This reverts commit 0097a6ef2d51d0e44f2201689f5111bdb69932dd.
---
 contrib/fribidi/module.defs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index 45de35d6c..edb7477b0 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -5,10 +5,9 @@ endif
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url      = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.gz
-FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/0.19.7.tar.gz
-FRIBIDI.FETCH.sha256   = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8
-FRIBIDI.FETCH.basename = fribidi-0.19.7.tar.gz
+FRIBIDI.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
+FRIBIDI.FETCH.url    += https://fribidi.org/download/fribidi-0.19.7.tar.bz2
+FRIBIDI.FETCH.sha256  = 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no
-- 
cgit v1.2.3


From bcfb612388626d97c0240ccd85a99df0e02b3f7c Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 27 Dec 2017 14:03:33 -0500
Subject: contrib: Update fribidi url to use GitHub tarball.

fribidi.org is gone. The official release archive we were using is gone. Only release tags on GitHub remain, and they are not direct replacements for the proper release archives we were using previously.

Some changes were necessary for compilation from source, namely:

- Removal of an ugly hack that resulted in configure being run more than once. Apparently the same fix is already upstream https://github.com/fribidi/fribidi/commit/0efbaa9052320a951823a6e776b30a580e3a2b4e
- Modification of Makefile.am to avoid building the doc subdirectory, since this will fail wherever c2man isn't available such as on Mac. We don't need these docs
- Modification of gen.tab/Makefile.in to use the host compiler when cross-compiling. This cannot be done as a normal patch since Makefile.in is generated in the bootstrap phase. This is an open issue upstream: https://github.com/fribidi/fribidi/issues/7

This is all a good lesson on the importance of maintaining urls. I'm still a bit stunned a widely used GNU project would shutter its domain and release archive.
---
 contrib/fribidi/A02-remove-horrible-hack.patch | 17 +++++++++++++++++
 contrib/fribidi/A03-no-doc.patch               | 12 ++++++++++++
 contrib/fribidi/module.defs                    | 16 +++++++++++-----
 3 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 contrib/fribidi/A02-remove-horrible-hack.patch
 create mode 100644 contrib/fribidi/A03-no-doc.patch

diff --git a/contrib/fribidi/A02-remove-horrible-hack.patch b/contrib/fribidi/A02-remove-horrible-hack.patch
new file mode 100644
index 000000000..54c6839cd
--- /dev/null
+++ b/contrib/fribidi/A02-remove-horrible-hack.patch
@@ -0,0 +1,17 @@
+diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
+--- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
++++ fribidi-0.19.7/Makefile.am	2017-12-27 19:44:48.000000000 -0500
+@@ -37,12 +37,7 @@
+ 		$(srcdir)/missing \
+ 		$(srcdir)/mkinstalldirs \
+ 		$(srcdir)/ChangeLog \
+-		`find "$(srcdir)" -type f -name Makefile.in -print` \
+-		`$(srcdir)/bootstrap --write-configure`
+-# The last line above is a horrible hack.
+-# GNU Coding Standards recommends that `make maintainer-clean' should not 
+-# remove the configure script.
+-# We instead make configure call bootstrap.
++		`find "$(srcdir)" -type f -name Makefile.in -print`
+ 
+ # Indent all C source and header files, using indent(1):
+ 
diff --git a/contrib/fribidi/A03-no-doc.patch b/contrib/fribidi/A03-no-doc.patch
new file mode 100644
index 000000000..838e5f7d7
--- /dev/null
+++ b/contrib/fribidi/A03-no-doc.patch
@@ -0,0 +1,12 @@
+diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
+--- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
++++ fribidi-0.19.7/Makefile.am	2017-12-27 17:53:09.000000000 -0500
+@@ -11,7 +11,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ ## The order of subdirs is important, don't change without a reason.
+-SUBDIRS = gen.tab charset lib bin doc test
++SUBDIRS = gen.tab charset lib bin test
+ 
+ EXTRA_DIST = bootstrap ChangeLog.old
+ 
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index edb7477b0..01db6a1c2 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -5,14 +5,20 @@ endif
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.url    += https://fribidi.org/download/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.sha256  = 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e
+FRIBIDI.FETCH.url      = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.gz
+FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/0.19.7.tar.gz
+FRIBIDI.FETCH.sha256   = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8
+FRIBIDI.FETCH.basename = fribidi-0.19.7.tar.gz
+
+FRIBIDI.CONFIGURE.bootstrap = ./bootstrap;
+
+ifeq (1,$(BUILD.cross))
+    # force host system compiler for gen.tab, otherwise cross-compiling fails
+    FRIBIDI.CONFIGURE.bootstrap = ./bootstrap; sed -i.bak '/@CC@/s//gcc/' gen.tab/Makefile.in;
+endif
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no
 else ifeq (darwin,$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no
 endif
-
-FRIBIDI.CONFIGURE.bootstrap = ./bootstrap;
-- 
cgit v1.2.3