diff options
Diffstat (limited to 'dev-util/bless')
| -rw-r--r-- | dev-util/bless/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-util/bless/bless-0.6.0-r1.ebuild (renamed from dev-util/bless/bless-0.6.0.ebuild) | 16 | ||||
| -rw-r--r-- | dev-util/bless/files/bless-0.6.0-docpath.patch | 103 | ||||
| -rw-r--r-- | dev-util/bless/files/bless-0.6.0-pixmap.patch | 20 |
4 files changed, 136 insertions, 13 deletions
diff --git a/dev-util/bless/ChangeLog b/dev-util/bless/ChangeLog index a66413847cf2..f55f4e35ab44 100644 --- a/dev-util/bless/ChangeLog +++ b/dev-util/bless/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/bless # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/ChangeLog,v 1.16 2009/03/05 22:49:06 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/ChangeLog,v 1.17 2009/12/13 14:07:47 ikelos Exp $ + +*bless-0.6.0-r1 (13 Dec 2009) + + 13 Dec 2009; Mike Auty <ikelos@gentoo.org> -bless-0.6.0.ebuild, + +bless-0.6.0-r1.ebuild, +files/bless-0.6.0-docpath.patch, + +files/bless-0.6.0-pixmap.patch: + Fix up documentation bug 296669 and an upstream bug affecting nvidia + users. 05 Mar 2009; Mike Auty <ikelos@gentoo.org> bless-0.6.0.ebuild: Fix up bug 248852, thanks to Kevin. diff --git a/dev-util/bless/bless-0.6.0.ebuild b/dev-util/bless/bless-0.6.0-r1.ebuild index fc1163ecc76c..1e66810f4e35 100644 --- a/dev-util/bless/bless-0.6.0.ebuild +++ b/dev-util/bless/bless-0.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.6.0.ebuild,v 1.3 2009/03/05 22:49:06 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.6.0-r1.ebuild,v 1.1 2009/12/13 14:07:47 ikelos Exp $ EAPI=2 @@ -33,18 +33,10 @@ pkg_setup() { sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" } -src_unpack() { - gnome2_src_unpack - +src_prepare() { einfo "Running gettextize -f --no-changelog..." ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" + epatch "${FILESDIR}/${P}-pixmap.patch" + epatch "${FILESDIR}/${P}-docpath.patch" eautoreconf } - -src_configure() { - gnome2_src_configure -} - -src_compile() { - default -} diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch new file mode 100644 index 000000000000..0def24d27e98 --- /dev/null +++ b/dev-util/bless/files/bless-0.6.0-docpath.patch @@ -0,0 +1,103 @@ +diff --git a/Makefile.am b/Makefile.am +index 33f265b..23fcb0e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,10 +35,10 @@ dist-hook: + bzr log > $(distdir)/ChangeLog + + install-data-local: +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) + $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \ + README README.packaging bless.spec \ +- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) ++ $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) + + uninstall-local: + rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME) +diff --git a/data/Makefile.am b/data/Makefile.am +index 13ea7ed..207c17a 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -12,7 +12,7 @@ PWD=$(shell pwd) + help_script.sh: help_script.tmpl + sed -e 's,@blessdocdir\@,$(PWD)/../doc,g' help_script.tmpl > help_script.sh + chmod +x help_script.sh +- sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME),g' help_script.tmpl > help_script.sh.install ++ sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install + + install-data-local: + $(INSTALL) -d $(DESTDIR)$(datadir)/$(PACKAGE_NAME) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index b18e94a..c0e700d 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,4 +1,4 @@ + SUBDIRS= developer user + + uninstall-local: +- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) ++ rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) +diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am +index 65911f8..c13f216 100644 +--- a/doc/developer/Makefile.am ++++ b/doc/developer/Makefile.am +@@ -4,8 +4,8 @@ DOCS=$(srcdir)/en/*.xml \ + EXTRA_DIST=$(DOCS) bless-docs.source + + #install-data-local: +-# $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer +-# $(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer ++# $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer ++# $(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer + + #uninstall-local: +-# rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer ++# rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer +diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am +index 729b295..b1d371d 100644 +--- a/doc/user/Makefile.am ++++ b/doc/user/Makefile.am +@@ -10,7 +10,7 @@ noinst_SCRIPTS=$(OMF) + + $(OMF): $(OMF).in + if [ -x `which scrollkeeper-preinstall` ]; then \ +- scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF); \ ++ scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/bless-manual.xml $(OMF).in $(OMF); \ + else \ + cp $(OMF).in $(OMF); \ + fi +@@ -27,22 +27,22 @@ dist-hook: doc + rm html_file_list + + install-data-local: +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures ++ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user ++ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures + $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \ +- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user +- $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures +- $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) +- $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) ++ $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user ++ $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures ++ $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION) ++ $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION) + if WITH_SCROLLKEEPER +- scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) ++ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION) + endif + + uninstall-local: +- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user +- rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF) ++ rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user ++ rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(OMF) + if WITH_SCROLLKEEPER +- scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) ++ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION) + endif +- rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) ++ rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION) + diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch new file mode 100644 index 000000000000..441a9e2bfb79 --- /dev/null +++ b/dev-util/bless/files/bless-0.6.0-pixmap.patch @@ -0,0 +1,20 @@ +=== modified file 'src/gui/drawers/HexDrawer.cs' +--- src/gui/drawers/HexDrawer.cs 2007-06-13 12:20:53 +0000 ++++ src/gui/drawers/HexDrawer.cs 2009-04-10 23:21:41 +0000 +@@ -57,11 +57,14 @@ + + //System.Console.WriteLine(s); + +- pangoLayout.SetText(s); ++ pangoLayout.SetText(s.Substring(0,256)); + + + gc.RgbFgColor = fg; + pix.DrawLayout(gc, 0, 0, pangoLayout); ++ ++ pangoLayout.SetText(s.Substring(256,256)); ++ pix.DrawLayout(gc, 128*2*width, 0, pangoLayout); + + return pix; + } + |