rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

4.8.3 

- remove cmake implicit link directories patch
- remove adblock filter patch
This commit is contained in:
Jaroslav Reznik 2012-04-30 10:01:59 +02:00
parent f6f84d57b9
commit dc4ed5b61b
5 changed files with 10 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/kdelibs-4.6.5.tar.bz2
/kdelibs-4.8.2.tar.xz
/kdelibs-4.8.3.tar.xz

22
kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
View File

@ -1,22 +0,0 @@
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index 6d65e61..700d265 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -1036,12 +1036,13 @@ if (UNIX)
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
else (APPLE)
# add our LIB_INSTALL_DIR to the RPATH (but only when it is not one of the standard system link
- # directories listed in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling
+ # directories listed in CMAKE_{PLATFORM,CXX}_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling
- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
- if("${_isSystemLibDir}" STREQUAL "-1")
+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
+ list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
+ if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
- endif("${_isSystemLibDir}" STREQUAL "-1")
+ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)

123
kdelibs-4.8.2-filter.patch
View File

@ -1,123 +0,0 @@
commit abc933ccee0af644bc642dc7551651d1ce0ca29a
Author: Andrea Iacovitti <aiacovitti@libero.it>
Date: Wed Apr 11 22:38:35 2012 +0200
Load/Update filter lists only when AdBlock is enabled.
FIXED-IN: 4.8.3
diff --git a/khtml/khtml_settings.cpp b/khtml/khtml_settings.cpp
index 118f388..bbe1bb4 100644
--- a/khtml/khtml_settings.cpp
+++ b/khtml/khtml_settings.cpp
@@ -410,59 +410,63 @@ void KHTMLSettings::init( KConfig * config, bool reset )
d->adBlackList.clear();
d->adWhiteList.clear();
- /** read maximum age for filter list files, minimum is one day */
- int htmlFilterListMaxAgeDays = cgFilter.readEntry(QString("HTMLFilterListMaxAgeDays")).toInt();
- if (htmlFilterListMaxAgeDays < 1)
- htmlFilterListMaxAgeDays = 1;
-
- QMap<QString,QString> entryMap = cgFilter.entryMap();
- QMap<QString,QString>::ConstIterator it;
- for( it = entryMap.constBegin(); it != entryMap.constEnd(); ++it )
- {
- int id = -1;
- QString name = it.key();
- QString url = it.value();
+ if (d->m_adFilterEnabled) {
- if (name.startsWith("Filter"))
- {
- if (url.startsWith(QLatin1String("@@")))
- d->adWhiteList.addFilter(url);
- else
- d->adBlackList.addFilter(url);
- } else if (name.startsWith("HTMLFilterListName-") && (id = name.mid(19).toInt()) > 0)
+ /** read maximum age for filter list files, minimum is one day */
+ int htmlFilterListMaxAgeDays = cgFilter.readEntry(QString("HTMLFilterListMaxAgeDays")).toInt();
+ if (htmlFilterListMaxAgeDays < 1)
+ htmlFilterListMaxAgeDays = 1;
+
+ QMap<QString,QString> entryMap = cgFilter.entryMap();
+ QMap<QString,QString>::ConstIterator it;
+ for( it = entryMap.constBegin(); it != entryMap.constEnd(); ++it )
{
- /** check if entry is enabled */
- bool filterEnabled = cgFilter.readEntry(QString("HTMLFilterListEnabled-").append(QString::number(id))) != QLatin1String("false");
-
- /** get url for HTMLFilterList */
- KUrl url(cgFilter.readEntry(QString("HTMLFilterListURL-").append(QString::number(id))));
-
- if (filterEnabled && url.isValid()) {
- /** determine where to cache HTMLFilterList file */
- QString localFile = cgFilter.readEntry(QString("HTMLFilterListLocalFilename-").append(QString::number(id)));
- localFile = KStandardDirs::locateLocal("data", "khtml/" + localFile);
-
- /** determine existence and age of cache file */
- QFileInfo fileInfo(localFile);
-
- /** load cached file if it exists, irrespective of age */
- if (fileInfo.exists())
- d->adblockFilterLoadList( localFile );
-
- /** if no cache list file exists or if it is too old ... */
- if (!fileInfo.exists() || fileInfo.lastModified().daysTo(QDateTime::currentDateTime()) > htmlFilterListMaxAgeDays)
- {
- /** ... in this case, refetch list asynchronously */
- kDebug(6000) << "Asynchronously fetching filter list from" << url << "to" << localFile;
-
- KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::Reload, KIO::HideProgressInfo );
- QObject::connect( job, SIGNAL(result(KJob*)), d, SLOT(adblockFilterResult(KJob*)) );
- /** for later reference, store name of cache file */
- job->setProperty("khtmlsettings_adBlock_filename", localFile);
+ int id = -1;
+ QString name = it.key();
+ QString url = it.value();
+
+ if (name.startsWith("Filter"))
+ {
+ if (url.startsWith(QLatin1String("@@")))
+ d->adWhiteList.addFilter(url);
+ else
+ d->adBlackList.addFilter(url);
+ } else if (name.startsWith("HTMLFilterListName-") && (id = name.mid(19).toInt()) > 0)
+ {
+ /** check if entry is enabled */
+ bool filterEnabled = cgFilter.readEntry(QString("HTMLFilterListEnabled-").append(QString::number(id))) != QLatin1String("false");
+
+ /** get url for HTMLFilterList */
+ KUrl url(cgFilter.readEntry(QString("HTMLFilterListURL-").append(QString::number(id))));
+
+ if (filterEnabled && url.isValid()) {
+ /** determine where to cache HTMLFilterList file */
+ QString localFile = cgFilter.readEntry(QString("HTMLFilterListLocalFilename-").append(QString::number(id)));
+ localFile = KStandardDirs::locateLocal("data", "khtml/" + localFile);
+
+ /** determine existence and age of cache file */
+ QFileInfo fileInfo(localFile);
+
+ /** load cached file if it exists, irrespective of age */
+ if (fileInfo.exists())
+ d->adblockFilterLoadList( localFile );
+
+ /** if no cache list file exists or if it is too old ... */
+ if (!fileInfo.exists() || fileInfo.lastModified().daysTo(QDateTime::currentDateTime()) > htmlFilterListMaxAgeDays)
+ {
+ /** ... in this case, refetch list asynchronously */
+ kDebug(6000) << "Asynchronously fetching filter list from" << url << "to" << localFile;
+
+ KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::Reload, KIO::HideProgressInfo );
+ QObject::connect( job, SIGNAL(result(KJob*)), d, SLOT(adblockFilterResult(KJob*)) );
+ /** for later reference, store name of cache file */
+ job->setProperty("khtmlsettings_adBlock_filename", localFile);
+ }
}
}
}
}
+
}
KConfigGroup cgHtml( config, "HTML Settings" );

