Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 548160 - app-office/scribus-9999 fails to apply scribus-1.5.0-docs.patch
Summary: app-office/scribus-9999 fails to apply scribus-1.5.0-docs.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Justin Lecher (RETIRED)
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2015-04-29 17:14 UTC by Miroslav Šulc
Modified: 2015-05-18 16:58 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
updated patch (scribus-1.5.0-docs.patch,916 bytes, patch)
2015-05-01 09:31 UTC, Miroslav Šulc
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Miroslav Šulc gentoo-dev 2015-04-29 17:14:41 UTC
>>> Emerging (1 of 1) app-office/scribus-9999::gentoo
>>> Unpacking source...
 * subversion update start -->
 *      repository: svn://scribus.net/trunk/Scribus
Updating '.':
At revision 20035.
 *    working copy: /usr/src/esvn-src/Scribus-1.5/Scribus

>>> Source unpacked in /var/tmp/portage/app-office/scribus-9999/work
>>> Preparing source in /var/tmp/portage/app-office/scribus-9999/work/scribus-9999 ...
 * Applying scribus-1.5.0-docs.patch ...

 * Failed Patch: scribus-1.5.0-docs.patch !
 *  ( /usr/portage/app-office/scribus/files/scribus-1.5.0-docs.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/app-office/scribus-9999/temp/scribus-1.5.0-docs.patch.out

 * ERROR: app-office/scribus-9999::gentoo failed (prepare phase):
 *   Failed Patch: scribus-1.5.0-docs.patch!
 * 
 * Call stack:
 *     ebuild.sh, line   93:  Called src_prepare
 *   environment, line 3814:  Called cmake-utils_src_prepare
 *   environment, line 1005:  Called _execute_optionally 'src_prepare'
 *   environment, line  421:  Called enable_cmake-utils_src_prepare
 *   environment, line 1328:  Called epatch '/usr/portage/app-office/scribus/files/scribus-1.5.0-docs.patch'
 *   environment, line 1562:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of `emerge --info '=app-office/scribus-9999::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=app-office/scribus-9999::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/app-office/scribus-9999/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/app-office/scribus-9999/temp/environment'.
 * Working directory: '/var/tmp/portage/app-office/scribus-9999/work/scribus-9999'
 * S: '/var/tmp/portage/app-office/scribus-9999/work/scribus-9999'



# cat /var/tmp/portage/app-office/scribus-9999/temp/scribus-1.5.0-docs.patch.out
***** scribus-1.5.0-docs.patch *****
PWD: /var/tmp/portage/app-office/scribus-9999/work/scribus-9999
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.5
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall

License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by Larry Wall and Paul Eggert

====================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  < '/usr/portage/app-office/scribus/files/scribus-1.5.0-docs.patch'

====================================
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| CMakeLists.txt | 3 +--
| 1 file changed, 1 insertion(+), 2 deletions(-)
|
|diff --git a/CMakeLists.txt b/CMakeLists.txt
|index c97080b..46742c7 100644
|--- a/CMakeLists.txt
|+++ b/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
====================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  < '/usr/portage/app-office/scribus/files/scribus-1.5.0-docs.patch'

====================================
checking file CMakeLists.txt
Hunk #1 FAILED at 244.
Hunk #2 succeeded at 940 (offset 57 lines).
1 out of 2 hunks FAILED

patch program exited with status 1
====================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  < '/usr/portage/app-office/scribus/files/scribus-1.5.0-docs.patch'

====================================
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| CMakeLists.txt | 3 +--
| 1 file changed, 1 insertion(+), 2 deletions(-)
|
|diff --git a/CMakeLists.txt b/CMakeLists.txt
|index c97080b..46742c7 100644
|--- a/CMakeLists.txt
|+++ b/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
====================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  < '/usr/portage/app-office/scribus/files/scribus-1.5.0-docs.patch'

====================================
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| CMakeLists.txt | 3 +--
| 1 file changed, 1 insertion(+), 2 deletions(-)
|
|diff --git a/CMakeLists.txt b/CMakeLists.txt
|index c97080b..46742c7 100644
|--- a/CMakeLists.txt
|+++ b/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
====================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  < '/usr/portage/app-office/scribus/files/scribus-1.5.0-docs.patch'

====================================
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| CMakeLists.txt | 3 +--
| 1 file changed, 1 insertion(+), 2 deletions(-)
|
|diff --git a/CMakeLists.txt b/CMakeLists.txt
|index c97080b..46742c7 100644
|--- a/CMakeLists.txt
|+++ b/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
Comment 1 Miroslav Šulc gentoo-dev 2015-05-01 09:31:49 UTC
Created attachment 402370 [details, diff]
updated patch

here is updated patch that applies fine
Comment 2 Justin Lecher (RETIRED) gentoo-dev 2015-05-18 16:58:46 UTC
+*scribus-1.4.5-r1 (18 May 2015)
+
+  18 May 2015; Justin Lecher <jlec@gentoo.org>
+  +files/scribus-1.4.4-ppc64-fpic.patch, +scribus-1.4.5-r1.ebuild,
+  files/scribus-1.5.0-docs.patch, scribus-1.4.4-r1.ebuild,
+  scribus-1.4.9999.ebuild, scribus-9999.ebuild:
+  Build all 64bit arch with fPIC, bug #549746; Update live doc patch, bug
+  #548160; use LINGUAS for all localizable files in this app, bug #538238
+