summaryrefslogtreecommitdiffstats
path: root/freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff
diff options
context:
space:
mode:
Diffstat (limited to 'freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff')
-rw-r--r--freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff34
1 files changed, 34 insertions, 0 deletions
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,