UPDATE: x11/i3-gaps
Please find blow a simple diff to update i3-gaps to the latest stable
version. This update needs a patch to replace wordexp with glob
otherwise it's straight-forward. Runs without notable issues with my
setup on amd64.
While here, I added me as maintainer.
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/i3-gaps/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile27 Feb 2021 13:55:47 - 1.13
+++ Makefile11 Nov 2021 21:57:58 -
@@ -2,13 +2,14 @@
COMMENT = improved dynamic tiling window manager, fork with gaps
-V =4.19.1
-REVISION = 1
+V =4.20.1
DISTNAME = i3-gaps-${V}
CATEGORIES = x11
HOMEPAGE = https://i3wm.org/
+
+MAINTAINER = Rafael Sadowski
# BSD
PERMIT_PACKAGE = Yes
Index: distinfo
===
RCS file: /cvs/ports/x11/i3-gaps/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo13 Feb 2021 05:59:02 - 1.7
+++ distinfo11 Nov 2021 21:57:58 -
@@ -1,2 +1,2 @@
-SHA256 (gaps-i3-4.19.1.tar.xz) = +yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0=
-SIZE (gaps-i3-4.19.1.tar.xz) = 1280920
+SHA256 (gaps-i3-4.20.1.tar.xz) = /Y4ttm8dqCojtnFAQHj4/BAT67oarNQkXl0cLTMaOtg=
+SIZE (gaps-i3-4.20.1.tar.xz) = 1288400
Index: patches/patch-etc_config
===
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-etc_config,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-etc_config
--- patches/patch-etc_config13 Feb 2021 05:59:02 - 1.4
+++ patches/patch-etc_config11 Nov 2021 21:57:58 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-etc_config,v 1.4 2021/02
Index: etc/config
--- etc/config.orig
+++ etc/config
-@@ -22,18 +22,18 @@ font pango:monospace 8
+@@ -26,18 +26,18 @@ exec --no-startup-id dex --autostart --environment i3
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
# screen before suspend. Use loginctl lock-session to lock your screen.
@@ -29,7 +29,7 @@ Index: etc/config
# use these keys for focus, movement, and resize directions when reaching for
# the arrows is not convenient
-@@ -46,13 +46,13 @@ set $right semicolon
+@@ -50,13 +50,13 @@ set $right semicolon
floating_modifier Mod1
# start a terminal
Index: patches/patch-etc_config_keycodes
===
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-etc_config_keycodes,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-etc_config_keycodes
--- patches/patch-etc_config_keycodes 13 Feb 2021 05:59:02 - 1.4
+++ patches/patch-etc_config_keycodes 11 Nov 2021 21:57:58 -
@@ -6,7 +6,7 @@ different between Linux and OpenBSD.
Index: etc/config.keycodes
--- etc/config.keycodes.orig
+++ etc/config.keycodes
-@@ -23,30 +23,30 @@ font pango:monospace 8
+@@ -27,30 +27,30 @@ exec --no-startup-id dex --autostart --environment i3
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
# screen before suspend. Use loginctl lock-session to lock your screen.
@@ -46,7 +46,7 @@ Index: etc/config.keycodes
# A more modern dmenu replacement is rofi:
# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
# There also is i3-dmenu-desktop which only displays applications shipping a
-@@ -60,10 +60,10 @@ bindcode $mod+46 focus up
+@@ -64,10 +64,10 @@ bindcode $mod+46 focus up
bindcode $mod+47 focus right
# alternatively, you can use the cursor keys:
@@ -61,7 +61,7 @@ Index: etc/config.keycodes
# move focused window
bindcode $mod+Shift+44 move left
-@@ -72,10 +72,10 @@ bindcode $mod+Shift+46 move up
+@@ -76,10 +76,10 @@ bindcode $mod+Shift+46 move up
bindcode $mod+Shift+47 move right
# alternatively, you can use the cursor keys:
@@ -76,7 +76,7 @@ Index: etc/config.keycodes
# split in horizontal orientation
bindcode $mod+43 split h
-@@ -161,10 +161,10 @@ mode "resize" {
+@@ -165,10 +165,10 @@ mode "resize" {
bindcode 47 resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
Index: patches/patch-i3-dmenu-desktop
===
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-i3-dmenu-desktop,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-i3-dmenu-desktop
--- patches/patch-i3-dmenu-desktop 13 Feb 2021 05:59:02 - 1.3
+++ patches/patch-i3-dmenu-desktop 11 Nov 2021 21:57:58 -
@@ -12,7 +12,7 @@ Index: i3-dmenu-desktop
!defined($xdg_data_dirs) ||
$xdg_data_dirs eq '';
-@@ -224,12 +224,12 @@ for my $file (values %desktops) {
+@@ -226,12 +226,12 @@ for my $file (values %desktops) {
# 'evince.desktop' => {
# 'Exec' => 'evince %U',
# 'Name' => 'Dokumentenbetrachter',
@@ -27,7 +27,7 @@ Index: i3-dmenu-desktop
# }
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&m=156762440931634&w=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&m=156762440931634&w=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:
UPDATE x11/i3-4.18.3
Simple diff for updating i3 to 4.18.3, which is a bugfix release. From the release notes: - Bugfix: kick tray clients before destroying the bar Run tested on amd64. OK? Index: Makefile === RCS file: /cvs/ports/x11/i3/Makefile,v retrieving revision 1.125 diff -u -p -r1.125 Makefile --- Makefile31 Jul 2020 10:00:51 - 1.125 +++ Makefile5 Nov 2020 17:46:30 - @@ -2,7 +2,7 @@ COMMENT = improved dynamic tiling window manager -DISTNAME = i3-4.18.2 +DISTNAME = i3-4.18.3 CATEGORIES = x11 Index: distinfo === RCS file: /cvs/ports/x11/i3/distinfo,v retrieving revision 1.36 diff -u -p -r1.36 distinfo --- distinfo31 Jul 2020 10:00:51 - 1.36 +++ distinfo5 Nov 2020 17:46:30 - @@ -1,2 +1,2 @@ -SHA256 (i3-4.18.2.tar.bz2) = soYX1i8wi5OBf8mUna/+50z0oAFoXeOJ8wcstEz1Egw= -SIZE (i3-4.18.2.tar.bz2) = 1218440 +SHA256 (i3-4.18.3.tar.bz2) = U655A/rW7qgw1Y6UlpjkpQLEMsDQpYJlmgpZsbmVsQ0= +SIZE (i3-4.18.3.tar.bz2) = 1218766
UPDATE x11/i3-4.18.1
Diff below brings i3 to 4.18.1, which is a bugfix release. Release notes: https://i3wm.org/downloads/RELEASE-NOTES-4.18.1.txt Lightly run tested on amd64. Comments/OK? diff --git Makefile Makefile index 94c613754fa..c4e8ec479a5 100644 --- Makefile +++ Makefile @@ -2,7 +2,7 @@ COMMENT = improved dynamic tiling window manager -DISTNAME = i3-4.18 +DISTNAME = i3-4.18.1 CATEGORIES = x11 diff --git distinfo distinfo index d3908c12572..1cac26ae945 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (i3-4.18.tar.bz2) = H7tY1YDo+K+36Af+cRZNYAPkVNcfIu6l6zJWxzx6ZTc= -SIZE (i3-4.18.tar.bz2) = 1218591 +SHA256 (i3-4.18.1.tar.bz2) = mr+Q+oA/LLjlPjvIyVLrpIxDRjCDYI5BB/xTqyJL4Hw= +SIZE (i3-4.18.1.tar.bz2) = 1217703
Re: UPDATE x11/i3-4.18
On Fri, Mar 06, 2020 at 02:14:56PM +0100, Bjorn Ketelaars wrote: > On Fri 06/03/2020 13:09, Florian Viehweger wrote: > > > Comments/OK? Thanks for this update. This works fine on my daily driver, no regression spotted. > > I had to uncomment lines 27 and 31 in the auto-generated config file as > > 'xss-lock' and 'nm-applet' were not found. > > These lines are also present in the example config located in > > '/usr/local/share/examples/i3/config'. > > xss-lock, nm-applet, and pactl (volume key) have been added to the > default config [0]. If I'm not mistaken it should be ok if any > combination of these are not installed, i3 merely tries to start them, > it does not rely on them being there. Default behaviour for us has not > changed. I think this set of examples does not make all that much sense for OpenBSD. Only pactl exists in ports and the volume keys should work out of the box. I'd prefer to patch this away as I don't expect it to be a considerable maintenance burden, but I don't insist. Either way: ok tb
Re: UPDATE x11/i3-4.18
> xss-lock, nm-applet, and pactl (volume key) have been added to the > default config [0]. If I'm not mistaken it should be ok if any > combination of these are not installed, i3 merely tries to start them, > it does not rely on them being there. Default behaviour for us has not > changed. > > Should it be necessary, these tools can easily be patched out. i3 starts fine with these lines, I've just seen error messages in ~/.xession-errors and wanted to mention them. > I'm not sure that I understand what the issue is. i3status is a > separate tool (x11/i3status) with its own config file. Could you > explain what aspect of this update has been broken? How does this > compare to the version in ports? This is seperate, I've just observed it. It seems I've missed the message to copy the example config file to my home directory. I'm sorry if my mail has caused confusion. This update has been working fine so far. Thank you! -- greetings, Florian Viehweger
Re: UPDATE x11/i3-4.18
On Fri 06/03/2020 13:09, Florian Viehweger wrote: > > Comments/OK? > > I had to uncomment lines 27 and 31 in the auto-generated config file as > 'xss-lock' and 'nm-applet' were not found. > These lines are also present in the example config located in > '/usr/local/share/examples/i3/config'. xss-lock, nm-applet, and pactl (volume key) have been added to the default config [0]. If I'm not mistaken it should be ok if any combination of these are not installed, i3 merely tries to start them, it does not rely on them being there. Default behaviour for us has not changed. Should it be necessary, these tools can easily be patched out. > Additionally I had to copy the example config of i3status to the > corresponding folder in my home directory to work correctly. I'm not sure that I understand what the issue is. i3status is a separate tool (x11/i3status) with its own config file. Could you explain what aspect of this update has been broken? How does this compare to the version in ports? > Other than that no issues found after light testing on i386. Thanks for testing! [0] https://github.com/i3/i3/commit/72975d6764ffd31f810d8a117555785c885a17b1
Re: UPDATE x11/i3-4.18
> Comments/OK? I had to uncomment lines 27 and 31 in the auto-generated config file as 'xss-lock' and 'nm-applet' were not found. These lines are also present in the example config located in '/usr/local/share/examples/i3/config'. Additionally I had to copy the example config of i3status to the corresponding folder in my home directory to work correctly. Other than that no issues found after light testing on i386. -- greetings, Florian Viehweger
UPDATE x11/i3-4.18
Diff below brings i3 to 4.18, Release notes can be found at
https://github.com/i3/i3/blob/4.18/RELEASE-NOTES-4.18.
Changes to the port:
- Unfortunately pledge() support has not been fixed. As such, I added a
bit of information to Makefile for future reference
- Sync WANTLIB
Testing:
- (Very) lightly run tested on amd64
Comments/OK?
diff --git Makefile Makefile
index 87062cfc8b0..b25abb9d54f 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.17.1
-REVISION = 1
+DISTNAME = i3-4.18
CATEGORIES = x11
@@ -12,9 +11,10 @@ HOMEPAGE = https://i3wm.org/
# BSD
PERMIT_PACKAGE = Yes
-# uses pledge()
-WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1
+# XXX use of pledge has been neutered. For more details see
+# https://marc.info/?l=openbsd-ports&m=156762440931634&w=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 += 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
diff --git distinfo distinfo
index afe58183839..d3908c12572 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (i3-4.17.1.tar.bz2) = Ho/hM6GVwpqOKqOxxW5bx35/VTTy3ZLgn6q+LKLYX0U=
-SIZE (i3-4.17.1.tar.bz2) = 1218418
+SHA256 (i3-4.18.tar.bz2) = H7tY1YDo+K+36Af+cRZNYAPkVNcfIu6l6zJWxzx6ZTc=
+SIZE (i3-4.18.tar.bz2) = 1218591
diff --git patches/patch-Makefile_in patches/patch-Makefile_in
index 6c55aa0ad7c..8ad4473dd21 100644
--- patches/patch-Makefile_in
+++ patches/patch-Makefile_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2019/08/23 15:07:20 sthen Exp
$
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -810,10 +810,7 @@ i3include_HEADERS = \
+@@ -809,10 +809,7 @@ i3include_HEADERS = \
dist_bin_SCRIPTS = \
i3-dmenu-desktop \
i3-migrate-config-to-v4 \
@@ -15,7 +15,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -969,9 +966,6 @@ docs_poddir = ${docdir}
+@@ -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 \
@@ -25,7 +25,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3280,7 +3274,7 @@ distclean-tags:
+@@ -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=''.
@@ -34,7 +34,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -4013,7 +4007,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -4033,7 +4027,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
diff --git patches/patch-configure patches/patch-configure
deleted file mode 100644
index 74f98f02d05..000
--- patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2019/08/23 15:07:20 sthen Exp $
-
-Index: configure
configure.orig
-+++ configure
-@@ -6400,7 +6400,7 @@ char iconv_open ();
- int
- main ()
- {
--return iconv_open ();
-+return libiconv_open ();
- ;
- return 0;
- }
diff --git patches/patch-i3-nagbar_main_c patches/patch-i3-nagbar_main_c
index cdf7958af2a..c4978b2e14a 100644
--- patches/patch-i3-nagbar_main_c
+++ patches/patch-i3-nagbar_main_c
@@ -3,7 +3,7 @@ $OpenBSD: patch-i3-nagbar_main_c,v 1.16 2019/09/04 20:24:04
sthen Exp $
Index: i3-nagbar/main.c
--- i3-nagbar/main.c.orig
+++ i3-nagbar/main.c
-@@ -189,7 +189,7 @@ static void handle_button_release(xcb_connection_t *co
+@@ -190,7 +190,7 @@ static void handle_button_release(xcb_connection_t *co
char *terminal_cmd;
if (button->terminal) {
@@ -12,7 +12,7 @@ Index: i3-nagbar/main.c
} else {
terminal_cmd = sstrdup(link_path);
}
-@@ -454,7 +454,7 @@ int main(int argc, char *argv[]) {
+@@ -462,7 +462,7 @@ int main(int argc, char *argv[]) {
font = load_font(pattern, true);
set_font(&font);
diff --git patches/patch-src_config_directives_c
patches/patch-src_config_directives_c
index bbad3e35f74..54d72e8bd23 100644
--- patches/patch-src_config_directives_c
+++ patches/patch-src_config_directives_c
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_config_directives_c,v 1.6 2019/08/23
15:07:20 sthen Exp $
Index: src/config_directives.c
--- src/config_directives.c.orig
+++ src/config_directives.c
-@@ -479,10 +479,6 @@ CFGFUN(no_focus) {
+@@ -481,10 +481,6 @@ CFGFUN(no_focus) {
TAILQ_INSERT_TAIL(&assignments, assignment, assignments);
}
diff --git patches/patch-src_main_c patches/patch-src_main_c
index b46460cb1e5
UPDATE: x11/i3-gaps
Update i3-gaps to 4.17. Sync Makefile with x11/i3 and regen WANTLIB.
Works fine on amd64. OK?
RS
Index: Makefile
===
RCS file: /cvs/ports/x11/i3-gaps/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile12 Jul 2019 20:51:14 - 1.3
+++ Makefile18 Aug 2019 15:02:36 -
@@ -2,7 +2,7 @@
COMMENT = improved dynamic tiling window manager, fork with gaps
-V =4.16.1
+V =4.17
DISTNAME = i3-gaps-${V}
CATEGORIES = x11
@@ -15,8 +15,8 @@ PERMIT_PACKAGE = Yes
# uses pledge()
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1
-WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-util
-WANTLIB += xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
+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 = https://github.com/Airblader/i3/
@@ -26,9 +26,8 @@ DISTFILES = gaps-{releases/download/${V}
BUILD_DEPENDS =textproc/asciidoc \
textproc/xmlto
-
LIB_DEPENDS = devel/libev \
- devel/libyajl \
+ devel/libyajl>=2.0.0 \
devel/pango \
devel/pcre \
devel/startup-notification \
@@ -49,12 +48,16 @@ WRKDIST = ${WRKDIR}/${DISTNAME:S/-gaps//
SEPARATE_BUILD =Yes
USE_GMAKE =Yes
CONFIGURE_STYLE =gnu
-CONFIGURE_ARGS =--enable-builddir=${WRKBUILD} \
- --enable-debug=no
+CONFIGURE_ARGS =--enable-builddir=${WRKBUILD}
+
CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include \
-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib \
-L${LOCALBASE}/lib"
+
+.if defined(DEBUG)
+CONFIGURE_ARGS +=--enable-debug
+.endif
pre-configure:
${SUBST_CMD} ${WRKSRC}/etc/config \
Index: distinfo
===
RCS file: /cvs/ports/x11/i3-gaps/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo7 Mar 2019 19:34:32 - 1.1.1.1
+++ distinfo18 Aug 2019 15:02:36 -
@@ -1,2 +1,2 @@
-SHA256 (gaps-i3-4.16.1.tar.bz2) = 3u0ByEUA9Qq4GpBthDzbVJNDWVUxT8nGE+TInLARt2A=
-SIZE (gaps-i3-4.16.1.tar.bz2) = 1228703
+SHA256 (gaps-i3-4.17.tar.bz2) = jtXMGNRmzr3MU2hB6U+h0EGKQBUrywITBwlOn9qit0A=
+SIZE (gaps-i3-4.17.tar.bz2) = 1240135
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 7 Mar 2019 19:34:32 - 1.1.1.1
+++ patches/patch-Makefile_in 18 Aug 2019 15:02:36 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -753,10 +753,7 @@ i3include_HEADERS = \
+@@ -809,10 +809,7 @@ i3include_HEADERS = \
dist_bin_SCRIPTS = \
i3-dmenu-desktop \
i3-migrate-config-to-v4 \
@@ -14,7 +14,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -912,9 +909,6 @@ docs_poddir = ${docdir}
+@@ -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 \
@@ -24,7 +24,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3216,7 +3210,7 @@ distclean-tags:
+@@ -3279,7 +3273,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=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -3782,7 +3776,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -4012,7 +4006,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 7 Mar 2019 19:34:32 - 1.1.1.1
+++ patches/patch-configure 18 Aug 2019 15:02:36 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2019
Index: configure
--- configure.orig
+++ configure
-@@ -6380,7 +6380,7 @@ char iconv_open ();
+@@ -6388,7 +6388,7 @@ char iconv_open ();
int
main ()
{
Index: patches/patch-etc_config
===
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-etc_config,v
retri
Re: UPDATE: x11/i3
OK
Re: UPDATE: x11/i3
On Sat, Mar 09, 2019 at 02:24:11PM +0100, Giovanni Bechis wrote: > Hi, > bugfix update to 4.16.1 released on late January. > Comments ? Ok ? Running on it now on amd64. Works so far. :)
UPDATE: x11/i3
Hi,
bugfix update to 4.16.1 released on late January.
Comments ? Ok ?
Cheers
Giovanni
Index: Makefile
===
RCS file: /var/cvs/ports/x11/i3/Makefile,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile
--- Makefile18 Jan 2019 11:34:20 - 1.115
+++ Makefile9 Mar 2019 13:08:55 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.16
-REVISION = 0
+DISTNAME = i3-4.16.1
CATEGORIES = x11
Index: distinfo
===
RCS file: /var/cvs/ports/x11/i3/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo13 Jan 2019 12:48:10 - 1.30
+++ distinfo9 Mar 2019 13:09:04 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.16.tar.bz2) = zGCl9RjF43tBQ7ZEqEC7KtKmPqencZVMMyzVY322VbQ=
-SIZE (i3-4.16.tar.bz2) = 1213251
+SHA256 (i3-4.16.1.tar.bz2) = q2XCXAasvcZ8uj/yPiqC6heRHe9l9P0CALtvk4I3hXY=
+SIZE (i3-4.16.1.tar.bz2) = 1211532
Index: patches/patch-docs_ipc
===
RCS file: patches/patch-docs_ipc
diff -N patches/patch-docs_ipc
--- patches/patch-docs_ipc 18 Jan 2019 11:34:20 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-$OpenBSD: patch-docs_ipc,v 1.1 2019/01/18 11:34:20 giovanni Exp $
-
-Index: docs/ipc
docs/ipc.orig
-+++ docs/ipc
-@@ -693,14 +693,6 @@ program does not want to cope which such kinds of race
- event based library may not have a problem here), I suggest you create a
- separate connection to receive events.
-
--If an event message needs to be sent and the socket is not writeable (write
--returns EAGAIN, happens when the socket doesn't have enough buffer space for
--writing new data) then i3 uses a queue system to store outgoing messages for
--each client. This is combined with a timer: if the message queue for a client
is
--not empty and no data where successfully written in the past 10 seconds, the
--connection is killed. Practically, this means that your client should try to
--always read events from the socket to avoid having its connection closed.
--
- === Subscribing to events
-
- By sending a message of type SUBSCRIBE with a JSON-encoded array as payload
Index: patches/patch-include_config_directives_h
===
RCS file: patches/patch-include_config_directives_h
diff -N patches/patch-include_config_directives_h
--- patches/patch-include_config_directives_h 18 Jan 2019 11:34:20 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-include_config_directives_h,v 1.1 2019/01/18 11:34:20 giovanni
Exp $
-
-Index: include/config_directives.h
include/config_directives.h.orig
-+++ include/config_directives.h
-@@ -63,7 +63,6 @@ CFGFUN(assign_output, const char *output);
- CFGFUN(assign, const char *workspace, bool is_number);
- CFGFUN(no_focus);
- CFGFUN(ipc_socket, const char *path);
--CFGFUN(ipc_kill_timeout, const long timeout_ms);
- CFGFUN(restart_state, const char *path);
- CFGFUN(popup_during_fullscreen, const char *value);
- CFGFUN(color, const char *colorclass, const char *border, const char
*background, const char *text, const char *indicator, const char *child_border);
Index: patches/patch-include_ipc_h
===
RCS file: patches/patch-include_ipc_h
diff -N patches/patch-include_ipc_h
--- patches/patch-include_ipc_h 18 Jan 2019 11:57:36 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-$OpenBSD: patch-include_ipc_h,v 1.5 2019/01/18 11:57:36 giovanni Exp $
-
-Index: include/ipc.h
include/ipc.h.orig
-+++ include/ipc.h
-@@ -35,11 +35,6 @@ typedef struct ipc_client {
- * event has been sent by i3. */
- bool first_tick_sent;
-
--struct ev_io *callback;
--struct ev_timer *timeout;
--uint8_t *buffer;
--size_t buffer_size;
--
- TAILQ_ENTRY(ipc_client)
- clients;
- } ipc_client;
-@@ -129,9 +124,3 @@ void ipc_send_barconfig_update_event(Barconfig *barcon
- * For the binding events, we send the serialized binding struct.
- */
- void ipc_send_binding_event(const char *event_type, Binding *bind);
--
--/**
-- * Set the maximum duration that we allow for a connection with an
unwriteable
-- * socket.
-- */
--void ipc_set_kill_timeout(ev_tstamp new);
Index: patches/patch-include_libi3_h
===
RCS file: patches/patch-include_libi3_h
diff -N patches/patch-include_libi3_h
--- patches/patch-include_libi3_h 18 Jan 2019 11:57:36 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-$OpenBSD: patch-include_libi3_h,v 1.3 2019/01/18 11:57:36 giovanni Exp $
-
-Index: include/libi3.h
include/libi3.h.orig
-+++ include/libi3.h
-@@ -167,14 +167,6 @@ int sasprintf(char **strp, const char *fmt, ...);
Re: UPDATE: x11/i3
On Sat, Jan 05, 2019 at 10:55:31AM +0100, Rafael Sadowski wrote: > On Fri Dec 28, 2018 at 04:36:27PM +0100, Theo Buehler wrote: > > +dcoppa > > > > On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote: > > > Simple update to the latest version 4.16. > > > > > > Works fine on amd64, OK? > > > > Tested on macppc and amd64. Works fine, thanks. Please reinstate/port > > the hunks you lost in i3-nagbar/main.c and man/i3.man. > > > > With that: > > > > ok tb > > (provided dcoppa is fine with it/doesn't object) > > > > Hi i3 users, > > new diff based on edd@'s work from openbsd-wip. He tweaks the test case. I > guess this is the more clean way to go into the tree!? I don't see any lost > parts in the patches, do I? > > A general question: I would like to port a i3 with gaps[1], should we go > with a second port (i3-gaps) of should we improve x11/i3 with patches? > > RS Tested on amd64 just now. Works fine. As a user, I'm OK with gaps as either a subpackage or as a separate port as I don't have a need for it.
Re: UPDATE: x11/i3
On 2019/01/05 10:55, Rafael Sadowski wrote: > A general question: I would like to port a i3 with gaps[1], should we go > with a second port (i3-gaps) of should we improve x11/i3 with patches? > > RS > > [1]: https://github.com/Airblader/i3/tree/gaps That looks like it should be a separate port. I think ideally it shouldn't conflict with i3, so it's possible to try it out more easily?
Re: UPDATE: x11/i3
On Fri Dec 28, 2018 at 04:36:27PM +0100, Theo Buehler wrote:
> +dcoppa
>
> On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote:
> > Simple update to the latest version 4.16.
> >
> > Works fine on amd64, OK?
>
> Tested on macppc and amd64. Works fine, thanks. Please reinstate/port
> the hunks you lost in i3-nagbar/main.c and man/i3.man.
>
> With that:
>
> ok tb
> (provided dcoppa is fine with it/doesn't object)
>
Hi i3 users,
new diff based on edd@'s work from openbsd-wip. He tweaks the test case. I
guess this is the more clean way to go into the tree!? I don't see any lost
parts in the patches, do I?
A general question: I would like to port a i3 with gaps[1], should we go
with a second port (i3-gaps) of should we improve x11/i3 with patches?
RS
[1]: https://github.com/Airblader/i3/tree/gaps
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.113
diff -u -p -u -p -r1.113 Makefile
--- Makefile27 Jun 2018 21:04:12 - 1.113
+++ Makefile5 Jan 2019 09:43:16 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.15
-REVISION = 0
+DISTNAME = i3-4.16
CATEGORIES = x11
@@ -36,7 +35,10 @@ RUN_DEPENDS =devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
-TEST_DEPENDS = x11/p5-AnyEvent-I3
+
+# 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/"
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo29 Mar 2018 21:05:32 - 1.29
+++ distinfo5 Jan 2019 09:43:16 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
-SIZE (i3-4.15.tar.bz2) = 1196263
+SHA256 (i3-4.16.tar.bz2) = zGCl9RjF43tBQ7ZEqEC7KtKmPqencZVMMyzVY322VbQ=
+SIZE (i3-4.16.tar.bz2) = 1213251
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 29 Mar 2018 21:05:32 - 1.4
+++ patches/patch-Makefile_in 5 Jan 2019 09:43:16 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -752,10 +752,7 @@ i3include_HEADERS = \
+@@ -754,10 +754,7 @@ i3include_HEADERS = \
dist_bin_SCRIPTS = \
i3-dmenu-desktop \
i3-migrate-config-to-v4 \
@@ -14,7 +14,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -911,9 +908,6 @@ docs_poddir = ${docdir}
+@@ -913,9 +910,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 \
@@ -24,7 +24,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3174,7 +3168,7 @@ distclean-tags:
+@@ -3217,7 +3211,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=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -3783,7 +3777,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/i3/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 4 Sep 2017 14:33:07 - 1.2
+++ patches/patch-configure 5 Jan 2019 09:43:16 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.2 2017/09/
Index: configure
--- configure.orig
+++ configure
-@@ -6388,7 +6388,7 @@ char iconv_open ();
+@@ -6392,7 +6392,7 @@ char iconv_open ();
int
main ()
{
Index: patches/patch-i3-nagbar_main_c
===
RCS file: /cvs/ports/x11/i3/patches/patch-i3-nagbar_main_c,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-i3-nagbar_main_c
--- patches/patch-i3-nagbar_main_c 21 Oct 2017 19:22:04 - 1.13
+++ patches/patch-i3-nagbar_main_c 5 Jan 2019 09:43:16 -
@@ -3,16 +3,16 @@ $OpenBSD: patch-i3-nagbar_main_c,v 1.13
Index: i3-nagbar/main.c
--- i3-nagbar/main.c.orig
+++ i3-nagbar/main.c
-@@ -184,7 +184,7 @@ static void handle_button_release(xcb_connection_t *co
- }
+@@ -189,7 +18
Re: UPDATE: x11/i3
+dcoppa On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote: > Simple update to the latest version 4.16. > > Works fine on amd64, OK? Tested on macppc and amd64. Works fine, thanks. Please reinstate/port the hunks you lost in i3-nagbar/main.c and man/i3.man. With that: ok tb (provided dcoppa is fine with it/doesn't object)
Re: UPDATE: x11/i3
On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote: > Simple update to the latest version 4.16. > > Works fine on amd64, OK? Also comes up and seems to work fine on i386. :)
UPDATE: x11/i3
Simple update to the latest version 4.16.
Works fine on amd64, OK?
Rafael Sadowski
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.113
diff -u -p -u -p -r1.113 Makefile
--- Makefile27 Jun 2018 21:04:12 - 1.113
+++ Makefile27 Dec 2018 19:33:15 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.15
-REVISION = 0
+DISTNAME = i3-4.16
CATEGORIES = x11
@@ -45,10 +44,8 @@ USE_GMAKE = Yes
CONFIGURE_STYLE =gnu
CONFIGURE_ARGS =--enable-builddir=${WRKBUILD} \
--enable-debug=no
-CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include \
- -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib \
--L${LOCALBASE}/lib"
+CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
pre-configure:
${SUBST_CMD} ${WRKSRC}/etc/config \
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo29 Mar 2018 21:05:32 - 1.29
+++ distinfo27 Dec 2018 19:33:15 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
-SIZE (i3-4.15.tar.bz2) = 1196263
+SHA256 (i3-4.16.tar.bz2) = zGCl9RjF43tBQ7ZEqEC7KtKmPqencZVMMyzVY322VbQ=
+SIZE (i3-4.16.tar.bz2) = 1213251
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 29 Mar 2018 21:05:32 - 1.4
+++ patches/patch-Makefile_in 27 Dec 2018 19:33:15 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -752,10 +752,7 @@ i3include_HEADERS = \
+@@ -754,10 +754,7 @@ i3include_HEADERS = \
dist_bin_SCRIPTS = \
i3-dmenu-desktop \
i3-migrate-config-to-v4 \
@@ -14,7 +14,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -911,9 +908,6 @@ docs_poddir = ${docdir}
+@@ -913,9 +910,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 \
@@ -24,7 +24,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3174,7 +3168,7 @@ distclean-tags:
+@@ -3217,7 +3211,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=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -3783,7 +3777,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/i3/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 4 Sep 2017 14:33:07 - 1.2
+++ patches/patch-configure 27 Dec 2018 19:33:15 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.2 2017/09/
Index: configure
--- configure.orig
+++ configure
-@@ -6388,7 +6388,7 @@ char iconv_open ();
+@@ -6392,7 +6392,7 @@ char iconv_open ();
int
main ()
{
Index: patches/patch-i3-nagbar_main_c
===
RCS file: /cvs/ports/x11/i3/patches/patch-i3-nagbar_main_c,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-i3-nagbar_main_c
--- patches/patch-i3-nagbar_main_c 21 Oct 2017 19:22:04 - 1.13
+++ patches/patch-i3-nagbar_main_c 27 Dec 2018 19:33:15 -
@@ -3,16 +3,7 @@ $OpenBSD: patch-i3-nagbar_main_c,v 1.13
Index: i3-nagbar/main.c
--- i3-nagbar/main.c.orig
+++ i3-nagbar/main.c
-@@ -184,7 +184,7 @@ static void handle_button_release(xcb_connection_t *co
- }
-
- char *terminal_cmd;
--sasprintf(&terminal_cmd, "i3-sensible-terminal -e %s", link_path);
-+sasprintf(&terminal_cmd, "${X11BASE}/bin/xterm -e %s", link_path);
- printf("argv0 = %s\n", argv0);
- printf("terminal_cmd = %s\n", terminal_cmd);
-
-@@ -438,11 +438,6 @@ int main(int argc, char *argv[]) {
+@@ -454,11 +454,6 @@ int main(int argc, char *argv[]) {
font = load_font(pattern, true);
set_font(&font);
@@ -24,7 +15,7 @@ Index: i3-nagbar/main.c
xcb_rectangle_t win_pos = get_window_position();
xcb_cursor_t cursor;
-@@ -543,6 +538,1
Re: UPDATE: x11/i3 to 4.15
On Wed, Mar 21, 2018 at 10:21:46AM +, Stuart Henderson wrote: > On 2018/03/21 10:29, Henrik Friedrichsen wrote: > > On Thu, Mar 15, 2018 at 06:41:46PM +0100, Henrik Friedrichsen wrote: > > > Well, attached is another diff with https links. EXTRACT_SUFX was moved > > > below MASTER_SITES, but I'm fine either way and will delegate that > > > choice to the committer ;) > > > > Ping? > > > > Is this still going on for 6.3? > > Post-6.3 unless there is something critical (which I don't see from > reading release notes). > Diff looks fine to me and I've been running it for a week without problems on amd64 and macppc. ok
Re: UPDATE: x11/i3 to 4.15
On 2018/03/21 10:29, Henrik Friedrichsen wrote: > On Thu, Mar 15, 2018 at 06:41:46PM +0100, Henrik Friedrichsen wrote: > > Well, attached is another diff with https links. EXTRACT_SUFX was moved > > below MASTER_SITES, but I'm fine either way and will delegate that > > choice to the committer ;) > > Ping? > > Is this still going on for 6.3? Post-6.3 unless there is something critical (which I don't see from reading release notes).
Re: UPDATE: x11/i3 to 4.15
On Thu, Mar 15, 2018 at 06:41:46PM +0100, Henrik Friedrichsen wrote: > Well, attached is another diff with https links. EXTRACT_SUFX was moved > below MASTER_SITES, but I'm fine either way and will delegate that > choice to the committer ;) Ping? Is this still going on for 6.3?
Re: UPDATE: x11/i3 to 4.15
On Thu, Mar 15, 2018 at 12:17:32AM +, Stuart Henderson wrote:
> On 2018/03/14 16:44, Klemens Nanni wrote:
> > You can switch HOMEPAGE and thus MASTER_SITES to HTTPS.
> >
>
> I think Makefile.template has EXTRACT_SUFX in a bit of a weird place tbh,
> near DISTNAME makes a lot more sense to me...
>
Well, attached is another diff with https links. EXTRACT_SUFX was moved
below MASTER_SITES, but I'm fine either way and will delegate that
choice to the committer ;)
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile
--- Makefile8 Nov 2017 21:14:27 - 1.111
+++ Makefile15 Mar 2018 17:39:30 -
@@ -2,12 +2,11 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.14.1
-REVISION = 1
+DISTNAME = i3-4.15
+EXTRACT_SUFX = .tar.bz2
CATEGORIES = x11
-EXTRACT_SUFX = .tar.bz2
-HOMEPAGE = http://i3wm.org/
+HOMEPAGE = https://i3wm.org/
MASTER_SITES = ${HOMEPAGE}/downloads/
MAINTAINER = David Coppa
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo25 Sep 2017 06:30:43 - 1.28
+++ distinfo15 Mar 2018 17:39:30 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.14.1.tar.bz2) = 0AY6xWHzqo1+MeE3NWgVuteBvWrXdAMDYsiavparX7E=
-SIZE (i3-4.14.1.tar.bz2) = 1173560
+SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
+SIZE (i3-4.15.tar.bz2) = 1196263
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 25 Sep 2017 06:30:43 - 1.3
+++ patches/patch-Makefile_in 15 Mar 2018 17:39:30 -
@@ -14,7 +14,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -906,9 +903,6 @@ docs_poddir = ${docdir}
+@@ -911,9 +908,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 \
@@ -24,7 +24,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3169,7 +3163,7 @@ distclean-tags:
+@@ -3174,7 +3168,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=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -3735,7 +3729,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
Index: patches/patch-etc_config_keycodes
===
RCS file: /cvs/ports/x11/i3/patches/patch-etc_config_keycodes,v
retrieving revision 1.1
diff -u -p -r1.1 patch-etc_config_keycodes
--- patches/patch-etc_config_keycodes 13 Nov 2016 20:46:23 - 1.1
+++ patches/patch-etc_config_keycodes 15 Mar 2018 17:39:30 -
@@ -3,8 +3,9 @@ $OpenBSD: patch-etc_config_keycodes,v 1.
Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
different between Linux and OpenBSD.
etc/config.keycodes.orig Sun Mar 29 19:07:08 2015
-+++ etc/config.keycodesMon Mar 30 14:13:25 2015
+Index: etc/config.keycodes
+--- etc/config.keycodes.orig
etc/config.keycodes
@@ -29,13 +29,13 @@ font pango:monospace 8
floating_modifier $mod
@@ -51,7 +52,7 @@ different between Linux and OpenBSD.
# split in horizontal orientation
bindcode $mod+43 split h
-@@ -136,10 +136,10 @@ mode "resize" {
+@@ -149,10 +149,10 @@ mode "resize" {
bindcode 47 resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
@@ -64,5 +65,5 @@ different between Linux and OpenBSD.
+bindcode 98 resize shrink height 10 px or 10 ppt
+bindcode 102 resize grow width 10 px or 10 ppt
- # back to normal: Enter or Escape
+ # back to normal: Enter or Escape or $mod+r
bindcode 36 mode "default"
Index: patches/patch-src_con_c
===
RCS file: patches/patch-src_con_c
diff -N patches/patch-src_con_c
--- patches/patch-src_con_c 8 Nov 2017 21:14:27 - 1.20
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_con_c,v 1.20 2017/11/08 21:14:27 danj Exp $
-
-backport
https://github.com/i3/i3/pull/2849/commits/c028f0cb173ebc4c7033c758c7f942adfbc224af
-and
https://github.com/i3/i3/pull/2849/commits/26014ca1a22c1b862c782f4dfa3d40a5ab629627
-
-Index: src/con.c
src/c
Re: UPDATE: x11/i3 to 4.15
On 2018/03/14 16:44, Klemens Nanni wrote: > On Wed, Mar 14, 2018 at 02:11:05PM +0100, Henrik Friedrichsen wrote: > > Some initial work to get the ball rolling. Diff updates to 4.15. Patches > > were updated to new source tarball, some of the patches are now upstream > > and where thus removed. > > > > Compiles and runs fine on amd64. Test suite fails, did it work before > > with "make test"? > You can switch HOMEPAGE and thus MASTER_SITES to HTTPS. > > I'd also move MASTER_SITES and EXTRACT_SUFX below WANTLIB as done in > Makefile.template but that's just make up, OK kn either ways. > I think Makefile.template has EXTRACT_SUFX in a bit of a weird place tbh, near DISTNAME makes a lot more sense to me...
Re: UPDATE: x11/i3 to 4.15
On Wed, Mar 14, 2018 at 02:11:05PM +0100, Henrik Friedrichsen wrote: > Some initial work to get the ball rolling. Diff updates to 4.15. Patches > were updated to new source tarball, some of the patches are now upstream > and where thus removed. > > Compiles and runs fine on amd64. Test suite fails, did it work before > with "make test"? You can switch HOMEPAGE and thus MASTER_SITES to HTTPS. I'd also move MASTER_SITES and EXTRACT_SUFX below WANTLIB as done in Makefile.template but that's just make up, OK kn either ways.
Re: UPDATE: x11/i3 to 4.15
On Wed Mar 14, 2018 at 02:11:05PM +0100, Henrik Friedrichsen wrote:
> Some initial work to get the ball rolling. Diff updates to 4.15. Patches
> were updated to new source tarball, some of the patches are now upstream
> and where thus removed.
>
> Compiles and runs fine on amd64. Test suite fails, did it work before
> with "make test"?
Thanks Henrik! The old one was also broken. Works fine for me. ok
rsadowski@.
Someone could take a look at i3lock.
>
> Cheers
> Henrik
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/i3/Makefile,v
> retrieving revision 1.111
> diff -u -p -r1.111 Makefile
> --- Makefile 8 Nov 2017 21:14:27 - 1.111
> +++ Makefile 14 Mar 2018 13:08:18 -
> @@ -2,8 +2,7 @@
>
> COMMENT =improved dynamic tiling window manager
>
> -DISTNAME = i3-4.14.1
> -REVISION = 1
> +DISTNAME = i3-4.15
> CATEGORIES = x11
>
> EXTRACT_SUFX = .tar.bz2
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/i3/distinfo,v
> retrieving revision 1.28
> diff -u -p -r1.28 distinfo
> --- distinfo 25 Sep 2017 06:30:43 - 1.28
> +++ distinfo 14 Mar 2018 13:08:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (i3-4.14.1.tar.bz2) = 0AY6xWHzqo1+MeE3NWgVuteBvWrXdAMDYsiavparX7E=
> -SIZE (i3-4.14.1.tar.bz2) = 1173560
> +SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
> +SIZE (i3-4.15.tar.bz2) = 1196263
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-Makefile_in
> --- patches/patch-Makefile_in 25 Sep 2017 06:30:43 - 1.3
> +++ patches/patch-Makefile_in 14 Mar 2018 13:08:18 -
> @@ -14,7 +14,7 @@ Index: Makefile.in
>
> i3confdir = $(sysconfdir)/i3
> dist_i3conf_DATA = \
> -@@ -906,9 +903,6 @@ docs_poddir = ${docdir}
> +@@ -911,9 +908,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 \
> @@ -24,7 +24,7 @@ Index: Makefile.in
> @BUILD_MANS_TRUE@ man/i3-dump-log.1
>
> @BUILD_MANS_TRUE@pod_MANS = \
> -@@ -3169,7 +3163,7 @@ distclean-tags:
> +@@ -3174,7 +3168,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=''.
> @@ -33,7 +33,7 @@ Index: Makefile.in
> am--force-recheck:
> @:
>
> -@@ -3735,7 +3729,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
> +@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
>
>
>
> anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
> Index: patches/patch-etc_config_keycodes
> ===
> RCS file: /cvs/ports/x11/i3/patches/patch-etc_config_keycodes,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-etc_config_keycodes
> --- patches/patch-etc_config_keycodes 13 Nov 2016 20:46:23 - 1.1
> +++ patches/patch-etc_config_keycodes 14 Mar 2018 13:08:18 -
> @@ -3,8 +3,9 @@ $OpenBSD: patch-etc_config_keycodes,v 1.
> Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
> different between Linux and OpenBSD.
>
> etc/config.keycodes.orig Sun Mar 29 19:07:08 2015
> -+++ etc/config.keycodes Mon Mar 30 14:13:25 2015
> +Index: etc/config.keycodes
> +--- etc/config.keycodes.orig
> etc/config.keycodes
> @@ -29,13 +29,13 @@ font pango:monospace 8
> floating_modifier $mod
>
> @@ -51,7 +52,7 @@ different between Linux and OpenBSD.
>
> # split in horizontal orientation
> bindcode $mod+43 split h
> -@@ -136,10 +136,10 @@ mode "resize" {
> +@@ -149,10 +149,10 @@ mode "resize" {
> bindcode 47 resize grow width 10 px or 10 ppt
>
> # same bindings, but for the arrow keys
> @@ -64,5 +65,5 @@ different between Linux and OpenBSD.
> +bindcode 98 resize shrink height 10 px or 10 ppt
> +bindcode 102 resize grow width 10 px or 10 ppt
>
> - # back to normal: Enter or Escape
> + # back to normal: Enter or Escape or $mod+r
> bindcode 36 mode "default"
> Index: patches/patch-src_con_c
> ===
> RCS file: patches/patch-src_con_c
> diff -N patches/patch-src_con_c
> --- patches/patch-src_con_c 8 Nov 2017 21:14:27 - 1.20
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,28 +0,0 @@
> -$OpenBSD: patch-src_con_c,v 1.20 2017/11/08 21:14:27 danj Exp $
> -
> -backport
> https://github.com/i3/i3/pull/2849/commits/c028f0cb173ebc4c7033c758c7f942adfbc224af
> -and
> https://github.com/i3/i3/pull/2849/commits/26014ca1a22c1b862c782f4dfa3d40a5ab629627
UPDATE: x11/i3 to 4.15
Some initial work to get the ball rolling. Diff updates to 4.15. Patches
were updated to new source tarball, some of the patches are now upstream
and where thus removed.
Compiles and runs fine on amd64. Test suite fails, did it work before
with "make test"?
Cheers
Henrik
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile
--- Makefile8 Nov 2017 21:14:27 - 1.111
+++ Makefile14 Mar 2018 13:08:18 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.14.1
-REVISION = 1
+DISTNAME = i3-4.15
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo25 Sep 2017 06:30:43 - 1.28
+++ distinfo14 Mar 2018 13:08:18 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.14.1.tar.bz2) = 0AY6xWHzqo1+MeE3NWgVuteBvWrXdAMDYsiavparX7E=
-SIZE (i3-4.14.1.tar.bz2) = 1173560
+SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
+SIZE (i3-4.15.tar.bz2) = 1196263
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 25 Sep 2017 06:30:43 - 1.3
+++ patches/patch-Makefile_in 14 Mar 2018 13:08:18 -
@@ -14,7 +14,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -906,9 +903,6 @@ docs_poddir = ${docdir}
+@@ -911,9 +908,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 \
@@ -24,7 +24,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3169,7 +3163,7 @@ distclean-tags:
+@@ -3174,7 +3168,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=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -3735,7 +3729,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
Index: patches/patch-etc_config_keycodes
===
RCS file: /cvs/ports/x11/i3/patches/patch-etc_config_keycodes,v
retrieving revision 1.1
diff -u -p -r1.1 patch-etc_config_keycodes
--- patches/patch-etc_config_keycodes 13 Nov 2016 20:46:23 - 1.1
+++ patches/patch-etc_config_keycodes 14 Mar 2018 13:08:18 -
@@ -3,8 +3,9 @@ $OpenBSD: patch-etc_config_keycodes,v 1.
Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
different between Linux and OpenBSD.
etc/config.keycodes.orig Sun Mar 29 19:07:08 2015
-+++ etc/config.keycodesMon Mar 30 14:13:25 2015
+Index: etc/config.keycodes
+--- etc/config.keycodes.orig
etc/config.keycodes
@@ -29,13 +29,13 @@ font pango:monospace 8
floating_modifier $mod
@@ -51,7 +52,7 @@ different between Linux and OpenBSD.
# split in horizontal orientation
bindcode $mod+43 split h
-@@ -136,10 +136,10 @@ mode "resize" {
+@@ -149,10 +149,10 @@ mode "resize" {
bindcode 47 resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
@@ -64,5 +65,5 @@ different between Linux and OpenBSD.
+bindcode 98 resize shrink height 10 px or 10 ppt
+bindcode 102 resize grow width 10 px or 10 ppt
- # back to normal: Enter or Escape
+ # back to normal: Enter or Escape or $mod+r
bindcode 36 mode "default"
Index: patches/patch-src_con_c
===
RCS file: patches/patch-src_con_c
diff -N patches/patch-src_con_c
--- patches/patch-src_con_c 8 Nov 2017 21:14:27 - 1.20
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_con_c,v 1.20 2017/11/08 21:14:27 danj Exp $
-
-backport
https://github.com/i3/i3/pull/2849/commits/c028f0cb173ebc4c7033c758c7f942adfbc224af
-and
https://github.com/i3/i3/pull/2849/commits/26014ca1a22c1b862c782f4dfa3d40a5ab629627
-
-Index: src/con.c
src/con.c.orig
-+++ src/con.c
-@@ -1735,7 +1756,7 @@ void con_set_layout(Con *con, layout_t layout) {
- con->workspace_layout = ws_layout;
- DLOG("Setting layout to %d\n", layout);
- con->layout = layout;
--} else if (layout == L_STACKED || layout == L_TABBED) {
-+} else if (layout == L_STACKED || layout == L_TABB
Re: [UPDATE] x11/i3-4.8
On Fri, Jul 04, 2014 at 01:27:30AM +0200, Theo Buehler wrote:
> This patch updates x11/i3-4.7p6 to the latest release i3 version 4.8.
>
> The new save-tree feature depends on the perl-module AnyEvent::I3 (port
> submitted in a separate mail) which in turn pulls in the perl modules
> AnyEvent and JSON::XS.
>
> It is possible to run i3 without these dependencies, but it is strongly
> recommended to install it since save-tree is a significant new feature.
> Therefore I was unsure whether it was worth the effort to create a
> flavor that throws these dependencies out.
>
> I have run and tested it on amd64 over the last few days and didn't
> encounter any difficulties. The patches are minor adaptations of the
> previous patches.
>
This time with a (hopefully) correctly encoded attachment.
Index: x11/i3/Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- x11/i3/Makefile 15 Apr 2014 10:31:30 - 1.85
+++ x11/i3/Makefile 3 Jul 2014 22:39:31 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.7.2
-REVISION = 6
+DISTNAME = i3-4.8
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -30,7 +29,8 @@ LIB_DEPENDS = devel/libev \
RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
- x11/i3status
+ x11/i3status \
+ x11/p5-AnyEvent-I3
USE_GMAKE =Yes
Index: x11/i3/distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- x11/i3/distinfo 24 Jan 2014 10:08:38 - 1.17
+++ x11/i3/distinfo 3 Jul 2014 22:39:31 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.7.2.tar.bz2) = b+RWXjZKUBfraonOEE1rshr820uws77pUmeB+mSx85M=
-SIZE (i3-4.7.2.tar.bz2) = 897398
+SHA256 (i3-4.8.tar.bz2) = UCw0KQ8jl4C7QDUhkfBQDo810kRu3bVzxnwnhz1qG2s=
+SIZE (i3-4.8.tar.bz2) = 939690
Index: x11/i3/patches/patch-common_mk
===
RCS file: /cvs/ports/x11/i3/patches/patch-common_mk,v
retrieving revision 1.20
diff -u -p -r1.20 patch-common_mk
--- x11/i3/patches/patch-common_mk 16 Apr 2014 14:12:04 - 1.20
+++ x11/i3/patches/patch-common_mk 3 Jul 2014 22:39:31 -
@@ -6,8 +6,8 @@ Date: Wed Mar 26 10:01:50 2014 +0100
OpenBSD does not have librt
common.mk.orig Thu Jan 23 22:52:24 2014
-+++ common.mk Tue Apr 15 07:55:02 2014
+--- common.mk.orig Sun Jun 15 19:12:43 2014
common.mk Wed Jul 2 20:14:26 2014
@@ -1,5 +1,5 @@
UNAME=$(shell uname)
-DEBUG=1
@@ -15,7 +15,7 @@ OpenBSD does not have librt
COVERAGE=0
INSTALL=install
LN=ln
-@@ -160,9 +160,9 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
+@@ -157,9 +157,9 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
endif
ifeq ($(UNAME),OpenBSD)
@@ -27,14 +27,3 @@ OpenBSD does not have librt
endif
ifeq ($(UNAME),FreeBSD)
-@@ -171,8 +171,8 @@ endif
-
- ifeq ($(UNAME),Darwin)
- LIBS += -liconv
--else
--# Darwin (Mac OS X) doesn’t have librt
-+else ifneq ($(UNAME),OpenBSD)
-+# Darwin (Mac OS X) and OpenBSD do not have librt
- LIBS += -lrt
- endif
-
Index: x11/i3/patches/patch-i3-dmenu-desktop
===
RCS file: /cvs/ports/x11/i3/patches/patch-i3-dmenu-desktop,v
retrieving revision 1.3
diff -u -p -r1.3 patch-i3-dmenu-desktop
--- x11/i3/patches/patch-i3-dmenu-desktop 13 Aug 2013 10:01:54 -
1.3
+++ x11/i3/patches/patch-i3-dmenu-desktop 3 Jul 2014 22:39:31 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-i3-dmenu-desktop,v 1.3 2013/08/13 10:01:54 dcoppa Exp $
i3-dmenu-desktop.orig Wed Aug 7 20:50:24 2013
-+++ i3-dmenu-desktop Mon Aug 12 15:19:02 2013
-@@ -103,7 +103,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
+--- i3-dmenu-desktop.orig Sun Jun 15 19:12:43 2014
i3-dmenu-desktop Wed Jul 2 20:14:26 2014
+@@ -107,7 +107,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
! -d $xdg_data_home;
my $xdg_data_dirs = $ENV{XDG_DATA_DIRS};
@@ -10,7 +10,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.3 2
!defined($xdg_data_dirs) ||
$xdg_data_dirs eq '';
-@@ -205,12 +205,12 @@ for my $file (values %desktops) {
+@@ -209,12 +209,12 @@ for my $file (values %desktops) {
# 'evince.desktop' => {
# 'Exec' => 'evince %U',
# 'Name' => 'Dokumentenbetrachter',
@@ -25,7 +25,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.3 2
# }
# };
-@@ -415,7 +415,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
+@@ -420,7 +420,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
# we need to create a temporary script that contains the full command line
# as the syntax for starting commands with arguments varies from terminal
# emulator to
[UPDATE] x11/i3-4.8
This patch updates x11/i3-4.7p6 to the latest release i3 version 4.8.
The new save-tree feature depends on the perl-module AnyEvent::I3 (port
submitted in a separate mail) which in turn pulls in the perl modules
AnyEvent and JSON::XS.
It is possible to run i3 without these dependencies, but it is strongly
recommended to install it since save-tree is a significant new feature.
Therefore I was unsure whether it was worth the effort to create a
flavor that throws these dependencies out.
I have run and tested it on amd64 over the last few days and didn't
encounter any difficulties. The patches are minor adaptations of the
previous patches.
Index: x11/i3/Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- x11/i3/Makefile 15 Apr 2014 10:31:30 - 1.85
+++ x11/i3/Makefile 3 Jul 2014 22:39:31 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.7.2
-REVISION = 6
+DISTNAME = i3-4.8
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -30,7 +29,8 @@ LIB_DEPENDS = devel/libev \
RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
- x11/i3status
+ x11/i3status \
+ x11/p5-AnyEvent-I3
USE_GMAKE =Yes
Index: x11/i3/distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- x11/i3/distinfo 24 Jan 2014 10:08:38 - 1.17
+++ x11/i3/distinfo 3 Jul 2014 22:39:31 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.7.2.tar.bz2) = b+RWXjZKUBfraonOEE1rshr820uws77pUmeB+mSx85M=
-SIZE (i3-4.7.2.tar.bz2) = 897398
+SHA256 (i3-4.8.tar.bz2) = UCw0KQ8jl4C7QDUhkfBQDo810kRu3bVzxnwnhz1qG2s=
+SIZE (i3-4.8.tar.bz2) = 939690
Index: x11/i3/patches/patch-common_mk
===
RCS file: /cvs/ports/x11/i3/patches/patch-common_mk,v
retrieving revision 1.20
diff -u -p -r1.20 patch-common_mk
--- x11/i3/patches/patch-common_mk 16 Apr 2014 14:12:04 - 1.20
+++ x11/i3/patches/patch-common_mk 3 Jul 2014 22:39:31 -
@@ -6,8 +6,8 @@ Date: Wed Mar 26 10:01:50 2014 +0100
OpenBSD does not have librt
common.mk.orig Thu Jan 23 22:52:24 2014
-+++ common.mk Tue Apr 15 07:55:02 2014
+--- common.mk.orig Sun Jun 15 19:12:43 2014
common.mk Wed Jul 2 20:14:26 2014
@@ -1,5 +1,5 @@
UNAME=$(shell uname)
-DEBUG=1
@@ -15,7 +15,7 @@ OpenBSD does not have librt
COVERAGE=0
INSTALL=install
LN=ln
-@@ -160,9 +160,9 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
+@@ -157,9 +157,9 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
endif
ifeq ($(UNAME),OpenBSD)
@@ -27,14 +27,3 @@ OpenBSD does not have librt
endif
ifeq ($(UNAME),FreeBSD)
-@@ -171,8 +171,8 @@ endif
-
- ifeq ($(UNAME),Darwin)
- LIBS += -liconv
--else
--# Darwin (Mac OS X) doesnât have librt
-+else ifneq ($(UNAME),OpenBSD)
-+# Darwin (Mac OS X) and OpenBSD do not have librt
- LIBS += -lrt
- endif
-
Index: x11/i3/patches/patch-i3-dmenu-desktop
===
RCS file: /cvs/ports/x11/i3/patches/patch-i3-dmenu-desktop,v
retrieving revision 1.3
diff -u -p -r1.3 patch-i3-dmenu-desktop
--- x11/i3/patches/patch-i3-dmenu-desktop 13 Aug 2013 10:01:54 -
1.3
+++ x11/i3/patches/patch-i3-dmenu-desktop 3 Jul 2014 22:39:31 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-i3-dmenu-desktop,v 1.3 2013/08/13 10:01:54 dcoppa Exp $
i3-dmenu-desktop.orig Wed Aug 7 20:50:24 2013
-+++ i3-dmenu-desktop Mon Aug 12 15:19:02 2013
-@@ -103,7 +103,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
+--- i3-dmenu-desktop.orig Sun Jun 15 19:12:43 2014
i3-dmenu-desktop Wed Jul 2 20:14:26 2014
+@@ -107,7 +107,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
! -d $xdg_data_home;
my $xdg_data_dirs = $ENV{XDG_DATA_DIRS};
@@ -10,7 +10,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.3 2
!defined($xdg_data_dirs) ||
$xdg_data_dirs eq '';
-@@ -205,12 +205,12 @@ for my $file (values %desktops) {
+@@ -209,12 +209,12 @@ for my $file (values %desktops) {
# 'evince.desktop' => {
# 'Exec' => 'evince %U',
# 'Name' => 'Dokumentenbetrachter',
@@ -25,7 +25,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.3 2
# }
# };
-@@ -415,7 +415,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
+@@ -420,7 +420,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
# we need to create a temporary script that contains the full command line
# as the syntax for starting commands with arguments varies from terminal
# emulator to terminal emulator.
@@ -34,7 +34,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.3 2
my ($fh, $filename) = tempfile();
binmode($fh, ':utf8');
Re: update x11/i3 (please read)
On Mon, Aug 2, 2010 at 10:40 AM, Marc Espie wrote: > On Mon, Aug 02, 2010 at 10:00:49AM +0200, David Coppa wrote: >> I know the ports tree is locked now... >> But we had a problem with this that now is finally solved. >> Since I've imported new prerequisites for this update in >> the past days, it seems silly to not have this in too. >> >> Christopher, I've deeply tested it during the weekend and >> your latest patch has effectively fixed the segfault I was >> having. > > What was the problem ? is the existing port not working and > segfaulting under some conditions ? > > Or are you telling me that this update didn't occur sooner because > there was a segfault with it, and you finally solved that ? > The latter. The update didn't occur before the lock, because there was a segfault with it, and me and Christopher finally solved that. -dav
Re: update x11/i3 (please read)
On Mon, Aug 02, 2010 at 10:00:49AM +0200, David Coppa wrote: > I know the ports tree is locked now... > But we had a problem with this that now is finally solved. > Since I've imported new prerequisites for this update in > the past days, it seems silly to not have this in too. > > Christopher, I've deeply tested it during the weekend and > your latest patch has effectively fixed the segfault I was > having. What was the problem ? is the existing port not working and segfaulting under some conditions ? Or are you telling me that this update didn't occur sooner because there was a segfault with it, and you finally solved that ?
update x11/i3 (please read)
I know the ports tree is locked now...
But we had a problem with this that now is finally solved.
Since I've imported new prerequisites for this update in
the past days, it seems silly to not have this in too.
Christopher, I've deeply tested it during the weekend and
your latest patch has effectively fixed the segfault I was
having.
Maintainer is M.I.A.
Again, special thanks to Christopher Zimmermann who has
written the resolve_tilde() function to work around the
fact that wordexp() is missing on OpenBSD.
Ciao,
David
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile28 Jun 2010 22:51:25 - 1.3
+++ Makefile2 Aug 2010 07:37:14 -
@@ -2,8 +2,8 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-3.c
-PKGNAME = i3-3.3p1
+DISTNAME = i3-3.e-bf1
+PKGNAME = i3-3.5.1
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -17,19 +17,38 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = X11 c m xcb xcb-atom xcb-aux xcb-event \
- xcb-icccm xcb-keysyms xcb-property xcb-xinerama
+WANTLIB += X11 c ev yajl m xcb xcb-atom xcb-aux
+WANTLIB += xcb-event xcb-icccm xcb-keysyms
+WANTLIB += xcb-property xcb-randr xcb-xinerama
MODULES = converters/libiconv
-LIB_DEPENDS = ev::devel/libev
-RUN_DEPENDS = ::x11/dmenu
+
+LIB_DEPENDS = ::devel/libev \
+ ::devel/libyajl
+
+BUILD_DEPENDS = ::devel/bison
+
+RUN_DEPENDS = ::x11/dmenu \
+ ::devel/p5-IPC-Run \
+ ::devel/p5-Try-Tiny \
+ ::devel/p5-AnyEvent \
+ ::x11/p5-AnyEvent-I3
USE_GMAKE =Yes
USE_X11 = Yes
NO_REGRESS = Yes
+FAKE_FLAGS = PREFIX=${PREFIX} \
+ SYSCONFDIR=${PREFIX}/share/examples \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+ INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/i3.config ${WRKSRC}/src/config.c
+ ${SUBST_CMD} ${WRKSRC}/i3.config ${WRKSRC}/src/config.c
+
+post-install:
+ ${INSTALL_MAN} ${WRKBUILD}/man/*.1 ${PREFIX}/man/man1/
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo2 Sep 2009 19:26:17 - 1.1.1.1
+++ distinfo2 Aug 2010 07:37:14 -
@@ -1,5 +1,5 @@
-MD5 (i3-3.c.tar.bz2) = jjpMN4S+7lxQNMdXC8/xyA==
-RMD160 (i3-3.c.tar.bz2) = lNfn7XDI1dVymFkJ2+aEtDw7B98=
-SHA1 (i3-3.c.tar.bz2) = QgH86kbiPnXqpwv/W9K9Cr6auhk=
-SHA256 (i3-3.c.tar.bz2) = kXJqpPuVj/flfOTwdMCGtzjqzCMb40vGDZ0xaT5JMVU=
-SIZE (i3-3.c.tar.bz2) = 110076
+MD5 (i3-3.e-bf1.tar.bz2) = 4TvhpMbzulGAxyZBlPV+OA==
+RMD160 (i3-3.e-bf1.tar.bz2) = aXXRKtC9Z6eV6vTEVXUrrFEMMfI=
+SHA1 (i3-3.e-bf1.tar.bz2) = /Ig5LT3Bnzej8Gv1rDcBJeYfLzQ=
+SHA256 (i3-3.e-bf1.tar.bz2) = aLkFjiMmOkCUIcOa0uzFPCi3Q6oJpofrBEE6oqlgUcc=
+SIZE (i3-3.e-bf1.tar.bz2) = 291172
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 2 Sep 2009 20:05:34 - 1.2
+++ patches/patch-Makefile 2 Aug 2010 07:37:14 -
@@ -1,35 +1,58 @@
-$OpenBSD: patch-Makefile,v 1.2 2009/09/02 20:05:34 bernd Exp $
Makefile.orig Wed Aug 19 14:39:09 2009
-+++ Makefile Wed Sep 2 21:23:16 2009
-@@ -8,24 +8,20 @@ HEADERS=$(wildcard include/*.h)
+$OpenBSD$
+--- Makefile.orig Wed Jun 9 09:58:15 2010
Makefile Mon Jul 19 17:07:45 2010
+@@ -20,20 +20,14 @@ endif
# Depend on the specific file (.c for each .o) and on all headers
src/%.o: src/%.c ${HEADERS}
- echo "CC $<"
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $<
.c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
- all: ${FILES}
+ all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
- echo "LINK i3"
- $(CC) -o i3 ${FILES} $(LDFLAGS)
+ $(CC) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LDFLAGS)
- echo ""
- echo "SUBDIR i3-msg"
$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg
+- echo "SUBDIR i3-input"
+ $(MAKE) TOPDIR=$(TOPDIR) -C i3-input
+
+ loglevels.h:
+- echo "LOGLEVELS"
+ for file in $$(ls src/*.c src/*.y src/*.l | grep -v
'cfgparse.\(tab\|yy\).c'); \
+ do \
+ echo $$(basename $$file .c); \
+@@ -45,27 +39,24 @@ loglevels.h:
+ echo "};") > include/loglevels.h;
+
+ src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
+- echo "LEX $<"
+ flex -i -o$(@:.o=.c) $<
+ $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR
}' l
[UPDATE] x11/i3
Hi
here is the new version 3.d of i3, it is still young (verbose and debug output
is still there - it should be configurable by next release) most of the patches
has been integrated upstream.
Hope the patch is ok
regards,
Bapt
diff -Nrau i3.orig/Makefile i3/Makefile
--- i3.orig/Makefile Mon Sep 14 19:19:29 2009
+++ i3/Makefile Tue Nov 10 08:14:51 2009
@@ -2,8 +2,8 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-3.c
-PKGNAME = i3-3.3p0
+DISTNAME = i3-3.d
+PKGNAME = i3-3.4p0
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -21,6 +21,7 @@
xcb-icccm xcb-keysyms xcb-property xcb-xinerama
MODULES = converters/libiconv
+BUILD_DEPENDS = ::devel/bison
LIB_DEPENDS = ev::devel/libev
RUN_DEPENDS = ::x11/dmenu
diff -Nrau i3.orig/distinfo i3/distinfo
--- i3.orig/distinfo Wed Sep 2 21:26:17 2009
+++ i3/distinfo Tue Nov 10 08:14:51 2009
@@ -1,5 +1,5 @@
-MD5 (i3-3.c.tar.bz2) = jjpMN4S+7lxQNMdXC8/xyA==
-RMD160 (i3-3.c.tar.bz2) = lNfn7XDI1dVymFkJ2+aEtDw7B98=
-SHA1 (i3-3.c.tar.bz2) = QgH86kbiPnXqpwv/W9K9Cr6auhk=
-SHA256 (i3-3.c.tar.bz2) = kXJqpPuVj/flfOTwdMCGtzjqzCMb40vGDZ0xaT5JMVU=
-SIZE (i3-3.c.tar.bz2) = 110076
+MD5 (i3-3.d.tar.bz2) = 3GSMC79xHWaRyYH2ZcfFTA==
+RMD160 (i3-3.d.tar.bz2) = piK0U7G/PC6essJ3Fw0u9i6P12I=
+SHA1 (i3-3.d.tar.bz2) = jOSdbCSH6heZx/8/abcqLYaU0NI=
+SHA256 (i3-3.d.tar.bz2) = pki+iCy1eLP3O985a6yr+u9lCparxnZBKmXOFrKKSSs=
+SIZE (i3-3.d.tar.bz2) = 156205
diff -Nrau i3.orig/patches/patch-Makefile i3/patches/patch-Makefile
--- i3.orig/patches/patch-Makefile Wed Sep 2 22:05:34 2009
+++ i3/patches/patch-Makefile Tue Nov 10 08:14:51 2009
@@ -1,20 +1,31 @@
-$OpenBSD: patch-Makefile,v 1.2 2009/09/02 20:05:34 bernd Exp $
Makefile.orig Wed Aug 19 14:39:09 2009
-+++ Makefile Wed Sep 2 21:23:16 2009
-@@ -8,24 +8,20 @@ HEADERS=$(wildcard include/*.h)
+--- Makefile.orig Mon Nov 9 22:37:11 2009
Makefile Tue Nov 10 07:59:39 2009
+@@ -10,37 +10,33 @@
# Depend on the specific file (.c for each .o) and on all headers
src/%.o: src/%.c ${HEADERS}
- echo "CC $<"
$(CC) $(CFLAGS) -c -o $@ $<
- all: ${FILES}
+ all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
- echo "LINK i3"
- $(CC) -o i3 ${FILES} $(LDFLAGS)
+ $(CC) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LDFLAGS)
- echo ""
- echo "SUBDIR i3-msg"
$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg
+- echo "SUBDIR i3-input"
+ $(MAKE) TOPDIR=$(TOPDIR) -C i3-input
+ src/cfgparse.yy.o: src/cfgparse.l
+- echo "LEX $<"
+ flex -i -o$(@:.o=.c) $<
+ $(CC) $(CFLAGS) -c -o $@ $(@:.o=.c)
+
+ src/cfgparse.y.o: src/cfgparse.y
+- echo "YACC $<"
+ bison --debug --verbose -b $(basename $< .y) -d $<
+ $(CC) $(CFLAGS) -c -o $@ $(<:.y=.tab.c)
+
install: all
- echo "INSTALL"
- $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
@@ -22,14 +33,19 @@
- $(INSTALL) -d -m 0755 $(DESTDIR)/usr/share/xsessions
- $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
- test -e $(DESTDIR)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
+- $(INSTALL) -m 0644 i3.welcome $(DESTDIR)/etc/i3/welcome
- $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
+ $(INSTALL) -d -m 0755 $(PREFIX)/bin
++ $(INSTALL) -d -m 0755 $(PREFIX)/etc/i3
+ $(INSTALL) -d -m 0755 $(PREFIX)/share/examples/i3
+ $(INSTALL) -d -m 0755 $(PREFIX)/share/xsessions
+ $(INSTALL) -m 0755 i3 $(PREFIX)/bin/
++ $(INSTALL) -m 0644 i3.config $(PREFIX)/share/examples/i3/config
+ $(INSTALL) -m 0444 man/i3.1 $(PREFIX)/man/man1/
-+ test -e $(PREFIX)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(PREFIX)/share/examples/i3/config
++ $(INSTALL) -m 0444 man/i3-msg.1 $(PREFIX)/man/man1/
++ $(INSTALL) -m 0444 man/i3-input.1 $(PREFIX)/man/man1/
++ $(INSTALL) -m 0644 i3.welcome $(PREFIX)/etc/i3/welcome
+ $(INSTALL) -m 0644 i3.desktop $(PREFIX)/share/xsessions/
$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
+ $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install
- dist: distclean
diff -Nrau i3.orig/patches/patch-common_mk i3/patches/patch-common_mk
--- i3.orig/patches/patch-common_mk Wed Sep 2 21:26:17 2009
+++ i3/patches/patch-common_mk Tue Nov 10 08:14:51 2009
@@ -1,45 +1,12 @@
-$OpenBSD: patch-common_mk,v 1.1.1.1 2009/09/02 19:26:17 landry Exp $
common.mk.orig Wed Aug 19 14:39:09 2009
-+++ common.mk Wed Sep 2 21:23:04 2009
-@@ -9,7 +9,7 @@ CFLAGS += -pipe
- CFLAGS += -Wall
- CFLAGS += -Wunused
- CFLAGS += -Iinclude
--CFLAGS += -I/usr/local/include
-+CFLAGS += -I${LOCALBASE}/include
- CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-
- # Check if pkg-config is installed, because without pkg-config, the following
-@@ -38,7 +38,7 @@ LDFLAGS += -lxcb-icccm
- LDFLAGS += -lxcb-xinerama
- LDFLAGS += -lX11
- LDFLAGS += -lev
--LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
-+LDFLAGS += -L${LOCALBASE}/lib -L/usr/pkg/lib
-
- ifeq ($(UNAME),NetBSD)
- # We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
-@@ -50,6 +50,13 @@ ifeq ($(UNAME),FreeBSD)
- LDFLAGS += -liconv
- endif
-
-+ifeq ($(UNAME),OpenBSD)
-+CFLAGS += -ftrampolines
-+CFLAGS += -I${X11BASE}/include
