Merge branch 'epilys-dev' into dev

13 files changed, 160 insertions, 0 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..0d4486dc
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,70 @@
+name: packages
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+  workflow_dispatch:
+
+env:
+  RELEASE_VERSION: 0.8.0
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+          submodules: 'recursive'
+      - name: install-dependencies
+        run: |
+          git submodule sync
+          sudo apt-get update -qq -y
+          sudo apt-get install -y -qq --no-install-recommends cmake libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev libmpg123-dev debhelper dh-make devscripts fakeroot build-essential
+      - name: package-build
+        run: |
+          git archive --format=tar.gz --prefix=lagrange-${RELEASE_VERSION}/ HEAD >lagrange-${RELEASE_VERSION}.tar.gz
+          tar -xvzf lagrange-${RELEASE_VERSION}.tar.gz
+          ln -s lagrange-${RELEASE_VERSION}.tar.gz lagrange_${RELEASE_VERSION}.orig.tar.gz 
+          cd lagrange-${RELEASE_VERSION}
+          debuild
+          cd ..
+          mkdir -p artifacts
+          mv *deb artifacts/
+        shell: bash
+      - name: plain-build
+        run: |
+          mkdir builddir
+          cd builddir
+          cmake .. -DCMAKE_BUILD_TYPE=Release
+          cmake --build .
+          mkdir -p ../artifacts/
+          tar -czvf ../artifacts/lagrange-${RELEASE_VERSION}-linux-amd64.tar.gz lagrange
+          cd ..
+      - name: upload-artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ubuntu-latest
+          path: artifacts
+  debian_build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+          submodules: 'recursive'
+      - name: get-repo-name
+        run: |
+          echo "REPOSITORY_NAME="$(echo $GITHUB_REPOSITORY | awk -F / '{print $2}' | sed -e "s/:refs//") >> $GITHUB_ENV
+        shell: bash
+      - name: install-dependencies
+        run: |
+          git submodule sync
+      - name: debian_docker
+        uses: ./.github/workflows/docker-debian/
+      - name: upload-debian-artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: debian
+          path: /home/runner/work/${{env.REPOSITORY_NAME}}/${{env.REPOSITORY_NAME}}/artifacts
diff --git a/.github/workflows/docker-debian/action.yml b/.github/workflows/docker-debian/action.yml
new file mode 100644
index 00000000..d510199b
--- /dev/null
+++ b/.github/workflows/docker-debian/action.yml
@@ -0,0 +1,4 @@
+name: 'docker'
+runs:
+  using: 'docker'
+  image: 'debian-dockerfile'
diff --git a/.github/workflows/docker-debian/debian-dockerfile b/.github/workflows/docker-debian/debian-dockerfile
new file mode 100644
index 00000000..147449a0
--- /dev/null
+++ b/.github/workflows/docker-debian/debian-dockerfile
@@ -0,0 +1,8 @@
+# Container image that runs your code
+FROM debian:buster
+
+# Copies your code file from your action repository to the filesystem path `/` of the container
+COPY entrypoint.sh /entrypoint.sh
+
+# Code file to execute when the docker container starts up (`entrypoint.sh`)
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/workflows/docker-debian/entrypoint.sh b/.github/workflows/docker-debian/entrypoint.sh
new file mode 100755
index 00000000..67518f3b
--- /dev/null
+++ b/.github/workflows/docker-debian/entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/sh -xv
+
+apt-get update -qq -y
+apt-get install -y -qq --no-install-recommends cmake libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev libmpg123-dev debhelper dh-make devscripts fakeroot git build-essential
+git submodule sync
+
+git archive --format=tar.gz --prefix=lagrange-${RELEASE_VERSION}/ HEAD >lagrange-${RELEASE_VERSION}.tar.gz
+tar -xvzf lagrange-${RELEASE_VERSION}.tar.gz
+ln -s lagrange-${RELEASE_VERSION}.tar.gz lagrange_${RELEASE_VERSION}.orig.tar.gz 
+cd lagrange-${RELEASE_VERSION}
+debuild
+cd ..
+mkdir -p artifacts
+mv *deb artifacts/
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 00000000..ad9f06ad
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,14 @@
+lagrange (0.8.0) unstable; urgency=low
+
+  * Added support for Gopher.
+  * Added support for the full palette of 8-bit ANSI foreground colors.
+  * Added option to disable smooth scrolling.
+  * Added button to manually set server certificate as trusted (if the certificate is valid but untrusted).
+  * Added keybindings for Back/Forward navigation.
+  * Added a context menu item for opening HTTP links in the default browser even when a proxy is configured.
+  * Revised identity creation dialog: changed field order, added warning about temporary identities not being saved.
+  * Ctrl+Click opens tab in background, Shift+Ctrl+Click opens as foreground tab. The same modifier keys work with keyboard navigation.
+  * Improved word wrapping of emoticons (:D).
+  * Automatic redirects allowed when the destination URL uses the same scheme as the originating URL. For example, when using a proxy, HTTP(S) is allowed to automatically redirect to other HTTP(S) URLs.
+  
+ -- Jaakko Keränen (skyjake) <jaakko.keranen@iki.fi>  Sun, 08 Nov 2020 17:11:46 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000..b4de3947
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000..88ef8134
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: lagrange
+Section: net
+Priority: optional
+Maintainer: Jaakko Keränen (skyjake) <jaakko.keranen@iki.fi>
+Build-Depends: cmake, debhelper (>=11~), libsdl2-dev, libssl-dev, libpcre3-dev, zlib1g-dev, libunistring-dev, libmpg123-dev
+Standards-Version: 4.1.4
+Homepage: https://gmi.skyjake.fi/lagrange/
+
+Package: lagrange
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Lagrange - A Beautiful Gemini Client
+ Lagrange is a desktop GUI client for browsing Geminispace.
+ It offers modern conveniences familiar from web browsers, 
+ such as smooth scrolling, inline image viewing, multiple 
+ tabs, visual themes, Unicode fonts, bookmarks, history,
+ and page outlines.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 00000000..f38d3382
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,14 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: lagrange
+Upstream-Contact: Jaakko Keränen (skyjake) <jaakko.keranen@iki.fi>
+Source: https://codeberg.org/skyjake/lagrange
+
+Files: *
+Copyright: 2020 Jaakko Keränen
+License: BSD-2-Clause
+
+Files: src/audio/stb_vorbic.c
+       src/stb_image.h
+       src/stb_truetype.h
+Copyright: 2007 Sean Barrett
+License: MIT
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..4a97dfa7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# You must remove unused comment lines for the released package.
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000..f4578eea
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+export DH_VERBOSE = 1
+export DEB_BUILD_MAINT_OPTIONS=hardening=-format
+
+%:
+        dh $@  
+
+override_dh_auto_configure:
+        cmake .. -DENABLE_WINDOWPOS_FIX=YES -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(pwd)/../usr
+
+override_dh_build_configure:
+        cmake --build .
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 00000000..00131ee8
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+#abort-on-upstream-changes
+#unapply-patches
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000..9e7c0dae
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1 @@
+version=3