Re: [UPDATE] x11/i3 4.19.1
Thanks Stuart and Rafael. Le 13/02/2021 à 09:48, Stuart Henderson a écrit : Oh the xxCONFIGURE_ARGS should just be removed, it was from testing. > The dependencies are not needed unless those args are set. With a git > checkout they are needed in order to generate docs but with a > released tarball they are not. >
Re: [UPDATE] x11/i3 4.19.1
Oh the xxCONFIGURE_ARGS should just be removed, it was from testing. The
dependencies are not needed unless those args are set. With a git checkout
they are needed in order to generate docs but with a released tarball they
are not.
--
Sent from a phone, apologies for poor formatting.
On 13 February 2021 06:03:54 Rafael Sadowski wrote:
On Fri Feb 12, 2021 at 11:16:32PM +, Stuart Henderson wrote:
On 2021/02/12 09:29, Guy Godfroy wrote:
> I ended up by almost duplicating i3-mousedrag. So now i3-sensible-*
> stuff are back in the game.
>
> Let me know what you think about it.
thanks, some of the diff didn't apply but I have got it into shape,
and adapted a few things (some parts only relevant for builds from
git which isn't needed for proper releases) and committed.
it looks like the upstream ticket with i3-mousedrag is moving again,
so I'm hoping that we'll be able to get rid of i3-mousedrag and
merge into the main port before too long, so it's good to have things
in sync.
Looks like xxCONFIGURE_ARGS is a mistake and it hides build
dependencies.
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- Makefile12 Feb 2021 23:14:04 - 1.127
+++ Makefile13 Feb 2021 05:55:21 -
@@ -3,6 +3,7 @@
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.19.1
+REVISION = 0
CATEGORIES =x11
@@ -36,13 +37,15 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
+BUILD_DEPENDS =textproc/asciidoc \
+ textproc/xmlto
MODULES = devel/meson
# Tests now use the X11::XCB Perl module, not yet in ports and a bit complex
#TEST_DEPENDS= x11/p5-AnyEvent-I3
NO_TEST=Yes
-xxCONFIGURE_ARGS= -Dmans=true \
+CONFIGURE_ARGS=-Dmans=true \
-Ddocs=true
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
Re: [UPDATE] x11/i3 4.19.1
On Fri Feb 12, 2021 at 11:16:32PM +, Stuart Henderson wrote:
> On 2021/02/12 09:29, Guy Godfroy wrote:
> > I ended up by almost duplicating i3-mousedrag. So now i3-sensible-*
> > stuff are back in the game.
> >
> > Let me know what you think about it.
>
> thanks, some of the diff didn't apply but I have got it into shape,
> and adapted a few things (some parts only relevant for builds from
> git which isn't needed for proper releases) and committed.
>
> it looks like the upstream ticket with i3-mousedrag is moving again,
> so I'm hoping that we'll be able to get rid of i3-mousedrag and
> merge into the main port before too long, so it's good to have things
> in sync.
>
Looks like xxCONFIGURE_ARGS is a mistake and it hides build
dependencies.
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- Makefile12 Feb 2021 23:14:04 - 1.127
+++ Makefile13 Feb 2021 05:55:21 -
@@ -3,6 +3,7 @@
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.19.1
+REVISION = 0
CATEGORIES = x11
@@ -36,13 +37,15 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
+BUILD_DEPENDS =textproc/asciidoc \
+ textproc/xmlto
MODULES = devel/meson
# Tests now use the X11::XCB Perl module, not yet in ports and a bit complex
#TEST_DEPENDS= x11/p5-AnyEvent-I3
NO_TEST= Yes
-xxCONFIGURE_ARGS= -Dmans=true \
+CONFIGURE_ARGS=-Dmans=true \
-Ddocs=true
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
Re: [UPDATE] x11/i3 4.19.1
On 2021/02/12 09:29, Guy Godfroy wrote: > I ended up by almost duplicating i3-mousedrag. So now i3-sensible-* > stuff are back in the game. > > Let me know what you think about it. thanks, some of the diff didn't apply but I have got it into shape, and adapted a few things (some parts only relevant for builds from git which isn't needed for proper releases) and committed. it looks like the upstream ticket with i3-mousedrag is moving again, so I'm hoping that we'll be able to get rid of i3-mousedrag and merge into the main port before too long, so it's good to have things in sync.
Re: [UPDATE] x11/i3 4.19.1
I ended up by almost duplicating i3-mousedrag. So now i3-sensible-*
stuff are back in the game.
Let me know what you think about it.
Le 12/02/2021 à 08:37, Guy Godfroy a écrit :
> Thank you Stuart!
>
> I'll clean it a bit then. It's the first time I submit such a big port
> patch.
>
> Concerning patch-meson_build, I only translated the previous file (and
> now deleted) patch-Makefile_in. I don't know the reason i3-sensible_*
> tools were removed. Do you think we could include them again?
>
> Le 11/02/2021 à 22:09, Stuart Henderson a écrit :
>> This leaves some bits from the autoconf build which are no longer
>> needed, and misses setting a C11-compatible COMPILER. There is also
>> x11/i3-mousedrag in ports which I updated recently that is from a
>> similar codebase.
>>
>> (i3-mousedrag is built from a git checkout which doesn't come with
>> bundled manuals, so has a few extra bits for that, and I left in the
>> i3-sensible-XX scripts as I didn't see much point in patching to
>> disable them).
>>
>>
>>> Index: patches/patch-meson_build
>>> ===
>> ..
>>> + 'sh',
>>> + '-c',
>>> +-'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL &&
>>> make && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
>>> ++'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL &&
>>> gmake && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
>>> + ],
>>
>> I think this is unused in the i3 build
>>
>>> share/doc/i3/userguide.html
>>> share/doc/i3/wsbar.html
>>> share/examples/i3/
>>> @sample ${SYSCONFDIR}/i3/
>>> -share/examples/i3/config
>>> @sample ${SYSCONFDIR}/i3/config
>>> -share/examples/i3/config.keycodes
>>> @sample ${SYSCONFDIR}/i3/config.keycodes
>>
>> you are now creating /etc/i3/config and /etc/i3/config.keycodes with the
>> contents of the wsbar.html file..
>>
? maildiff
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile7 Nov 2020 13:14:21 - 1.126
+++ Makefile12 Feb 2021 08:26:35 -
@@ -2,7 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.18.3
+DISTNAME = i3-4.19.1
CATEGORIES = x11
@@ -13,14 +13,18 @@ PERMIT_PACKAGE =Yes
# XXX use of pledge has been neutered. For more details see
# https://marc.info/?l=openbsd-ports=156762440931634=2
-WANTLIB += c cairo ev glib-2.0 gobject-2.0 harfbuzz iconv intl
-WANTLIB += m pango-1.0 pangocairo-1.0 pcre pthread startup-notification-1
+WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv
+WANTLIB += m pango-1.0 pangocairo-1.0 pcre startup-notification-1
WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape
WANTLIB += xcb-util xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
WANTLIB += yajl
+# C11
+COMPILER= base-clang ports-gcc
+COMPILER_LANGS=c
+
MASTER_SITES = ${HOMEPAGE}/downloads/
-EXTRACT_SUFX = .tar.bz2
+EXTRACT_SUFX = .tar.xz
BUILD_DEPENDS =textproc/asciidoc \
textproc/xmlto
@@ -34,24 +38,16 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
+MODULES=devel/meson
# Tests now use the X11::XCB Perl module, not yet in ports.
NO_TEST = Yes
#TEST_DEPENDS =x11/p5-AnyEvent-I3
-FAKE_FLAGS = i3confdir="${PREFIX}/share/examples/i3/"
-
-SEPARATE_BUILD =Yes
-USE_GMAKE =Yes
-CONFIGURE_STYLE =gnu
-CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include \
- -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib \
--L${LOCALBASE}/lib"
-
-.if defined(DEBUG)
-CONFIGURE_ARGS +=--enable-debug
-.endif
+CONFIGURE_ARGS=-Dmans=true \
+ -Ddocs=true
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
pre-configure:
${SUBST_CMD} ${WRKSRC}/etc/config \
@@ -62,5 +58,9 @@ pre-configure:
${WRKSRC}/libi3/get_exe_path.c \
${WRKSRC}/man/i3-config-wizard.man \
${WRKSRC}/man/i3.man
+
+post-install:
+ rm ${WRKINST}/etc/i3/*.{orig,beforesubst}
+ mv ${WRKINST}/etc/i3 ${PREFIX}/share/examples/
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo7 Nov 2020 13:14:21 - 1.37
+++ distinfo12 Feb 2021 08:26:35 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.18.3.tar.bz2) = U655A/rW7qgw1Y6UlpjkpQLEMsDQpYJlmgpZsbmVsQ0=
-SIZE (i3-4.18.3.tar.bz2) = 1218766
+SHA256 (i3-4.19.1.tar.xz) = IoTIEvxongM42P6b4LjRVS5Uj8Fo0WX3lbJr9JfCK0c=
+SIZE (i3-4.19.1.tar.xz) = 1277648
Index: patches/patch-etc_config
Re: [UPDATE] x11/i3 4.19.1
Thank you Stuart!
I'll clean it a bit then. It's the first time I submit such a big port
patch.
Concerning patch-meson_build, I only translated the previous file (and
now deleted) patch-Makefile_in. I don't know the reason i3-sensible_*
tools were removed. Do you think we could include them again?
Le 11/02/2021 à 22:09, Stuart Henderson a écrit :
> This leaves some bits from the autoconf build which are no longer
> needed, and misses setting a C11-compatible COMPILER. There is also
> x11/i3-mousedrag in ports which I updated recently that is from a
> similar codebase.
>
> (i3-mousedrag is built from a git checkout which doesn't come with
> bundled manuals, so has a few extra bits for that, and I left in the
> i3-sensible-XX scripts as I didn't see much point in patching to
> disable them).
>
>
>> Index: patches/patch-meson_build
>> ===
> ..
>> + 'sh',
>> + '-c',
>> +-'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL && make
>> && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
>> ++'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL &&
>> gmake && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
>> + ],
>
> I think this is unused in the i3 build
>
>> share/doc/i3/userguide.html
>> share/doc/i3/wsbar.html
>> share/examples/i3/
>> @sample ${SYSCONFDIR}/i3/
>> -share/examples/i3/config
>> @sample ${SYSCONFDIR}/i3/config
>> -share/examples/i3/config.keycodes
>> @sample ${SYSCONFDIR}/i3/config.keycodes
>
> you are now creating /etc/i3/config and /etc/i3/config.keycodes with the
> contents of the wsbar.html file..
>
Re: [UPDATE] x11/i3 4.19.1
This leaves some bits from the autoconf build which are no longer
needed, and misses setting a C11-compatible COMPILER. There is also
x11/i3-mousedrag in ports which I updated recently that is from a
similar codebase.
(i3-mousedrag is built from a git checkout which doesn't come with
bundled manuals, so has a few extra bits for that, and I left in the
i3-sensible-XX scripts as I didn't see much point in patching to
disable them).
> Index: patches/patch-meson_build
> ===
..
> + 'sh',
> + '-c',
> +-'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL && make
> && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
> ++'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL && gmake
> && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
> + ],
I think this is unused in the i3 build
> share/doc/i3/userguide.html
> share/doc/i3/wsbar.html
> share/examples/i3/
> @sample ${SYSCONFDIR}/i3/
> -share/examples/i3/config
> @sample ${SYSCONFDIR}/i3/config
> -share/examples/i3/config.keycodes
> @sample ${SYSCONFDIR}/i3/config.keycodes
you are now creating /etc/i3/config and /etc/i3/config.keycodes with the
contents of the wsbar.html file..
[UPDATE] x11/i3 4.19.1
Hello,
Here is a diff that updates i3 to 4.19.1. Testes on amd64.
Biggest change was switching from autotools to meson.
See full changelogs here:
https://i3wm.org/downloads/RELEASE-NOTES-4.19.txt
https://i3wm.org/downloads/RELEASE-NOTES-4.19.1.txt
I also removed dependencies to libs harfbuzz intl pthread, as the
command make port-lib-depends-check showed they weren't needed anymore
apparently.
Guy Godfroy
? maildiff
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile7 Nov 2020 13:14:21 - 1.126
+++ Makefile11 Feb 2021 19:10:34 -
@@ -2,7 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.18.3
+DISTNAME = i3-4.19.1
CATEGORIES = x11
@@ -13,14 +13,14 @@ PERMIT_PACKAGE =Yes
# XXX use of pledge has been neutered. For more details see
# https://marc.info/?l=openbsd-ports=156762440931634=2
-WANTLIB += c cairo ev glib-2.0 gobject-2.0 harfbuzz iconv intl
-WANTLIB += m pango-1.0 pangocairo-1.0 pcre pthread startup-notification-1
+WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv
+WANTLIB += m pango-1.0 pangocairo-1.0 pcre startup-notification-1
WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape
WANTLIB += xcb-util xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
WANTLIB += yajl
MASTER_SITES = ${HOMEPAGE}/downloads/
-EXTRACT_SUFX = .tar.bz2
+EXTRACT_SUFX = .tar.xz
BUILD_DEPENDS =textproc/asciidoc \
textproc/xmlto
@@ -34,6 +34,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
+MODULES=devel/meson
# Tests now use the X11::XCB Perl module, not yet in ports.
NO_TEST = Yes
@@ -43,7 +44,6 @@ FAKE_FLAGS = i3confdir="${PREFIX}/share/
SEPARATE_BUILD =Yes
USE_GMAKE =Yes
-CONFIGURE_STYLE =gnu
CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include \
-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib \
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo7 Nov 2020 13:14:21 - 1.37
+++ distinfo11 Feb 2021 19:10:34 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.18.3.tar.bz2) = U655A/rW7qgw1Y6UlpjkpQLEMsDQpYJlmgpZsbmVsQ0=
-SIZE (i3-4.18.3.tar.bz2) = 1218766
+SHA256 (i3-4.19.1.tar.xz) = IoTIEvxongM42P6b4LjRVS5Uj8Fo0WX3lbJr9JfCK0c=
+SIZE (i3-4.19.1.tar.xz) = 1277648
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 31 Jul 2020 10:00:51 - 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.8 2020/07/31 10:00:51 solene Exp $
-
-Index: Makefile.in
Makefile.in.orig
-+++ Makefile.in
-@@ -809,10 +809,7 @@ i3include_HEADERS = \
- dist_bin_SCRIPTS = \
- i3-dmenu-desktop \
- i3-migrate-config-to-v4 \
-- i3-save-tree \
-- i3-sensible-editor \
-- i3-sensible-pager \
-- i3-sensible-terminal
-+ i3-save-tree
-
- i3confdir = $(sysconfdir)/i3
- dist_i3conf_DATA = \
-@@ -968,9 +965,6 @@ docs_poddir = ${docdir}
- @BUILD_MANS_TRUE@ man/i3-nagbar.1 \
- @BUILD_MANS_TRUE@ man/i3-config-wizard.1 \
- @BUILD_MANS_TRUE@ man/i3-migrate-config-to-v4.1 \
--@BUILD_MANS_TRUE@ man/i3-sensible-editor.1 \
--@BUILD_MANS_TRUE@ man/i3-sensible-pager.1 \
--@BUILD_MANS_TRUE@ man/i3-sensible-terminal.1 \
- @BUILD_MANS_TRUE@ man/i3-dump-log.1
-
- @BUILD_MANS_TRUE@pod_MANS = \
-@@ -3298,7 +3292,7 @@ distclean-tags:
-
- # Leading 'am--fnord' is there to ensure the list of targets does not
- # expand to empty, as could happen e.g. with make check TESTS=''.
--am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-+am--fnord $(TEST_LOGS): $(am__force_recheck)
- am--force-recheck:
- @:
-
-@@ -4039,7 +4033,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
-
-
- anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
-- $(AM_V_BUILD) (cd $(top_srcdir)/AnyEvent-I3 && perl Makefile.PL && make)
-+ $(AM_V_BUILD) (cd $(top_srcdir)/AnyEvent-I3 && perl Makefile.PL &&
gmake)
- $(AM_V_at) touch $@
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: patches/patch-etc_config
===
RCS file: /cvs/ports/x11/i3/patches/patch-etc_config,v
retrieving revision 1.4
diff -u -p -r1.4 patch-etc_config
--- patches/patch-etc_config10 Mar 2020 16:27:53 - 1.4
+++ patches/patch-etc_config11 Feb 2021 19:10:34 -
@@ -1,4 +1,4 @@
-$OpenBSD:
