pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/open-vm-tools
Module Name: pkgsrc
Committed By: joerg
Date: Fri Dec 16 00:04:03 UTC 2016
Modified Files:
pkgsrc/sysutils/open-vm-tools: distinfo
Added Files:
pkgsrc/sysutils/open-vm-tools/patches:
patch-services_plugins_dndcp_copyPasteUIX11.cpp
patch-services_plugins_dndcp_dndUIX11.cpp
Log Message:
Avoid UDL since it is now getting compiled as C++11.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_copyPasteUIX11.cpp \
pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dndUIX11.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/open-vm-tools/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.17 pkgsrc/sysutils/open-vm-tools/distinfo:1.18
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.17 Mon Nov 21 00:16:29 2016
+++ pkgsrc/sysutils/open-vm-tools/distinfo Fri Dec 16 00:04:03 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2016/11/21 00:16:29 wiz Exp $
+$NetBSD: distinfo,v 1.18 2016/12/16 00:04:03 joerg Exp $
SHA1 (open-vm-tools-10.0.7-3227872.tar.gz) = cd22a3d79d68de46647e8add78bcaf829bb0598d
RMD160 (open-vm-tools-10.0.7-3227872.tar.gz) = df8cfa62ffd0fbba0432cb0deac0f202b2278625
@@ -46,6 +46,8 @@ SHA1 (patch-lib_nicInfo_nicInfoPosix.c)
SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b
SHA1 (patch-scripts_Makefile.am) = 5238c5cabf1125f9cd334349e5f67f1b7a568428
SHA1 (patch-scripts_netbsd_network) = cf4c47e337b0d1f8bba3d4e87678924f85dd635e
+SHA1 (patch-services_plugins_dndcp_copyPasteUIX11.cpp) = 2027b2eb49a1c83ed7bedd1e195f9f3b4a323cbc
+SHA1 (patch-services_plugins_dndcp_dndUIX11.cpp) = 43107436e7bed9aa32786af42ba5fd0abd7c3337
SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = 61acce40961ac82b48e055c159efd0c3b7a8899c
SHA1 (patch-services_plugins_timeSync_Makefile.am) = 45a9c9044f1e4274c173d822a74dfc63bde0f5e9
SHA1 (patch-services_vmtoolsd_Makefile.am) = 8a34599f5bd9722333de1ecf741a27a0636104c5
Added files:
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_copyPasteUIX11.cpp
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_copyPasteUIX11.cpp:1.1
--- /dev/null Fri Dec 16 00:04:03 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_copyPasteUIX11.cpp Fri Dec 16 00:04:03 2016
@@ -0,0 +1,96 @@
+$NetBSD: patch-services_plugins_dndcp_copyPasteUIX11.cpp,v 1.1 2016/12/16 00:04:03 joerg Exp $
+
+Avoid User-defined Literals in C++11.
+
+--- services/plugins/dndcp/copyPasteUIX11.cpp.orig 2016-12-15 15:01:19.828851463 +0000
++++ services/plugins/dndcp/copyPasteUIX11.cpp
+@@ -214,7 +214,7 @@ CopyPasteUIX11::~CopyPasteUIX11()
+ !mHGStagingDir.empty()) {
+ uint64 totalSize = File_GetSizeEx(mHGStagingDir.c_str());
+ if (mTotalFileSize != totalSize) {
+- g_debug("%s: deleting %s, expecting %"FMT64"d, finished %"FMT64"d\n",
++ g_debug("%s: deleting %s, expecting %" FMT64 "d, finished %" FMT64 "d\n",
+ __FUNCTION__, mHGStagingDir.c_str(),
+ mTotalFileSize, totalSize);
+ DnD_DeleteStagingFiles(mHGStagingDir.c_str(), FALSE);
+@@ -552,7 +552,7 @@ CopyPasteUIX11::LocalGetTextOrRTFRequest
+ return;
+ }
+
+- g_debug("%s: providing RTF data, size %"FMTSZ"u\n",
++ g_debug("%s: providing RTF data, size %" FMTSZ "u\n",
+ __FUNCTION__, mHGRTFData.size());
+
+ sd.set(target.c_str(), mHGRTFData.c_str());
+@@ -566,7 +566,7 @@ CopyPasteUIX11::LocalGetTextOrRTFRequest
+ g_debug("%s: Can not get valid text data\n", __FUNCTION__);
+ return;
+ }
+- g_debug("%s: providing plain text, size %"FMTSZ"u\n",
++ g_debug("%s: providing plain text, size %" FMTSZ "u\n",
+ __FUNCTION__, mHGTextData.bytes());
+
+ sd.set(target.c_str(), mHGTextData.c_str());
+@@ -743,7 +743,7 @@ again:
+ CPClipboard_SetItem(&mClipboard, CPFORMAT_IMG_PNG,
+ buf, bufSize)) {
+ validDataInClip = true;
+- g_debug("%s: Got PNG: %"FMTSZ"u\n", __FUNCTION__, bufSize);
++ g_debug("%s: Got PNG: %" FMTSZ "u\n", __FUNCTION__, bufSize);
+ } else {
+ g_debug("%s: Failed to get PNG\n", __FUNCTION__);
+ }
+@@ -796,7 +796,7 @@ again:
+ CPClipboard_SetItem(&mClipboard, CPFORMAT_TEXT,
+ (const void *)str.data(), bufSize + 1)) {
+ validDataInClip = true;
+- g_debug("%s: Got TEXT: %"FMTSZ"u\n", __FUNCTION__, bufSize);
++ g_debug("%s: Got TEXT: %" FMTSZ "u\n", __FUNCTION__, bufSize);
+ } else {
+ g_debug("%s: Failed to get TEXT\n", __FUNCTION__);
+ }
+@@ -1031,7 +1031,7 @@ CopyPasteUIX11::LocalGetSelectionFileLis
+
+ DynBuf_Init(&buf);
+ fileList.SetFileSize(totalSize);
+- g_debug("%s: totalSize is %"FMT64"u\n", __FUNCTION__, totalSize);
++ g_debug("%s: totalSize is %" FMT64 "u\n", __FUNCTION__, totalSize);
+ fileList.ToCPClipboard(&buf, false);
+ CPClipboard_SetItem(&mClipboard, CPFORMAT_FILELIST, DynBuf_Get(&buf),
+ DynBuf_GetSize(&buf));
+@@ -1198,7 +1198,7 @@ CopyPasteUIX11::GetRemoteClipboardCB(con
+ * accept paste.
+ */
+ if (CPClipboard_GetItem(clip, CPFORMAT_RTF, &buf, &sz)) {
+- g_debug("%s: RTF data, size %"FMTSZ"u.\n", __FUNCTION__, sz);
++ g_debug("%s: RTF data, size %" FMTSZ "u.\n", __FUNCTION__, sz);
+ Gtk::TargetEntry appRtf(TARGET_NAME_APPLICATION_RTF);
+ Gtk::TargetEntry textRtf(TARGET_NAME_TEXT_RICHTEXT);
+
+@@ -1214,7 +1214,7 @@ CopyPasteUIX11::GetRemoteClipboardCB(con
+ Gtk::TargetEntry utf8Text(TARGET_NAME_UTF8_STRING);
+ Gtk::TargetEntry compountText(TARGET_NAME_COMPOUND_TEXT);
+
+- g_debug("%s: Text data, size %"FMTSZ"u.\n", __FUNCTION__, sz);
++ g_debug("%s: Text data, size %" FMTSZ "u.\n", __FUNCTION__, sz);
+ targets.push_back(stringText);
+ targets.push_back(plainText);
+ targets.push_back(utf8Text);
+@@ -1234,7 +1234,7 @@ CopyPasteUIX11::GetRemoteClipboardCB(con
+ }
+
+ if (CPClipboard_GetItem(clip, CPFORMAT_IMG_PNG, &buf, &sz)) {
+- g_debug("%s: PNG data, size %"FMTSZ"u.\n", __FUNCTION__, sz);
++ g_debug("%s: PNG data, size %" FMTSZ "u.\n", __FUNCTION__, sz);
+ /* Try to load buf into pixbuf, and write to local clipboard. */
+ try {
+ Glib::RefPtr<Gdk::PixbufLoader> loader = Gdk::PixbufLoader::create();
+@@ -1388,7 +1388,7 @@ CopyPasteUIX11::LocalPrepareFileContents
+
+ if (!fileItem[i].cpName.cpName_val ||
+ 0 == fileItem[i].cpName.cpName_len) {
+- g_debug("%s: invalid fileItem[%"FMTSZ"u].cpName.\n", __FUNCTION__, i);
++ g_debug("%s: invalid fileItem[%" FMTSZ "u].cpName.\n", __FUNCTION__, i);
+ goto exit;
+ }
+
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dndUIX11.cpp
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dndUIX11.cpp:1.1
--- /dev/null Fri Dec 16 00:04:03 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dndUIX11.cpp Fri Dec 16 00:04:03 2016
@@ -0,0 +1,59 @@
+$NetBSD: patch-services_plugins_dndcp_dndUIX11.cpp,v 1.1 2016/12/16 00:04:03 joerg Exp $
+
+Avoid User-defined Literals in C++11.
+
+--- services/plugins/dndcp/dndUIX11.cpp.orig 2016-12-15 15:03:55.031323362 +0000
++++ services/plugins/dndcp/dndUIX11.cpp
+@@ -128,7 +128,7 @@ DnDUIX11::~DnDUIX11()
+ && !mHGStagingDir.empty()) {
+ uint64 totalSize = File_GetSizeEx(mHGStagingDir.c_str());
+ if (mTotalFileSize != totalSize) {
+- g_debug("%s: deleting %s, expecting %"FMT64"d, finished %"FMT64"d\n",
++ g_debug("%s: deleting %s, expecting %" FMT64 "d, finished %" FMT64 "d\n",
+ __FUNCTION__, mHGStagingDir.c_str(),
+ mTotalFileSize, totalSize);
+ DnD_DeleteStagingFiles(mHGStagingDir.c_str(), FALSE);
+@@ -1125,14 +1125,14 @@ DnDUIX11::OnGtkDragDataGet(
+
+ if ( TargetIsPlainText(target)
+ && CPClipboard_GetItem(&mClipboard, CPFORMAT_TEXT, &buf, &sz)) {
+- g_debug("%s: providing plain text, size %"FMTSZ"u\n", __FUNCTION__, sz);
++ g_debug("%s: providing plain text, size %" FMTSZ "u\n", __FUNCTION__, sz);
+ selection_data.set(target.c_str(), (const char *)buf);
+ return;
+ }
+
+ if ( TargetIsRichText(target)
+ && CPClipboard_GetItem(&mClipboard, CPFORMAT_RTF, &buf, &sz)) {
+- g_debug("%s: providing rtf text, size %"FMTSZ"u\n", __FUNCTION__, sz);
++ g_debug("%s: providing rtf text, size %" FMTSZ "u\n", __FUNCTION__, sz);
+ selection_data.set(target.c_str(), (const char *)buf);
+ return;
+ }
+@@ -1457,7 +1457,7 @@ DnDUIX11::SetCPClipboardFromGtk(const Gt
+ && source.size() < DNDMSG_MAX_ARGSZ
+ && CPClipboard_SetItem(&mClipboard, CPFORMAT_TEXT, source.c_str(),
+ source.size() + 1)) {
+- g_debug("%s: Got text, size %"FMTSZ"u\n", __FUNCTION__, source.size());
++ g_debug("%s: Got text, size %" FMTSZ "u\n", __FUNCTION__, source.size());
+ } else {
+ g_debug("%s: Failed to get text\n", __FUNCTION__);
+ return false;
+@@ -1473,7 +1473,7 @@ DnDUIX11::SetCPClipboardFromGtk(const Gt
+ && source.size() < DNDMSG_MAX_ARGSZ
+ && CPClipboard_SetItem(&mClipboard, CPFORMAT_RTF, source.c_str(),
+ source.size() + 1)) {
+- g_debug("%s: Got RTF, size %"FMTSZ"u\n", __FUNCTION__, source.size());
++ g_debug("%s: Got RTF, size %" FMTSZ "u\n", __FUNCTION__, source.size());
+ return true;
+ } else {
+ g_debug("%s: Failed to get text\n", __FUNCTION__ );
+@@ -2229,7 +2229,7 @@ DnDUIX11::WriteFileContentsToStagingDir(
+
+ if (!fileItem[i].cpName.cpName_val ||
+ 0 == fileItem[i].cpName.cpName_len) {
+- g_debug("%s: invalid fileItem[%"FMTSZ"u].cpName.\n", __FUNCTION__, i);
++ g_debug("%s: invalid fileItem[%" FMTSZ "u].cpName.\n", __FUNCTION__, i);
+ goto exit;
+ }
+
Home |
Main Index |
Thread Index |
Old Index