[arch-commits] Commit in open-vm-tools/repos/community-x86_64 (8 files)

Christian Hesse eworm at archlinux.org
Sun Dec 15 19:44:58 UTC 2019


    Date: Sunday, December 15, 2019 @ 19:44:57
  Author: eworm
Revision: 537812

archrelease: copy trunk to community-x86_64

Added:
  open-vm-tools/repos/community-x86_64/0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
    (from rev 537811, open-vm-tools/trunk/0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch)
  open-vm-tools/repos/community-x86_64/PKGBUILD
    (from rev 537811, open-vm-tools/trunk/PKGBUILD)
  open-vm-tools/repos/community-x86_64/vmtoolsd.service
    (from rev 537811, open-vm-tools/trunk/vmtoolsd.service)
  open-vm-tools/repos/community-x86_64/vmware-vmblock-fuse.service
    (from rev 537811, open-vm-tools/trunk/vmware-vmblock-fuse.service)
Deleted:
  open-vm-tools/repos/community-x86_64/0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
  open-vm-tools/repos/community-x86_64/PKGBUILD
  open-vm-tools/repos/community-x86_64/vmtoolsd.service
  open-vm-tools/repos/community-x86_64/vmware-vmblock-fuse.service

----------------------------------------------------------+
 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch |  174 ++++++-------
 PKGBUILD                                                 |  130 ++++-----
 vmtoolsd.service                                         |   18 -
 vmware-vmblock-fuse.service                              |   24 -
 4 files changed, 173 insertions(+), 173 deletions(-)

