On 2023/07/18 10:52, Ashlen wrote:
> On Tue, 18 Jul 2023 14:23 +0200, Joerg Jung wrote:
> >
> >
> > > On 18. Jul 2023, at 10:31, Sebastien Marie <[email protected]> wrote:
> > >
> > > On Mon, Jul 17, 2023 at 11:25:37PM -0600, Ashlen wrote:
> > >> Hello,
> > >> I am reaching out to discuss the possibility of adding an xresources
> > >> flavor to x11/st. In my opinion, this addition would greatly enhance the
> > >> functionality of the program by allowing it to read colors and a font
> > >> from the .Xresources file.
> > >>
> > >> Personally, I find it beneficial to set Solarized colors in my
> > >> .Xresources file as it helps reduce eye strain. By incorporating this
> > >> flavor, it would simplify the process of setting up my development
> > >> environment after a fresh OpenBSD installation.
> > >>
> > >> I've attached a diff for your review. I'd greatly appreciate it if you
> > >> could take a look and let me know if it meets the necessary
> > >> requirements.
> > >
> > > My personal point of vue would be to have only one alternate flavour:
> > >
> > > - no flavor : plain st
> > > - "enhanced" flavor : st + scrollback + xresources
> >
> > Yes, I agree with that.
> >
> >
> > > I think that xresources is interesting as it permits to somehow configure
> > > st
> > > without having to recompile it (which defeat the fact to have it in ports
> > > tree).
> > >
> > > What are others opinions ?
> >
> > Personally, I don’t really like the xresources patch, but if wanted by
> > others
> > I would be fine with adding it.
>
> Can I ask why you dislike it, Joerg? Maybe it could be a valuable
> learning experience for me. If it's a technical issue that can be
> resolved, I'm guessing upstream would greatly appreciate a solution, and
> I can help coordinate that.
>
> <aside>
> Also, I noticed that you are the maintainer of x11/dmenu. If you don't
> mind, I'd like to work on a flavor of dmenu that includes an xresources
> patch. This would allow me to easily switch between Solarized light and
> Solarized dark and have those changes apply to both st and dmenu.
> </aside>
>
> In any case, I've attached another patch for review that incorporates
> everyone's feedback. Please let me know if there's anything else I can
> do to improve my diff. :)
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile 12 Jan 2023 21:00:13 -0000 1.26
> +++ Makefile 18 Jul 2023 16:05:32 -0000
> @@ -2,7 +2,10 @@ COMMENT= simple X terminal
>
> V= 0.9
> DISTNAME= st-${V}
> -SUPDISTFILES= st-scrollback-0.8.5.diff:0
> +
> +SUPDISTFILES= st-scrollback-0.8.5.diff:0 \
> + st-xresources-20230320-45a15676.diff:1
> +
> REVISION= 0
>
> CATEGORIES= x11
> @@ -19,6 +22,7 @@ WANTLIB= X11 Xft c fontconfig freetype
>
> MASTER_SITES= https://dl.suckless.org/st/
> MASTER_SITES0= https://st.suckless.org/patches/scrollback/
> +MASTER_SITES1= https://st.suckless.org/patches/xresources/
>
> MAKE_ENV= LDFLAGS="${LDFLAGS}" \
> X11INC=${X11BASE}/include \
> @@ -26,10 +30,10 @@ MAKE_ENV= LDFLAGS="${LDFLAGS}" \
>
> NO_TEST= Yes
>
> -FLAVORS= scrollback
> +FLAVORS= enhanced
> FLAVOR?=
>
> -.if ${FLAVOR:Mscrollback}
> +.if ${FLAVOR:Menhanced}
> PATCHFILES= ${SUPDISTFILES}
> .endif
> PATCH_DIST_STRIP= -p1
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 12 Jan 2023 21:00:13 -0000 1.17
> +++ distinfo 18 Jul 2023 16:05:32 -0000
> @@ -1,4 +1,6 @@
> SHA256 (st-0.9.tar.gz) = 82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=
> SHA256 (st-scrollback-0.8.5.diff) =
> 3H9SI7JvyBPZHUrjW9qlTWMCTK6fGK/Zs1lLozmd+lU=
> +SHA256 (st-xresources-20230320-45a15676.diff) =
> /ETVhdSM8d+wD7MMTixM+RmLd/VakfaO974mpcdXBKg=
> SIZE (st-0.9.tar.gz) = 48171
> SIZE (st-scrollback-0.8.5.diff) = 8914
> +SIZE (st-xresources-20230320-45a15676.diff) = 4853
> Index: pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/x11/st/pkg/DESCR,v
> retrieving revision 1.2
> diff -u -p -r1.2 DESCR
> --- pkg/DESCR 12 Jan 2023 21:00:14 -0000 1.2
> +++ pkg/DESCR 18 Jul 2023 16:05:32 -0000
> @@ -1,5 +1,10 @@
> st is a simple virtual terminal emulator for X which sucks less.
>
> Flavour:
> + enhanced - built with the patches listed below.
> +
> +Patches:
> scrollback - allows scrolling through terminal output with
> - shift+pgup/pgdn
> + shift+pgup/pgdn.
> +
> + xresources - configure st through Xresources.
If you are changing existing flavours, you need @pkgpath markers and
devel/quirks entries to handle the rename (and in the event anyone
is using a script/config management to "pkg_add st--scrollback" they'll
need to change it).
REVISION needs a bump too (both for the flavour change and because
DESCR changed).
I'm in two minds about stacking more patches on top, though.
Perhaps a new port of xst (https://github.com/gnotclub/xst) would
be better instead.
