pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
i3-git: Import i3-4.11 as wip/i3-git.
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Tue Feb 9 16:47:00 2016 +0100
Changeset: 3aefc19252f887c288c2455b8474bf344ae76333
Added Files:
i3-git/DESCR
i3-git/Makefile
i3-git/PLIST
i3-git/buildlink3.mk
i3-git/distinfo
i3-git/patches/patch-Makefile
i3-git/patches/patch-src_log.c
i3-git/patches/patch-src_main.c
Log Message:
i3-git: Import i3-4.11 as wip/i3-git.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3aefc19252f887c288c2455b8474bf344ae76333
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
i3-git/DESCR | 8 ++++++
i3-git/Makefile | 58 +++++++++++++++++++++++++++++++++++++++++
i3-git/PLIST | 34 ++++++++++++++++++++++++
i3-git/buildlink3.mk | 14 ++++++++++
i3-git/distinfo | 9 +++++++
i3-git/patches/patch-Makefile | 12 +++++++++
i3-git/patches/patch-src_log.c | 35 +++++++++++++++++++++++++
i3-git/patches/patch-src_main.c | 27 +++++++++++++++++++
8 files changed, 197 insertions(+)
diffs:
diff --git a/i3-git/DESCR b/i3-git/DESCR
new file mode 100644
index 0000000..0996ded
--- /dev/null
+++ b/i3-git/DESCR
@@ -0,0 +1,8 @@
+Key features of i3 are correct implementation of Xinerama (workspaces are
+assigned to virtual screens, i3 does the right thing when attaching new
+monitors), XrandR support (not done yet), horizontal and vertical columns
+(think of a table) in tiling. Also, special focus is on writing clean,
+readable and well documented code. i3 uses xcb for asynchronous
+communication with X11, and has several measures to be very fast.
+
+Please be aware i3 is primarily targeted at advanced users and developers.
diff --git a/i3-git/Makefile b/i3-git/Makefile
new file mode 100644
index 0000000..fcaac4f
--- /dev/null
+++ b/i3-git/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.13 2015/11/09 11:05:44 nros Exp $
+#
+
+DISTNAME= i3-4.11
+CATEGORIES= wm
+MASTER_SITES= http://i3wm.org/downloads/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= tonnerre%NetBSD.org@localhost
+HOMEPAGE= http://i3wm.org/
+COMMENT= Improved dynamic tiling window manager
+LICENSE= modified-bsd
+
+USE_TOOLS+= gmake bison lex yacc pkg-config perl
+USE_LANGUAGES= c99
+MAKE_JOBS_SAFE= no
+
+PKG_SYSCONFSUBDIR= i3
+INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/${PKGBASE}
+
+EGDIR= ${PREFIX}/share/examples/i3
+CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/config
+CONF_FILES+= ${EGDIR}/config.keycodes ${PKG_SYSCONFDIR}/config.keycodes
+
+MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:C/\/i3//}
+MAKE_ENV+= DEBUG=0
+MAKE_ENV+= SHM_SUPPORT=0
+
+REPLACE_PERL+= i3-dmenu-desktop
+REPLACE_PERL+= i3-migrate-config-to-v4
+REPLACE_PERL+= i3-save-tree
+
+SUBST_CLASSES+= conf
+SUBST_STAGE.conf= pre-install
+SUBST_MESSAGE.conf= Change src/i3.mk to install conf files in share/examples
+SUBST_FILES.conf= src/i3.mk
+SUBST_SED.conf= -e s,$$\(SYSCONFDIR\),$$\(PREFIX\)/share/examples,g
+
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+
+.include "../../devel/libev/buildlink3.mk"
+.include "../../devel/yajl/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../x11/xcb-util-cursor/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/i3-git/PLIST b/i3-git/PLIST
new file mode 100644
index 0000000..1301fcb
--- /dev/null
+++ b/i3-git/PLIST
@@ -0,0 +1,34 @@
+@comment $NetBSD: PLIST,v 1.3 2015/04/05 17:02:51 nros Exp $
+bin/i3
+bin/i3-config-wizard
+bin/i3-dmenu-desktop
+bin/i3-input
+bin/i3-migrate-config-to-v4
+bin/i3-msg
+bin/i3-nagbar
+bin/i3-save-tree
+bin/i3-sensible-editor
+bin/i3-sensible-pager
+bin/i3-sensible-terminal
+bin/i3-with-shmlog
+bin/i3bar
+include/i3/ipc.h
+man/man1/i3-config-wizard.1
+man/man1/i3-dmenu-desktop.1
+man/man1/i3-dump-log.1
+man/man1/i3-input.1
+man/man1/i3-migrate-config-to-v4.1
+man/man1/i3-msg.1
+man/man1/i3-nagbar.1
+man/man1/i3-save-tree.1
+man/man1/i3-sensible-editor.1
+man/man1/i3-sensible-pager.1
+man/man1/i3-sensible-terminal.1
+man/man1/i3.1
+man/man1/i3bar.1
+share/applications/i3.desktop
+share/doc/i3/LICENSE
+share/examples/i3/config
+share/examples/i3/config.keycodes
+share/xsessions/i3-with-shmlog.desktop
+share/xsessions/i3.desktop
diff --git a/i3-git/buildlink3.mk b/i3-git/buildlink3.mk
new file mode 100644
index 0000000..e679b14
--- /dev/null
+++ b/i3-git/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/05 17:04:59 nros Exp $
+
+BUILDLINK_TREE+= i3
+
+.if !defined(I3_BUILDLINK3_MK)
+I3_BUILDLINK3_MK:=
+
+BULDLINK_DEPMETHOD.i3?= build
+BUILDLINK_API_DEPENDS.i3+= i3>=4.10.1
+BUILDLINK_PKGSRCDIR.i3?= ../../wm/i3
+
+.endif # I3_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -i3
diff --git a/i3-git/distinfo b/i3-git/distinfo
new file mode 100644
index 0000000..7f165f4
--- /dev/null
+++ b/i3-git/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.9 2015/11/09 11:05:44 nros Exp $
+
+SHA1 (i3-4.11.tar.bz2) = 85d04492214bd26c2804dfa83c979fda54b51c08
+RMD160 (i3-4.11.tar.bz2) = afdc6ef9708e797870b4c6c4dedc3b289a7b7d9c
+SHA512 (i3-4.11.tar.bz2) = 76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df3dddd28f912ff49a4f
+Size (i3-4.11.tar.bz2) = 972929 bytes
+SHA1 (patch-Makefile) = 919f0e87efa951bde531b9172b74589d3e1c474a
+SHA1 (patch-src_log.c) = 75ac4d0681d114e0343ddb015292c6c8ee81c1ae
+SHA1 (patch-src_main.c) = c03fcb12d404fcdfd14c1892b771ee0c7a86b39d
diff --git a/i3-git/patches/patch-Makefile b/i3-git/patches/patch-Makefile
new file mode 100644
index 0000000..4e6434b
--- /dev/null
+++ b/i3-git/patches/patch-Makefile
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile,v 1.1.1.1 2013/02/12 23:25:35 tonnerre Exp $
+
+--- Makefile.orig 2012-11-25 16:04:42.000000000 +0000
++++ Makefile
+@@ -18,7 +18,6 @@ include i3-msg/i3-msg.mk
+ include i3-input/i3-input.mk
+ include i3-nagbar/i3-nagbar.mk
+ include i3bar/i3bar.mk
+-include i3-dump-log/i3-dump-log.mk
+ include docs/docs.mk
+ include man/man.mk
+
diff --git a/i3-git/patches/patch-src_log.c b/i3-git/patches/patch-src_log.c
new file mode 100644
index 0000000..0f9b231
--- /dev/null
+++ b/i3-git/patches/patch-src_log.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_log.c,v 1.3 2014/08/09 19:14:01 degroote Exp $
+
+NetBSD does not support shm_open (3), disable the code in this case
+
+--- src/log.c.orig 2014-06-15 17:12:43.000000000 +0000
++++ src/log.c 2014-08-09 20:52:23.000000000 +0000
+@@ -108,6 +108,7 @@
+ * For 512 MiB of RAM this will lead to a 5 MiB log buffer.
+ * At the moment (2011-12-10), no testcase leads to an i3 log
+ * of more than ~ 600 KiB. */
++#if !defined(__NetBSD__)
+ long long physical_mem_bytes;
+ #if defined(__APPLE__)
+ int mib[2] = {CTL_HW, HW_MEMSIZE};
+@@ -163,6 +164,7 @@
+ logwalk = logbuffer + sizeof(i3_shmlog_header);
+ loglastwrap = logbuffer + logbuffer_size;
+ store_log_markers();
++#endif /* !defined(__NetBSD__) */
+ }
+
+ /*
+@@ -170,10 +172,12 @@
+ *
+ */
+ void close_logbuffer(void) {
++#if !defined(__NetBSD__)
+ close(logbuffer_shm);
+ shm_unlink(shmlogname);
+ logbuffer = NULL;
+ shmlogname = "";
++#endif
+ }
+
+ /*
diff --git a/i3-git/patches/patch-src_main.c b/i3-git/patches/patch-src_main.c
new file mode 100644
index 0000000..7e6eea7
--- /dev/null
+++ b/i3-git/patches/patch-src_main.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_main.c,v 1.1.1.1 2013/02/12 23:25:35 tonnerre Exp $
+
+--- src/main.c.orig 2012-12-11 23:08:17.000000000 +0000
++++ src/main.c
+@@ -218,12 +218,6 @@ static void i3_exit(void) {
+ #if EV_VERSION_MAJOR >= 4
+ ev_loop_destroy(main_loop);
+ #endif
+-
+- if (*shmlogname != '\0') {
+- fprintf(stderr, "Closing SHM log \"%s\"\n", shmlogname);
+- fflush(stderr);
+- shm_unlink(shmlogname);
+- }
+ }
+
+ /*
+@@ -233,9 +227,6 @@ static void i3_exit(void) {
+ *
+ */
+ static void handle_signal(int sig, siginfo_t *info, void *data) {
+- if (*shmlogname != '\0') {
+- shm_unlink(shmlogname);
+- }
+ raise(sig);
+ }
+
Home |
Main Index |
Thread Index |
Old Index