diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:30:47 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:31:02 +0200 |
commit | 9010047840d810d9ccba3d00b7943a842e125291 (patch) | |
tree | 7698717495c9bc52be2bc8ab526071f3063b466d /freebsd/libraries | |
parent | b4f5663d87c16e08aaef66346f4b22eba2de80bd (diff) | |
download | tde-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/libraries')
-rw-r--r-- | freebsd/libraries/kipi-plugins/Makefile | 2 | ||||
-rw-r--r-- | freebsd/libraries/kipi-plugins/distinfo | 6 | ||||
-rw-r--r-- | freebsd/libraries/libkdcraw/Makefile | 2 | ||||
-rw-r--r-- | freebsd/libraries/libkdcraw/distinfo | 6 | ||||
-rw-r--r-- | freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff | 74 | ||||
-rw-r--r-- | freebsd/libraries/libkexiv2/Makefile | 2 | ||||
-rw-r--r-- | freebsd/libraries/libkexiv2/distinfo | 6 | ||||
-rw-r--r-- | freebsd/libraries/libkipi/Makefile | 2 | ||||
-rw-r--r-- | freebsd/libraries/libkipi/distinfo | 6 | ||||
-rw-r--r-- | freebsd/libraries/libksquirrel/Makefile | 4 | ||||
-rw-r--r-- | freebsd/libraries/libksquirrel/distinfo | 6 | ||||
-rw-r--r-- | freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff | 13 | ||||
-rw-r--r-- | freebsd/libraries/libtdeldap/Makefile | 2 | ||||
-rw-r--r-- | freebsd/libraries/libtdeldap/distinfo | 6 |
14 files changed, 112 insertions, 25 deletions
diff --git a/freebsd/libraries/kipi-plugins/Makefile b/freebsd/libraries/kipi-plugins/Makefile index 8fed25933..1a9be126c 100644 --- a/freebsd/libraries/kipi-plugins/Makefile +++ b/freebsd/libraries/kipi-plugins/Makefile @@ -7,7 +7,7 @@ PORTNAME= kipi-plugins-trinity COMMENT= Trinity image manipulation/handling plugins for KIPI aware programs -TDE_PREVERSION= ~pre9+d366d7ef +TDE_PREVERSION= MASTER_SITE_SUBDIR= k/${PORTNAME} PORTREVISION= 0 CATEGORIES= graphics diff --git a/freebsd/libraries/kipi-plugins/distinfo b/freebsd/libraries/kipi-plugins/distinfo index 14d16ac34..b055fe80c 100644 --- a/freebsd/libraries/kipi-plugins/distinfo +++ b/freebsd/libraries/kipi-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527561205 -SHA256 (TDE/libraries/kipi-plugins-trinity_14.0.5~pre9.orig.tar.xz) = db99e4fd5b5b57b36688dbf24fac4d0fe148c9383a6293e66fa67a96cf2b81e9 -SIZE (TDE/libraries/kipi-plugins-trinity_14.0.5~pre9.orig.tar.xz) = 6593000 +TIMESTAMP = 1533395951 +SHA256 (TDE/libraries/kipi-plugins-trinity_14.0.5.orig.tar.xz) = af5636b7ee225112335bedb75b6a434d25a86cd9dda386c2952f55cb1171a728 +SIZE (TDE/libraries/kipi-plugins-trinity_14.0.5.orig.tar.xz) = 6589728 diff --git a/freebsd/libraries/libkdcraw/Makefile b/freebsd/libraries/libkdcraw/Makefile index 1e3214bc1..71f09f293 100644 --- a/freebsd/libraries/libkdcraw/Makefile +++ b/freebsd/libraries/libkdcraw/Makefile @@ -7,7 +7,7 @@ PORTNAME= libkdcraw-trinity COMMENT= Trinity RAW picture decoding C++ library -TDE_PREVERSION= ~pre7+5a187761 +TDE_PREVERSION= MASTER_SITE_SUBDIR= libk/${PORTNAME} PORTREVISION= 0 CATEGORIES= graphics devel diff --git a/freebsd/libraries/libkdcraw/distinfo b/freebsd/libraries/libkdcraw/distinfo index 28b2419e4..96e2cf140 100644 --- a/freebsd/libraries/libkdcraw/distinfo +++ b/freebsd/libraries/libkdcraw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495992051 -SHA256 (TDE/libraries/libkdcraw-trinity_14.0.5~pre7.orig.tar.xz) = cc7e402f023f600fa5ed76b9232808324405b1e7e5cbcd020943d2e8145cfb0b -SIZE (TDE/libraries/libkdcraw-trinity_14.0.5~pre7.orig.tar.xz) = 525212 +TIMESTAMP = 1533394932 +SHA256 (TDE/libraries/libkdcraw-trinity_14.0.5.orig.tar.xz) = 978242c5a015bf2a60d035681e4ba9ea937359363d25f8713341a3bd78cc8b59 +SIZE (TDE/libraries/libkdcraw-trinity_14.0.5.orig.tar.xz) = 524936 diff --git a/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff new file mode 100644 index 000000000..f820774f8 --- /dev/null +++ b/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff @@ -0,0 +1,74 @@ +diff --git a/libkdcraw/libraw/internal/dcraw_common.cpp b/libkdcraw/libraw/internal/dcraw_common.cpp +index 868f676..13fa1df 100644 +--- a/libkdcraw/libraw/internal/dcraw_common.cpp ++++ b/libkdcraw/libraw/internal/dcraw_common.cpp +@@ -3595,28 +3595,28 @@ void CLASS lin_interpolate() + void CLASS vng_interpolate() + { + static const signed char *cp, terms[] = { +- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, +- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, +- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, +- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06, +- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04, +- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, +- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, +- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11, +- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11, +- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22, +- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44, +- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10, +- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04, +- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, +- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20, +- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08, +- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20, +- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44, +- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60, +- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, +- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, +- +1,+0,+2,+1,0,0x10 ++ -2,-2,+0,-1,0,'\x01', -2,-2,+0,+0,1,'\x01', -2,-1,-1,+0,0,'\x01', ++ -2,-1,+0,-1,0,'\x02', -2,-1,+0,+0,0,'\x03', -2,-1,+0,+1,1,'\x01', ++ -2,+0,+0,-1,0,'\x06', -2,+0,+0,+0,1,'\x02', -2,+0,+0,+1,0,'\x03', ++ -2,+1,-1,+0,0,'\x04', -2,+1,+0,-1,1,'\x04', -2,+1,+0,+0,0,'\x06', ++ -2,+1,+0,+1,0,'\x02', -2,+2,+0,+0,1,'\x04', -2,+2,+0,+1,0,'\x04', ++ -1,-2,-1,+0,0,'\x80', -1,-2,+0,-1,0,'\x01', -1,-2,+1,-1,0,'\x01', ++ -1,-2,+1,+0,1,'\x01', -1,-1,-1,+1,0,'\x88', -1,-1,+1,-2,0,'\x40', ++ -1,-1,+1,-1,0,'\x22', -1,-1,+1,+0,0,'\x33', -1,-1,+1,+1,1,'\x11', ++ -1,+0,-1,+2,0,'\x08', -1,+0,+0,-1,0,'\x44', -1,+0,+0,+1,0,'\x11', ++ -1,+0,+1,-2,1,'\x40', -1,+0,+1,-1,0,'\x66', -1,+0,+1,+0,1,'\x22', ++ -1,+0,+1,+1,0,'\x33', -1,+0,+1,+2,1,'\x10', -1,+1,+1,-1,1,'\x44', ++ -1,+1,+1,+0,0,'\x66', -1,+1,+1,+1,0,'\x22', -1,+1,+1,+2,0,'\x10', ++ -1,+2,+0,+1,0,'\x04', -1,+2,+1,+0,1,'\x04', -1,+2,+1,+1,0,'\x04', ++ +0,-2,+0,+0,1,'\x80', +0,-1,+0,+1,1,'\x88', +0,-1,+1,-2,0,'\x40', ++ +0,-1,+1,+0,0,'\x11', +0,-1,+2,-2,0,'\x40', +0,-1,+2,-1,0,'\x20', ++ +0,-1,+2,+0,0,'\x30', +0,-1,+2,+1,1,'\x10', +0,+0,+0,+2,1,'\x08', ++ +0,+0,+2,-2,1,'\x40', +0,+0,+2,-1,0,'\x60', +0,+0,+2,+0,1,'\x20', ++ +0,+0,+2,+1,0,'\x30', +0,+0,+2,+2,1,'\x10', +0,+1,+1,+0,0,'\x44', ++ +0,+1,+1,+2,0,'\x10', +0,+1,+2,-1,1,'\x40', +0,+1,+2,+0,0,'\x60', ++ +0,+1,+2,+1,0,'\x20', +0,+1,+2,+2,0,'\x10', +1,-2,+1,+0,0,'\x80', ++ +1,-1,+1,+1,0,'\x88', +1,+0,+1,+2,0,'\x08', +1,+0,+2,-1,0,'\x40', ++ +1,+0,+2,+1,0,'\x10' + }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; + ushort (*brow[5])[4], *pix; + int prow=7, pcol=1, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; +@@ -5950,7 +5950,8 @@ void CLASS adobe_coeff (char *p_make, char *p_model) + { + static const struct { + const char *prefix; +- short t_black, t_maximum, trans[12]; ++ unsigned short t_black, t_maximum; ++ short trans[12]; + } table[] = { + { "Apple QuickTake", 0, 0, /* DJC */ + { 17576,-3191,-3318,5210,6733,-1942,9031,1280,-124 } }, +@@ -8189,7 +8190,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) + strncpy (th->t_desc, desc, 512); + strncpy (th->t_make, make, 64); + strncpy (th->t_model, model, 64); +- strcpy (th->soft, "dcraw v"VERSION); ++ strcpy (th->soft, "dcraw v" VERSION); + t = gmtime (×tamp); + sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", + t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); diff --git a/freebsd/libraries/libkexiv2/Makefile b/freebsd/libraries/libkexiv2/Makefile index b1cd146cd..0a4a82a4f 100644 --- a/freebsd/libraries/libkexiv2/Makefile +++ b/freebsd/libraries/libkexiv2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libkexiv2-trinity COMMENT= Trinity TQt like interface for the libexiv2 library -TDE_PREVERSION= ~pre7+39ff0304 +TDE_PREVERSION= MASTER_SITE_SUBDIR= libk/${PORTNAME} PORTREVISION= 0 CATEGORIES= graphics devel diff --git a/freebsd/libraries/libkexiv2/distinfo b/freebsd/libraries/libkexiv2/distinfo index 39d328781..f2168d10a 100644 --- a/freebsd/libraries/libkexiv2/distinfo +++ b/freebsd/libraries/libkexiv2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495992051 -SHA256 (TDE/libraries/libkexiv2-trinity_14.0.5~pre7.orig.tar.xz) = 64e7ab4d4d051852435a7270f277df3696f87767303992b01a95d15d17080c56 -SIZE (TDE/libraries/libkexiv2-trinity_14.0.5~pre7.orig.tar.xz) = 293892 +TIMESTAMP = 1533395807 +SHA256 (TDE/libraries/libkexiv2-trinity_14.0.5.orig.tar.xz) = 3a937029bd1d3740cd7cf55ba28a495af203de2d635bb01460f53b76b372e76a +SIZE (TDE/libraries/libkexiv2-trinity_14.0.5.orig.tar.xz) = 293864 diff --git a/freebsd/libraries/libkipi/Makefile b/freebsd/libraries/libkipi/Makefile index dce133142..09daaacb0 100644 --- a/freebsd/libraries/libkipi/Makefile +++ b/freebsd/libraries/libkipi/Makefile @@ -7,7 +7,7 @@ PORTNAME= libkipi-trinity COMMENT= Trinity library for apps that want to use kipi-plugins -TDE_PREVERSION= ~pre7+720aab52 +TDE_PREVERSION= MASTER_SITE_SUBDIR= libk/${PORTNAME} PORTREVISION= 0 CATEGORIES= graphics devel diff --git a/freebsd/libraries/libkipi/distinfo b/freebsd/libraries/libkipi/distinfo index 57d26b238..ba728cbb9 100644 --- a/freebsd/libraries/libkipi/distinfo +++ b/freebsd/libraries/libkipi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495992051 -SHA256 (TDE/libraries/libkipi-trinity_14.0.5~pre7.orig.tar.xz) = df6ae9a366bfbdc391f011f33abba3034a1a35a361bbc093571f839e56ad59d4 -SIZE (TDE/libraries/libkipi-trinity_14.0.5~pre7.orig.tar.xz) = 361120 +TIMESTAMP = 1533395891 +SHA256 (TDE/libraries/libkipi-trinity_14.0.5.orig.tar.xz) = d28ec633cf83942b7b91cabd4ff10cd6a1fa7d42d8fec2b569d4ab1320a111fd +SIZE (TDE/libraries/libkipi-trinity_14.0.5.orig.tar.xz) = 361460 diff --git a/freebsd/libraries/libksquirrel/Makefile b/freebsd/libraries/libksquirrel/Makefile index c4f13d72f..b9cdbdf7d 100644 --- a/freebsd/libraries/libksquirrel/Makefile +++ b/freebsd/libraries/libksquirrel/Makefile @@ -7,7 +7,7 @@ PORTNAME= libksquirrel-trinity COMMENT= Libraries for KSquirrel -TDE_PREVERSION= ~pre8+03101ede +TDE_PREVERSION= MASTER_SITE_SUBDIR= libk/${PORTNAME} PORTREVISION= 0 CATEGORIES= graphics devel @@ -37,7 +37,7 @@ LIB_DEPENDS+=\ libtiff.so:${PORTSDIR}/graphics/tiff \ libwmf.so:${PORTSDIR}/graphics/libwmf \ -USE_XORG+= xproto +USE_XORG+= xorgproto # Build post-patch: tde-pathfix diff --git a/freebsd/libraries/libksquirrel/distinfo b/freebsd/libraries/libksquirrel/distinfo index 7baa94651..8fc697cf3 100644 --- a/freebsd/libraries/libksquirrel/distinfo +++ b/freebsd/libraries/libksquirrel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495992053 -SHA256 (TDE/libraries/libksquirrel-trinity_14.0.5~pre8.orig.tar.xz) = 9894ba8e11941b9874cea1c3e1682f24826874fced0e6ac51ebcecb1bd064458 -SIZE (TDE/libraries/libksquirrel-trinity_14.0.5~pre8.orig.tar.xz) = 770204 +TIMESTAMP = 1533396218 +SHA256 (TDE/libraries/libksquirrel-trinity_14.0.5.orig.tar.xz) = bdcbc11ecd70d09f936e70a154735442ad8ee49733c47794f5e25ffe0ad4e620 +SIZE (TDE/libraries/libksquirrel-trinity_14.0.5.orig.tar.xz) = 768180 diff --git a/freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff new file mode 100644 index 000000000..627f4276f --- /dev/null +++ b/freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff @@ -0,0 +1,13 @@ +diff --git a/kernel/kls_wal/q2pal.h b/kernel/kls_wal/q2pal.h +index 39530e5..e7ee100 100644 +--- a/kernel/kls_wal/q2pal.h ++++ b/kernel/kls_wal/q2pal.h +@@ -3,7 +3,7 @@ + + /* Quake2 pallette taken from DevIL library (http://imagelib.org) */ + +-static const s8 q2pal[768] = ++static const u8 q2pal[768] = + { + 0, 0, 0, + 15, 15, 15, diff --git a/freebsd/libraries/libtdeldap/Makefile b/freebsd/libraries/libtdeldap/Makefile index aec113d3f..98b80bf26 100644 --- a/freebsd/libraries/libtdeldap/Makefile +++ b/freebsd/libraries/libtdeldap/Makefile @@ -7,7 +7,7 @@ PORTNAME= libtdeldap-trinity COMMENT= LDAP interface library for TDE -TDE_PREVERSION= ~pre6+ce95d4d0 +TDE_PREVERSION= MASTER_SITE_SUBDIR= libt/${PORTNAME} PORTREVISION= 0 CATEGORIES= net devel diff --git a/freebsd/libraries/libtdeldap/distinfo b/freebsd/libraries/libtdeldap/distinfo index d7c32f42c..73fe25067 100644 --- a/freebsd/libraries/libtdeldap/distinfo +++ b/freebsd/libraries/libtdeldap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495992053 -SHA256 (TDE/libraries/libtdeldap-trinity_14.0.5~pre6.orig.tar.xz) = d6fbf78990031d85c708cd0b0f91c1826d01d6910f845dd7dedd19bef0715e28 -SIZE (TDE/libraries/libtdeldap-trinity_14.0.5~pre6.orig.tar.xz) = 267100 +TIMESTAMP = 1533397018 +SHA256 (TDE/libraries/libtdeldap-trinity_14.0.5.orig.tar.xz) = 805336a718c3b065b691dc0273b2205dd5bbcf9c07c5252642434ece593fad72 +SIZE (TDE/libraries/libtdeldap-trinity_14.0.5.orig.tar.xz) = 267144 |