drop kdelibs-4.3.1-drkonq.patch which is merged in upstream
This commit is contained in:
Than Ngo
parent
951e5a7edf
commit
340421a010
|
|
@ -1,12 +0,0 @@
|
|||
diff -up kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig kdelibs-4.3.1/kdeui/util/kcrash.cpp
|
||||
--- kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig 2009-09-21 17:42:19.000000000 +0200
|
||||
+++ kdelibs-4.3.1/kdeui/util/kcrash.cpp 2009-09-21 17:43:44.000000000 +0200
|
||||
@@ -67,7 +67,7 @@ static char *s_autoRestartCommand = 0;
|
||||
static char *s_appPath = 0;
|
||||
static char *s_drkonqiPath = 0;
|
||||
static KCrash::CrashFlags s_flags = 0;
|
||||
-static bool s_launchDrKonqi = true;
|
||||
+static bool s_launchDrKonqi = false;
|
||||
|
||||
namespace KCrash
|
||||
{
|
||||
33
kdelibs.spec
33
kdelibs.spec
|
|
@ -14,9 +14,14 @@
|
|||
|
||||
%define halectomy 1
|
||||
|
||||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver}
|
||||
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
|
||||
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.6.5
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -36,7 +41,6 @@ BuildRequires: kde-filesystem >= 4-23
|
|||
BuildRequires: docbook-dtds
|
||||
BuildRequires: docbook-style-xsl >= %{docbook_style_xsl_ver}
|
||||
Requires: ca-certificates
|
||||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
|
||||
Requires: docbook-dtds
|
||||
Requires: docbook-style-xsl >= %{docbook_style_xsl_ver}
|
||||
|
|
@ -50,38 +54,42 @@ Requires: hunspell
|
|||
# beware of possible bootstrapping problems -- Rex
|
||||
# reverted %%{version} => 4.6.2 due to some (hopefully temporary) regressions seen in 4.6.3 -- Rex
|
||||
Requires: oxygen-icon-theme >= 4.6.2
|
||||
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
|
||||
Requires: phonon%{?_isa} >= %{phonon_version}
|
||||
Requires: shared-desktop-ontologies >= 0.4
|
||||
Requires: shared-mime-info
|
||||
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
|
||||
Requires: soprano%{?_isa} >= %{soprano_version}
|
||||
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
|
||||
Requires: strigi-libs%{?_isa} >= %{strigi_version}
|
||||
|
||||
# make kdelibs-devel parallel-installable with kdelibs3-devel
|
||||
Patch0: kdelibs-4.5.80-parallel_devel.patch
|
||||
|
||||
# fix kde#149705
|
||||
Patch2: kdelibs-4.2.85-kde149705.patch
|
||||
|
||||
# install all .css files and Doxyfile.global in kdelibs-common to build
|
||||
# kdepimlibs-apidocs against
|
||||
Patch8: kdelibs-4.3.90-install_all_css.patch
|
||||
|
||||
# add Fedora/V-R to KHTML UA string
|
||||
Patch9: kdelibs-4.5.80-branding.patch
|
||||
|
||||
# don't cache kdeglobals paths because they change after profile directories
|
||||
# are loaded from kde4rc
|
||||
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
||||
|
||||
# adds the Administration menu from redhat-menus which equals System + Settings
|
||||
# This prevents the stuff getting listed twice, under both System and Settings.
|
||||
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||
|
||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||
Patch14: kdelibs-4.5.80-libexecdir.patch
|
||||
|
||||
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
||||
Patch18: kdelibs-4.5.80-kstandarddirs.patch
|
||||
# COMMENT ME PLEASE
|
||||
|
||||
# set build type
|
||||
Patch20: kdelibs-4.1.70-cmake.patch
|
||||
# disable drkonqi by default, RHEL prefers/wants abrt
|
||||
Patch24: kdelibs-4.3.1-drkonq.patch
|
||||
|
||||
# die rpath die, since we're using standard paths, we can avoid
|
||||
# this extra hassle (even though cmake is *supposed* to not add standard
|
||||
# paths (like /usr/lib64) already! With this, we can drop
|
||||
|
|
@ -93,9 +101,11 @@ Patch27: kdelibs-4.5.80-no_rpath.patch
|
|||
# reverting to our past gnupg2-only setup.
|
||||
# TODO: try to use either gpg or gpg2, whichever is available
|
||||
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
||||
|
||||
# https://bugs.kde.org/show_bug.cgi?id=269045
|
||||
# https://git.reviewboard.kde.org/r/101231/
|
||||
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
||||
|
||||
# Fix for KHTML form completion regression (kde#277457) from bugs.kde.org
|
||||
# attachment (patch by Andrea Iacovitti)
|
||||
# https://bugs.kde.org/show_bug.cgi?id=277457#c2
|
||||
|
|
@ -104,6 +114,7 @@ Patch52: kdelibs-4.6.5-khtml-kde#277457.patch
|
|||
## 4.6 upstream
|
||||
# fix docbook-style-xsl borkage
|
||||
Patch101: kdelibs-4.6.4-kdoctools_docbook.patch
|
||||
|
||||
# http://bugzilla.redhat.com/667787
|
||||
# http://bugs.kde.org/261180
|
||||
Patch102: kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch
|
||||
|
|
@ -278,9 +289,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
%patch14 -p1 -b .libexecdir
|
||||
%patch18 -p1 -b .kstandarddirs
|
||||
%patch20 -p1 -b .xxcmake
|
||||
%if 0%{?rhel} > 5
|
||||
%patch24 -p1 -b .drkonq
|
||||
%endif
|
||||
%patch27 -p1 -b .no_rpath
|
||||
|
||||
# upstreamable patches
|
||||
|
|
@ -546,6 +554,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 26 2011 Than Ngo <than@redhat.com> - 4.6.5-3
|
||||
- drop kdelibs-4.3.1-drkonq.patch which is merged in upstream
|
||||
|
||||
* Mon Jul 25 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.5-2
|
||||
- fix KHTML form completion regression (kde#277457, patch by Andrea Iacovitti)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue