Bug 644610 – [gnome overlay] dev-util/gdbus-codegen-2.54.3 - gdbus-codegen-2.54.2-sitedir.patch fails: No file to patch. Skipping patch.

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description fkhp 2018-01-15 02:08:50 UTC]

Created attachment 514836 [details]
emerge --info

>>> Emerging (1 of 9) dev-util/gdbus-codegen-2.54.3::gnome
 * glib-2.54.3.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                        [ ok ]
>>> Unpacking source...
>>> Unpacking glib-2.54.3.tar.xz to /var/tmp/portage/dev-util/gdbus-codegen-2.54.3/work
>>> Source unpacked in /var/tmp/portage/dev-util/gdbus-codegen-2.54.3/work
>>> Preparing source in /var/tmp/portage/dev-util/gdbus-codegen-2.54.3/work/glib-2.54.3/gio/gdbus-2.0/codegen ...
 * Applying gdbus-codegen-2.54.2-sitedir.patch ...
The text leading up to this was:
--------------------------
|From f2f8ccb15cc6288455f4780d016789aa2e023d6d Mon Sep 17 00:00:00 2001
|From: Sobhan Mohammadpour <[e-mail]>
|Date: Thu, 14 Dec 2017 17:10:50 +0330
|Subject: [PATCH] glib-2.54.2 external gdbus codegen
|
|--
| gio/gdbus-2.0/codegen/gdbus-codegen.in | 11 +----------
| 1 file changed, 1 insertion(+), 10 deletions(-)
|
|diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
|index 8050981..c097702 100644
|--- a/glib-2.54.3/gio/gdbus-2.0/codegen/gdbus-codegen.in
|+++ b/glib-2.54.3/gio/gdbus-2.0/codegen/gdbus-codegen.in
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored                                                                           [ !! ]
 * ERROR: dev-util/gdbus-codegen-2.54.3::gnome failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/dev-util/gdbus-codegen-2.54.3/files/gdbus-codegen-2.54.2-sitedir.patch
 * 
 * Call stack:
 *               ebuild.sh, line  124:  Called src_prepare
 *             environment, line 2820:  Called distutils-r1_src_prepare
 *             environment, line  840:  Called python_prepare_all
 *             environment, line 2618:  Called distutils-r1_python_prepare_all
 *             environment, line  745:  Called default
 *      phase-functions.sh, line  853:  Called default_src_prepare
 *      phase-functions.sh, line  918:  Called __eapi6_src_prepare
 *             environment, line  201:  Called eapply '/var/tmp/portage/dev-util/gdbus-codegen-2.54.3/files/gdbus-codegen-2.54.2-sitedir.patch'
 *             environment, line  983:  Called _eapply_patch '/var/tmp/portage/dev-util/gdbus-codegen-2.54.3/files/gdbus-codegen-2.54.2-sitedir.patch'
 *             environment, line  921:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/dev-util/gdbus-codegen-2.54.3/files/gdbus-codegen-2.54.2-sitedir.patch'
 *   isolated-functions.sh, line  117:  Called die
 * The specific snippet of code:
 *   		die "$@"

[Comment 1 fkhp 2018-01-15 02:09:15 UTC]

Created attachment 514838 [details]
emerge -pqv

[Comment 2 fkhp 2018-01-15 02:09:41 UTC]

Created attachment 514840 [details]
build.log

[Comment 3 fkhp 2018-01-15 02:10:05 UTC]

Created attachment 514842 [details]
environment

[Comment 4 fkhp 2018-01-15 02:15:48 UTC]

Created attachment 514844 [details, diff]
the working patch to be put in files folder

# diff -ut files/gd*
--- files/gdbus-codegen-2.54.2-sitedir.patch	2018-01-15 10:06:09.957757463 +0800
+++ files/gdbus-codegen-2.54.2-sitedir.patch.orig	2018-01-15 10:05:39.947718794 +0800
@@ -9,8 +9,8 @@
 
 diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
 index 8050981..c097702 100644
---- a/gdbus-codegen.in
-+++ b/gdbus-codegen.in
+--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
 @@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
  
  if srcdir is not None:

[Comment 5 Tom-Steve Watzke 2018-01-19 09:36:28 UTC]

Created attachment 515298 [details, diff]
git diff for gdbus-codegen-2.54.3

This git diff is a bit better, 
it does not touch the older patch 
and is ready to be integrated into the git repository:

git apply gdbus-codegen-2.54.3.patch-fix.git.diff

[Comment 6 Dennis Lamm 2018-01-22 19:13:07 UTC]

Should work now. Problem was the wrong path in the patch file. I think also that 2.54.2 does not work and is also affected by this. See commit https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2fbb943aebc10b093727e3179b9ac048fcbf4495 for changes in 2.54.3.