Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cfd9d01bcbbc248802616aa4a67c6edfbd202b4a
commit cfd9d01bcbbc248802616aa4a67c6edfbd202b4a Author: PacMiam <[email protected]> Date: Tue Jan 21 21:15:12 2014 +0100 i3-4.7.1-1-i686 * Version bump: 4.7 -> 4.7.1 * Remove useless patchs diff --git a/source/x11-extra/i3/FrugalBuild b/source/x11-extra/i3/FrugalBuild index 2236c94..595962d 100644 --- a/source/x11-extra/i3/FrugalBuild +++ b/source/x11-extra/i3/FrugalBuild @@ -1,18 +1,38 @@ # Compiling Time: 0.14 SBU # Maintainer: PacMiam <[email protected]> +options+=('asneeded') + pkgname=i3 -pkgver=4.7 -pkgrel=2 +pkgver=4.7.1 +pkgrel=1 pkgdesc="An improved dynamic tiling window manager" url="http://i3wm.org/"; + depends=('libxcursor' 'xcb-util>=0.3.9' 'xcb-util-wm>=0.3.9' 'xcb-util-keysyms' \ 'xcb-util-cursor' 'libev' 'yajl' 'startup-notification' 'pcre' 'dmenu') makedepends=('bison' 'flex' 'pango') + groups=('x11-extra') archs=('i686' 'x86_64') + up2date="lynx -dump http://i3wm.org/downloads/ | Flasttar" -source=(http://i3wm.org/downloads/$pkgname-$pkgver.tar.bz2 i3.patch i3bar.patch) -sha1sums=('37c8f13b96447d572b95ebf7c74140a96a17529e' \ - '027ddc27b671d800fe2e89df9ab2d0984da3899d' \ - '9bf63ec87573c53cee7375a06d720474dbc3e7b3') +source=(http://i3wm.org/downloads/$pkgname-$pkgver.tar.bz2) +sha1sums=('44ad994348ec3919f1cfa2aa69fa02129baa7cce') + +build() { + Fcd + + # Change ev.h to libev/ev.h + Fsed 'ev.h' 'libev/ev.h' src/ipc.c + Fsed 'ev.h' 'libev/ev.h' include/ipc.h + Fsed 'ev.h' 'libev/ev.h' src/main.c + Fsed 'ev.h' 'libev/ev.h' src/sighandler.c + Fsed 'ev.h' 'libev/ev.h' i3bar/src/parse_json_header.c + Fsed 'ev.h' 'libev/ev.h' i3bar/src/ipc.c + Fsed 'ev.h' 'libev/ev.h' i3bar/src/main.c + Fsed 'ev.h' 'libev/ev.h' i3bar/src/xcb.c + Fsed 'ev.h' 'libev/ev.h' i3bar/src/child.c + + Fbuild +} diff --git a/source/x11-extra/i3/i3.patch b/source/x11-extra/i3/i3.patch deleted file mode 100644 index 7e74fea..0000000 --- a/source/x11-extra/i3/i3.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -Naur i3-4.6/include/ipc.h i3-4.6b/include/ipc.h ---- i3-4.6/include/ipc.h 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/include/ipc.h 2013-08-08 09:48:12.000000000 +0200 -@@ -10,7 +10,7 @@ - #ifndef I3_IPC_H - #define I3_IPC_H - --#include <ev.h> -+#include <libev/ev.h> - #include <stdbool.h> - #include <yajl/yajl_gen.h> - #include <yajl/yajl_parse.h> - -diff -Naur i3-4.6/src/main.c i3-4.6b/src/main.c ---- i3-4.6/src/main.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/src/main.c 2013-08-08 09:48:26.000000000 +0200 -@@ -9,7 +9,7 @@ - * main.c: Initialization, main loop - * - */ --#include <ev.h> -+#include <libev/ev.h> - #include <fcntl.h> - #include <sys/types.h> - #include <sys/socket.h> - -diff -Naur i3-4.6/src/sighandler.c i3-4.6b/src/sighandler.c ---- i3-4.6/src/sighandler.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/src/sighandler.c 2013-08-08 09:48:48.000000000 +0200 -@@ -13,7 +13,7 @@ - */ - #include "all.h" - --#include <ev.h> -+#include <libev/ev.h> - #include <iconv.h> - #include <signal.h> - #include <sys/wait.h> - -diff -Naur i3-4.6/src/ipc.c i3-4.6b/src/ipc.c ---- i3-4.6/src/ipc.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/src/ipc.c 2013-08-08 09:49:31.000000000 +0200 -@@ -16,7 +16,7 @@ - #include <sys/un.h> - #include <fcntl.h> - #include <libgen.h> --#include <ev.h> -+#include <libev/ev.h> - #include <yajl/yajl_gen.h> - #include <yajl/yajl_parse.h> - -diff -Naur i3-4.6/i3bar/src/ipc.c i3-4.6b/i3bar/src/ipc.c ---- i3-4.6/i3bar/src/ipc.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/i3bar/src/ipc.c 2013-08-08 09:50:00.000000000 +0200 -@@ -16,7 +16,7 @@ - #include <sys/socket.h> - #include <sys/un.h> - #include <i3/ipc.h> --#include <ev.h> -+#include <libev/ev.h> - - #include "common.h" - - -diff -Naur i3-4.6/i3bar/src/main.c i3-4.6b/i3bar/src/main.c ---- i3-4.6/i3bar/src/main.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/i3bar/src/main.c 2013-08-08 09:50:16.000000000 +0200 -@@ -11,7 +11,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <errno.h> --#include <ev.h> -+#include <libev/ev.h> - #include <getopt.h> - #include <glob.h> - -diff -Naur i3-4.6/i3bar/src/xcb.c i3-4.6b/i3bar/src/xcb.c ---- i3-4.6/i3bar/src/xcb.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/i3bar/src/xcb.c 2013-08-08 09:50:32.000000000 +0200 -@@ -21,7 +21,7 @@ - #include <fcntl.h> - #include <string.h> - #include <i3/ipc.h> --#include <ev.h> -+#include <libev/ev.h> - #include <errno.h> - #include <limits.h> - #include <err.h> - -diff -Naur i3-4.6/i3bar/src/child.c i3-4.6b/i3bar/src/child.c ---- i3-4.6/i3bar/src/child.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/i3bar/src/child.c 2013-08-08 09:50:44.000000000 +0200 -@@ -17,7 +17,7 @@ - #include <string.h> - #include <errno.h> - #include <err.h> --#include <ev.h> -+#include <libev/ev.h> - #include <yajl/yajl_common.h> - #include <yajl/yajl_parse.h> - #include <yajl/yajl_version.h> - -diff -Naur i3-4.6/i3bar/src/parse_json_header.c i3-4.6b/i3bar/src/parse_json_header.c ---- i3-4.6/i3bar/src/parse_json_header.c 2013-08-07 20:50:24.000000000 +0200 -+++ i3-4.6b/i3bar/src/parse_json_header.c 2013-08-08 09:50:56.000000000 +0200 -@@ -18,7 +18,7 @@ - #include <string.h> - #include <errno.h> - #include <err.h> --#include <ev.h> -+#include <libev/ev.h> - #include <stdbool.h> - #include <stdint.h> - #include <yajl/yajl_common.h> diff --git a/source/x11-extra/i3/i3bar.patch b/source/x11-extra/i3/i3bar.patch deleted file mode 100644 index 6636d32..0000000 --- a/source/x11-extra/i3/i3bar.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/i3bar/src/child.c b/i3bar/src/child.c -index 1bd0d25..527e353 100644 ---- a/i3bar/src/child.c -+++ b/i3bar/src/child.c -@@ -456,6 +456,9 @@ void child_write_output(void) { - * - */ - void start_child(char *command) { -+ if (command == NULL) -+ return; -+ - /* Allocate a yajl parser which will be used to parse stdin. */ - memset(&callbacks, '\0', sizeof(yajl_callbacks)); - callbacks.yajl_map_key = stdin_map_key; - - -diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c -index d3dc948..8286103 100644 ---- a/i3bar/src/xcb.c -+++ b/i3bar/src/xcb.c -@@ -603,17 +603,18 @@ static void handle_client_message(xcb_client_message_event_t* event) { - * exits/crashes. */ - xcb_change_save_set(xcb_connection, XCB_SET_MODE_INSERT, client); - -+ trayclient *tc = smalloc(sizeof(trayclient)); -+ tc->win = client; -+ tc->xe_version = xe_version; -+ tc->mapped = false; -+ TAILQ_INSERT_TAIL(output->trayclients, tc, tailq); -+ - if (map_it) { - DLOG("Mapping dock client\n"); - xcb_map_window(xcb_connection, client); - } else { - DLOG("Not mapping dock client yet\n"); - } -- trayclient *tc = smalloc(sizeof(trayclient)); -- tc->win = client; -- tc->xe_version = xe_version; -- TAILQ_INSERT_TAIL(output->trayclients, tc, tailq); -- - /* Trigger an update to copy the statusline text to the appropriate - * position */ - configure_trayclients(); - - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
