Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 537704 Details for
Bug 642996
games-engines/gargoyle-2011.1 fails to compile
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch against gargoyle-2011.1.ebuild
gargoyle-2011.1.ebuild.patch (text/plain), 2.77 KB, created by
Nikos Chantziaras
on 2018-06-29 15:32:36 UTC
(
hide
)
Description:
Patch against gargoyle-2011.1.ebuild
Filename:
MIME Type:
Creator:
Nikos Chantziaras
Created:
2018-06-29 15:32:36 UTC
Size:
2.77 KB
patch
obsolete
>--- a/gargoyle-2011.1.ebuild 2017-11-19 12:16:16.901675218 +0200 >+++ b/gargoyle-2011.1.ebuild 2018-06-29 18:25:04.703727134 +0300 >@@ -1,4 +1,4 @@ >-# Copyright 1999-2016 Gentoo Foundation >+# Copyright 1999-2018 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > > # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled >@@ -8,8 +8,8 @@ > # Since we don't compile or install any of the bundled fonts, their licenses > # don't apply. (Fonts are installed through dependencies instead.) > >-EAPI=5 >-inherit eutils flag-o-matic multiprocessing toolchain-funcs gnome2-utils games >+EAPI=6 >+inherit eutils flag-o-matic gnome2-utils multilib multiprocessing toolchain-funcs > > DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats" > HOMEPAGE="http://ccxvii.net/gargoyle/" >@@ -21,7 +21,7 @@ > IUSE="" > > RDEPEND=" >- >=media-fonts/libertine-5 >+ media-fonts/libertine > media-fonts/liberation-fonts > media-libs/freetype:2 > media-libs/libpng:0 >@@ -52,11 +52,10 @@ > # Convert garglk.ini to UNIX format. > edos2unix garglk/garglk.ini > >- # The font name of Linux Libertine changed in version 5. >- sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die >- > epatch "${FILESDIR}"/${P}-desktopfile.patch > append-cflags -std=gnu89 # build with gcc5 (bug #573378) >+ append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996) >+ default > } > > src_compile() { >@@ -69,7 +68,7 @@ > -sC++="$(tc-getCXX) ${CXXFLAGS}" \ > -sCXX="$(tc-getCXX) ${CXXFLAGS}" \ > -sC++FLAGS="" \ >- -sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \ >+ -sGARGLKINI="/etc/garglk.ini" \ > -sUSESDL=yes \ > -sBUNDLEFONTS=no \ > -dx \ >@@ -78,15 +77,15 @@ > > src_install() { > DESTDIR="${D}" \ >- _BINDIR="${GAMES_PREFIX}/libexec/${PN}" \ >- _APPDIR="${GAMES_PREFIX}/libexec/${PN}" \ >- _LIBDIR="$(games_get_libdir)" \ >+ _BINDIR="/usr/libexec/${PN}" \ >+ _APPDIR="/usr/libexec/${PN}" \ >+ _LIBDIR="/usr/$(get_libdir)" \ > EXEMODE=755 \ > FILEMODE=755 \ > jam install || die > > # Install config file. >- insinto "${GAMES_SYSCONFDIR}" >+ insinto "/etc" > newins garglk/garglk.ini garglk.ini > > # Install application entry and icon. >@@ -97,24 +96,20 @@ > for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \ > level9 magnetic nitfol scare tadsr > do >- dosym "${GAMES_PREFIX}/libexec/${PN}/${terp}" \ >- "${GAMES_BINDIR}/${PN}-${terp}" >+ dosym "/usr/libexec/${PN}/${terp}" \ >+ "/usr/bin/${PN}-${terp}" > done > > # Also symlink the main binary since it resides in libexec. >- dosym "${GAMES_PREFIX}/libexec/${PN}/${PN}" \ >- "${GAMES_BINDIR}/${PN}" >- >- prepgamesdirs >+ dosym "/usr/libexec/${PN}/${PN}" \ >+ "/usr/bin/${PN}" > } > > pkg_preinst() { >- games_pkg_preinst > gnome2_icon_savelist > } > > pkg_postinst() { >- games_pkg_postinst > gnome2_icon_cache_update > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 642996
:
512634
|
537704
|
538314