commit kdelibs4 for openSUSE:13.1:Update
Hello community, here is the log from the commit of package kdelibs4 for openSUSE:13.1:Update checked in at 2015-12-29 17:05:57 Comparing /work/SRC/openSUSE:13.1:Update/kdelibs4 (Old) and /work/SRC/openSUSE:13.1:Update/.kdelibs4.new (New) Package is "kdelibs4" Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.GGuRO8/_old 2015-12-29 17:05:58.0 +0100 +++ /var/tmp/diff_new_pack.GGuRO8/_new 2015-12-29 17:05:58.0 +0100 @@ -1 +1 @@ - +
commit kdelibs4 for openSUSE:13.1:Update
Hello community, here is the log from the commit of package kdelibs4 for openSUSE:13.1:Update checked in at 2015-03-23 17:46:52 Comparing /work/SRC/openSUSE:13.1:Update/kdelibs4 (Old) and /work/SRC/openSUSE:13.1:Update/.kdelibs4.new (New) Package is "kdelibs4" Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.Eq0R8A/_old 2015-03-23 17:46:54.0 +0100 +++ /var/tmp/diff_new_pack.Eq0R8A/_new 2015-03-23 17:46:54.0 +0100 @@ -1 +1 @@ - + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kdelibs4 for openSUSE:13.1:Update
Hello community, here is the log from the commit of package kdelibs4 for openSUSE:13.1:Update checked in at 2014-08-11 09:43:53 Comparing /work/SRC/openSUSE:13.1:Update/kdelibs4 (Old) and /work/SRC/openSUSE:13.1:Update/.kdelibs4.new (New) Package is "kdelibs4" Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.ftDJez/_old 2014-08-11 09:44:14.0 +0200 +++ /var/tmp/diff_new_pack.ftDJez/_new 2014-08-11 09:44:14.0 +0200 @@ -1 +1 @@ - + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kdelibs4 for openSUSE:13.1:Update
Hello community, here is the log from the commit of package kdelibs4 for openSUSE:13.1:Update checked in at 2014-02-03 15:25:34 Comparing /work/SRC/openSUSE:13.1:Update/kdelibs4 (Old) and /work/SRC/openSUSE:13.1:Update/.kdelibs4.new (New) Package is "kdelibs4" Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.JpdLic/_old 2014-02-03 15:25:35.0 +0100 +++ /var/tmp/diff_new_pack.JpdLic/_new 2014-02-03 15:25:35.0 +0100 @@ -1 +1 @@ - + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kdelibs4 for openSUSE:13.1:Update
Hello community, here is the log from the commit of package kdelibs4 for openSUSE:13.1:Update checked in at 2014-01-16 10:50:42 Comparing /work/SRC/openSUSE:13.1:Update/kdelibs4 (Old) and /work/SRC/openSUSE:13.1:Update/.kdelibs4.new (New) Package is "kdelibs4" Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.uWuJd8/_old 2014-01-16 10:50:43.0 +0100 +++ /var/tmp/diff_new_pack.uWuJd8/_new 2014-01-16 10:50:43.0 +0100 @@ -1 +1 @@ - + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kdelibs4 for openSUSE:13.1
Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:13.1 checked
in at 2013-10-22 10:18:08
Comparing /work/SRC/openSUSE:13.1/kdelibs4 (Old)
and /work/SRC/openSUSE:13.1/.kdelibs4.new (New)
Package is "kdelibs4"
Changes:
--- /work/SRC/openSUSE:13.1/kdelibs4/kdelibs4.changes 2013-10-19
16:49:04.0 +0200
+++ /work/SRC/openSUSE:13.1/.kdelibs4.new/kdelibs4.changes 2013-10-22
10:18:15.0 +0200
@@ -1,0 +2,6 @@
+Mon Oct 21 14:30:48 UTC 2013 - wba...@tmo.at
+
+- Added 0001-Improve-fix-for-association-with-derived-mimetypes.patch,
+ improves the last fix for mimetype handling (kde#321706)
+
+---
New:
0001-Improve-fix-for-association-with-derived-mimetypes.patch
Other differences:
--
++ kdelibs4.spec ++
--- /var/tmp/diff_new_pack.Us2fCr/_old 2013-10-22 10:18:16.0 +0200
+++ /var/tmp/diff_new_pack.Us2fCr/_new 2013-10-22 10:18:16.0 +0200
@@ -110,6 +110,8 @@
Patch1000: 0001-verbose.patch
# PATCH-FIX-UPSTREAM 0001-Fix-association-with-derived-mimetype-again.patch --
fixup for resolving kde#321706. resolves kde#324502
Patch2000: 0001-Fix-association-with-derived-mimetype-again.patch
+# PATCH-FIX-UPSTREAM
0001-Improve-fix-for-association-with-derived-mimetypes.patch -- followup fix
for resolving kde#321706.
+Patch2001: 0001-Improve-fix-for-association-with-derived-mimetypes.patch
PreReq: permissions
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}'
libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}'
strigi-devel`)
@@ -176,6 +178,7 @@
%patch11 -p1
%patch1000 -p1
%patch2000 -p1
+%patch2001 -p1
%build
EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \
++ 0001-Improve-fix-for-association-with-derived-mimetypes.patch ++
commit 8bfcace7efc0feea8899f70dfc15c3050c90ea99
Author: David Faure
Date: Sat Oct 19 10:15:35 2013 +0200
Improve fix for association with derived mimetypes (f723e2e7d36)
If a desktop file was mentionning two aliases, they would both get
removed, due to is() returning true for aliases as well.
CCBUG: 321706
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index b4564bd..7a2a2fc 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -269,8 +269,13 @@ void KBuildServiceFactory::populateServiceTypes()
} else {
bool shouldAdd = true;
foreach (const QString &otherType,
service->serviceTypes()) {
+// Skip derived types if the base class is listed
(#321706)
if (stName != otherType && mime->is(otherType)) {
-shouldAdd = false;
+// But don't skip aliases (they got resolved into
mime->name() already, but don't let two aliases cancel out)
+if
(KMimeTypeRepository::self()->canonicalName(otherType) != mime->name()) {
+//kDebug() << "Skipping" << mime->name() <<
"because of" << otherType << "(canonical" <<
KMimeTypeRepository::self()->canonicalName(otherType) << ") while parsing" <<
service->entryPath();
+shouldAdd = false;
+}
}
}
if (shouldAdd) {
diff --git a/kded/tests/kmimeassociationstest.cpp
b/kded/tests/kmimeassociationstest.cpp
index a07637f..342a8fd 100644
--- a/kded/tests/kmimeassociationstest.cpp
+++ b/kded/tests/kmimeassociationstest.cpp
@@ -140,10 +140,12 @@ private Q_SLOTS:
// This interacted badly with mimeapps.list listing another app for
text/plain, but the
// lookup found this app first, due to c-src. The fix: ignoring
derived mimetypes when
// the base mimetype is already listed.
+//
+// Also include aliases (msword), to check they don't cancel each
other out.
fakeCSrcApplication = m_localApps + "fakecsrcapplication.desktop";
if (!QFile::exists(fakeCSrcApplication)) {
mustUpdateKSycoca = true;
-writeAppDesktopFile(fakeCSrcApplication, QStringList() <<
"text/plain" << "text/c-src", 8);
+writeAppDesktopFile(fakeCSrcApplication, QStringList() <<
"text/plain" << "text/c-src" << "application/vnd.ms-word" <<
"application/msword", 8);
}
fakeJpegApplication = m_localApps + "fakejpegapplication.desktop";
@@ -200,6 +202,7 @@ private Q_SLOTS:
preferredApps["text/plain"] << "faketextapplication.desktop" <<
"kde4-kwrite.desktop";
preferredApps["
commit kdelibs4 for openSUSE:13.1
Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:13.1 checked
in at 2013-10-19 11:11:09
Comparing /work/SRC/openSUSE:13.1/kdelibs4 (Old)
and /work/SRC/openSUSE:13.1/.kdelibs4.new (New)
Package is "kdelibs4"
Changes:
--- /work/SRC/openSUSE:13.1/kdelibs4/kdelibs4-apidocs.changes 2013-10-03
15:54:09.0 +0200
+++ /work/SRC/openSUSE:13.1/.kdelibs4.new/kdelibs4-apidocs.changes
2013-10-19 16:49:04.0 +0200
@@ -1,0 +2,6 @@
+Fri Oct 18 15:40:44 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Added 0001-Fix-association-with-derived-mimetype-again.patch, fixes
+ remaining issues in mimetype handling, see e.g. kde#324502
+
+---
kdelibs4.changes: same change
New:
0001-Fix-association-with-derived-mimetype-again.patch
Other differences:
--
++ kdelibs4.spec ++
--- /var/tmp/diff_new_pack.0iZkU2/_old 2013-10-19 16:49:05.0 +0200
+++ /var/tmp/diff_new_pack.0iZkU2/_new 2013-10-19 16:49:05.0 +0200
@@ -108,6 +108,8 @@
# when e.g. starting dolphin from CLI
# NOTE patch is from master, aka 4.12 branch
Patch1000: 0001-verbose.patch
+# PATCH-FIX-UPSTREAM 0001-Fix-association-with-derived-mimetype-again.patch --
fixup for resolving kde#321706. resolves kde#324502
+Patch2000: 0001-Fix-association-with-derived-mimetype-again.patch
PreReq: permissions
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}'
libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}'
strigi-devel`)
@@ -173,6 +175,7 @@
%patch10
%patch11 -p1
%patch1000 -p1
+%patch2000 -p1
%build
EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \
++ 0001-Fix-association-with-derived-mimetype-again.patch ++
>From f723e2e7d36b597c5262bf63dde380d89ec6bfcb Mon Sep 17 00:00:00 2001
From: David Faure
Date: Fri, 18 Oct 2013 09:44:17 +0200
Subject: [PATCH 1/1] Fix association-with-derived-mimetype again.
8718a88a made it impossible to re-order file type associations.
7f42bf253009 fixed that, but changed the value of KService::mimeTypes(), which
broke okular. This new fix works the same way, but only inside kbuildsycoca
when it processes the mimetypes. The value of KService::mimeTypes() is now
restored to be exactly what's in the desktop file.
CCBUG: 321706
FIXED-IN: 4.11.3
---
kdecore/services/kservice.cpp | 45 +-
kdecore/tests/kservicetest.cpp | 7 ---
kded/kbuildservicefactory.cpp | 11 ++-
3 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/kdecore/services/kservice.cpp b/kdecore/services/kservice.cpp
index d7945bf..8e81929 100644
--- a/kdecore/services/kservice.cpp
+++ b/kdecore/services/kservice.cpp
@@ -227,44 +227,17 @@ void KServicePrivate::init( const KDesktopFile *config,
KService* q )
<< "has an empty mimetype!";
continue;
}
-
-// The following searches through the list for duplicate, inherited
mimetypes
-// For example, if application/rtf and text/plain are both listed
application/rtf is removed
-// since it is inherited from text/plain
-// This is a reworked fix for revision
8718a88a600c8f850a020d44bfc5f5858caa
-bool shouldAdd = true;
-KMimeType::Ptr mimeType1 =
KMimeTypeRepository::self()->findMimeTypeByName(st);
-if (mimeType1) {
-foreach(const QString mime2, lstServiceTypes) {
-// Don't compare the mimetype with itself
-if (st == mime2) {
-continue;
-}
-
-// is checks for inheritance and aliases, so this should
suffice
-if (mimeType1->is(mime2)) {
-shouldAdd = false;
-break;
-}
+int initialPreference = m_initialPreference;
+if ( st_it.hasNext() ) {
+// TODO better syntax - separate group with mimetype=number
entries?
+bool isNumber;
+const int val = st_it.peekNext().toInt(&isNumber);
+if (isNumber) {
+initialPreference = val;
+st_it.next();
}
}
-
-// Only add unique mimetypes
-if (shouldAdd) {
-int initialPreference = m_initialPreference;
-if (st_it.hasNext()) {
-// TODO better syntax - separate group with mimetype=number
entries?
-bool isNumber;
-const int val = st_it.peekNext().toInt(&isNumber);
-if (isNumber) {
-initialPreference = val;
-st_it.next();
-}
-
commit kdelibs4 for openSUSE:13.1
Hello community, here is the log from the commit of package kdelibs4 for openSUSE:13.1 checked in at 2013-10-03 15:54:08 Comparing /work/SRC/openSUSE:13.1/kdelibs4 (Old) and /work/SRC/openSUSE:13.1/.kdelibs4.new (New) Package is "kdelibs4" Changes: --- /work/SRC/openSUSE:13.1/kdelibs4/kdelibs4-apidocs.changes 2013-09-23 10:55:39.0 +0200 +++ /work/SRC/openSUSE:13.1/.kdelibs4.new/kdelibs4-apidocs.changes 2013-10-03 15:54:09.0 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 15:04:18 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php + +--- kdelibs4.changes: same change Old: kdelibs-4.11.1.tar.xz New: kdelibs-4.11.2.tar.xz Other differences: -- ++ kdelibs4-apidocs.spec ++ --- /var/tmp/diff_new_pack.dYu9HG/_old 2013-10-03 15:54:09.0 +0200 +++ /var/tmp/diff_new_pack.dYu9HG/_new 2013-10-03 15:54:09.0 +0200 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version:4.11.1 +Version:4.11.2 Release:0 Summary:KDE 4 API documentation License:LGPL-2.1+ ++ kdelibs4.spec ++ --- /var/tmp/diff_new_pack.dYu9HG/_old 2013-10-03 15:54:09.0 +0200 +++ /var/tmp/diff_new_pack.dYu9HG/_new 2013-10-03 15:54:09.0 +0200 @@ -24,7 +24,7 @@ %define kderev 0 Name: kdelibs4 -Version:4.11.1 +Version:4.11.2 Release:0 BuildRequires: OpenEXR-devel BuildRequires: automoc4 ++ kdelibs-4.11.1.tar.xz -> kdelibs-4.11.2.tar.xz ++ /work/SRC/openSUSE:13.1/kdelibs4/kdelibs-4.11.1.tar.xz /work/SRC/openSUSE:13.1/.kdelibs4.new/kdelibs-4.11.2.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
