diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-01-24 13:42:59 -0800 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-01-24 13:42:59 -0800 |
| commit | 7ebf59e999f05f177da745b0e5e3d38050d052db (patch) | |
| tree | e281b854936fb7e0d060659001a4d8f6f41f8cdb /x11-misc | |
| parent | x11-misc/image: clone upstream (diff) | |
| download | gmt-7ebf59e999f05f177da745b0e5e3d38050d052db.tar.gz gmt-7ebf59e999f05f177da745b0e5e3d38050d052db.tar.bz2 gmt-7ebf59e999f05f177da745b0e5e3d38050d052db.zip | |
Fix #499166
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/imake/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/imake/files/imake-1.0.6-gcc48-avoid-stdin.patch | 22 | ||||
| -rw-r--r-- | x11-misc/imake/imake-1.0.6-r1.ebuild | 7 |
3 files changed, 30 insertions, 2 deletions
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest index b9957fe..21d54c4 100644 --- a/x11-misc/imake/Manifest +++ b/x11-misc/imake/Manifest @@ -1,4 +1,5 @@ +AUX imake-1.0.6-gcc48-avoid-stdin.patch 1316 SHA256 e2a7bc2ea5aa8ede1ce081926a4665d6210b62ebd32c25e237bc0f0f6c1775e7 SHA512 0b8af18b5d1390aaf03fceac72a3c4bedeb7d1d837eca37d96b4e34eb00c7f7e9147893810e38706bf4ec8fe7096cac8f40f3e497c0c02fdd562616c4f11f114 WHIRLPOOL e17569e6d4f91c9abedcd05fbbc58c4399079acad5fbc363133b5250ea8cdea89052d9566b4cdb1f4cc2e0aace1e7487bce33a550707f0a085f9f0733c6f9ec8 DIST imake-1.0.6.tar.bz2 155571 SHA256 fa8983fdb0a72ba8482d1d2683967fb45c29edd7149b25f619f97ea5a599069d SHA512 5e0744903c8b044fac98859fee1d15fe1db4b8346a1b1fd0c8c8a683914c3a83a2d18316cadf1ab7ee455004b761c1fa7808bdf48bbfb9e7cbe6c7c143ad2f43 WHIRLPOOL 091e0f6e8708fccdede729f412b4ae777dbc329372d3dd99ea04181a1ddb41cd0e750ca1252cb72fba8377ffb535096e173d6bde97823060355f2d9765eda31f -EBUILD imake-1.0.6-r1.ebuild 723 SHA256 4d852c467cc10daaf855336726f590ef2c1d5bf5d21e377816ded9f9c222abdb SHA512 36c792ebf0b1cdeb57cc95c1c5f8443c25df9e85ca42d6b19b14af9ca8ad3376fc8e0cf837d6fbbfe9ff4b52ce707a49e1eb251f4df9551c7bc8d2e4ab645517 WHIRLPOOL f280eade48625daf4707e23148c8f98147bd8251d85735c3335e3387d3a91b6567410a8d5db8137df02f126c6eec50d56a5e4550869b653dcc08cbb876c3934e +EBUILD imake-1.0.6-r1.ebuild 678 SHA256 a8f96f52bbecff564f17cc78b33b4465e9ab38f2d0abd109a1df1e85d00fd2bc SHA512 048721f1e5416a6b49b6271790f0db05f26d6007be601c4c98254b284bc6a0debeb53ae3b3f324662993a59020f4e00c1296424668b410e12d75c1b4c055a882 WHIRLPOOL ee364e5b21fcb80821a662f36be5c243e3a6b04cbdea91ff7f4011270bb1da543228f99c8dad4fcff6c72273c4b1a8c0aa6b0a68abf16f2f391c52d65cde6191 MISC ChangeLog 7959 SHA256 711172ea1440d54bb815887d7a02f8b7a04bd2818939826fea4583a0f1812e7c SHA512 68aabc00d1e148b1b28f9f1e5599a970290981c1b5dad38ce8f5e81efa7494d5b9d7542f931166af87f6be53321221ef9bd55961d869d6b7ab8a590c06c1da88 WHIRLPOOL 4c35e9d9545cf8c3aa2986097ed9317b8c604f5340ff56be4c87d62102bfe7899b47b508acd341594de1f585ebee00b028938370fe16f89cb69c995a9a21005d MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-misc/imake/files/imake-1.0.6-gcc48-avoid-stdin.patch b/x11-misc/imake/files/imake-1.0.6-gcc48-avoid-stdin.patch new file mode 100644 index 0000000..0f0be9b --- /dev/null +++ b/x11-misc/imake/files/imake-1.0.6-gcc48-avoid-stdin.patch @@ -0,0 +1,22 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=74031 + +diff -urpN imake-1.0.6.orig/Makefile.am imake-1.0.6/Makefile.am +--- imake-1.0.6.orig/Makefile.am 2013-07-22 21:53:04.000000000 -0700 ++++ imake-1.0.6/Makefile.am 2014-01-24 11:46:07.825378603 -0800 +@@ -76,13 +76,13 @@ bin_SCRIPTS = \ + $(MKHTMLINDEX) + + xmkmf: xmkmf.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + ccmakedep: mdepend.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + mergelib: mergelib.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + if HAS_PERL + MKHTMLINDEX_SCRIPT = $(srcdir)/mkhtmlindex.pl diff --git a/x11-misc/imake/imake-1.0.6-r1.ebuild b/x11-misc/imake/imake-1.0.6-r1.ebuild index eb27a23..e1c8eaa 100644 --- a/x11-misc/imake/imake-1.0.6-r1.ebuild +++ b/x11-misc/imake/imake-1.0.6-r1.ebuild @@ -5,20 +5,25 @@ EAPI=4 XORG_STATIC=no +XORG_EAUTORECONF=yes inherit xorg-2 DESCRIPTION="C preprocessor interface to the make utility" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64" IUSE="" RDEPEND="x11-misc/xorg-cf-files" DEPEND="${RDEPEND} x11-proto/xproto" +# backport upstream fix: https://bugs.freedesktop.org/show_bug.cgi?id=69439 +PATCHES=( "${FILESDIR}"/${P}-gcc48-avoid-stdin.patch ) + src_prepare() { # don't use Sun compilers on Solaris, we want GCC from prefix sed -i \ -e "1s/^/#if defined(sun)\n# undef sun\n#endif/" \ imake.c imakemdep.h || die "sed failed" + xorg-2_src_prepare } |