- enable KWallet, gnome-keyring support

This commit is contained in:
jorton 2009-06-01 19:34:04 +00:00
parent f03a66afd1
commit 1e4746bf58
6 changed files with 1 additions and 151 deletions

View File

@ -1,28 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQBI/zKmCwOubk4kUXwRAv0uAKDF9bgcbI6wh+CJjVQhxP2NCYdHHgCfbrnW
iu/c3oCFpn+K5jJe3i3Fxtw=
=vvuv
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQBI/60VNR8z5DU+JbwRAh3mAJ0bxAceqhWh8CMAb9fzpAw+tX4vDwCfZ1RL
1ytJAOfOpgZ+vvo9nNELRtM=
=pQwt
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQBJAExk9o1G+2zNQDgRAoRKAKC7xxAXFJXw3UXkSz7tyXLd8s8RsgCgkv3v
cuIOw7HhUbImTOlfGETx5yY=
=QiCN
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)
iEYEABECAAYFAkkAJ0kACgkQ/P1jBZgh97LKWQCfQ/018LDOjTpSE9AdeFNCkMx4
jk4AnRs9u+iuTVYnNSnbZkoruVv4Jibx
=arbL
-----END PGP SIGNATURE-----

View File

@ -1,35 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkmlkusACgkQCwOubk4kUXwZxwCgzH29yGPMxB5BhuqTyp+VFIfv
sb4AoMU4dPm5/zn5r0dlWzPYDJg+6Gtd
=qPyK
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkmlujYACgkQvJ27E9sAokgXggCgjcQYY2hTOQv4Ky83FKc0GpJG
8IYAnA/2jIpHS/9ohEoXMRlZIAAF1qUP
=XON9
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkmllUYACgkQokEGqRcG/W51UwCffPPA3zPH/jqmk2MKQ/0GBIOh
FRAAoI+aVskN69uvjfH0HgFc6B84Zhdu
=R4LR
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkmmA8YACgkQ9o1G+2zNQDhytQCdHF6oU24LB8ghM+MMUmuA11QD
adQAoLi5M+wSRjxqAobuuN251mu/qe8h
=6B4V
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)
iEYEABECAAYFAkmmbkYACgkQ/P1jBZgh97IwPQCbBdK0VxwR0OKeQ/oGLmIVxzEg
hXIAmwceK3qgrCfIKqF1nx/D627vbGHP
=Mls4
-----END PGP SIGNATURE-----

View File

@ -1,31 +0,0 @@
Libraries should be linked with -rpath $libdir but programs should not.
Doing so for the latter means that a redundant RPATH entry of $libdir
will end up in the binaries.
The redundant RPATH can also cause obscure build failures by causing
in-build binaries to pick up libraries from the system environment,
which libtool will otherwise avoid.
--- subversion-1.6.0/build/generator/gen_base.py.rpath
+++ subversion-1.6.0/build/generator/gen_base.py
@@ -455,6 +455,9 @@ class TargetLib(TargetLinked):
self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
self.msvc_export = options.get('msvc-export', '').split()
+ ### hmm. this is Makefile-specific
+ self.link_cmd = '$(LINK_LIB)'
+
class TargetApacheMod(TargetLib):
def __init__(self, name, options, gen_obj):
--- subversion-1.6.0/Makefile.in.rpath
+++ subversion-1.6.0/Makefile.in
@@ -184,6 +184,7 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
COMPILE_JAVAHL_JAVAH = $(JAVAH)
+LINK_LIB = $(LINK) -rpath $(libdir)
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)

View File

@ -1,28 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAknClnUACgkQCwOubk4kUXzzrwCeP6g1IJ5tC/dcTaSon+AFeH0V
zNYAoKY0ZhzX0oLmSdNDeZb5IbE0/BMl
=cV+A
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)
iEYEABECAAYFAknCqHAACgkQ/P1jBZgh97LYHQCdFFNSRiPWNFaHf00fzTUJRVHI
ZdwAn0SIV4WEu2ek8PWYjY9Dfs1SOgEo
=DXbN
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAknCqzUACgkQokEGqRcG/W6M6wCcDH7uBuRCRRSp/MozjJJ+P1RZ
l0sAn2pLD/nyYTKMofWAG1Ce5B6rAWMg
=rhHR
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAknDRyEACgkQvJ27E9sAokjuQACfSPnJdzy7XV9PuFTl7y9R4nCV
fawAnjZdVWUBYwi6boWYlltmxHPDVk1O
=LYDm
-----END PGP SIGNATURE-----

View File

@ -1,28 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAknc50kACgkQCwOubk4kUXx2xACfUCx724/5r494oVGpnYpfg9nq
Y/YAoIHPysjMeCwcWWiDs/S8VgTmgcxF
=z1DJ
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
iEYEABECAAYFAkndpNYACgkQYM9qgQ/zOWNawQCeLMiNS/PHZ4MiS2wml5itHfTO
MmkAoJ/3tWr/mFuX31ayPCsmRrGKMIv/
=YCH0
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkndmZIACgkQ9o1G+2zNQDjclACcCaL6NxFd+QIJ7PwD8IRdc3Jy
i4wAoJJ+M5COafJaw8xOhli8XVEJOr0I
=4Vb5
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)
iEYEABECAAYFAkneHZ4ACgkQ/P1jBZgh97LShQCfWUV36nwHJxGLf9xb9zBDpEAf
Jc4Anjk7Xg4xQiPYiGPVkylKm3Rru2kk
=4kOK
-----END PGP SIGNATURE-----

View File

@ -33,7 +33,7 @@ BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
BuildRequires: sqlite-devel >= 3.4.0 BuildRequires: sqlite-devel >= 3.4.0
BuildRequires: gnome-keyring-devel, kdelibs-devel >= 4.0.0 BuildRequires: gnome-keyring-devel, dbus-devel, kdelibs-devel >= 4.0.0
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: svn = %{version}-%{release} Provides: svn = %{version}-%{release}
Requires: apr >= 1.3.0 Requires: apr >= 1.3.0