rpm/kio
SHA256
1
0
Fork 0
forked from pool/kio
Code Pull Requests Activity

Accepting request 344527 from KDE:Frameworks5

Browse Source 
Update to 5.16.0

OBS-URL: https://build.opensuse.org/request/show/344527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2015-11-24 21:23:57 +00:00 committed by Git OBS Bridge
commit 888ed8af31
7 changed files with 47 additions and 1337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
0001-Move-konqpopupmenuplugin.desktop-from-kde-baseapps-t.patch
View File

@ -1,127 +0,0 @@
From 12620c7dfba6f6a3b611a8b0588436b4a3b6f091 Mon Sep 17 00:00:00 2001
From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sat, 3 Oct 2015 09:26:33 +0200
Subject: [PATCH] Move konqpopupmenuplugin.desktop from kde-baseapps to kio
This ensures that service menu entries are shown if the unreleased
KF5-based version of lib/konq from kde-baseapps is not installed
BUG: 350769
Change-Id: I530c91bc26447cd9f9e3c712dee3a4737982141a
REVIEW: 125425
---
src/widgets/CMakeLists.txt | 1 +
src/widgets/konqpopupmenuplugin.desktop | 89 +++++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+)
create mode 100644 src/widgets/konqpopupmenuplugin.desktop
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 820cd34..9fd2fc0 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -184,6 +184,7 @@ install(FILES
kfileitemactionplugin.desktop
kpropertiesdialogplugin.desktop
kurifilterplugin.desktop
+ konqpopupmenuplugin.desktop
kiodndpopupmenuplugin.desktop
DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
diff --git a/src/widgets/konqpopupmenuplugin.desktop b/src/widgets/konqpopupmenuplugin.desktop
new file mode 100644
index 0000000..be79174
--- /dev/null
+++ b/src/widgets/konqpopupmenuplugin.desktop
@@ -0,0 +1,89 @@
+[Desktop Entry]
+Type=ServiceType
+X-KDE-ServiceType=KonqPopupMenu/Plugin
+Comment=Plugin for the Konqueror Popup Menu
+Comment[af]=Inplak vir die Konqueror Opspring Kieslys
+Comment[ar]=ملحق لقائمة كونكيورر المنبثقة
+Comment[as]=Konqueror প'প-আপ তালিকাৰ কাৰণে প্লাগ-ইন
+Comment[ast]=Complementu pal menú emerxente de Konqueror
+Comment[be]=Утулка для выплыўнага меню Konqueror
+Comment[be@latin]=Plugin dla vypłyŭnoha menu prahramy „Konqueror”
+Comment[bg]=Приставка за контекстното меню на браузъра
+Comment[bn]=কনকরার পপ-আপ মেনুর জন্য প্লাগ-ইন
+Comment[bn_IN]=Konqueror পপ-আপ মেনুর প্লাগ-ইন
+Comment[bs]=Priključak za K‑osvajačev iskačući meni
+Comment[ca]=Connector per al menú emergent del Konqueror
+Comment[ca@valencia]=Connector per al menú emergent del Konqueror
+Comment[cs]=Modul pro kontextovou nabídku Konqueroru
+Comment[csb]=Wtëkôcz do menu (òtmëkô knąpą mëszë) Konquerora
+Comment[cy]=Ategyn i Naidlen Konqueror
+Comment[da]=Plugin for Konquerors popop-menu
+Comment[de]=Erweiterung für das Aufklapp-Menü von Konqueror
+Comment[el]=Πρόσθετο για το αναδυόμενο μενού του Konqueror
+Comment[en_GB]=Plugin for the Konqueror Popup Menu
+Comment[eo]=Kromprogrameto por la spruĉmenuo de Konkeranto
+Comment[es]=Complemento para el menú emergente de Konqueror
+Comment[et]=Konquerori hüpikmenüü plugin
+Comment[eu]=Konquerorren laster-menuetarako plugina
+Comment[fa]=وصله برای گزینگان بالاپر Konqueror
+Comment[fi]=Konquerorin ponnahdusvalikkoliitännäinen
+Comment[fr]=Module externe pour le menu contextuel de Konqueror
+Comment[fy]=Plugin foar Konqueror's fluesmenu
+Comment[ga]=Breiseán le haghaidh Roghchláir Aníos Konqueror
+Comment[gl]=Complemento para o menú contextual de Konqueror
+Comment[gu]=કોન્કરર પોપઅપ મેનુ માટે પ્લગઇન
+Comment[he]=תוסף לתפריט המוקפץ של Konqueror
+Comment[hi]=कॉन्करर पॉपअप मेन्यू के लिए प्लगइन
+Comment[hne]=कान्करर पापअप मेन्यू बर प्लगइन
+Comment[hr]=Dodatak za Konqueror pop-up izbornik
+Comment[hsb]=zašćěpka za popup-meni w konqueroru
+Comment[hu]=Bővítőmodul a Konqueror felbukkanó menühöz
+Comment[ia]=Plugin pro le Menu de Popup de Konqueror
+Comment[id]=Plugin untuk Menu Popup Konqueror
+Comment[is]=Íforrit fyrir sprettvalmynd Konqueror Popup Menu
+Comment[it]=Estensione per il menu a comparsa di Konqueror
+Comment[ja]=Konqueror ポップアップメニューのプラグイン
+Comment[ka]=Konqueror-ის ჩამოშლადი მენიუს პლაგინი
+Comment[kk]=Konqueror баптау қалқымалы мәзір плагині
+Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់​ម៉ឺនុយ​លេច​ឡើង​របស់​ Konqueror
+Comment[kn]=ಕಾಂಕರ್ ಪುಟಿಕೆ (ಪಾಪಪ್) ಪರಿವಿಡಿಗೆ ಮಿಳಿತಾನ್ವಯ (ಪ್ಲಗಿನ್)
+Comment[ko]=Konqueror 팝업 메뉴 플러그인
+Comment[ku]=Pêveka ji bo Pêşeka Hilpekîn a Konquerorê
+Comment[lt]=Priedas pasirodančiam Konqueror meniu
+Comment[lv]=Konqueror izlecošās izvēlnes spraudnis
+Comment[mai]=कान्करर पापअप मेनू क' लेल प्लगइन
+Comment[mk]=Приклучок за контекстното мени на Konqueror
+Comment[ml]=കോണ്‍ക്വററിന്റെ പൊങ്ങിവരുന്ന മെനുവിനുള്ള സംയോജകം
+Comment[mr]=कॉन्करर पॉपअप मेन्यू करिता प्लगइन
+Comment[ms]=Plugin untuk Menu Popuo Konqueror
+Comment[nds]=Plugin för dat Konqueror-Opdukmenü
+Comment[ne]=कन्क्वेरर पपअप मेनुका लागि प्लगइन
+Comment[nl]=Plugin voor Konqueror's contextmenu
+Comment[or]=Konqueror ପପଅପ ତାଲିକା ପାଇଁ ପ୍ଲଗଇନ
+Comment[pa]=ਕੋਨਕਿਉਰੋਰ ਪਾਪਅੱਪ ਮੇਨੂ ਲਈ ਪਲੱਗਇਨ
+Comment[pl]=Wtyczka do menu (otwieranego przyciskiem myszy) Konquerora
+Comment[pt]='Plugin' para o Menu do Konqueror
+Comment[pt_BR]=Plugin do Konqueror para menus de contexto
+Comment[ro]=Extensie pentru meniul popup Konqueror
+Comment[ru]=Расширение контекстного меню Konqueror
+Comment[si]=Konqueror පොප් අප් මෙනුව සඳහා ප්ලගිනය
+Comment[sk]=Modul pre kontextové menu Konquerora
+Comment[sl]=Vstavek za Konquerorjev pojavni meni
+Comment[sr]=Прикључак за К‑освајачев искачући мени
+Comment[sr@ijekavian]=Прикључак за К‑освајачев искачући мени
+Comment[sr@ijekavianlatin]=Priključak za K‑osvajačev iskačući meni
+Comment[sr@latin]=Priključak za K‑osvajačev iskačući meni
+Comment[sv]=Insticksprogram för Konquerors popupmeny
+Comment[ta]=கான்கொரர் தோன்றும் பட்டிக்கான செருகல்கள்
+Comment[te]=Konqueror పాప్అప్ మెనూకొరకు ప్లగ్ఇన్
+Comment[tg]=Плагин барои менюи пайдошавии Konqueror
+Comment[th]=ส่วนเสริมการทำงานสำหรับเมนูผุดของคอนเควอร์เรอร์
+Comment[tr]=Konqueror Açılabilir Menüsü İçin Eklenti
+Comment[ug]=Konqueror قاڭقىش تىزىملىكىنىڭ قىستۇرمىسى
+Comment[uk]=Додаток контекстного меню Konqueror
+Comment[vi]=Trình bổ sung cho Trình đơn Bật lên của Konqueror
+Comment[wa]=Tchôke-divins po l' aspitant menu di Konqueror
+Comment[xh]=Iplagi efakiweyo ye Konqueror ye Popup Menu
+Comment[x-test]=xxPlugin for the Konqueror Popup Menuxx
+Comment[zh_CN]=Konqueror 弹出菜单插件
+Comment[zh_TW]=Konqueror 彈出式選單的外掛程式
--
2.1.4

1193
0001-Move-the-entries-for-the-Create-New-menu-from-kde-ba.patch
View File

File diff suppressed because it is too large Load Diff

3
kio-5.15.0.tar.xz
View File

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

3
kio-5.16.0.tar.xz Normal file
View File

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

36
kio.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Sun Nov 8 17:01:28 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.16.0 (boo#955067)
* Save proxy url with correct scheme
* Ship the "new file templates" in the kiofilewidgets library using
a .qrc (kde#353642)
* Properly handle middle click in navigatormenu
* Make kio_http_cache_cleaner deployable in application
installer/bundles
* KOpenWithDialog: Fix creating desktop file with empty mimetype
* Read protocol info from plugin metadata
* Allow local kioslave deployment
* Add a .protocol to JSON converted
* Fix double-emit of result and missing warning when listing hits
an inaccessible folder (kde#333436)
* Preserve relative link targets when copying symlinks.
(kde#352927)
* Using suitable icons for default folders in the user home
(kde#352498)
* Add an interface which allow plugin to show custom overlay icons
* Make KNotifications dep in KIO (kpac) optional
* Make doctools + wallet optional
* Avoid kio crashes if no dbus server is running
* Add KUriFilterSearchProviderActions, to show a list of actions
for searching some text using web shortcuts
* Move the entries for the "Create New" menu from
kde-baseapps/lib/konq to kio (kde#349654)
* Move konqpopupmenuplugin.desktop from kde-baseapps to kio
(kde#350769)
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.16.0.php
- Drop 0001-Move-konqpopupmenuplugin.desktop-from-kde-baseapps-t.patch
and 0001-Move-the-entries-for-the-Create-New-menu-from-kde-ba.patch,
upstreamed
-------------------------------------------------------------------
Mon Oct 5 17:37:21 UTC 2015 - hrvoje.senjan@gmail.com

12
kio.spec
View File

@ -17,9 +17,9 @@
%bcond_without lang
%define _tar_path 5.15
%define _tar_path 5.16
Name: kio
Version: 5.15.0
Version: 5.16.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@ -75,10 +75,6 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
Patch0: kio_help-fallback-to-kde4-docs.patch
# PATCH-FIX-UPSTREAM 0001-Move-konqpopupmenuplugin.desktop-from-kde-baseapps-t.patch -- https://git.reviewboard.kde.org/r/124983/
Patch1: 0001-Move-konqpopupmenuplugin.desktop-from-kde-baseapps-t.patch
# PATCH-FIX-UPSTREAM 0001-Move-the-entries-for-the-Create-New-menu-from-kde-ba.patch -- https://git.reviewboard.kde.org/r/124983/
Patch2: 0001-Move-the-entries-for-the-Create-New-menu-from-kde-ba.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -125,8 +121,6 @@ Development files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%cmake_kf5 -d build
@ -237,7 +231,6 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%{_kf5_servicesdir}/useragent.desktop
%{_kf5_servicesdir}/useragentstrings/
%{_kf5_servicesdir}/webshortcuts.desktop
%{_kf5_sharedir}/templates/
%doc %lang(en) %{_kf5_mandir}/*/kcookiejar5.*
%dir %{_kf5_htmldir}/en
%dir %{_kf5_htmldir}
@ -245,6 +238,7 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%files devel
%defattr(-,root,root)
%{_kf5_bindir}/protocoltojson
%{_kf5_libdir}/libKF5KIOCore.so
%{_kf5_libdir}/libKF5KIOWidgets.so
%{_kf5_libdir}/libKF5KIOFileWidgets.so

10
kio_help-fallback-to-kde4-docs.patch
View File

@ -1,15 +1,15 @@
diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp
index 5abd4c8..5bc692b 100644
index cb27a77..0157c4f 100644
--- a/src/ioslaves/help/kio_help.cpp
+++ b/src/ioslaves/help/kio_help.cpp
@@ -49,7 +49,9 @@ QString HelpProtocol::langLookup(const QString &fname)
QStringList search;
// assemble the local search paths
- const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
+ QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
+ QStringList fallbacklocalDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/kde/HTML", QStandardPaths::LocateDirectory);
- const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
+ QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
+ QStringList fallbacklocalDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/kde/HTML"), QStandardPaths::LocateDirectory);
+ localDoc.append(fallbacklocalDoc);
QStringList langs = QLocale().uiLanguages();
langs.append("en");
langs.append(QStringLiteral("en"));