bicatali 14/04/15 22:42:35
Added: octave-3.8.1-pkgbuilddir.patch
Removed:
octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch
octave-3.4.3-help.patch
octave-3.8.0-imagemagick.patch
octave-3.8.0-JIT-64-bit-indexing.patch
Log:
Fixed bug #504470, thanks jer, fixed for gui prefix, add sub-slotted
dependencies, general cleanup
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with
key 0x13CB1360)
Revision Changes Path
1.1 sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch?rev=1.1&content-type=text/plain
Index: octave-3.8.1-pkgbuilddir.patch
===================================================================
--- scripts/pkg/private/install.m.orig 2014-04-15 08:45:55.487258887 -0700
+++ scripts/pkg/private/install.m 2014-04-15 12:12:40.985606248 -0700
@@ -62,7 +62,14 @@
for i = 1:length (files)
tgz = files{i};
- if (exist (tgz, "file"))
+ ## The filename pointed to an uncompressed package to begin with.
+ if (exist (tgz, "dir"))
+ if (tgz(1) == '/')
+ packdir = tgz;
+ else
+ packdir = fullfile (pwd(), tgz);
+ endif
+ elseif (exist (tgz, "file"))
## Create a temporary directory.
tmpdir = tmpnam ();
tmpdirs{end+1} = tmpdir;
@@ -89,20 +96,12 @@
if (length (dirlist) > 3)
error ("bundles of packages are not allowed");
endif
- endif
- ## The filename pointed to an uncompressed package to begin with.
- if (exist (tgz, "dir"))
- dirlist = {".", "..", tgz};
+ ## The two first entries of dirlist are "." and "..".
+ packdir = fullfile (tmpdir, dirlist{3});
endif
if (exist (tgz, "file") || exist (tgz, "dir"))
- ## The two first entries of dirlist are "." and "..".
- if (exist (tgz, "file"))
- packdir = fullfile (tmpdir, dirlist{3});
- else
- packdir = fullfile (pwd (), dirlist{3});
- endif
packdirs{end+1} = packdir;
## Make sure the package contains necessary files.