Deleted: 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
===================================================================
--- 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch	2019-12-15 19:44:53 UTC (rev 537811)
+++ 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch	2019-12-15 19:44:57 UTC (rev 537812)
@@ -1,87 +0,0 @@
-From 89c0d444567eb525e8d083fb564c46d68e96660c Mon Sep 17 00:00:00 2001
-From: Oliver Kurth <okurth at vmware.com>
-Date: Mon, 30 Sep 2019 16:24:27 -0700
-Subject: [PATCH] GitHub Issue #367. Remove references to deprecated
- G_INLINE_FUNC.
-
-G_INLINE_FUNC was a work-around for compilers that didn't support
-static inline.  Change uses of it to static inline.
----
- open-vm-tools/lib/include/vmware/tools/plugin.h     | 2 +-
- open-vm-tools/lib/include/vmware/tools/threadPool.h | 8 ++++----
- open-vm-tools/lib/include/vmware/tools/utils.h      | 9 ---------
- 3 files changed, 5 insertions(+), 14 deletions(-)
-
-diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h
-index f9acc6a29..deefd1f3d 100644
---- a/open-vm-tools/lib/include/vmware/tools/plugin.h
-+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h
-@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx {
-  *
-  * @return TRUE if COM is initialized when the function returns.
-  */
--G_INLINE_FUNC gboolean
-+static inline gboolean
- ToolsCore_InitializeCOM(ToolsAppCtx *ctx)
- {
-    if (!ctx->comInitialized) {
-diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h
-index 3f2082b3e..5880fbcff 100644
---- a/open-vm-tools/lib/include/vmware/tools/threadPool.h
-+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h
-@@ -91,7 +91,7 @@ typedef struct ToolsCorePool {
-  *******************************************************************************
-  */
- 
--G_INLINE_FUNC ToolsCorePool *
-+static inline ToolsCorePool *
- ToolsCorePool_GetPool(ToolsAppCtx *ctx)
- {
-    ToolsCorePool *pool = NULL;
-@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
-  *******************************************************************************
-  */
- 
--G_INLINE_FUNC guint
-+static inline guint
- ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
-                          ToolsCorePoolCb cb,
-                          gpointer data,
-@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
-  *******************************************************************************
-  */
- 
--G_INLINE_FUNC void
-+static inline void
- ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
-                          guint taskId)
- {
-@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
-  *******************************************************************************
-  */
- 
--G_INLINE_FUNC gboolean
-+static inline gboolean
- ToolsCorePool_StartThread(ToolsAppCtx *ctx,
-                           const gchar *threadName,
-                           ToolsCorePoolCb cb,
-diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h
-index f65745906..a3292d5c0 100644
---- a/open-vm-tools/lib/include/vmware/tools/utils.h
-+++ b/open-vm-tools/lib/include/vmware/tools/utils.h
-@@ -51,15 +51,6 @@
- #  include <sys/time.h>
- #endif
- 
--
--/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */
--#if defined(G_PLATFORM_WIN32)
--#  if defined(G_INLINE_FUNC)
--#     undef G_INLINE_FUNC
--#  endif
--#  define G_INLINE_FUNC static __inline
--#endif
--
- #ifndef ABS
- #  define ABS(x) (((x) >= 0) ? (x) : -(x))
- #endif

Copied: open-vm-tools/repos/community-x86_64/0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch (from rev 537811, open-vm-tools/trunk/0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch)
===================================================================
--- 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch	                        (rev 0)
+++ 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch	2019-12-15 19:44:57 UTC (rev 537812)
@@ -0,0 +1,87 @@
+From 89c0d444567eb525e8d083fb564c46d68e96660c Mon Sep 17 00:00:00 2001
+From: Oliver Kurth <okurth at vmware.com>
+Date: Mon, 30 Sep 2019 16:24:27 -0700
+Subject: [PATCH] GitHub Issue #367. Remove references to deprecated
+ G_INLINE_FUNC.
+
+G_INLINE_FUNC was a work-around for compilers that didn't support
+static inline.  Change uses of it to static inline.
+---
+ open-vm-tools/lib/include/vmware/tools/plugin.h     | 2 +-
+ open-vm-tools/lib/include/vmware/tools/threadPool.h | 8 ++++----
+ open-vm-tools/lib/include/vmware/tools/utils.h      | 9 ---------
+ 3 files changed, 5 insertions(+), 14 deletions(-)
+
+diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h
+index f9acc6a29..deefd1f3d 100644
+--- a/open-vm-tools/lib/include/vmware/tools/plugin.h
++++ b/open-vm-tools/lib/include/vmware/tools/plugin.h
+@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx {
+  *
+  * @return TRUE if COM is initialized when the function returns.
+  */
+-G_INLINE_FUNC gboolean
++static inline gboolean
+ ToolsCore_InitializeCOM(ToolsAppCtx *ctx)
+ {
+    if (!ctx->comInitialized) {
+diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h
+index 3f2082b3e..5880fbcff 100644
+--- a/open-vm-tools/lib/include/vmware/tools/threadPool.h
++++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h
+@@ -91,7 +91,7 @@ typedef struct ToolsCorePool {
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC ToolsCorePool *
++static inline ToolsCorePool *
+ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
+ {
+    ToolsCorePool *pool = NULL;
+@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC guint
++static inline guint
+ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
+                          ToolsCorePoolCb cb,
+                          gpointer data,
+@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC void
++static inline void
+ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
+                          guint taskId)
+ {
+@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC gboolean
++static inline gboolean
+ ToolsCorePool_StartThread(ToolsAppCtx *ctx,
+                           const gchar *threadName,
+                           ToolsCorePoolCb cb,
+diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h
+index f65745906..a3292d5c0 100644
+--- a/open-vm-tools/lib/include/vmware/tools/utils.h
++++ b/open-vm-tools/lib/include/vmware/tools/utils.h
+@@ -51,15 +51,6 @@
+ #  include <sys/time.h>
+ #endif
+ 
+-
+-/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */
+-#if defined(G_PLATFORM_WIN32)
+-#  if defined(G_INLINE_FUNC)
+-#     undef G_INLINE_FUNC
+-#  endif
+-#  define G_INLINE_FUNC static __inline
+-#endif
+-
+ #ifndef ABS
+ #  define ABS(x) (((x) >= 0) ? (x) : -(x))
+ #endif

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-15 19:44:53 UTC (rev 537811)
+++ PKGBUILD	2019-12-15 19:44:57 UTC (rev 537812)
@@ -1,65 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Krzysztof Raczkowski <raczkow at gmail.com>
-
-pkgname=open-vm-tools
-epoch=6
-pkgver=11.0.0
-pkgrel=1
-pkgdesc='The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools'
-arch=('x86_64')
-url='https://github.com/vmware/open-vm-tools'
-license=('LGPL')
-depends=('libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss'
-         'iproute2' 'fuse2' 'lsb-release' 'libmspack')
-makedepends=('chrpath' 'doxygen' 'gtkmm3' 'libxtst' 'python' 'rpcsvc-proto')
-optdepends=('gtkmm3: DnD/CP plugin'
-            'libxtst: DnD/CP, resolution set plugins'
-            'netctl: suspend-resume network state'
-            'networkmanager: suspend-resume network state')
-backup=('etc/xdg/autostart/vmware-user.desktop')
-options=('docs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/vmware/open-vm-tools/archive/stable-${pkgver/_/-}.tar.gz"
-        '0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch'
-        'vmtoolsd.service'
-        'vmware-vmblock-fuse.service')
-sha256sums=('e5c1929cef0fe6db76c8e5700a2160c31020651ab7a0618d5ac402d8e50d2ac7'
-            'c97484a15dbc65d7eb14bbd96dd3785e2a1a130a44e3950f9865a988c28bc137'
-            '5a9403f78356873258521644068f2c9639b994d5954e5ad953934136822b2689'
-            '99e3cc1da20a751049144cc02dec77174a55109b5b5960e1facd78709da7724f')
-
-prepare() {
-  cd "$srcdir/$pkgname-stable-${pkgver}/"
-
-  patch -Np1 < ../0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
-}
-
-build() {
-  cd "$srcdir/$pkgname-stable-${pkgver}/open-vm-tools/"
-
-  autoreconf -vi
-  sh ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --with-udev-rules-dir=/usr/lib/udev/rules.d \
-    --without-xmlsecurity \
-    --without-kernel-modules
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-stable-${pkgver}/open-vm-tools/"
-
-  make install DESTDIR="$pkgdir"
-  chmod 7755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper
-
-  # install vmware-xdg-detect-de
-  install -D -m0755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de
-
-  # We don't want a symlink in /sbin
-  rm "$pkgdir"/sbin/mount.vmhgfs
-  rmdir "$pkgdir"/sbin
-
-  # install systemd files
-  install -D -m0644 "$srcdir"/vmtoolsd.service "$pkgdir"/usr/lib/systemd/system/vmtoolsd.service
-  install -D -m0644 "$srcdir"/vmware-vmblock-fuse.service "$pkgdir"/usr/lib/systemd/system/vmware-vmblock-fuse.service
-}

Copied: open-vm-tools/repos/community-x86_64/PKGBUILD (from rev 537811, open-vm-tools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-15 19:44:57 UTC (rev 537812)
@@ -0,0 +1,65 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Krzysztof Raczkowski <raczkow at gmail.com>
+
+pkgname=open-vm-tools
+epoch=6
+pkgver=11.0.1
+pkgrel=1
+pkgdesc='The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools'
+arch=('x86_64')
+url='https://github.com/vmware/open-vm-tools'
+license=('LGPL')
+depends=('libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss'
+         'iproute2' 'fuse2' 'lsb-release' 'libmspack')
+makedepends=('chrpath' 'doxygen' 'gtkmm3' 'libxtst' 'python' 'rpcsvc-proto')
+optdepends=('gtkmm3: DnD/CP plugin'
+            'libxtst: DnD/CP, resolution set plugins'
+            'netctl: suspend-resume network state'
+            'networkmanager: suspend-resume network state')
+backup=('etc/xdg/autostart/vmware-user.desktop')
+options=('docs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vmware/open-vm-tools/archive/stable-${pkgver/_/-}.tar.gz"
+        '0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch'
+        'vmtoolsd.service'
+        'vmware-vmblock-fuse.service')
+sha256sums=('99f1e3c5245bb002c1e66cbb7a1078e1c3567db5f92cc2e00ab08557e9df4758'
+            'c97484a15dbc65d7eb14bbd96dd3785e2a1a130a44e3950f9865a988c28bc137'
+            '5a9403f78356873258521644068f2c9639b994d5954e5ad953934136822b2689'
+            '99e3cc1da20a751049144cc02dec77174a55109b5b5960e1facd78709da7724f')
+
+prepare() {
+  cd "$srcdir/$pkgname-stable-${pkgver}/"
+
+  patch -Np1 < ../0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-stable-${pkgver}/open-vm-tools/"
+
+  autoreconf -vi
+  sh ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-udev-rules-dir=/usr/lib/udev/rules.d \
+    --without-xmlsecurity \
+    --without-kernel-modules
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-stable-${pkgver}/open-vm-tools/"
+
+  make install DESTDIR="$pkgdir"
+  chmod 7755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper
+
+  # install vmware-xdg-detect-de
+  install -D -m0755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de
+
+  # We don't want a symlink in /sbin
+  rm "$pkgdir"/sbin/mount.vmhgfs
+  rmdir "$pkgdir"/sbin
+
+  # install systemd files
+  install -D -m0644 "$srcdir"/vmtoolsd.service "$pkgdir"/usr/lib/systemd/system/vmtoolsd.service
+  install -D -m0644 "$srcdir"/vmware-vmblock-fuse.service "$pkgdir"/usr/lib/systemd/system/vmware-vmblock-fuse.service
+}

Deleted: vmtoolsd.service
===================================================================
--- vmtoolsd.service	2019-12-15 19:44:53 UTC (rev 537811)
+++ vmtoolsd.service	2019-12-15 19:44:57 UTC (rev 537812)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Open Virtual Machine Tools (VMware Tools)
-ConditionVirtualization=vmware
-
-[Service]
-ExecStart=/usr/bin/vmtoolsd
-
-[Install]
-WantedBy=multi-user.target

Copied: open-vm-tools/repos/community-x86_64/vmtoolsd.service (from rev 537811, open-vm-tools/trunk/vmtoolsd.service)
===================================================================
--- vmtoolsd.service	                        (rev 0)
+++ vmtoolsd.service	2019-12-15 19:44:57 UTC (rev 537812)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Open Virtual Machine Tools (VMware Tools)
+ConditionVirtualization=vmware
+
+[Service]
+ExecStart=/usr/bin/vmtoolsd
+
+[Install]
+WantedBy=multi-user.target

Deleted: vmware-vmblock-fuse.service
===================================================================
--- vmware-vmblock-fuse.service	2019-12-15 19:44:53 UTC (rev 537811)
+++ vmware-vmblock-fuse.service	2019-12-15 19:44:57 UTC (rev 537812)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Open Virtual Machine Tools (vmware-vmblock-fuse)
-ConditionVirtualization=vmware
-
-[Service]
-Type=simple
-RuntimeDirectory=vmblock-fuse
-RuntimeDirectoryMode=755
-ExecStart=/usr/bin/vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
-
-[Install]
-WantedBy=multi-user.target

Copied: open-vm-tools/repos/community-x86_64/vmware-vmblock-fuse.service (from rev 537811, open-vm-tools/trunk/vmware-vmblock-fuse.service)
===================================================================
--- vmware-vmblock-fuse.service	                        (rev 0)
+++ vmware-vmblock-fuse.service	2019-12-15 19:44:57 UTC (rev 537812)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Open Virtual Machine Tools (vmware-vmblock-fuse)
+ConditionVirtualization=vmware
+
+[Service]
+Type=simple
+RuntimeDirectory=vmblock-fuse
+RuntimeDirectoryMode=755
+ExecStart=/usr/bin/vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
+
+[Install]
+WantedBy=multi-user.target


More information about the arch-commits mailing list