From 215a5e9cda0f9d038feaa89d7f1a591b8cdb5b60 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 20 Jul 2024 20:05:53 +0200 Subject: [PATCH] remove custom fork of chroma since patch has been merged upstream patch theme css to restore green as primary color [release 1.22.1-2mamba;Sat Jul 20 2024] --- gitea-1.22.1-theme-primary-green.patch | 118 +++++++++++++++++++++++++ gitea.spec | 15 ++-- 2 files changed, 125 insertions(+), 8 deletions(-) create mode 100644 gitea-1.22.1-theme-primary-green.patch diff --git a/gitea-1.22.1-theme-primary-green.patch b/gitea-1.22.1-theme-primary-green.patch new file mode 100644 index 0000000..ee31085 --- /dev/null +++ b/gitea-1.22.1-theme-primary-green.patch @@ -0,0 +1,118 @@ +diff -Nru gitea-1.22.1/web_src/css/themes.orig/theme-gitea-dark.css gitea-1.22.1/web_src/css/themes/theme-gitea-dark.css +--- gitea-1.22.1/web_src/css/themes.orig/theme-gitea-dark.css 2024-07-04 14:41:15.000000000 +0200 ++++ gitea-1.22.1/web_src/css/themes/theme-gitea-dark.css 2024-07-20 15:53:40.392209206 +0200 +@@ -3,31 +3,31 @@ + + :root { + --is-dark-theme: true; +- --color-primary: #4183c4; ++ --color-primary: #41ad32; + --color-primary-contrast: #ffffff; +- --color-primary-dark-1: #548fca; +- --color-primary-dark-2: #679cd0; +- --color-primary-dark-3: #7aa8d6; +- --color-primary-dark-4: #8db5dc; +- --color-primary-dark-5: #b3cde7; +- --color-primary-dark-6: #d9e6f3; +- --color-primary-dark-7: #f4f8fb; +- --color-primary-light-1: #3876b3; +- --color-primary-light-2: #31699f; +- --color-primary-light-3: #2b5c8b; +- --color-primary-light-4: #254f77; +- --color-primary-light-5: #193450; +- --color-primary-light-6: #0c1a28; +- --color-primary-light-7: #04080c; +- --color-primary-alpha-10: #4183c419; +- --color-primary-alpha-20: #4183c433; +- --color-primary-alpha-30: #4183c44b; +- --color-primary-alpha-40: #4183c466; +- --color-primary-alpha-50: #4183c480; +- --color-primary-alpha-60: #4183c499; +- --color-primary-alpha-70: #4183c4b3; +- --color-primary-alpha-80: #4183c4cc; +- --color-primary-alpha-90: #4183c4e1; ++ --color-primary-dark-1: #54ca8f; ++ --color-primary-dark-2: #67d09c; ++ --color-primary-dark-3: #7ad6a8; ++ --color-primary-dark-4: #8ddcb5; ++ --color-primary-dark-5: #b3e7cd; ++ --color-primary-dark-6: #d9f3e6; ++ --color-primary-dark-7: #f4fbf8; ++ --color-primary-light-1: #38b376; ++ --color-primary-light-2: #319f69; ++ --color-primary-light-3: #2b8b5c; ++ --color-primary-light-4: #25774f; ++ --color-primary-light-5: #195034; ++ --color-primary-light-6: #0c281a; ++ --color-primary-light-7: #040c08; ++ --color-primary-alpha-10: #41c48319; ++ --color-primary-alpha-20: #41c48333; ++ --color-primary-alpha-30: #41c4834b; ++ --color-primary-alpha-40: #41c48366; ++ --color-primary-alpha-50: #41c48380; ++ --color-primary-alpha-60: #41c48399; ++ --color-primary-alpha-70: #41c483b3; ++ --color-primary-alpha-80: #41c483cc; ++ --color-primary-alpha-90: #41c483e1; + --color-primary-hover: var(--color-primary-light-1); + --color-primary-active: var(--color-primary-light-2); + --color-secondary: #3b444c; +diff -Nru gitea-1.22.1/web_src/css/themes.orig/theme-gitea-light.css gitea-1.22.1/web_src/css/themes/theme-gitea-light.css +--- gitea-1.22.1/web_src/css/themes.orig/theme-gitea-light.css 2024-07-04 14:41:15.000000000 +0200 ++++ gitea-1.22.1/web_src/css/themes/theme-gitea-light.css 2024-07-20 15:54:01.924264621 +0200 +@@ -3,31 +3,31 @@ + + :root { + --is-dark-theme: false; +- --color-primary: #4183c4; ++ --color-primary: #41ad32; + --color-primary-contrast: #ffffff; +- --color-primary-dark-1: #3876b3; +- --color-primary-dark-2: #31699f; +- --color-primary-dark-3: #2b5c8b; +- --color-primary-dark-4: #254f77; +- --color-primary-dark-5: #193450; +- --color-primary-dark-6: #0c1a28; +- --color-primary-dark-7: #04080c; +- --color-primary-light-1: #548fca; +- --color-primary-light-2: #679cd0; +- --color-primary-light-3: #7aa8d6; +- --color-primary-light-4: #8db5dc; +- --color-primary-light-5: #b3cde7; +- --color-primary-light-6: #d9e6f3; +- --color-primary-light-7: #f4f8fb; +- --color-primary-alpha-10: #4183c419; +- --color-primary-alpha-20: #4183c433; +- --color-primary-alpha-30: #4183c44b; +- --color-primary-alpha-40: #4183c466; +- --color-primary-alpha-50: #4183c480; +- --color-primary-alpha-60: #4183c499; +- --color-primary-alpha-70: #4183c4b3; +- --color-primary-alpha-80: #4183c4cc; +- --color-primary-alpha-90: #4183c4e1; ++ --color-primary-dark-1: #38b376; ++ --color-primary-dark-2: #319f69; ++ --color-primary-dark-3: #2b8b5c; ++ --color-primary-dark-4: #25774f; ++ --color-primary-dark-5: #195034; ++ --color-primary-dark-6: #0c281a; ++ --color-primary-dark-7: #040c08; ++ --color-primary-light-1: #54ca8f; ++ --color-primary-light-2: #67d09c; ++ --color-primary-light-3: #7ad6a8; ++ --color-primary-light-4: #8ddcb5; ++ --color-primary-light-5: #b3e7cd; ++ --color-primary-light-6: #d9f3e6; ++ --color-primary-light-7: #f4fbf8; ++ --color-primary-alpha-10: #41c48319; ++ --color-primary-alpha-20: #41c48333; ++ --color-primary-alpha-30: #41c4834b; ++ --color-primary-alpha-40: #41c48366; ++ --color-primary-alpha-50: #41c48380; ++ --color-primary-alpha-60: #41c48399; ++ --color-primary-alpha-70: #41c483b3; ++ --color-primary-alpha-80: #41c483cc; ++ --color-primary-alpha-90: #41c483e1; + --color-primary-hover: var(--color-primary-dark-1); + --color-primary-active: var(--color-primary-dark-2); + --color-secondary: #d0d7de; diff --git a/gitea.spec b/gitea.spec index d824ece..d8d0021 100644 --- a/gitea.spec +++ b/gitea.spec @@ -1,6 +1,6 @@ Name: gitea Version: 1.22.1 -Release: 1mamba +Release: 2mamba Summary: Painless self-hosted Git service, community managed Group: System/Servers Vendor: openmamba @@ -11,6 +11,7 @@ Source: https+git://github.com/go-gitea/gitea.git/v%{version}/gitea-%{ver Source1: gitea.service Source2: gitea.sysusers Source3: gitea.tmpfiles +Patch0: gitea-1.22.1-theme-primary-green.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -26,13 +27,9 @@ Painless self-hosted all-in-one software development service, including Git host %prep %setup -q - #-D -T #:<< _EOF -# Workaround for poetry stuck in infinite processes -#poetry cache clear --all . - -#make deps +%patch 0 -p1 %build export EXTRA_GOFLAGS="-buildmode=pie -mod=readonly -modcacherw" @@ -41,8 +38,6 @@ export LDFLAGS="-linkmode=external -compressdwarf=false -X \ -X 'code.gitea.io/gitea/modules/setting.CustomConf=%{_sysconfdir}/gitea/app.ini'" export TAGS="bindata sqlite sqlite_unlock_notify pam" -# Replace chroma with custom fork adding RPM Spec support for syntax highlighting -go mod edit -replace github.com/alecthomas/chroma/v2="github.com/mambasoft/chroma/v2@v2.0.0-20240102115650-6fed1b9b0d99" go mod tidy %make -j1 @@ -86,6 +81,10 @@ install -D -m644 custom/conf/app.example.ini %{buildroot}%{_sysconfdir}/gitea/ap %doc LICENSE %changelog +* Sat Jul 20 2024 Silvan Calarco 1.22.1-2mamba +- remove custom fork of chroma since patch has been merged upstream +- patch theme css to restore green as primary color + * Thu Jul 04 2024 Automatic Build System 1.22.1-1mamba - automatic version update by autodist