summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-01-08 14:43:51 +0100
committerPacho Ramos <pacho@gentoo.org>2016-01-08 14:44:11 +0100
commit56edcfc31f1047e9baf63997ce85cbe60fe4f3ee (patch)
treefb61c600ed655127a575279e0aa21a45fd467541 /app-misc/g15macro
parentdev-java/testng: Fix DESCRIPTION length. (diff)
downloadgentoo-56edcfc31f1047e9baf63997ce85cbe60fe4f3ee.tar.gz
gentoo-56edcfc31f1047e9baf63997ce85cbe60fe4f3ee.tar.bz2
gentoo-56edcfc31f1047e9baf63997ce85cbe60fe4f3ee.zip
app-misc/g15macro: Fix building (#514980)
Package-Manager: portage-2.2.26
Diffstat (limited to 'app-misc/g15macro')
-rw-r--r--app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch13
-rw-r--r--app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch10
-rw-r--r--app-misc/g15macro/g15macro-1.0.3-r1.ebuild17
3 files changed, 36 insertions, 4 deletions
diff --git a/app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch b/app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch
new file mode 100644
index 00000000000..bc457dc52fb
--- /dev/null
+++ b/app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,9 +10,8 @@
+ imagedir = $(prefix)/share/g15macro/splash
+ image_DATA = ${top_builddir}/g15macro.wbmp
+
+-LIBS = -lg15daemon_client -lg15render -lX11 -lXtst
++LIBS = -lg15daemon_client -lg15render -lX11 -lXtst -lpthread
+ IMCLUDES = -I
+-g15macro_LDFLAGS = -avoid-version
+ g15macro_SOURCES = g15macro.c
+
+
diff --git a/app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch b/app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch
new file mode 100644
index 00000000000..7cdde1d098e
--- /dev/null
+++ b/app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -8,7 +8,6 @@
+ AC_CONFIG_HEADER([config.h])
+
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
+ AC_PROG_RANLIB
+
+ AC_CHECK_LIB([g15daemon_client], [g15daemon_version],,AC_MSG_ERROR(["libg15daemon_client (or its devel package) not found. please install it"]))
diff --git a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild b/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
index 2dd1ac5efe3..4fc8399c0a0 100644
--- a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
+++ b/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
+inherit autotools eutils
DESCRIPTION="Macro recording plugin to G15daemon"
HOMEPAGE="http://g15daemon.sourceforge.net/"
@@ -19,10 +20,18 @@ DEPEND=">=app-misc/g15daemon-1.9.0
x11-libs/libX11
x11-proto/xextproto
x11-proto/xproto
- x11-libs/libXtst"
-
+ x11-libs/libXtst
+"
RDEPEND="${DEPEND}
- sys-libs/zlib"
+ sys-libs/zlib
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-Makefile.am.patch
+ epatch "${FILESDIR}"/${P}-configure.in.patch
+ mv configure.in configure.ac || die
+ eautoreconf
+}
src_configure() {
econf --enable-xtest