keynav patches merged upstream. New minor version bump.

6 files changed, 2 insertions, 201 deletions

diff --git a/x11-misc/keynav/Manifest b/x11-misc/keynav/Manifest
index b474d1d..bbdeed3 100644
--- a/x11-misc/keynav/Manifest
+++ b/x11-misc/keynav/Manifest
@@ -1,6 +1,2 @@
-AUX keynav-20091231.01_as-needed.patch 704 RMD160 ea8714da689989e1e8202b2e5eae5e262d44e1f3 SHA1 8c77d0f1293c8db3fc8d2ac3f36309eebf24b4cd SHA256 1205427518f7176d7df325904c2b36b72b1694646d1d2e0c3d81ab4255470aac
-AUX keynav-20091231.01_etc-config.patch 1684 RMD160 c9329ca5c8bf063cc8cdbed9713bcfaee097031c SHA1 df6818fb894b2252b0435249b1cea3df541e1612 SHA256 757146ab8dc6f23ee552d30470d481d4ef7c524cb3d28d651501b532f157ec5d
-AUX keynav-20091231.01_fix-makefile.patch 1600 RMD160 56329b1bf1dc5565bf6a36f3c66db60818deb3d7 SHA1 f08a267e5daff0ffbdc3238fa0959adc0a0174f7 SHA256 98d54ec1f7b35f10d25bd84d7518ee6bfa6672ab99a1712b75d011d4e60bc2a8
-AUX keynav-20091231.01_fix-memleaks.patch 707 RMD160 2064784df6f232fe0dc43cc773e76282aa03735c SHA1 fdbd10c281093ace59bdfb2a21a8033da74e4450 SHA256 6c613718ac520f9b5a7fa302237ee528420a58461fdf29942024eb17d3615e7b
-EBUILD keynav-20091231.01.ebuild 1031 RMD160 fff7fe43fb5b1e458b8f6d1f6eeec96f4d57ba07 SHA1 b0cbf150d81e83ef76888aae30193fcfccf0aaa2 SHA256 2e6a9da7621ae1ec9b0437b6f4e2e2832e2d00f15550d4daeb8ef102de47b23d
-DIST keynav-20091231.01.tar.gz 37277 RMD160 ff84ea62a3e8d6bfea19bb191b4a5430ed2e1416 SHA1 ae11cadee8d4ea932f4bd1bb3fc165751c115ea8 SHA256 cdb3865fb844d22abd8cb14110c134e2ae82bba57799b64636229fe9e2987006
+EBUILD keynav-20091231.02.ebuild 835 RMD160 c17a51748510b160a0ce640e8b5b42a17ce42172 SHA1 b100c140554725172bc683e3c00832688d2e05f3 SHA256 8cacc31a6e86d17a9f575376981647785f702c972fd849afd7a3bde59a5faddd
+DIST keynav-20091231.02.tar.gz 37455 RMD160 6e6279a5f2cf0e645a1336e140764ddd7f8f7b39 SHA1 8fe7859b648c96f5a9333686b2a0d26a1bfa8545 SHA256 cdfbb359388c7f1c0e162c3a7ce9be1cc73604f06ccc54e8a6590cb1fbc36597
diff --git a/x11-misc/keynav/files/keynav-20091231.01_as-needed.patch b/x11-misc/keynav/files/keynav-20091231.01_as-needed.patch
deleted file mode 100644
index 3290760..0000000
--- a/x11-misc/keynav/files/keynav-20091231.01_as-needed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 18568a4913378fc9f9bfe4087eac637d19a03fd3 Mon Sep 17 00:00:00 2001
-From: Russell Harmon <russ@eatnumber1.com>
-Date: Thu, 31 Dec 2009 12:19:13 -0500
-Subject: [PATCH] Fix building with --as-needed
-
----
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f168e82..9b8f406 100644
---- a/Makefile
-+++ b/Makefile
-@@ -21,10 +21,10 @@ clean:
- keynav: keynav.o
- 	@set -x; \
- 	if $(LD) -lxdo > /dev/null 2>&1 ; then \
--		$(CC) $(LDFLAGS) -lxdo keynav.o -o $@; \
-+		$(CC) keynav.o -o $@ $(LDFLAGS) -lxdo; \
- 	else \
- 		$(MAKE) xdo.o; \
--		$(CC) $(LDFLAGS) xdo.o keynav.o -o $@; \
-+		$(CC) xdo.o keynav.o -o $@ $(LDFLAGS); \
- 	fi
- 
- xdo.o:
--- 
-1.6.4.4
-
diff --git a/x11-misc/keynav/files/keynav-20091231.01_etc-config.patch b/x11-misc/keynav/files/keynav-20091231.01_etc-config.patch
deleted file mode 100644
index 00a32eb..0000000
--- a/x11-misc/keynav/files/keynav-20091231.01_etc-config.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 50fb30000ecd172e1748fab9bad7762df4ea2cf0 Mon Sep 17 00:00:00 2001
-From: Russell Harmon <russ@eatnumber1.com>
-Date: Thu, 31 Dec 2009 11:44:16 -0500
-Subject: [PATCH 1/3] Support using a config file located in /etc
-
----
- keynav.c |   33 ++++++++++++++++++---------------
- 1 files changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/keynav.c b/keynav.c
-index d872805..76fd307 100644
---- a/keynav.c
-+++ b/keynav.c
-@@ -306,6 +306,22 @@ void addbinding(int keycode, int mods, char *commands) {
-   }
- }
- 
-+void parse_config_file(const char* file) {
-+  FILE *fp = NULL;
-+#define LINEBUF_SIZE 512
-+  char line[LINEBUF_SIZE];
-+  fp = fopen(file, "r");
-+  if (fp != NULL) {
-+    /* fopen succeeded */
-+    while (fgets(line, LINEBUF_SIZE, fp) != NULL) {
-+      /* Kill the newline */
-+      *(line + strlen(line) - 1) = '\0';
-+      parse_config_line(line);
-+    }
-+    fclose(fp);
-+  }
-+}
-+
- void parse_config() {
-   char *homedir;
- 
-@@ -313,28 +329,15 @@ void parse_config() {
- 
-   defaults();
- 
-+  parse_config_file("/etc/keynavrc");
-   homedir = getenv("HOME");
- 
-   if (homedir != NULL) {
-     char *rcfile = NULL;
--    FILE *fp = NULL;
--#define LINEBUF_SIZE 512
--    char line[LINEBUF_SIZE];
-     asprintf(&rcfile, "%s/.keynavrc", homedir);
--    fp = fopen(rcfile, "r");
--    if (fp != NULL) {
--      /* fopen succeeded */
--      while (fgets(line, LINEBUF_SIZE, fp) != NULL) {
--        /* Kill the newline */
--        *(line + strlen(line) - 1) = '\0';
--        parse_config_line(line);
--      }
--      free(rcfile);
--      return;
--    }
-+    parse_config_file(rcfile);
-     free(rcfile);
-   }
--  fprintf(stderr, "No ~/.keynavrc found.\n");
- }
- 
- void defaults() {
--- 
-1.6.4.4
-
diff --git a/x11-misc/keynav/files/keynav-20091231.01_fix-makefile.patch b/x11-misc/keynav/files/keynav-20091231.01_fix-makefile.patch
deleted file mode 100644
index ea83cd2..0000000
--- a/x11-misc/keynav/files/keynav-20091231.01_fix-makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ba0b36967da328b84f3d29b5d660d30bfd37df37 Mon Sep 17 00:00:00 2001
-From: Russell Harmon <russ@eatnumber1.com>
-Date: Thu, 31 Dec 2009 11:51:33 -0500
-Subject: [PATCH 2/3] Fix the makefile
-
----
- Makefile |   13 ++++++++-----
- 1 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cf83800..f168e82 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,6 @@
--CFLAGS=`pkg-config --cflags xext xinerama x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include`
--LDFLAGS=`pkg-config --libs xext xinerama x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lXext` 
-+CFLAGS+= $(shell pkg-config --cflags xext xinerama x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include)
-+LDFLAGS+= $(shell pkg-config --libs xext xinerama x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lXext)
-+
- 
- #CFLAGS+=-g
- OTHERFILES=README CHANGELIST COPYRIGHT \
-@@ -7,11 +8,13 @@ OTHERFILES=README CHANGELIST COPYRIGHT \
- 
- MICROVERSION?=00
- 
-+.PHONY: all
-+
- all: keynav
- 
- clean:
- 	rm *.o || true;
--	make -C xdotool clean || true
-+	$(MAKE) -C xdotool clean || true
- 
- # We'll try to detect 'libxdo' and use it if we find it.
- # otherwise, build monolithic.
-@@ -20,12 +23,12 @@ keynav: keynav.o
- 	if $(LD) -lxdo > /dev/null 2>&1 ; then \
- 		$(CC) $(LDFLAGS) -lxdo keynav.o -o $@; \
- 	else \
--		make xdo.o; \
-+		$(MAKE) xdo.o; \
- 		$(CC) $(LDFLAGS) xdo.o keynav.o -o $@; \
- 	fi
- 
- xdo.o:
--	make -C xdotool xdo.o
-+	$(MAKE) -C xdotool xdo.o
- 	cp xdotool/xdo.o .
- 
- package: clean
--- 
-1.6.4.4
-
diff --git a/x11-misc/keynav/files/keynav-20091231.01_fix-memleaks.patch b/x11-misc/keynav/files/keynav-20091231.01_fix-memleaks.patch
deleted file mode 100644
index 4c1593a..0000000
--- a/x11-misc/keynav/files/keynav-20091231.01_fix-memleaks.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 83b84889b59cb0469c2b246a32a98c1d24ce755c Mon Sep 17 00:00:00 2001
-From: Russell Harmon <russ@eatnumber1.com>
-Date: Thu, 31 Dec 2009 11:52:50 -0500
-Subject: [PATCH 3/3] Fix several memory leaks
-
----
- keynav.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/keynav.c b/keynav.c
-index 76fd307..bb6a186 100644
---- a/keynav.c
-+++ b/keynav.c
-@@ -267,6 +267,7 @@ int parse_mods(char *keyseq) {
-   }
- 
-   free(dup);
-+  free(mods);
-   return modmask;
- }
- 
-@@ -1138,6 +1139,7 @@ void query_screen_xinerama() {
-     viewports[i].screen = ScreenOfDisplay(dpy, 0);
-     viewports[i].root = DefaultRootWindow(dpy);
-   }
-+  XFree(screeninfo);
- }
- 
- void query_screen_normal() {
--- 
-1.6.4.4
-
diff --git a/x11-misc/keynav/keynav-20091231.01.ebuild b/x11-misc/keynav/keynav-20091231.02.ebuild
index 51abebc..702c128 100644
--- a/x11-misc/keynav/keynav-20091231.01.ebuild
+++ b/x11-misc/keynav/keynav-20091231.02.ebuild
@@ -2,8 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
-
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Make pointer-driven interfaces easier and faster for users to operate"
@@ -22,13 +20,6 @@ RDEPEND="x11-libs/libX11
 DEPEND="x11-proto/xproto
 	${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}_etc-config.patch" \
-		"${FILESDIR}/${P}_fix-makefile.patch" \
-		"${FILESDIR}/${P}_fix-memleaks.patch" \
-		"${FILESDIR}/${P}_as-needed.patch"
-}
-
 src_compile() {
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" || die "Unable to build sources"
 }