* [gentoo-commits] gentoo-x86 commit in app-i18n/skim/files: skim-1.4.5-asneeded.patch
@ 2008-04-21 15:36 Diego Petteno (flameeyes)
0 siblings, 0 replies; 2+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-04-21 15:36 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/04/21 15:36:14
Added: skim-1.4.5-asneeded.patch
Log:
Add patch to fix building when --as-needed is forced on.
(Portage version: 2.1.5_rc5)
Revision Changes Path
1.1 app-i18n/skim/files/skim-1.4.5-asneeded.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/skim/files/skim-1.4.5-asneeded.patch?rev=1.1&view=markup
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
Index: skim-1.4.5-asneeded.patch
===================================================================
Index: skim-1.4.5/src/SConscript
===================================================================
--- skim-1.4.5.orig/src/SConscript
+++ skim-1.4.5/src/SConscript
@@ -7,8 +7,6 @@ srcenv.Add_define('VERSION')
srcenv.Add_define('PACKAGE')
srcenv.Add_define('SCIM_VERSION')
srcenv.AppendUnique(CCFLAGS = env['SCIM_CFLAGS'] )
-srcenv.AppendUnique(LINKFLAGS = env['SCIM_LIBS'])
-srcenv.AppendUnique(LINKFLAGS = env['SCIM_X11_LIBS'])
srcenv.KDEaddlibs( "qt-mt kdecore kdeui kutils" )
libskim=srcenv.Copy()
@@ -23,13 +21,13 @@ libskim.KDEaddpaths_includes( "#/ #/src"
#libskim.KDEaddlibs( "qt-mt kdecore kdeui kutils" )
libskim.Add_define('SCIM_BINARY_VERSION')
libskim.Add_define('SCIM_LIBDIR')
-libskim.KDEshlib( 'libskim', libskim_sources, kdelib=1, vnum=libskim.libskim_version())
+libskim.KDEshlib( 'libskim', libskim_sources, kdelib=1, vnum=libskim.libskim_version(), localshlibs='#/utils/libscim-kdeutils.la', globallibs=(env['SCIM_LIBS'] + env['SCIM_X11_LIBS']))
## IMPORTANT: this shows how to link against shared libraries
skim=srcenv.Copy()
skim_localshlibs='#src/libskim.so #utils/libscim-kdeutils.so'
skim_sources = 'main.cpp'
-skim_globallibs = ''
+skim_globallibs = env['SCIM_LIBS'] + env['SCIM_X11_LIBS']
skim_includes = '#/ #/src'
skim.KDEprogram(
target = 'skim',
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-i18n/skim/files: skim-1.4.5-asneeded.patch
@ 2008-11-12 0:41 Matsuu Takuto (matsuu)
0 siblings, 0 replies; 2+ messages in thread
From: Matsuu Takuto (matsuu) @ 2008-11-12 0:41 UTC (permalink / raw
To: gentoo-commits
matsuu 08/11/12 00:41:15
Modified: skim-1.4.5-asneeded.patch
Log:
Fixed doc/de/docbook issue, bug #211493. Fixed #246223.
(Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo x86_64)
Revision Changes Path
1.2 app-i18n/skim/files/skim-1.4.5-asneeded.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/skim/files/skim-1.4.5-asneeded.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/skim/files/skim-1.4.5-asneeded.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/skim/files/skim-1.4.5-asneeded.patch?r1=1.1&r2=1.2
Index: skim-1.4.5-asneeded.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/skim/files/skim-1.4.5-asneeded.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skim-1.4.5-asneeded.patch 21 Apr 2008 15:36:14 -0000 1.1
+++ skim-1.4.5-asneeded.patch 12 Nov 2008 00:41:15 -0000 1.2
@@ -1,8 +1,7 @@
-Index: skim-1.4.5/src/SConscript
-===================================================================
---- skim-1.4.5.orig/src/SConscript
-+++ skim-1.4.5/src/SConscript
-@@ -7,8 +7,6 @@ srcenv.Add_define('VERSION')
+diff -Naur skim-1.4.5.orig/src/SConscript skim-1.4.5/src/SConscript
+--- skim-1.4.5.orig/src/SConscript 2006-06-04 11:03:36.000000000 +0900
++++ skim-1.4.5/src/SConscript 2008-11-12 08:45:35.000000000 +0900
+@@ -7,8 +7,6 @@
srcenv.Add_define('PACKAGE')
srcenv.Add_define('SCIM_VERSION')
srcenv.AppendUnique(CCFLAGS = env['SCIM_CFLAGS'] )
@@ -11,7 +10,7 @@
srcenv.KDEaddlibs( "qt-mt kdecore kdeui kutils" )
libskim=srcenv.Copy()
-@@ -23,13 +21,13 @@ libskim.KDEaddpaths_includes( "#/ #/src"
+@@ -23,13 +21,13 @@
#libskim.KDEaddlibs( "qt-mt kdecore kdeui kutils" )
libskim.Add_define('SCIM_BINARY_VERSION')
libskim.Add_define('SCIM_LIBDIR')
@@ -27,3 +26,15 @@
skim_includes = '#/ #/src'
skim.KDEprogram(
target = 'skim',
+diff -Naur skim-1.4.5.orig/utils/SConscript skim-1.4.5/utils/SConscript
+--- skim-1.4.5.orig/utils/SConscript 2006-06-04 11:03:36.000000000 +0900
++++ skim-1.4.5/utils/SConscript 2008-11-12 08:52:49.000000000 +0900
+@@ -4,7 +4,7 @@
+
+ utils=env.Copy()
+ utils_sources='scimkdesettings.kcfgc scimmovehandle.cpp scimdragableframe.cpp scimxmlguibuilder.cpp scimactions.cpp scimtoolbar.cpp kautocmodule.cpp skimplugininfo.cpp'
+-utils.KDEshlib( 'libscim-kdeutils', utils_sources, kdelib=1, vnum=utils.libskim_version() )
++utils.KDEshlib( 'libscim-kdeutils', utils_sources, kdelib=1, vnum=utils.libskim_version(), globallibs=(env['SCIM_LIBS'] + env['SCIM_X11_LIBS']))
+ utils.KDEaddpaths_includes( "#/ #/src" )
+ utils.KDEaddlibs( "qt-mt kdecore kdeui" )
+
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-12 0:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-12 0:41 [gentoo-commits] gentoo-x86 commit in app-i18n/skim/files: skim-1.4.5-asneeded.patch Matsuu Takuto (matsuu)
-- strict thread matches above, loose matches on Subject: below --
2008-04-21 15:36 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox