From a335a0e9ec159ce1e089ca7329ff27cd81a4696d Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 15:53:52 +0800 Subject: [PATCH 01/10] Add site name and description to config --- _config.yml | 2 ++ _layouts/default.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 5176834..bda94ea 100644 --- a/_config.yml +++ b/_config.yml @@ -1,3 +1,5 @@ +name: Project Cangjie 全倉頡計劃 +description: Website for Project Cangjie 全倉頡計劃 highlighter: pygments markdown: redcarpet url: https://cangjie.pages.freedesktop.org diff --git a/_layouts/default.html b/_layouts/default.html index d8b9eea..e546f91 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,12 +4,12 @@ - + - {{ page.title }} + {{ page.title }} | {{ site.name }} From aced2a2cacb8552d42aaad482ba5295f48a142d3 Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 16:01:26 +0800 Subject: [PATCH 02/10] Update projects subdirectory * Get rid of the old GitHub related URLs. Replace with the new gitlab.freedesktop.org URLs. * In the install.md of each project, remove old Autotools build routines with the new meson-based ones. --- downloads/ibus-cangjie/index.md | 2 +- downloads/libcangjie/index.md | 2 +- downloads/pycangjie/index.md | 2 +- projects/ibus-cangjie/contribute.md | 4 ++-- projects/ibus-cangjie/index.md | 7 +++---- projects/ibus-cangjie/install.md | 25 ++++++++++++++++--------- projects/libcangjie/index.md | 5 ++--- projects/libcangjie/install.md | 25 +++++++++++++++++-------- projects/pycangjie/contribute.md | 4 ++-- projects/pycangjie/index.md | 7 +++---- projects/pycangjie/install.md | 25 +++++++++++++++++-------- 11 files changed, 65 insertions(+), 43 deletions(-) diff --git a/downloads/ibus-cangjie/index.md b/downloads/ibus-cangjie/index.md index d1161af..7538104 100644 --- a/downloads/ibus-cangjie/index.md +++ b/downloads/ibus-cangjie/index.md @@ -3,4 +3,4 @@ layout: default project: ibus-cangjie --- -IBus Cangjie downloads are now available [from Github](https://github.com/Cangjians/ibus-cangjie/releases). +IBus Cangjie downloads are now available [from Freedesktop.org](https://gitlab.freedesktop.org/cangjie/ibus-cangjie/-/releases). diff --git a/downloads/libcangjie/index.md b/downloads/libcangjie/index.md index b8b4fab..ef38a1a 100644 --- a/downloads/libcangjie/index.md +++ b/downloads/libcangjie/index.md @@ -3,4 +3,4 @@ layout: default project: libcangjie --- -libcangjie downloads are now available [from Github](https://github.com/Cangjians/libcangjie/releases). +libcangjie downloads are now available [from Freedesktop.org](https://gitlab.freedesktop.org/cangjie/libcangjie/-/releases). diff --git a/downloads/pycangjie/index.md b/downloads/pycangjie/index.md index dc5a1e5..2e482a1 100644 --- a/downloads/pycangjie/index.md +++ b/downloads/pycangjie/index.md @@ -3,4 +3,4 @@ layout: default project: pycangjie --- -pycangjie downloads are now available [from Github](https://github.com/Cangjians/pycangjie/releases). +pycangjie downloads are now available [from Freedesktop.org](https://gitlab.freedesktop.org/cangjie/pycangjie/-/releases). diff --git a/projects/ibus-cangjie/contribute.md b/projects/ibus-cangjie/contribute.md index e090d96..2ce6a79 100644 --- a/projects/ibus-cangjie/contribute.md +++ b/projects/ibus-cangjie/contribute.md @@ -18,8 +18,8 @@ First of all, it is written in Python 3, so if you want to contribute to the code, you'll need to know a bit about that. If you find a bug, please make sure it is not -[already known](https://github.com/Cangjians/ibus-cangjie/issues), and if not -please [report it](https://github.com/Cangjians/ibus-cangjie/issues/new). +[already known](https://gitlab.freedesktop.org/cangjie/ibus-cangjie/-/issues), and if not +please [report it](https://gitlab.freedesktop.org/cangjie/ibus-cangjie/-/issues/new). Of course, when looking at the list of open bugs, if you find one you would like to fix, just go ahead and send us a pull request. diff --git a/projects/ibus-cangjie/index.md b/projects/ibus-cangjie/index.md index eb06e9a..ffe9fb4 100644 --- a/projects/ibus-cangjie/index.md +++ b/projects/ibus-cangjie/index.md @@ -15,12 +15,11 @@ Chinese, as they are (by far) the majority of Cangjie and Quick users. However, it should work for others as well (e.g to input Simplified Chinese). Note that the actual input logic is handled by -[libcangjie](https://github.com/Cangjians/libcangjie). +[libcangjie](https://gitlab.freedesktop.org/cangjie/libcangjie). -Development happens [on github](https://github.com/Cangjians/ibus-cangjie), +Development happens [on freedesktop.org](https://gitlab.freedesktop.org/cangjie/ibus-cangjie), table release tarballs can be found in -[the download section](http://cangjians.github.io/downloads/ibus-cangjie/) of -our website. +[the releases section](https://gitlab.freedesktop.org/cangjie/ibus-cangjie/-/releases/) there. ## Legalities diff --git a/projects/ibus-cangjie/install.md b/projects/ibus-cangjie/install.md index e135ff5..bc7a9b8 100644 --- a/projects/ibus-cangjie/install.md +++ b/projects/ibus-cangjie/install.md @@ -39,14 +39,14 @@ $ sudo yum install ibus-cangjie ## Gentoo IBus Cangjie is included in the Gentoo repositories. It is currently masked. -You will need to add "app-i18n/ibus-cangjie" to your /etc/portage/package.accept_keywords +You will need to add "app-i18n/ibus-cangjie" to your /etc/portage/package.accept_keywords or use autounmask. Once unmasked install as root with : ``` $ emerge app-i18n/ibus-cangjie ``` -## Ubuntu 14.04 +## Ubuntu 14.04 or later IBus Cangjie is included in the default Ubuntu repositories, **starting with the 14.04 release**, so you can install it with `apt-get`: @@ -73,15 +73,22 @@ To build IBus Cangjie, you will need the following: ### Install from a release tarball Download a release tarball from -[the download section](http://cangjians.github.io/downloads/ibus-cangjie/) of -our website. +[the releases section](https://gitlab.freedesktop.org/cangjie/ibus-cangjie/-/releases) on. -From the root folder of the unpacked tarball, do the usual Autotools dance: +Installation requires [meson](https://mesonbuild.com/) build system to run. +After installing meson, from the root folder of the unpacked tarball, run: ``` -$ ./configure -$ make -$ sudo make install +$ meson setup ./builddir --prefix=/usr --wipe +$ meson build ./builddir +$ meson install -C ./builddir +``` + +If you have ibus-cangjie already running before this process, remember to +restart ibus daemon to reload the newly built and installed version: + +``` +$ ibus restart ``` ### Install from Git @@ -89,7 +96,7 @@ $ sudo make install First, you need to clone the development repository: ``` -$ git clone git://github.com/Cangjians/ibus-cangjie +$ git clone https://gitlab.freedesktop.org/cangjie/ibus-cangjie.git ``` Then, from the root folder of the Git clone, do the usual Autotools dance: diff --git a/projects/libcangjie/index.md b/projects/libcangjie/index.md index 84933f3..c7822d0 100644 --- a/projects/libcangjie/index.md +++ b/projects/libcangjie/index.md @@ -47,13 +47,12 @@ int main() { ``` For more details, refer to the documentation, either -[online](http://cangjians.github.io/projects/libcangjie/documentation) +[online]({{ site.url }}/projects/libcangjie/documentation) or the one shipped with this software. Development happens [at Freedesktop.org](https://gitlab.freedesktop.org/cangjie/libcangjie), and stable release tarballs can be found in -[the download section](http://cangjians.github.io/downloads/libcangjie/) of -our website. +[the releases section](https://gitlab.freedesktop.org/cangjie/libcangjie/-/releases) there. ## History diff --git a/projects/libcangjie/install.md b/projects/libcangjie/install.md index ef2bd69..946be9b 100644 --- a/projects/libcangjie/install.md +++ b/projects/libcangjie/install.md @@ -44,14 +44,14 @@ the `libcangjie-devel` package. ## Gentoo Libcangjie is included in the Gentoo repositories. It is currently masked. -You will need to add "app-i18n/libcangjie" to your /etc/portage/package.accept_keywords +You will need to add "app-i18n/libcangjie" to your /etc/portage/package.accept_keywords or use autounmask. Once unmasked install as root with : ``` $ emerge app-i18n/libcangjie ``` -## Ubuntu 14.04 +## Ubuntu 14.04 or later libcangjie is included in the default Ubuntu repositories, **starting with the 14.04 release**, so you can install it with `apt-get`: @@ -84,15 +84,24 @@ To build this library, you will need the following: ### Install from a release tarball Download a release tarball from -[the download section](http://cangjians.github.io/downloads/libcangjie/) of -our website. +[the releases section](https://gitlab.freedesktop.org/cangjie/libcangjie/-/releases) on +Freedesktop.org. -From the root folder of the unpacked tarball, do the usual Autotools dance: +Installation requires [meson](https://mesonbuild.com/) build system to run. +After installing meson, from the root folder of the unpacked tarball, run: ``` -$ ./configure -$ make -$ sudo make install +$ meson setup ./builddir --prefix=/usr --wipe +$ meson build ./builddir +$ meson install -C ./builddir +``` + +If you have want to test against ibus-cangjie on your system but ibus-cangjie is +already running before this process, remember to restart ibus daemon to reload +the newly built and installed version: + +``` +$ ibus restart ``` ### Install from Git diff --git a/projects/pycangjie/contribute.md b/projects/pycangjie/contribute.md index 827210e..510ff7e 100644 --- a/projects/pycangjie/contribute.md +++ b/projects/pycangjie/contribute.md @@ -18,8 +18,8 @@ code, you'll need to know a bit about that. Basic C and Python knowledge goes a long way towards understanding Cython. If you find a bug, please make sure it is not -[already known](https://github.com/Cangjians/pycangjie/issues), and if not -please [report it](https://github.com/Cangjians/pycangjie/issues/new). +[already known](htthttps://gitlab.freedesktop.org/cangjie/pycangjie/-/issues), and if not +please [report it](https://gitlab.freedesktop.org/cangjie/pycangjie/-/issues/new). Of course, when looking at the list of open bugs, if you find one you would like to fix, just go ahead and send us a pull request. diff --git a/projects/pycangjie/index.md b/projects/pycangjie/index.md index d804a5b..7afaa26 100644 --- a/projects/pycangjie/index.md +++ b/projects/pycangjie/index.md @@ -22,13 +22,12 @@ for c in cj.get_characters("a*y"): ``` For more details, refer to the documentation, either -[online](http://cangjians.github.io/projects/pycangjie/documentation) +[online]({{ site.url }}/projects/pycangjie/documentation) or the one shipped with this software. -Development happens [on github](https://github.com/Cangjians/pycangjie), and +Development happens [on Freedesktop.org](https://gitlab.freedesktop.org/cangjie/pycangjie), and stable release tarballs can be found in -[the download section](http://cangjians.github.io/downloads/pycangjie/) of -our website. +[the releases section](https://gitlab.freedesktop.org/cangjie/pycangjie/-/releases) there. ## Legalities diff --git a/projects/pycangjie/install.md b/projects/pycangjie/install.md index da19bc5..6fcb4da 100644 --- a/projects/pycangjie/install.md +++ b/projects/pycangjie/install.md @@ -38,7 +38,7 @@ $ sudo yum install python3-cangjie ## Gentoo Pycangjie is included in the Gentoo repositories. It is currently masked. -You will need to add "dev-python/cangjie" to your /etc/portage/package.accept_keywords +You will need to add "dev-python/cangjie" to your /etc/portage/package.accept_keywords or use autounmask. Once unmasked install as root with : ``` @@ -77,8 +77,8 @@ To build these bindings, you will need the following: ### Install from a release tarball Download a release tarball from -[the download section](http://cangjians.github.io/downloads/pycangjie/) of -our website. +[the releases section](https://gitlab.freedesktop.org/cangjie/pycangjie/-/releases) on +Freedesktop.org. From the root folder of the unpacked tarball, do the usual Autotools dance: @@ -93,13 +93,22 @@ $ sudo make install First, you need to clone the development repository: ``` -$ git clone git://github.com/Cangjians/pycangjie +$ git clone https://gitlab.freedesktop.org/cangjie/pycangjie.git ``` -Then, from the root folder of the Git clone, do the usual Autotools dance: +Installation requires [meson](https://mesonbuild.com/) build system to run. +After installing meson, from the root folder of the unpacked tarball, run: ``` -$ ./autogen.sh -$ make -$ sudo make install +$ meson setup ./builddir --prefix=/usr --wipe +$ meson build ./builddir +$ meson install -C ./builddir +``` + +If you have want to test against ibus-cangjie on your system but ibus-cangjie is +already running before this process, remember to restart ibus daemon to reload +the newly built and installed version: + +``` +$ ibus restart ``` From 35e29dd7742129b9f0b364e257c7369698c201a9 Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 17:23:02 +0800 Subject: [PATCH 03/10] contribute.md: convert github URLs to freedesktop.org --- contribute.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contribute.md b/contribute.md index c29f30c..1de5aeb 100644 --- a/contribute.md +++ b/contribute.md @@ -14,7 +14,7 @@ If you are interested, this page should give you all the necessary informations to join the team, and help us make the best possible input experience for Cangjie and Quick users. -Development happens [on Github](https://github.com/Cangjians/), where you can +Development happens [on Freedesktop.org](https://gitlab.freedesktop.org/cangjie), where you can find the source code for [our projects](/projects/), view the open issues and report new ones. @@ -54,18 +54,18 @@ to read Peter Hutterer’s great post about This website is also Free as in Freedom, just like [our software](/projects/). Unless specified otherwise, consider that all the web pages and assets under -the `cangjians.github.io` domain are under the +the `cangjie.pages.freedesktop.org` domain are under the [Creative Commons Attribution Share Alike](http://creativecommons.org/licenses/by-sa/3.0/) license. As everything else, it is hosted -[on Github](https://github.com/Cangjians/cangjians.github.io). +[on Freedesktop.org](https://gitlab.freedesktop.org/cangjie/cangjie.pages.freedesktop.org). If you find any problem with it, -[report the issue](https://github.com/Cangjians/cangjians.github.io/issues/new), +[report the issue](https://gitlab.freedesktop.org/cangjie/cangjie.pages.freedesktop.org/-/issues/new), or better: open a pull request! -### Make a new release +### Make a new release (Outdated) *Note: This is intended to the members of the team, although it can be of interest to developers in general.* From 71405632228699d7626637f614088aa8c65c7cb8 Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 16:08:29 +0800 Subject: [PATCH 04/10] Redirects GitHub page traffics to Freedesktop.org --- javascripts/main.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/javascripts/main.js b/javascripts/main.js index 0bac0e7..8404187 100644 --- a/javascripts/main.js +++ b/javascripts/main.js @@ -1,3 +1,21 @@ +(function () { + // Check if the domain is within accepted domain names. + // If not, redirect to the correct domain with the current path. + const acceptedDomains = [ + 'cangjie.pages.freedesktop.org', + 'localhost', // For local development + ]; + + const currentDomain = window.location.hostname; + if (acceptedDomains.includes(currentDomain)) { + return; + } + + const currentPath = window.location.pathname; + const newUrl = `https://${acceptedDomains[0]}${currentPath}`; + window.location.replace(newUrl); +})(); + (function () { // "Animate" the image on the home page const home_image = document.getElementById("cangjie_home"); From eb86c56710b65eded92fc8c30dd46063b15b0e51 Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 16:09:51 +0800 Subject: [PATCH 05/10] Add Gemfile.lock to repo * Prevent future version breaks to the build. --- .gitignore | 3 - Gemfile.lock | 303 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 303 insertions(+), 3 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 8594b18..0590eff 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,5 @@ # Configured Jekyll build target folder /public -# Gem lockfile -/Gemfile.lock - # Vim temporary file *.swp diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..30a985a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,303 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.1.3.4) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + bigdecimal (3.1.8) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + colorator (1.1.0) + commonmarker (0.23.10) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) + dnsruby (1.72.2) + simpleidn (~> 0.2.1) + drb (2.2.1) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) + eventmachine (1.2.7) + execjs (2.9.1) + faraday (2.10.1) + faraday-net_http (>= 2.0, < 3.2) + logger + faraday-net_http (3.1.1) + net-http + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-aarch64-linux-musl) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm-linux-musl) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86-linux-musl) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.0-x86_64-linux-musl) + forwardable-extended (2.6.0) + gemoji (4.1.0) + github-pages (231) + github-pages-health-check (= 1.18.2) + jekyll (= 3.9.5) + jekyll-avatar (= 0.8.0) + jekyll-coffeescript (= 1.2.2) + jekyll-commonmark-ghpages (= 0.4.0) + jekyll-default-layout (= 0.1.5) + jekyll-feed (= 0.17.0) + jekyll-gist (= 1.5.0) + jekyll-github-metadata (= 2.16.1) + jekyll-include-cache (= 0.2.1) + jekyll-mentions (= 1.6.0) + jekyll-optional-front-matter (= 0.3.2) + jekyll-paginate (= 1.1.0) + jekyll-readme-index (= 0.3.0) + jekyll-redirect-from (= 0.16.0) + jekyll-relative-links (= 0.6.1) + jekyll-remote-theme (= 0.4.3) + jekyll-sass-converter (= 1.5.2) + jekyll-seo-tag (= 2.8.0) + jekyll-sitemap (= 1.4.0) + jekyll-swiss (= 1.0.0) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) + jekyll-titles-from-headings (= 0.5.3) + jemoji (= 0.13.0) + kramdown (= 2.4.0) + kramdown-parser-gfm (= 1.1.0) + liquid (= 4.0.4) + mercenary (~> 0.3) + minima (= 2.5.1) + nokogiri (>= 1.13.6, < 2.0) + rouge (= 3.30.0) + terminal-table (~> 1.4) + github-pages-health-check (1.18.2) + addressable (~> 2.3) + dnsruby (~> 1.60) + octokit (>= 4, < 8) + public_suffix (>= 3.0, < 6.0) + typhoeus (~> 1.3) + html-pipeline (2.14.3) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.8.0) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + jekyll (3.9.5) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (>= 0.7, < 2) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (>= 1.17, < 3) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-avatar (0.8.0) + jekyll (>= 3.0, < 5.0) + jekyll-coffeescript (1.2.2) + coffee-script (~> 2.2) + coffee-script-source (~> 1.12) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.4.0) + commonmarker (~> 0.23.7) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) + rouge (>= 2.0, < 5.0) + jekyll-default-layout (0.1.5) + jekyll (>= 3.0, < 5.0) + jekyll-feed (0.17.0) + jekyll (>= 3.7, < 5.0) + jekyll-gist (1.5.0) + octokit (~> 4.2) + jekyll-github-metadata (2.16.1) + jekyll (>= 3.4, < 5.0) + octokit (>= 4, < 7, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) + jekyll-mentions (1.6.0) + html-pipeline (~> 2.3) + jekyll (>= 3.7, < 5.0) + jekyll-optional-front-matter (0.3.2) + jekyll (>= 3.0, < 5.0) + jekyll-paginate (1.1.0) + jekyll-readme-index (0.3.0) + jekyll (>= 3.0, < 5.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) + jekyll-relative-links (0.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-remote-theme (0.4.3) + addressable (~> 2.0) + jekyll (>= 3.5, < 5.0) + jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) + rubyzip (>= 1.3.0, < 3.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-swiss (1.0.0) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-hacker (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-primer (0.6.0) + jekyll (> 3.5, < 5.0) + jekyll-github-metadata (~> 2.9) + jekyll-seo-tag (~> 2.0) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-titles-from-headings (0.5.3) + jekyll (>= 3.3, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) + html-pipeline (~> 2.2) + jekyll (>= 3.0, < 5.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) + mercenary (0.3.6) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + minitest (5.24.1) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.7-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86-linux) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-linux) + racc (~> 1.4) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (5.1.1) + racc (1.8.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + rexml (3.3.4) + strscan + rouge (3.30.0) + rubyzip (2.3.2) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + simpleidn (0.2.3) + strscan (3.1.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + typhoeus (1.4.1) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (1.8.0) + uri (0.13.0) + webrick (1.8.1) + +PLATFORMS + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86-linux + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl + +DEPENDENCIES + github-pages + webrick + +BUNDLED WITH + 2.5.17 From 7548b23bd0bab7764b6fe8ec12ba089900b82987 Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 16:15:21 +0800 Subject: [PATCH 06/10] Update contact information * Remove IRC in favor of Matrix. * Remove email group because it was no longer active. --- contact.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/contact.md b/contact.md index efe5df6..d66d802 100644 --- a/contact.md +++ b/contact.md @@ -17,15 +17,11 @@ However, if you want to discuss about anything related to our team, our projects, or even the Cangjie input method in general, you can reach us on one of the following forums. -For **real-time chat**, please please join the `#linux-hk` channel on the -Freenode IRC network, say hi, and just ask about the Cangjians, or the -specific project you are interested in. At least Mathieu Bridon (aka -*bochecha*) hangs in there all day long, almost every day. - -If you'd rather talk to us over **email**, you can send one to -[the mailing-list](https://groups.google.com/forum/#!forum/hklug) of the -[Hong Kong Linux User Group](http://www.linux.org.hk/), and start the -conversation over there. +For **real-time chat**, please please join the [`#cangjie:converser.eu`][matrix-invite-url] +Matrix chatroom, say hi, and just ask about the Project Cangjie, or the specific +project you are interested in. At least Mathieu Bridon (aka +*bochecha*) and Koala Yeung (aka *yookoala*) hang in there all day long, almost +every day. And if you are in Hong Kong, feel free to use one of the above to get in touch and organize a real-life meetup over a drink. (*especially if you're inviting! @@ -38,3 +34,6 @@ promise to try our best to answer within a reasonable time frame. Of course, we **love** receiving feedback on our software, both good and bad (as long as it remains polite and constructive), so don't hesitate to contact us. + + +[matrix-invite-url]: https://matrix.to/#/#cangjie:converser.eu \ No newline at end of file From 2fd631fd5099c7a36e5eeb8156df47798241a5cd Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 16:19:43 +0800 Subject: [PATCH 07/10] README.md: fix development note * Server address without trailing slash seems to not work propertly. Add the trailing slash to be developers friendly. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 57179fd..e919790 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ bundle exec jekyll serve The server address will be displayed after the service is ready. -Usually the server address will be: http://127.0.0.1:4000 \ No newline at end of file +Usually the server address will be: http://127.0.0.1:4000/ From e058f1e6420f06142c1a10b5f1bc479dcada1dc2 Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 17:17:45 +0800 Subject: [PATCH 08/10] Retheme "Fork me" banner * Replace GitHub icon with the Freedesktop.org icon on the banner. * Use the Freedesktop.org theme color for the banner. --- images/freedesktop-org-icon.svg | 79 +++++++++++++++++++++++++++++++++ stylesheets/cangjians.css | 13 ++++++ 2 files changed, 92 insertions(+) create mode 100644 images/freedesktop-org-icon.svg diff --git a/images/freedesktop-org-icon.svg b/images/freedesktop-org-icon.svg new file mode 100644 index 0000000..cefced7 --- /dev/null +++ b/images/freedesktop-org-icon.svg @@ -0,0 +1,79 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/stylesheets/cangjians.css b/stylesheets/cangjians.css index 7f74b00..8b287a9 100644 --- a/stylesheets/cangjians.css +++ b/stylesheets/cangjians.css @@ -1,3 +1,16 @@ +:root { + --freedesktop-org-theme-color-rgb: 59, 128, 174; +} +#forkme_banner { + background-color: rgba(var(--freedesktop-org-theme-color-rgb), 0.6); + background-image: url('../images/freedesktop-org-icon.svg'); + background-size: 30px auto; + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; +} +#forkme_banner:hover { + background-color: rgba(var(--freedesktop-org-theme-color-rgb), 1); +} header.inner { padding-bottom: 0px !important; } From f1ffdba8bff5aa235b312e26a39657a440fb0ff7 Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 17:34:55 +0800 Subject: [PATCH 09/10] Fix "Fork me" banner URL * Should point to the project repositories instead of the site. --- _includes/header.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_includes/header.html b/_includes/header.html index 76cbaf8..f4efa9e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,6 +1,8 @@
- View on Freedesktop.org + View on Freedesktop.org

Project Cangjie 全倉頡中文輸入

 From e78f1080648e2a8bfe30f242c36c4d1550fc155f Mon Sep 17 00:00:00 2001 From: Koala Yeung Date: Tue, 6 Aug 2024 22:44:55 +0800 Subject: [PATCH 10/10] README.md: remind developer to install ruby headers * Development notes to remind developer to install ruby's development headers so the binary gems are installable. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e919790..d110056 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ This is the repository to build the website for the Cangjian project To develop the site locally, you need to install: * Ruby v3.0.0 or later +* The development headers of Ruby (e.g. "ruby-devel" or "ruby-dev" package in + your distro). * Rubygems To run the site locally: