Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 677402 - www-client/surf-9999 Failed Patch: surf-9999-gentoo.patch
Summary: www-client/surf-9999 Failed Patch: surf-9999-gentoo.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Jeroen Roovers (RETIRED)
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2019-02-07 05:38 UTC by Justin Keogh
Modified: 2019-02-07 11:13 UTC (History)
0 users

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


Attachments
surf-9999-gentoo.patch (surf-9999-gentoo.patch,1.28 KB, patch)
2019-02-07 05:38 UTC, Justin Keogh
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Justin Keogh 2019-02-07 05:38:39 UTC
Created attachment 564030 [details, diff]
surf-9999-gentoo.patch

www-client/surf-9999 fails to compile because surf-9999-gentoo.patch is out of date as of commit: http://git.suckless.org/surf/commit/890b2fc3960b76086a9c2b645d0592135f7d5284.html

The attached file replaces www-client/surf/files/surf-9999-gentoo.patch

Notes on changes from current (old) patch:

1. (same as the old patch) all instances of "pkg-config" are replaced by $(PKG_CONFIG) 

2. The old patch used the GNU-ism $(shell foo) instead of backticks, if this is policy or desired, I'll remember to use $(shell) instead of backticks in the future, but as far as I know there is no benefit to $(shell). Seems desirable to not need a patch at all, and if $(shell) is not necessary that is one less thing to need to change.

3. line 34 of the old patch unnecessarily added $(CFLAGS), causing it to be used twice on line 54 of the old patch.

4. line 34 of the old patch also (unnecessarily?) removed -fPIC. The new patch does not remove it.

5. lines 22 and 23 of the old patch removed "webkit2gtk-4.0" and instead relied on line 63 of the old patch to include it via $(WEBEXTLIBS). These vars were reorganized upstream (and the $(SURFLDLAGS) typo was fixed), so we don't need to change them in the new patch.

6. The two changes of /usr/local to /usr and removing the options target from all: are the same as the old patch.
Comment 1 Jeroen Roovers (RETIRED) gentoo-dev 2019-02-07 10:57:31 UTC
Comment on attachment 564030 [details, diff]
surf-9999-gentoo.patch

Why are you replacing $(shell $(PKG_CONFIG) ...) with `$(PKG_CONFIG) ...` ?

Could you please base your patch on the improvements of the existing one?
Comment 2 Larry the Git Cow gentoo-dev 2019-02-07 11:13:28 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13df6158e43d170a0dabf8934ec909f8a6b39631

commit 13df6158e43d170a0dabf8934ec909f8a6b39631
Author:     Jeroen Roovers <jer@gentoo.org>
AuthorDate: 2019-02-07 11:11:10 +0000
Commit:     Jeroen Roovers <jer@gentoo.org>
CommitDate: 2019-02-07 11:13:19 +0000

    www-client/surf: Fix live ebuild patch
    
    Package-Manager: Portage-2.3.59, Repoman-2.3.12
    
    Fixes: https://bugs.gentoo.org/677402
    Signed-off-by: Jeroen Roovers <jer@gentoo.org>

 www-client/surf/files/surf-9999-gentoo.patch | 47 ++++------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)