- up to 1.7.6

diff --git a/subversion-1.7.5-kwallet-gcc47.patch b/subversion-1.7.5-kwallet-gcc47.patch
new file mode 100644 (file)
index 0000000..f718a0b
--- /dev/null
+++ b/subversion-1.7.5-kwallet-gcc47.patch
@@ -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)),

diff --git a/subversion-DESTDIR.patch b/subversion-DESTDIR.patch
index d4759e604314231847c04e4b082f59144f35d66b..876c1593acf5e8e73690d3d4959e683163fa21cd 100644 (file)
--- a/subversion-DESTDIR.patch
+++ b/subversion-DESTDIR.patch
@@ -20,13 +20,20 @@
  
 --- subversion-1.7.0-rc3/build/generator/templates/makefile.ezt~       2011-04-27 23:54:33.000000000 +0200
 +++ subversion-1.7.0-rc3/build/generator/templates/makefile.ezt        2011-09-16 08:46:27.559338812 +0200
-@@ -125,7 +125,7 @@
+@@ -125,13 +125,13 @@
  ########################################
  [for areas]
  [is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
 -      cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
 +      cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
- [else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
+ [else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end] [for areas.apache_files] [areas.apache_files.fullname][end]
        $(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
        $(MKDIR) [areas.files.installdir]
+       cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
+       cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for areas.apache_files]
+-      cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
++      cd [areas.apache_files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
+ [if-any areas.extra_install]  $(INSTALL_EXTRA_[areas.uppervar])
+ [end][end][end]
+ 
 

diff --git a/subversion.spec b/subversion.spec
index ef1691fec70e6d6a1d3db1cda42e8f1224d105bb..e3b36f314f9d2838210cb0dfa5f52983ac34d464 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -52,12 +52,12 @@ Summary:    A Concurrent Versioning system similar to but better than CVS
 Summary(pl.UTF-8):     System kontroli wersji podobny, ale lepszy, niż CVS
 Summary(pt_BR.UTF-8):  Sistema de versionamento concorrente
 Name:          subversion
-Version:       1.7.5
+Version:       1.7.6
 Release:       1
 License:       Apache v2.0
 Group:         Development/Version Control
 Source0:       http://www.idg.pl/mirrors/apache/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5: f6353b9b581081cdf97299300c9eada3
+# Source0-md5: 4baa434db7709bb059b05d02a2547663
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
@@ -70,6 +70,7 @@ Patch0:               %{name}-home_etc.patch
 Patch1:                %{name}-DESTDIR.patch
 Patch2:                %{name}-ruby-datadir-path.patch
 Patch3:                %{name}-tests.patch
+Patch4:                subversion-1.7.5-kwallet-gcc47.patch
 URL:           http://subversion.apache.org/
 %{?with_apache:BuildRequires:  apache-devel >= 2.2.0-8}
 BuildRequires: apr-devel >= 1:1.0.0
@@ -444,6 +445,7 @@ uwierzytelniać się przy użyciu Portfela KDE.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p2
 
 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4