| 1 |
flameeyes 08/04/21 15:36:14 |
| 2 |
|
| 3 |
Added: skim-1.4.5-asneeded.patch |
| 4 |
Log: |
| 5 |
Add patch to fix building when --as-needed is forced on. |
| 6 |
(Portage version: 2.1.5_rc5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-i18n/skim/files/skim-1.4.5-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/skim/files/skim-1.4.5-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/skim/files/skim-1.4.5-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: skim-1.4.5-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
Index: skim-1.4.5/src/SConscript |
| 17 |
=================================================================== |
| 18 |
--- skim-1.4.5.orig/src/SConscript |
| 19 |
+++ skim-1.4.5/src/SConscript |
| 20 |
@@ -7,8 +7,6 @@ srcenv.Add_define('VERSION') |
| 21 |
srcenv.Add_define('PACKAGE') |
| 22 |
srcenv.Add_define('SCIM_VERSION') |
| 23 |
srcenv.AppendUnique(CCFLAGS = env['SCIM_CFLAGS'] ) |
| 24 |
-srcenv.AppendUnique(LINKFLAGS = env['SCIM_LIBS']) |
| 25 |
-srcenv.AppendUnique(LINKFLAGS = env['SCIM_X11_LIBS']) |
| 26 |
srcenv.KDEaddlibs( "qt-mt kdecore kdeui kutils" ) |
| 27 |
|
| 28 |
libskim=srcenv.Copy() |
| 29 |
@@ -23,13 +21,13 @@ libskim.KDEaddpaths_includes( "#/ #/src" |
| 30 |
#libskim.KDEaddlibs( "qt-mt kdecore kdeui kutils" ) |
| 31 |
libskim.Add_define('SCIM_BINARY_VERSION') |
| 32 |
libskim.Add_define('SCIM_LIBDIR') |
| 33 |
-libskim.KDEshlib( 'libskim', libskim_sources, kdelib=1, vnum=libskim.libskim_version()) |
| 34 |
+libskim.KDEshlib( 'libskim', libskim_sources, kdelib=1, vnum=libskim.libskim_version(), localshlibs='#/utils/libscim-kdeutils.la', globallibs=(env['SCIM_LIBS'] + env['SCIM_X11_LIBS'])) |
| 35 |
|
| 36 |
## IMPORTANT: this shows how to link against shared libraries |
| 37 |
skim=srcenv.Copy() |
| 38 |
skim_localshlibs='#src/libskim.so #utils/libscim-kdeutils.so' |
| 39 |
skim_sources = 'main.cpp' |
| 40 |
-skim_globallibs = '' |
| 41 |
+skim_globallibs = env['SCIM_LIBS'] + env['SCIM_X11_LIBS'] |
| 42 |
skim_includes = '#/ #/src' |
| 43 |
skim.KDEprogram( |
| 44 |
target = 'skim', |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
-- |
| 49 |
gentoo-commits@l.g.o mailing list |
Archives