pool/subversion
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 832359 from home:alarrosa:branches:devel:tools:scm:svn

Browse Source 
- Add patch to remove dependency on kdelibs4support just to run
  kf5-config to find out that headers are in /usr/include and
  libraries are in /usr/lib(64) (jsc#SLE-13845):
  * remove-kdelibs4support-dependency.patch

OBS-URL: https://build.opensuse.org/request/show/832359
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=330
This commit is contained in:
Tomáš Chvátal
2020-09-05 05:40:31 +00:00
committed by Git OBS Bridge
parent b1b7d25ad9
commit 9354d4d16e
3 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
remove-kdelibs4support-dependency.patch Normal file
View File

@@ -0,0 +1,55 @@
From: Antonio Larrosa <alarrosa@suse.com>
Subject: Removes requirement for kf5-config (kdelibs4support)
With this, we don't need to include kdelibs4support and all its dependencies on SLE
Index: subversion-1.14.0/build/ac-macros/kwallet.m4
===================================================================
--- subversion-1.14.0.orig/build/ac-macros/kwallet.m4
+++ subversion-1.14.0/build/ac-macros/kwallet.m4
@@ -59,30 +59,13 @@ AC_DEFUN(SVN_LIB_KWALLET,
kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore"
fi
if test -n "$qt_pkg_config_names"; then
- if test "$svn_lib_kwallet" != "yes"; then
- AC_MSG_CHECKING([for $kde_config_name])
- KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name"
- if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then
- AC_MSG_RESULT([yes])
+ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then
+ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"]
+ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"]
else
- if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then
- AC_MSG_RESULT([unneeded])
- KDE_CONFIG="unneeded"
- kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"]
- kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"]
- else
- AC_MSG_RESULT([no])
- KDE_CONFIG=""
- fi
- fi
- else
- AC_PATH_PROG(KDE_CONFIG, $kde_config_name)
- if test -n "$KDE_CONFIG"; then
- kde_incdir="`$KDE_CONFIG --install include`"
- kde_libdir="`$KDE_CONFIG --install lib`"
+ kde_incdir="${includedir}"
+ kde_libdir="${libdir}"
fi
- fi
- if test -n "$KDE_CONFIG"; then
old_CXXFLAGS="$CXXFLAGS"
old_LDFLAGS="$LDFLAGS"
old_LIBS="$LIBS"
@@ -122,9 +105,6 @@ int main()
AC_MSG_RESULT([no])
AC_MSG_ERROR([cannot find KWallet])
fi
- else
- AC_MSG_ERROR([cannot find $kde_config_name])
- fi
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([cannot find Qt])

8
subversion.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 4 12:21:59 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
- Add patch to remove dependency on kdelibs4support just to run
kf5-config to find out that headers are in /usr/include and
libraries are in /usr/lib(64) (jsc#SLE-13845):
* remove-kdelibs4support-dependency.patch
-------------------------------------------------------------------
Mon Jul 27 15:09:50 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>

5
subversion.spec
View File

@@ -62,6 +62,8 @@ Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
Patch40: subversion-perl-underlinking.patch
Patch42: gcc10-do-not-optimize-get_externals_to_pin.patch
Patch45: disable-fs-fs-pack-test.patch
# PATCH-FIX-OPENSUSE SLE-13845
Patch46: remove-kdelibs4support-dependency.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
BuildRequires: apache2-prefork
@@ -118,8 +120,6 @@ BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(libsecret-1)
%endif
%if %{with kde}
# for kf5-config
BuildRequires: kdelibs4support
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5Wallet)
@@ -242,6 +242,7 @@ parameters and keywords for the svn command and other tools.
%patch40 -p1
%patch42 -p1
%patch45 -p1
%patch46 -p1
# do not use 'env python'
sed -i -e 's#/usr/bin/env python#/usr/bin/python3#' subversion/tests/cmdline/*.py