summaryrefslogtreecommitdiffstats
path: root/freebsd/tdepim
diff options
context:
space:
mode:
Diffstat (limited to 'freebsd/tdepim')
-rw-r--r--freebsd/tdepim/distinfo6
-rw-r--r--freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff89
-rw-r--r--freebsd/tdepim/pkg-plist19
3 files changed, 22 insertions, 92 deletions
diff --git a/freebsd/tdepim/distinfo b/freebsd/tdepim/distinfo
index 48067e66d..217c9d40f 100644
--- a/freebsd/tdepim/distinfo
+++ b/freebsd/tdepim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532918490
-SHA256 (TDE/tdepim-trinity_14.0.5.orig.tar.xz) = ac90555cf9117b2d809ccc1979dcfea32534975f33a45b82fda8991c7bb901ce
-SIZE (TDE/tdepim-trinity_14.0.5.orig.tar.xz) = 9321620
+TIMESTAMP = 1551965882
+SHA256 (TDE/tdepim-trinity_14.0.6.orig.tar.xz) = 8ec5cd7a69166c961b61339a6c7b09ccc397446ab87d8d487838b0b416836b33
+SIZE (TDE/tdepim-trinity_14.0.6.orig.tar.xz) = 9357248
diff --git a/freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff
deleted file mode 100644
index a222aa5eb..000000000
--- a/freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
-index b92e3f3e..9ae28740 100644
---- a/kalarm/functions.cpp
-+++ b/kalarm/functions.cpp
-@@ -1053,7 +1053,7 @@ bool runKOrganizer()
- }
- if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
- {
-- kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl;
-+ kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl;
- return false;
- }
- }
-diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp
-index 834051c5..b06e3afe 100644
---- a/tderesources/groupwise/soap/stdsoap2.cpp
-+++ b/tderesources/groupwise/soap/stdsoap2.cpp
-@@ -1284,7 +1284,7 @@ soap_get(struct soap *soap)
- case '\'':
- return SOAP_AP;
- case '&':
-- return soap_char(soap) | 0x80000000;
-+ return soap_char(soap) | (1<<31);
- }
- break;
- }
-@@ -7094,7 +7094,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
- { soap_unget(soap, c);
- c = soap_getutf8(soap);
- if (soap->mode & SOAP_C_UTFSTRING)
-- { if ((c & 0x80000000) && c >= -0x7FFFFF80 && c < SOAP_AP)
-+ { if ((c & (1<<31)) && c >= -0x7FFFFF80 && c < SOAP_AP)
- { c &= 0x7FFFFFFF;
- t = buf;
- if (c < 0x0800)
-@@ -7297,7 +7297,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
- continue;
- }
- if (soap->mode & SOAP_C_UTFSTRING)
-- { if (((c = soap_get(soap)) & 0x80000000) && c >= -0x7FFFFF80 && c < SOAP_AP)
-+ { if (((c = soap_get(soap)) & (1<<31)) && c >= -0x7FFFFF80 && c < SOAP_AP)
- { c &= 0x7FFFFFFF;
- t = buf;
- if (c < 0x0800)
-@@ -7362,7 +7362,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
- }
- *s++ = '/';
- break;
-- case '<' | 0x80000000:
-+ case '<' | (1<<31):
- if (flag)
- *s++ = '<';
- else
-@@ -7371,7 +7371,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
- m = 3;
- }
- break;
-- case '>' | 0x80000000:
-+ case '>' | (1<<31):
- if (flag)
- *s++ = '>';
- else
-@@ -7380,7 +7380,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
- m = 3;
- }
- break;
-- case '&' | 0x80000000:
-+ case '&' | (1<<31):
- if (flag)
- *s++ = '&';
- else
-@@ -7389,7 +7389,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
- m = 4;
- }
- break;
-- case '"' | 0x80000000:
-+ case '"' | (1<<31):
- if (flag)
- *s++ = '"';
- else
-@@ -7398,7 +7398,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
- m = 5;
- }
- break;
-- case '\'' | 0x80000000:
-+ case '\'' | (1<<31):
- if (flag)
- *s++ = '\'';
- else
diff --git a/freebsd/tdepim/pkg-plist b/freebsd/tdepim/pkg-plist
index 8375ac64a..91a3450e8 100644
--- a/freebsd/tdepim/pkg-plist
+++ b/freebsd/tdepim/pkg-plist
@@ -1410,11 +1410,15 @@ share/icons/crystalsvg/16x16/actions/kontact_summary_green.png
share/icons/crystalsvg/16x16/actions/kontact_todo.png
share/icons/crystalsvg/16x16/actions/rss_tag.png
share/icons/crystalsvg/16x16/apps/akregator_empty.png
+share/icons/crystalsvg/16x16/apps/dirmngr.png
share/icons/crystalsvg/16x16/apps/gpg.png
+share/icons/crystalsvg/16x16/apps/gpg_agent.png
share/icons/crystalsvg/16x16/apps/gpgsm.png
share/icons/crystalsvg/16x16/apps/kandy.png
share/icons/crystalsvg/16x16/apps/kmailcvt.png
share/icons/crystalsvg/16x16/apps/konsolekalendar.png
+share/icons/crystalsvg/16x16/apps/pinentry.png
+share/icons/crystalsvg/16x16/apps/scdaemon.png
share/icons/crystalsvg/22x22/actions/button_fewer.png
share/icons/crystalsvg/22x22/actions/button_more.png
share/icons/crystalsvg/22x22/actions/kalarm.png
@@ -1428,10 +1432,14 @@ share/icons/crystalsvg/22x22/actions/kontact_summary.png
share/icons/crystalsvg/22x22/actions/kontact_summary_green.png
share/icons/crystalsvg/22x22/actions/kontact_todo.png
share/icons/crystalsvg/22x22/actions/rss_tag.png
+share/icons/crystalsvg/22x22/apps/dirmngr.png
share/icons/crystalsvg/22x22/apps/gpg.png
+share/icons/crystalsvg/22x22/apps/gpg_agent.png
share/icons/crystalsvg/22x22/apps/gpgsm.png
share/icons/crystalsvg/22x22/apps/kmaillight.png
share/icons/crystalsvg/22x22/apps/konsolekalendar.png
+share/icons/crystalsvg/22x22/apps/pinentry.png
+share/icons/crystalsvg/22x22/apps/scdaemon.png
share/icons/crystalsvg/32x32/actions/kontact_contacts.png
share/icons/crystalsvg/32x32/actions/kontact_date.png
share/icons/crystalsvg/32x32/actions/kontact_journal.png
@@ -1442,12 +1450,16 @@ share/icons/crystalsvg/32x32/actions/kontact_summary.png
share/icons/crystalsvg/32x32/actions/kontact_summary_green.png
share/icons/crystalsvg/32x32/actions/kontact_todo.png
share/icons/crystalsvg/32x32/actions/rss_tag.png
+share/icons/crystalsvg/32x32/apps/dirmngr.png
share/icons/crystalsvg/32x32/apps/gpg.png
+share/icons/crystalsvg/32x32/apps/gpg_agent.png
share/icons/crystalsvg/32x32/apps/gpgsm.png
share/icons/crystalsvg/32x32/apps/kandy.png
share/icons/crystalsvg/32x32/apps/kmailcvt.png
share/icons/crystalsvg/32x32/apps/kmaillight.png
share/icons/crystalsvg/32x32/apps/konsolekalendar.png
+share/icons/crystalsvg/32x32/apps/pinentry.png
+share/icons/crystalsvg/32x32/apps/scdaemon.png
share/icons/crystalsvg/48x48/actions/kontact_contacts.png
share/icons/crystalsvg/48x48/actions/kontact_date.png
share/icons/crystalsvg/48x48/actions/kontact_journal.png
@@ -1478,6 +1490,7 @@ share/icons/default.tde/32x32/devices/mobile_unknown.png
share/icons/hicolor/128x128/apps/akregator.png
share/icons/hicolor/128x128/apps/kaddressbook.png
share/icons/hicolor/128x128/apps/karm.png
+share/icons/hicolor/128x128/apps/kleopatra.png
share/icons/hicolor/128x128/apps/kmail.png
share/icons/hicolor/128x128/apps/knode.png
share/icons/hicolor/128x128/apps/knode2.png
@@ -1488,6 +1501,7 @@ share/icons/hicolor/16x16/apps/akregator.png
share/icons/hicolor/16x16/apps/kaddressbook.png
share/icons/hicolor/16x16/apps/kalarm.png
share/icons/hicolor/16x16/apps/karm.png
+share/icons/hicolor/16x16/apps/kleopatra.png
share/icons/hicolor/16x16/apps/kmail.png
share/icons/hicolor/16x16/apps/kmobile.png
share/icons/hicolor/16x16/apps/knode.png
@@ -1498,6 +1512,7 @@ share/icons/hicolor/16x16/apps/korganizer.png
share/icons/hicolor/16x16/apps/korn.png
share/icons/hicolor/22x22/apps/akregator.png
share/icons/hicolor/22x22/apps/karm.png
+share/icons/hicolor/22x22/apps/kleopatra.png
share/icons/hicolor/22x22/apps/kmail.png
share/icons/hicolor/22x22/apps/knotes.png
share/icons/hicolor/22x22/apps/kontact.png
@@ -1505,6 +1520,7 @@ share/icons/hicolor/32x32/apps/akregator.png
share/icons/hicolor/32x32/apps/kaddressbook.png
share/icons/hicolor/32x32/apps/kalarm.png
share/icons/hicolor/32x32/apps/karm.png
+share/icons/hicolor/32x32/apps/kleopatra.png
share/icons/hicolor/32x32/apps/kmail.png
share/icons/hicolor/32x32/apps/kmobile.png
share/icons/hicolor/32x32/apps/knode.png
@@ -1517,6 +1533,7 @@ share/icons/hicolor/48x48/apps/akregator.png
share/icons/hicolor/48x48/apps/kaddressbook.png
share/icons/hicolor/48x48/apps/kalarm.png
share/icons/hicolor/48x48/apps/karm.png
+share/icons/hicolor/48x48/apps/kleopatra.png
share/icons/hicolor/48x48/apps/kmail.png
share/icons/hicolor/48x48/apps/kmobile.png
share/icons/hicolor/48x48/apps/knode.png
@@ -1529,6 +1546,7 @@ share/icons/hicolor/48x48/apps/ktnef.png
share/icons/hicolor/64x64/apps/akregator.png
share/icons/hicolor/64x64/apps/kaddressbook.png
share/icons/hicolor/64x64/apps/karm.png
+share/icons/hicolor/64x64/apps/kleopatra.png
share/icons/hicolor/64x64/apps/kmail.png
share/icons/hicolor/64x64/apps/knode.png
share/icons/hicolor/64x64/apps/knode2.png
@@ -1536,6 +1554,7 @@ share/icons/hicolor/64x64/apps/knotes.png
share/icons/hicolor/64x64/apps/kontact.png
share/icons/hicolor/64x64/apps/korganizer.png
share/icons/hicolor/scalable/apps/akregator.svgz
+share/icons/hicolor/scalable/apps/kleopatra.svgz
share/icons/hicolor/scalable/apps/kmail.svgz
share/icons/locolor/16x16/apps/ktnef.png
share/icons/locolor/32x32/apps/ktnef.png