17
kdelibs.spec
View File

@ -24,8 +24,8 @@
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
Summary: KDE Libraries
Version: 4.8.2
Release: 4%{?dist}
Version: 4.8.3
Release: 1%{?dist}
Name: kdelibs
Epoch: 6
@ -141,11 +141,7 @@ Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
# add s390/s390x support in kjs
Patch53: kdelibs-4.7.2-kjs-s390.patch
## upstream
# don't set rpath on multiarch dirs, https://git.reviewboard.kde.org/r/103422
Patch101: kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
# Load/Update filter lists only when AdBlock is enabled
Patch102: kdelibs-4.8.2-filter.patch
## upstream
## security fix
# Not Upstreamed? why not ? -- Rex
@ -340,8 +336,6 @@ popd
%patch53 -p1 -b .kjs-s390
# upstream patches
%patch101 -p1 -b .cmake_cxx_implicit_link_directories
%patch102 -p1 -b .filter
# security fixes
%patch200 -p1 -b .CVE-2009-2702
@ -593,6 +587,11 @@ rm -rf %{buildroot}
%changelog
* Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.3-1
- 4.8.3
- remove cmake implicit link directories patch
- remove adblock filter patch
* Mon Apr 16 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.2-4
- enable udisks2, +Requires: udisks2 on f18+ too

2
sources
View File

@ -1 +1 @@
e9dc9a76a785045642fb3098692618d2 kdelibs-4.8.2.tar.xz
c4987c838164bd9ee2787e77243fe4a9 kdelibs-4.8.3.tar.xz