2 Commits

Author SHA1 Message Date
8f4bd0c6bd fix windows emoji font fallback 2026-07-08 22:18:28 -06:00
e0b159c069 Remove Manjaro package. Handled seperately. 2026-07-08 12:24:08 -06:00
4 changed files with 21 additions and 149 deletions

View File

@@ -1,79 +0,0 @@
name: Manjaro Package Build
on:
push:
branches: [master, main]
pull_request:
branches: [master, main]
workflow_dispatch:
permissions:
contents: read
jobs:
manjaro-package:
runs-on: ubuntu-latest
container:
image: manjarolinux/base:latest
steps:
- name: Install packaging toolchain
run: |
set -euxo pipefail
pacman -Syu --noconfirm
pacman -S --noconfirm --needed \
base-devel \
git \
namcap \
meson \
ninja \
pkgconf \
glib2 \
glib2-devel \
gtk3 \
openssl \
libcanberra \
libayatana-appindicator \
iso-codes \
lua \
perl \
python \
python-cffi \
pciutils
- name: Checkout repository
uses: actions/checkout@v5
with:
fetch-depth: 0
submodules: true
- name: Build package and generate .SRCINFO (non-root)
run: |
set -euxo pipefail
id -u builder >/dev/null 2>&1 || useradd -m builder
chown -R builder:builder "$GITHUB_WORKSPACE"
su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --noconfirm --syncdeps --cleanbuild"
su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --printsrcinfo > .SRCINFO"
- name: Lint PKGBUILD and package with namcap
run: |
set -euxo pipefail
cd "$GITHUB_WORKSPACE/packaging/manjaro"
namcap PKGBUILD
pkg_file="$(find . -maxdepth 1 -type f -name '*.pkg.tar.*' | head -n1)"
namcap "$pkg_file"
- name: Collect artifacts
run: |
set -euxo pipefail
mkdir -p artifacts
cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/*.pkg.tar.* artifacts/
cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/PKGBUILD artifacts/
cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/.SRCINFO artifacts/
- name: Upload package artifacts
uses: actions/upload-artifact@v6
with:
name: zoitechat-manjaro-package
path: artifacts/*
if-no-files-found: error

View File

@@ -1,69 +0,0 @@
# Maintainer: ZoiteChat Maintainers <zoitechat@users.noreply.github.com>
pkgname=zoitechat-git
pkgver=0
pkgrel=1
pkgdesc='IRC client for GNOME (ZoiteChat development snapshot)'
arch=('x86_64')
url='https://github.com/zoitechat/zoitechat'
license=('GPL-2.0-or-later')
depends=(
'glib2'
'gtk3'
'iso-codes'
'libayatana-appindicator'
'libcanberra'
'lua'
'openssl'
'perl'
'python-cffi'
)
makedepends=(
'git'
'meson'
'ninja'
'pkgconf'
'python'
)
optdepends=(
'pciutils: sysinfo plugin hardware detection details'
)
provides=('zoitechat')
conflicts=('zoitechat')
_repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
source=("zoitechat::git+file://${_repo_root}")
sha256sums=('SKIP')
pkgver() {
cd "$srcdir/zoitechat"
if git describe --long --tags --abbrev=7 >/dev/null 2>&1; then
git describe --long --tags --abbrev=7 \
| sed 's/^v//' \
| sed -E 's/([^-]+)-([0-9]+)-g/\1.r\2.g/' \
| sed 's/-/./g'
else
printf '0.r%s.%s\n' \
"$(git rev-list --count HEAD)" \
"$(git rev-parse --short=7 HEAD)"
fi
}
build() {
arch-meson zoitechat build \
-Dtext-frontend=false \
-Dwith-checksum=true \
-Dwith-fishlim=true \
-Dwith-lua=lua \
-Dwith-perl=perl \
-Dwith-python=python3 \
-Dwith-sysinfo=true \
-Dinstall-plugin-metainfo=true
meson compile -C build
}
package() {
meson install -C build --destdir "$pkgdir"
}

View File

@@ -3515,7 +3515,10 @@ mg_apply_session_font_prefs (session_gui *gui)
} }
if (gui->input_box && prefs.hex_gui_input_style) if (gui->input_box && prefs.hex_gui_input_style)
{
theme_manager_apply_entry_palette (gui->input_box, font); theme_manager_apply_entry_palette (gui->input_box, font);
mg_apply_emoji_fallback_widget (gui->input_box);
}
if (gui->chanview) if (gui->chanview)
chanview_apply_theme (gui->chanview); chanview_apply_theme (gui->chanview);
@@ -4364,7 +4367,7 @@ mg_inputbox_rightclick (GtkEntry *entry, GtkWidget *menu)
static const char *mg_emoji_family_fallback = static const char *mg_emoji_family_fallback =
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
"Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color"; "Segoe UI Emoji, Noto Color Emoji, Twemoji Mozilla, EmojiOne Color, Apple Color Emoji, Segoe UI Symbol";
#else #else
"Noto Color Emoji, Segoe UI Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color"; "Noto Color Emoji, Segoe UI Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color";
#endif #endif
@@ -4470,7 +4473,11 @@ mg_apply_emoji_fallback_widget (GtkWidget *widget)
if (!base_desc) if (!base_desc)
return; return;
#ifdef G_OS_WIN32
desc = mg_fontdesc_with_fallback (base_desc, TRUE);
#else
desc = mg_fontdesc_with_fallback (base_desc, FALSE); desc = mg_fontdesc_with_fallback (base_desc, FALSE);
#endif
pango_font_description_free (base_desc); pango_font_description_free (base_desc);
if (!desc) if (!desc)
return; return;
@@ -4788,6 +4795,7 @@ mg_create_entry (session *sess, GtkWidget *box)
if (prefs.hex_gui_input_style) if (prefs.hex_gui_input_style)
mg_apply_entry_style (entry); mg_apply_entry_style (entry);
mg_apply_emoji_fallback_widget (entry);
mg_apply_entry_scroll_artifact_fix (entry); mg_apply_entry_scroll_artifact_fix (entry);
g_object_set (G_OBJECT (entry), "show-emoji-icon", TRUE, NULL); g_object_set (G_OBJECT (entry), "show-emoji-icon", TRUE, NULL);

View File

@@ -601,6 +601,10 @@ static PangoFontDescription *
backend_font_open_real (char *name) backend_font_open_real (char *name)
{ {
PangoFontDescription *font; PangoFontDescription *font;
#ifdef WIN32
const char *family;
char *family_list;
#endif
font = pango_font_description_from_string (name); font = pango_font_description_from_string (name);
if (font && pango_font_description_get_size (font) == 0) if (font && pango_font_description_get_size (font) == 0)
@@ -611,6 +615,14 @@ backend_font_open_real (char *name)
if (!font) if (!font)
font = pango_font_description_from_string ("sans 11"); font = pango_font_description_from_string ("sans 11");
#ifdef WIN32
family = pango_font_description_get_family (font);
family_list = g_strdup_printf ("%s, Segoe UI Emoji, Noto Color Emoji, Twemoji Mozilla, Twitter Color Emoji, EmojiOne Color, EmojiOne Mozilla, Noto Emoji, Segoe UI Symbol, Symbola, Unifont",
family && *family ? family : "Sans");
pango_font_description_set_family (font, family_list);
g_free (family_list);
#endif
return font; return font;
} }