rpms/subversion
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Joe Orton 2012-07-16 09:28:15 +01:00
commit 3be5242bc4
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
subversion-1.7.5-kwallet-gcc47.patch Normal file
View File

@ -0,0 +1,44 @@
--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:50:48 1345739
+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:54:26 1345740
@@ -60,6 +60,9 @@
/* KWallet simple provider, puts passwords in KWallet */
/*-----------------------------------------------------------------------*/
+static int q_argc = 1;
+static char q_argv0[] = "svn"; // Build non-const char * from string constant
+static char *q_argv[] = { q_argv0 };
static const char *
get_application_name(apr_hash_t *parameters,
@@ -212,12 +215,11 @@
QCoreApplication *app;
if (! qApp)
{
- int argc = 1;
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+ int argc = q_argc;
+ app = new QCoreApplication(argc, q_argv);
}
- KCmdLineArgs::init(1,
- (char *[1]) {(char *) "svn"},
+ KCmdLineArgs::init(q_argc, q_argv,
get_application_name(parameters, pool),
"subversion",
ki18n(get_application_name(parameters, pool)),
@@ -289,12 +291,11 @@
QCoreApplication *app;
if (! qApp)
{
- int argc = 1;
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+ int argc = q_argc;
+ app = new QCoreApplication(argc, q_argv);
}
- KCmdLineArgs::init(1,
- (char *[1]) {(char *) "svn"},
+ KCmdLineArgs::init(q_argc, q_argv,
get_application_name(parameters, pool),
"subversion",
ki18n(get_application_name(parameters, pool)),

15
subversion.spec
View File

@ -26,7 +26,7 @@
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.7.5 Version: 1.7.5
Release: 2%{?dist} Release: 5%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Development/Tools Group: Development/Tools
URL: http://subversion.apache.org/ URL: http://subversion.apache.org/
@ -44,6 +44,7 @@ Patch3: subversion-1.7.0-kwallet.patch
Patch4: subversion-1.7.2-ruby19.patch Patch4: subversion-1.7.2-ruby19.patch
Patch7: subversion-1.7.4-kwallet2.patch Patch7: subversion-1.7.4-kwallet2.patch
Patch8: subversion-1.7.4-sqlitever.patch Patch8: subversion-1.7.4-sqlitever.patch
Patch9: subversion-1.7.5-kwallet-gcc47.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: %{dbdevel} >= 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
@ -182,6 +183,7 @@ This package includes supplementary tools for use with Subversion.
%patch4 -p1 -b .ruby %patch4 -p1 -b .ruby
%patch7 -p1 -b .kwallet2 %patch7 -p1 -b .kwallet2
%patch8 -p1 -b .sqlitever %patch8 -p1 -b .sqlitever
%patch9 -p2 -b .kwallet-gcc47
%build %build
# Regenerate the buildsystem, so that: # Regenerate the buildsystem, so that:
@ -477,9 +479,18 @@ fi
%endif %endif
%changelog %changelog
* Mon Jul 16 2012 Joe Orton <jorton@redhat.com> - 1.7.5-2 * Mon Jul 16 2012 Joe Orton <jorton@redhat.com> - 1.7.5-5
- switch svnserve pidfile to use /run, use /usr/lib/tmpfiles.d (#840195) - switch svnserve pidfile to use /run, use /usr/lib/tmpfiles.d (#840195)
* Thu Jun 28 2012 Petr Pisar <ppisar@redhat.com> - 1.7.5-4
- Perl 5.16 rebuild
* Mon Jun 18 2012 Dan Horák <dan[at]danny.cz - 1.7.5-3
- fix build with recent gcc 4.7 (svn rev 1345740)
* Fri Jun 08 2012 Petr Pisar <ppisar@redhat.com> - 1.7.5-2
- Perl 5.16 rebuild
* Tue May 22 2012 Joe Orton <jorton@redhat.com> - 1.7.5-1 * Tue May 22 2012 Joe Orton <jorton@redhat.com> - 1.7.5-1
- update to 1.7.5 - update to 1.7.5