KDE Applications 18.04 RC (take 3): for the changes proposed by Wolfgang, I think they can get in after this is accepted.

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=63
This commit is contained in:
Wolfgang Bauer 2018-04-10 13:20:36 +00:00 committed by Git OBS Bridge
parent 9781949dcc
commit e929a76258
5 changed files with 19 additions and 1263 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c020fa206511829556dd68840751bcc133861ef875a2eda2544f44aae101536
size 7720068

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c71719ad955ecd3c435d5bdceedf0b14e9907b5c42d6526cc36e521c052111a
size 7725756

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Apr 06 07:09:49 CEST 2018 - lbeltrame@kde.org
- Update to 18.03.90
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-18.03.90.php
- Changes since 17.12.3:
* Load translation catalog webenginepart
* Include zlib also on build time
* Add back KWallet support to Konqueror
* Fix i18n usage
- Dropped patches, now upstream:
* add-kwallet-support-to-webengine.patch
-------------------------------------------------------------------
Thu Mar 08 23:52:07 CET 2018 - lbeltrame@kde.org

View File

@ -19,7 +19,7 @@
%bcond_without lang
Name: konqueror
Version: 17.12.3
Version: 18.03.90
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
@ -33,8 +33,6 @@ License: GPL-2.0-or-later
Group: System/GUI/KDE
Url: http://www.kde.org/
Source: %{name}-%{version}.tar.xz
# PATCH-FEATURE-UPSTREAM
Patch: add-kwallet-support-to-webengine.patch
BuildRequires: extra-cmake-modules
BuildRequires: kactivities5-devel >= 5.7.0
BuildRequires: karchive-devel >= 5.7.0
@ -118,7 +116,6 @@ Development package for the konqueror libraries.
%prep
%setup -q
%patch -p1
sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAKE_BINARY_DIR}|g' settings/konqhtml/CMakeLists.txt
%build