Skip to content

Commit

Permalink
app-misc/g15macro: Fix building (#514980)
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.2.26
  • Loading branch information
pacho2 committed Jan 8, 2016
1 parent 17330f5 commit 56edcfc
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 4 deletions.
13 changes: 13 additions & 0 deletions app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch
Original file line number Diff line number Diff line change
@@ -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


10 changes: 10 additions & 0 deletions app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch
Original file line number Diff line number Diff line change
@@ -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"]))
17 changes: 13 additions & 4 deletions app-misc/g15macro/g15macro-1.0.3-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand All @@ -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
Expand Down

0 comments on commit 56edcfc

Please sign in to comment.