From 535665aa50f36643a0be03e5e0c479cfcd3f774e Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 23 Dec 2009 16:16:17 +0000 Subject: Fix app-defaults directory wrt #247655. (Portage version: 2.2_rc60/cvs/Linux x86_64, RepoMan options: --force) --- x11-misc/xosview/ChangeLog | 8 +++++- x11-misc/xosview/files/xosview-resdir.patch | 34 +++++++++++++++++------- x11-misc/xosview/xosview-1.8.3-r1.ebuild | 41 +++++++++++++++++++++++++++++ x11-misc/xosview/xosview-1.8.3.ebuild | 41 ----------------------------- 4 files changed, 72 insertions(+), 52 deletions(-) create mode 100644 x11-misc/xosview/xosview-1.8.3-r1.ebuild delete mode 100644 x11-misc/xosview/xosview-1.8.3.ebuild (limited to 'x11-misc/xosview') diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog index d50ee842ded1..0ed406e7e17f 100644 --- a/x11-misc/xosview/ChangeLog +++ b/x11-misc/xosview/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xosview # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.41 2009/08/06 16:00:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.42 2009/12/23 16:16:17 ssuominen Exp $ + +*xosview-1.8.3-r1 (23 Dec 2009) + + 23 Dec 2009; Samuli Suominen + +xosview-1.8.3-r1.ebuild, files/xosview-resdir.patch: + Fix app-defaults directory wrt #247655. 06 Aug 2009; Samuli Suominen xosview-1.8.3.ebuild, +files/xosview-1.8.3-gcc44.patch: diff --git a/x11-misc/xosview/files/xosview-resdir.patch b/x11-misc/xosview/files/xosview-resdir.patch index 3bd142e1d732..f6a0c2b67ec6 100644 --- a/x11-misc/xosview/files/xosview-resdir.patch +++ b/x11-misc/xosview/files/xosview-resdir.patch @@ -1,21 +1,34 @@ ---- xosview-1.8.2.orig/Xrm.cc -+++ xosview-1.8.2/Xrm.cc -@@ -148,20 +148,26 @@ +diff -ur xosview-1.8.3.orig/config/Makefile.top.in xosview-1.8.3/config/Makefile.top.in +--- xosview-1.8.3.orig/config/Makefile.top.in 2006-02-18 10:12:33.000000000 +0200 ++++ xosview-1.8.3/config/Makefile.top.in 2009-12-23 18:14:52.000000000 +0200 +@@ -49,7 +49,7 @@ + PREFIX_TO_USE=@prefix@ + BINDIR=$(PREFIX_TO_USE)/bin + MANDIR=$(PREFIX_TO_USE)/share/man/man1 +-XAPPLOADDIR=$(PREFIX_TO_USE)/lib/X11/app-defaults ++XAPPLOADDIR=$(PREFIX_TO_USE)/share/X11/app-defaults + PACKAGENAME=xosview-$(VERS) + DISTRIBDIR=@top_srcdir@/../$(PACKAGENAME) + +diff -ur xosview-1.8.3.orig/Xrm.cc xosview-1.8.3/Xrm.cc +--- xosview-1.8.3.orig/Xrm.cc 2006-02-18 06:33:04.000000000 +0200 ++++ xosview-1.8.3/Xrm.cc 2009-12-23 18:14:26.000000000 +0200 +@@ -152,20 +152,26 @@ // Merge in the system resource database. char rfilename[2048]; + int result; // Get the app-defaults -+ // Check /usr/lib/X11 for when /usr/X11R6 compatibility symlink is removed -+ result = snprintf(rfilename, sizeof rfilename, "/usr/lib/X11/app-defaults/%s", -+ XrmQuarkToString(_class)); -+ if (result >= 0 && result < sizeof rfilename) -+ XrmCombineFileDatabase (rfilename, &_db, 1); - snprintf(rfilename, 2048, "/usr/X11R6/lib/X11/app-defaults/%s", -+ result = snprintf(rfilename, sizeof rfilename, "/usr/X11R6/lib/X11/app-defaults/%s", ++ // Check /usr/lib/X11 for when /usr/X11R6 compatibility symlink is removed ++ result = snprintf(rfilename, sizeof rfilename, "/etc/X11/app-defaults/%s", XrmQuarkToString(_class)); - if (rfilename != NULL) ++ if (result >= 0 && result < sizeof rfilename) ++ XrmCombineFileDatabase (rfilename, &_db, 1); ++ result = snprintf(rfilename, sizeof rfilename, "/usr/share/X11/app-defaults/%s", ++ XrmQuarkToString(_class)); + if (result >= 0 && result < sizeof rfilename) XrmCombineFileDatabase (rfilename, &_db, 1); // Try a few more, for SunOS/Solaris folks. @@ -26,10 +39,11 @@ + if (result >= 0 && result < sizeof rfilename) XrmCombineFileDatabase (rfilename, &_db, 1); - snprintf(rfilename, 2048, "/usr/local/X11R6/lib/X11/app-defaults/%s", -+ result = snprintf(rfilename, sizeof rfilename, "/usr/local/X11R6/lib/X11/app-defaults/%s", ++ result = snprintf(rfilename, sizeof rfilename, "/usr/local/share/X11/app-defaults/%s", XrmQuarkToString(_class)); - if (rfilename != NULL) + if (result >= 0 && result < sizeof rfilename) XrmCombineFileDatabase (rfilename, &_db, 1); // Now, check for an XOSView file in the XAPPLRESDIR directory... +Only in xosview-1.8.3: Xrm.cc.orig diff --git a/x11-misc/xosview/xosview-1.8.3-r1.ebuild b/x11-misc/xosview/xosview-1.8.3-r1.ebuild new file mode 100644 index 000000000000..df16a6a30cb8 --- /dev/null +++ b/x11-misc/xosview/xosview-1.8.3-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3-r1.ebuild,v 1.1 2009/12/23 16:16:17 ssuominen Exp $ + +inherit eutils + +DESCRIPTION="X11 operating system viewer" +HOMEPAGE="http://xosview.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="alpha amd64 ppc ppc64 sparc x86" +IUSE="" + +COMMON_DEPS="x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt" + +RDEPEND="${COMMON_DEPS} + media-fonts/font-misc-misc" +DEPEND="${COMMON_DEPS} + x11-proto/xproto" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/xosview-emptyxpaths.patch + epatch "${FILESDIR}"/xosview-resdir.patch + epatch "${FILESDIR}"/${P}-remove-serialmeter.patch + epatch "${FILESDIR}"/${P}-gcc44.patch +} + +src_install() { + exeinto /usr/bin + doexe xosview + insinto /usr/share/X11/app-defaults + newins Xdefaults XOsview + doman *.1 + dodoc CHANGES README README.linux TODO +} diff --git a/x11-misc/xosview/xosview-1.8.3.ebuild b/x11-misc/xosview/xosview-1.8.3.ebuild deleted file mode 100644 index 32df0caf2f99..000000000000 --- a/x11-misc/xosview/xosview-1.8.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.12 2009/08/06 16:00:49 ssuominen Exp $ - -inherit eutils - -DESCRIPTION="X11 operating system viewer" -HOMEPAGE="http://xosview.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="alpha amd64 ppc ppc64 sparc x86" -IUSE="" - -COMMON_DEPS="x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt" - -RDEPEND="${COMMON_DEPS} - media-fonts/font-misc-misc" -DEPEND="${COMMON_DEPS} - x11-proto/xproto" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/xosview-emptyxpaths.patch - epatch "${FILESDIR}"/xosview-resdir.patch - epatch "${FILESDIR}"/${P}-remove-serialmeter.patch - epatch "${FILESDIR}"/${P}-gcc44.patch -} - -src_install() { - exeinto /usr/bin - doexe xosview - insinto /etc/X11/app-defaults - newins Xdefaults XOsview - doman *.1 - dodoc CHANGES README README.linux TODO -} -- cgit v1.2.3-65-gdbad