From 25d5b5bc3563221168758623811182417eb071b6 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Tue, 28 Apr 2020 18:12:35 +0200
Subject: [PATCH 1/3] fix #33 - Sigsegv upon starting dexed

---
 .gitlab-ci.yml | 8 ++++++++
 CHANGELOG.md   | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c64eb8d..5c34bb9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,10 +21,18 @@ release:
     GIT_SUBMODULE_STRATEGY: normal
   before_script:
   - apt-get update -y
+  # deps, packaging tools
   - apt-get install -y rpm
   - apt-get install -y git
   - apt-get install -y zip
   - apt-get install -y libcurl4-openssl-dev
+  # gitlab Ubuntu-based runners default to LD gold
+  # but linking lazarus programs requires LD bfd.
+  - update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 20
+  - update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 10
+  - update-alternatives --config ld
+  - ld --version
+  # lazarus
   - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.8/fpc-laz_3.0.4-1_amd64.deb/download && apt install -y ./fpc-laz_3.0.4-1_amd64.deb
   - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.8/fpc-src_3.0.4-2_amd64.deb/download && apt install -y ./fpc-src_3.0.4-2_amd64.deb
   - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.8/lazarus-project_2.0.8-0_amd64.deb/download && apt install -y ./lazarus-project_2.0.8-0_amd64.deb
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d08b6b2f..baed2fb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v3.9.1-dev
+
+## Bugs fixed
+
+- Other: Sigsegv upon starting dexed. (#33)
+- Other: the setting files could be corrupted when values contained mutli-bytes UTF-8 characters. (#19)
+
 # v3.9.0
 
 ## Enhancements

From 6c71cc8274640df37b5a229463691ccbf907cc31 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Tue, 28 Apr 2020 21:32:27 +0200
Subject: [PATCH 2/3] fix deb package location for library to make it compat
 with both ubuntu and debian

---
 setup/deb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/deb.sh b/setup/deb.sh
index 4e73688b..29a864b8 100644
--- a/setup/deb.sh
+++ b/setup/deb.sh
@@ -17,7 +17,7 @@ cfgdir=$basdir/DEBIAN
 bindir=$basdir/usr/bin
 pixdir=$basdir/usr/share/pixmaps
 shcdir=$basdir/usr/share/applications
-libdir=$basdir/usr/lib64
+libdir=$basdir/usr/lib
 
 mkdir -p $basdir
 mkdir -p $cfgdir

From ea76391bf92270359c8aaa43c5d67c2fc7630a03 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Tue, 28 Apr 2020 21:47:24 +0200
Subject: [PATCH 3/3] rpm, prevent dependency on specific on gitlab runner used
 to release

---
 setup/rpm.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/rpm.sh b/setup/rpm.sh
index 0d73bd7c..5f1cc822 100644
--- a/setup/rpm.sh
+++ b/setup/rpm.sh
@@ -69,11 +69,13 @@ Release: $lbl
 Summary: IDE for the D programming language
 License: Boost
 URL: gitlab.com/basile.b/dexed
-Requires: gtk2, glibc, cairo, libX11, vte
+Requires: gtk2, glibc, cairo, libX11, vte, libcurl
 
 %description
 Dexed is an IDE for the DMD D compiler.
 
+%define __requires_exclude libcurl.so.4
+
 %files
 /usr/bin/dexed
 /usr/lib64/libdexed-d.so