diff options
author | Angelo D'Autilia (sYdRo) <sydro@salug.it> | 2010-03-21 20:35:47 +0000 |
---|---|---|
committer | Angelo D'Autilia (sYdRo) <sydro@salug.it> | 2010-03-21 20:35:47 +0000 |
commit | 0ec492ae4e8e2c1e793d8668052dd1a3328df64c (patch) | |
tree | 61cbd20b6324243a75e19e981973150043260f7f /app-misc | |
parent | sys-apps/timer_entropyd: New ebuild to address bug 308599. (diff) | |
download | sunrise-0ec492ae4e8e2c1e793d8668052dd1a3328df64c.tar.gz sunrise-0ec492ae4e8e2c1e793d8668052dd1a3328df64c.tar.bz2 sunrise-0ec492ae4e8e2c1e793d8668052dd1a3328df64c.zip |
app-misc/bashstyle-ng: Access violations fixed (in sandbox), thanks to jlec
svn path=/sunrise/; revision=10324
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/bashstyle-ng/ChangeLog | 4 | ||||
-rw-r--r-- | app-misc/bashstyle-ng/Manifest | 5 | ||||
-rw-r--r-- | app-misc/bashstyle-ng/bashstyle-ng-7.10.ebuild | 11 | ||||
-rw-r--r-- | app-misc/bashstyle-ng/files/bashstyle-ng-7.10.patch | 38 |
4 files changed, 53 insertions, 5 deletions
diff --git a/app-misc/bashstyle-ng/ChangeLog b/app-misc/bashstyle-ng/ChangeLog index 74190454f..6d5c18203 100644 --- a/app-misc/bashstyle-ng/ChangeLog +++ b/app-misc/bashstyle-ng/ChangeLog @@ -3,6 +3,10 @@ # $Header: $ 21 Mar 2010; Angelo D'Autilia (sYdRo) <sydro@salug.it> + bashstyle-ng-7.10.ebuild, +files/bashstyle-ng-7.10.patch: + Access violations fixed (in sandbox), thanks to jlec + + 21 Mar 2010; Angelo D'Autilia (sYdRo) <sydro@salug.it> +bashstyle-ng-7.10.ebuild, +metadata.xml: New Ebuild for bug 310549, thanks to jlec diff --git a/app-misc/bashstyle-ng/Manifest b/app-misc/bashstyle-ng/Manifest index 9d589cc75..fc658ded7 100644 --- a/app-misc/bashstyle-ng/Manifest +++ b/app-misc/bashstyle-ng/Manifest @@ -1,4 +1,5 @@ +AUX bashstyle-ng-7.10.patch 2146 RMD160 4272138a0c41ff12adff66af76ec9fe41a84882b SHA1 942ee0ac1775da0250a68bb04ec326527ff6482b SHA256 46bf46589156b8a5caf66c998a1ec551113346019482044bcfe7232db5e8c29f DIST bashstyle-ng-7.10.tar.bz2 1343658 RMD160 6f343078b5f34be1321142d94450e451e1d526d0 SHA1 ef5d221cdfa328d8a69195cdee203e27970d1863 SHA256 698b676190a225d61377b8f144fa1e240ea60c1f86c463bb8fb320f618682269 -EBUILD bashstyle-ng-7.10.ebuild 813 RMD160 90fffc884ba97c4b476c4b535a08ac703158137a SHA1 7307fe626e5aa652604aef78d759252baffe0462 SHA256 3cf6f8c59193c223848db6f288a70a046e34c040b18ed4e7b66dad56868a87c0 -MISC ChangeLog 268 RMD160 b69c517c8993a82576ebba50edf15924f58a21be SHA1 98549f2fe726fc970e2beb56d9bc21c0c27458e1 SHA256 a3194d501490307c09d95a1ff34c90f0b87ed5a384ba6a1b9b693ae7ddbefbe4 +EBUILD bashstyle-ng-7.10.ebuild 834 RMD160 3096eaeedaf15e98526b3bc1e33111b3644715c0 SHA1 d6829a85afaecc6d22cba3811444871beb23bc60 SHA256 6904d00bced1f262651f0679ef958bd672d7905c96ade07c3b727d846d2bb968 +MISC ChangeLog 441 RMD160 25c4c1f9786acc8cfdec18c500289f747f5e05c1 SHA1 fc3f66fa0bc46970716e6a2b551902609fcb03c8 SHA256 94090cb956733d1db0c12c713f5cd2981d209f9c172b3aabdb2e030b03d60ce6 MISC metadata.xml 503 RMD160 9cb49b0efc59c5541dca857a29f2ce01ae0864a6 SHA1 4ab665fbceca102edd2750856175dcb70c4810fd SHA256 b9b573c7fe96c2540d24e383717d40be01a1954389e4c7d133b2ef144ba27c02 diff --git a/app-misc/bashstyle-ng/bashstyle-ng-7.10.ebuild b/app-misc/bashstyle-ng/bashstyle-ng-7.10.ebuild index a229037a0..8a4d141bd 100644 --- a/app-misc/bashstyle-ng/bashstyle-ng-7.10.ebuild +++ b/app-misc/bashstyle-ng/bashstyle-ng-7.10.ebuild @@ -4,7 +4,7 @@ EAPI="2" -inherit gnome2 +inherit eutils gnome2 DESCRIPTION="A graphical tool for changing the Bashs behaviour" HOMEPAGE="http://www.nanolx.org/" @@ -24,11 +24,16 @@ DEPEND="x11-libs/vte[python] usb? ( sys-apps/usbutils )" RDEPEND="${DEPEND}" -DOCS=( AUTHORS ChangeLog README TODO ) +DOCS="AUTHORS ChangeLog README TODO" + +src_prepare() { + epatch "${FILESDIR}/${P}.patch" +} src_install() { - emake DESTDIR="${D}" install || die "emake install die" if use doc; then dohtml documentation/* || die "documentation installation failed" fi + gnome2_src_install } + diff --git a/app-misc/bashstyle-ng/files/bashstyle-ng-7.10.patch b/app-misc/bashstyle-ng/files/bashstyle-ng-7.10.patch new file mode 100644 index 000000000..16f65e48c --- /dev/null +++ b/app-misc/bashstyle-ng/files/bashstyle-ng-7.10.patch @@ -0,0 +1,38 @@ +diff -uaNr bashstyle-ng-7.10-orig/Makefile.in bashstyle-ng-7.10/Makefile.in +--- bashstyle-ng-7.10-orig/Makefile.in 2010-03-21 20:22:56.000000000 +0100 ++++ bashstyle-ng-7.10/Makefile.in 2010-03-21 20:31:48.000000000 +0100 +@@ -134,20 +134,20 @@ + @install -m644 translations/mo/bs-ng-de.mo $(DESTDIR)/usr/share/locale/de/LC_MESSAGES/bashstyle-ng.mo + @install -m644 translations/mo/bs-ng-it.mo $(DESTDIR)/usr/share/locale/it/LC_MESSAGES/bashstyle-ng.mo + @install -m644 translations/mo/bs-ng-ru.mo $(DESTDIR)/usr/share/locale/ru/LC_MESSAGES/bashstyle-ng.mo +- @if test ! $(GCONF_DISABLE) ; then \ +- echo$(EARGS) "$(MAGENTA)deregistering: $(SMOOTHBLUE)deprecated gconf schemas" ; \ +- GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults \ +- gconftool-2 --makefile-uninstall-rule data/deprecated.schemas >/dev/null ; \ +- fi +- @if test ! $(GCONF_DISABLE) ; then \ +- echo$(EARGS) "$(MAGENTA)registering: $(SMOOTHBLUE)gconf schemas" ; \ +- GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults \ +- gconftool-2 --makefile-install-rule data/bashstyle.schemas >/dev/null ; \ +- fi +- @if test ! $(CACHE_DISABLE) ; then \ +- echo$(EARGS) "$(MAGENTA)updating: $(SMOOTHBLUE)icon cache" ; \ +- gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null ; \ +- fi ++ #@if test ! $(GCONF_DISABLE) ; then \ ++ # echo$(EARGS) "$(MAGENTA)deregistering: $(SMOOTHBLUE)deprecated gconf schemas" ; \ ++ # GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults \ ++ # gconftool-2 --makefile-uninstall-rule data/deprecated.schemas >/dev/null ; \ ++ #fi ++ #@if test ! $(GCONF_DISABLE) ; then \ ++ # echo$(EARGS) "$(MAGENTA)registering: $(SMOOTHBLUE)gconf schemas" ; \ ++ # GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults \ ++ # gconftool-2 --makefile-install-rule data/bashstyle.schemas >/dev/null ; \ ++ #fi ++ #@if test ! $(CACHE_DISABLE) ; then \ ++ # echo$(EARGS) "$(MAGENTA)updating: $(SMOOTHBLUE)icon cache" ; \ ++ # gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null ; \ ++ #fi + @if test ! $(KILL_DISABLE) ; then \ + echo$(EARGS) "$(RED)killing: $(SMOOTHBLUE)gconf daemon" ; \ + killall -qw gconfd-2 >/dev/null || exit 0; \ |