summaryrefslogtreecommitdiffstats
path: root/freebsd/tdepim
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-06 01:30:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-08-06 01:31:02 +0200
commit9010047840d810d9ccba3d00b7943a842e125291 (patch)
tree7698717495c9bc52be2bc8ab526071f3063b466d /freebsd/tdepim
parentb4f5663d87c16e08aaef66346f4b22eba2de80bd (diff)
downloadtde-packaging-9010047840d810d9ccba3d00b7943a842e125291.tar.gz
tde-packaging-9010047840d810d9ccba3d00b7943a842e125291.zip
FreeBSD: Update for final release R14.0.5r14.0.5
Additional patches due to stricter C++11 in Clang A new mkspec for Clang is used to build TQt Akode is now part of the TDE repository Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'freebsd/tdepim')
-rw-r--r--freebsd/tdepim/Makefile2
-rw-r--r--freebsd/tdepim/distinfo6
-rw-r--r--freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff89
3 files changed, 93 insertions, 4 deletions
diff --git a/freebsd/tdepim/Makefile b/freebsd/tdepim/Makefile
index c19ca8b34..0a718bdc7 100644
--- a/freebsd/tdepim/Makefile
+++ b/freebsd/tdepim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdepim-trinity
COMMENT= Trinity Personal Information Management apps
-TDE_PREVERSION= ~pre14+724a547c
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 deskutils
diff --git a/freebsd/tdepim/distinfo b/freebsd/tdepim/distinfo
index b95e612ea..48067e66d 100644
--- a/freebsd/tdepim/distinfo
+++ b/freebsd/tdepim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527518866
-SHA256 (TDE/tdepim-trinity_14.0.5~pre14.orig.tar.xz) = 6ca91223b726c55a36bbeb5574adad5ecd91fdd3896fc095ca90b4d8ba169e10
-SIZE (TDE/tdepim-trinity_14.0.5~pre14.orig.tar.xz) = 9329768
+TIMESTAMP = 1532918490
+SHA256 (TDE/tdepim-trinity_14.0.5.orig.tar.xz) = ac90555cf9117b2d809ccc1979dcfea32534975f33a45b82fda8991c7bb901ce
+SIZE (TDE/tdepim-trinity_14.0.5.orig.tar.xz) = 9321620
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
new file mode 100644
index 000000000..a222aa5eb
--- /dev/null
+++ b/freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,89 @@
+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