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/tdelibs | |
| 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/tdelibs')
| -rw-r--r-- | freebsd/tdelibs/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/tdelibs/distinfo | 6 | ||||
| -rw-r--r-- | freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff | 34 | ||||
| -rw-r--r-- | freebsd/tdelibs/pkg-plist | 1 |
4 files changed, 39 insertions, 4 deletions
diff --git a/freebsd/tdelibs/Makefile b/freebsd/tdelibs/Makefile index c00085080..8f13d7ef2 100644 --- a/freebsd/tdelibs/Makefile +++ b/freebsd/tdelibs/Makefile @@ -7,7 +7,7 @@ PORTNAME= tdelibs-trinity COMMENT= Core libraries and binaries for all TDE applications -TDE_PREVERSION= ~pre68+8140cac9 +TDE_PREVERSION= MASTER_SITE_SUBDIR= t/${PORTNAME} PORTREVISION= 0 CATEGORIES= x11 diff --git a/freebsd/tdelibs/distinfo b/freebsd/tdelibs/distinfo index e9cc73cae..f2b5d8d86 100644 --- a/freebsd/tdelibs/distinfo +++ b/freebsd/tdelibs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527607987 -SHA256 (TDE/tdelibs-trinity_14.0.5~pre68.orig.tar.xz) = 32366ba03dd2aee43beadffd05fbde66d425ceb553aa940273442fca24140279 -SIZE (TDE/tdelibs-trinity_14.0.5~pre68.orig.tar.xz) = 15105832 +TIMESTAMP = 1532798504 +SHA256 (TDE/tdelibs-trinity_14.0.5.orig.tar.xz) = 2e0f5bdc278b36ebcd39107c0504baf1293f09c7c39a969a8833004a756631d3 +SIZE (TDE/tdelibs-trinity_14.0.5.orig.tar.xz) = 15107820 diff --git a/freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff new file mode 100644 index 000000000..b53918e8c --- /dev/null +++ b/freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff @@ -0,0 +1,34 @@ +diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp +index 576f7192..566a8bda 100644 +--- a/tdeinit/tdeinit.cpp ++++ b/tdeinit/tdeinit.cpp +@@ -1514,7 +1514,7 @@ static void tdeinit_library_path() + TQCString display = getenv(DISPLAY); + if (display.isEmpty()) + { +- fprintf(stderr, "[tdeinit] Aborting. $"DISPLAY" is not set.\n"); ++ fprintf(stderr, "[tdeinit] Aborting. $" DISPLAY " is not set.\n"); + exit(255); + } + int i; +diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp +index ca8dea40..1f93a534 100644 +--- a/tdestyles/keramik/keramik.cpp ++++ b/tdestyles/keramik/keramik.cpp +@@ -2833,11 +2833,11 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, + + //CHECKME: Not sure the rects are perfect.. + XRectangle rects[5] = { +- {0, 0, resize->size().width()-2, resize->size().height()-6}, +- {0, resize->size().height()-6, resize->size().width()-2, 1}, +- {1, resize->size().height()-5, resize->size().width()-3, 1}, +- {2, resize->size().height()-4, resize->size().width()-5, 1}, +- {3, resize->size().height()-3, resize->size().width()-7, 1} ++ {0, 0, (unsigned short)(resize->size().width()-2), (unsigned short)(resize->size().height()-6)}, ++ {0, (short)(resize->size().height()-6), (unsigned short)(resize->size().width()-2), 1}, ++ {1, (short)(resize->size().height()-5), (unsigned short)(resize->size().width()-3), 1}, ++ {2, (short)(resize->size().height()-4), (unsigned short)(resize->size().width()-5), 1}, ++ {3, (short)(resize->size().height()-3), (unsigned short)(resize->size().width()-7), 1} + }; + + XShapeCombineRectangles(tqt_xdisplay(), listbox->handle(), ShapeBounding, 0, 0, diff --git a/freebsd/tdelibs/pkg-plist b/freebsd/tdelibs/pkg-plist index 033275f9b..4deb68745 100644 --- a/freebsd/tdelibs/pkg-plist +++ b/freebsd/tdelibs/pkg-plist @@ -1246,6 +1246,7 @@ share/apps/katepart/syntax/fstab.xml share/apps/katepart/syntax/ftl.xml share/apps/katepart/syntax/gap.xml share/apps/katepart/syntax/gcc.xml +share/apps/katepart/syntax/gcode.xml share/apps/katepart/syntax/gdb.xml share/apps/katepart/syntax/gdl.xml share/apps/katepart/syntax/gettext.xml |