pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix build with gcc47 ("taking address of temporary array")

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=96
This commit is contained in:
Michael Schröder 2012-06-11 14:40:09 +00:00 committed by Git OBS Bridge
parent b966f689e9
commit 4f24c883e9
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subversion.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 11 16:03:57 CEST 2012 - mls@suse.de
- fix build with gcc47 ("taking address of temporary array")
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 21 19:58:48 UTC 2012 - andreas.stieger@gmx.de Mon May 21 19:58:48 UTC 2012 - andreas.stieger@gmx.de

38
subversion.kwallet.patch Normal file
View File

@ -0,0 +1,38 @@
--- ./subversion/libsvn_auth_kwallet/kwallet.cpp.orig 2012-06-11 13:53:19.000000000 +0000
+++ ./subversion/libsvn_auth_kwallet/kwallet.cpp 2012-06-11 14:00:58.000000000 +0000
@@ -60,6 +60,7 @@
/* KWallet simple provider, puts passwords in KWallet */
/*-----------------------------------------------------------------------*/
+static char *svn_argv[] = { "svn" };
static const char *
get_application_name(apr_hash_t *parameters,
@@ -204,11 +205,11 @@ kwallet_password_get(const char **passwo
if (! qApp)
{
int argc = 1;
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+ app = new QCoreApplication(argc, svn_argv);
}
KCmdLineArgs::init(1,
- (char *[1]) {(char *) "svn"},
+ svn_argv,
get_application_name(parameters, pool),
"subversion",
ki18n(get_application_name(parameters, pool)),
@@ -274,11 +275,11 @@ kwallet_password_set(apr_hash_t *creds,
if (! qApp)
{
int argc = 1;
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+ app = new QCoreApplication(argc, svn_argv);
}
KCmdLineArgs::init(1,
- (char *[1]) {(char *) "svn"},
+ svn_argv,
get_application_name(parameters, pool),
"subversion",
ki18n(get_application_name(parameters, pool)),

3
subversion.spec
View File

@ -16,7 +16,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# Subversion as of 1.7.4 does not work with ruby 1.9 in Factory # Subversion as of 1.7.4 does not work with ruby 1.9 in Factory
%define with_ruby 0%{?suse_version} > 1110 && 0%{?suse_version} < 1220 %define with_ruby 0%{?suse_version} > 1110 && 0%{?suse_version} < 1220
%define with_intree_swig 0%{?suse_version} != 1110 %define with_intree_swig 0%{?suse_version} != 1110
@ -165,6 +164,7 @@ Patch37: subversion-no-build-date.patch
Patch38: subversion-neon-systemproxy.patch Patch38: subversion-neon-systemproxy.patch
# PATCH-FIX-UPSTREAM subversion-1.7.4-ruby-1.9-RbConfig.patch andreas.stieger@gmx.de -- Fixes warning/error in ruby 1.9 "Use RbConfig instead of obsolete and deprecated Config" # PATCH-FIX-UPSTREAM subversion-1.7.4-ruby-1.9-RbConfig.patch andreas.stieger@gmx.de -- Fixes warning/error in ruby 1.9 "Use RbConfig instead of obsolete and deprecated Config"
Patch39: subversion-1.7.4-ruby-1.9-RbConfig.patch Patch39: subversion-1.7.4-ruby-1.9-RbConfig.patch
Patch40: subversion.kwallet.patch
# #
%if %with_ruby %if %with_ruby
%if %{!?rb_arch:1}0 %if %{!?rb_arch:1}0
@ -338,6 +338,7 @@ popd #./sqlite-amalgamation
%patch37 %patch37
%patch38 %patch38
%patch39 %patch39
%patch40
SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\") SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\")
#" #"