[arch-commits] Commit in deepin-file-manager/repos (6 files)

Felix Yan felixonmars at archlinux.org
Mon Jul 31 15:16:41 UTC 2017


    Date: Monday, July 31, 2017 @ 15:16:40
  Author: felixonmars
Revision: 247132

archrelease: copy trunk to community-i686, community-x86_64

Added:
  deepin-file-manager/repos/community-i686/PKGBUILD
    (from rev 247131, deepin-file-manager/trunk/PKGBUILD)
  deepin-file-manager/repos/community-i686/remove-unimplemented-slots.patch
    (from rev 247131, deepin-file-manager/trunk/remove-unimplemented-slots.patch)
  deepin-file-manager/repos/community-x86_64/PKGBUILD
    (from rev 247131, deepin-file-manager/trunk/PKGBUILD)
  deepin-file-manager/repos/community-x86_64/remove-unimplemented-slots.patch
    (from rev 247131, deepin-file-manager/trunk/remove-unimplemented-slots.patch)
Deleted:
  deepin-file-manager/repos/community-i686/PKGBUILD
  deepin-file-manager/repos/community-x86_64/PKGBUILD

---------------------------------------------------+
 /PKGBUILD                                         |   82 ++++++++++++++++++++
 community-i686/PKGBUILD                           |   34 --------
 community-i686/remove-unimplemented-slots.patch   |   24 +++++
 community-x86_64/PKGBUILD                         |   34 --------
 community-x86_64/remove-unimplemented-slots.patch |   24 +++++
 5 files changed, 130 insertions(+), 68 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-07-31 15:16:13 UTC (rev 247131)
+++ community-i686/PKGBUILD	2017-07-31 15:16:40 UTC (rev 247132)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-file-manager
-pkgver=4.2.2
-pkgrel=1
-epoch=1
-pkgdesc='Deepin File Manager'
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/dde-file-manager"
-license=('GPL3')
-depends=('deepin-tool-kit' 'gtk2' 'gsettings-qt' 'libsecret' 'qt5-svg' 'file' 'polkit-qt5'
-         'deepin-shortcut-viewer' 'poppler' 'ffmpegthumbnailer' 'deepin-manual' 'file-roller'
-         'deepin-qt-dbus-factory' 'treefrog-framework' 'deepin-terminal' 'gst-plugins-good' 'mpv')
-makedepends=('qt5-tools' 'deepin-dock' 'deepin-gettext-tools')
-groups=('deepin')
-provides=('deepin-desktop')
-conflicts=('deepin-desktop')
-replaces=('deepin-desktop')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz")
-sha512sums=('07a1814f97c5abf63d9800453ec38fbb5d60b9ec1eae3e3be282c076f3a88e0f74399de1a965fbc3c234617aa2584be05caa47a6def486fb792810932f61aafb')
-
-build() {
-  cd dde-file-manager-$pkgver
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=
-  make
-}
-
-package() {
-  cd dde-file-manager-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: deepin-file-manager/repos/community-i686/PKGBUILD (from rev 247131, deepin-file-manager/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-07-31 15:16:40 UTC (rev 247132)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-file-manager
+pkgver=4.2.2
+pkgrel=2
+epoch=1
+pkgdesc='Deepin File Manager'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/dde-file-manager"
+license=('GPL3')
+depends=('deepin-tool-kit' 'gtk2' 'gsettings-qt' 'libsecret' 'qt5-svg' 'file' 'polkit-qt5'
+         'deepin-shortcut-viewer' 'poppler' 'ffmpegthumbnailer' 'deepin-manual' 'file-roller'
+         'deepin-qt-dbus-factory' 'treefrog-framework' 'deepin-terminal' 'gst-plugins-good' 'mpv')
+makedepends=('qt5-tools' 'deepin-dock' 'deepin-gettext-tools')
+groups=('deepin')
+provides=('deepin-desktop')
+conflicts=('deepin-desktop')
+replaces=('deepin-desktop')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
+        remove-unimplemented-slots.patch)
+sha512sums=('07a1814f97c5abf63d9800453ec38fbb5d60b9ec1eae3e3be282c076f3a88e0f74399de1a965fbc3c234617aa2584be05caa47a6def486fb792810932f61aafb'
+            '73c7a008322fa771f7d0defae487461e4ec9c6c08c02160df985653b320bcb47a353e7a16b7407c5516077f8aa4e059ddb2d11db5f39f94b7fc1b0f88f9ddbb6')
+
+prepare() {
+  cd dde-file-manager-$pkgver
+  patch -p1 -i ../remove-unimplemented-slots.patch
+}
+
+build() {
+  cd dde-file-manager-$pkgver
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=
+  make
+}
+
+package() {
+  cd dde-file-manager-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Copied: deepin-file-manager/repos/community-i686/remove-unimplemented-slots.patch (from rev 247131, deepin-file-manager/trunk/remove-unimplemented-slots.patch)
===================================================================
--- community-i686/remove-unimplemented-slots.patch	                        (rev 0)
+++ community-i686/remove-unimplemented-slots.patch	2017-07-31 15:16:40 UTC (rev 247132)
@@ -0,0 +1,24 @@
+commit fba6ea12ec4d7f9c547d61fb76bc48710fc98f55
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Mon Jul 31 13:06:16 2017 +0800
+
+    Remove unimplemented slots
+    
+    The names are not used, and defining them in the headers will break
+    plugin loading with CXXFLAGS -fno-plt and LDFLAGS -z,now enabled,
+    causing a symbol not found error.
+    
+    Change-Id: I23c0cddbb856f645008c0306bf3ecefd27cae61f
+
+diff --git a/dde-dock-plugins/disk-mount/diskcontrolwidget.h b/dde-dock-plugins/disk-mount/diskcontrolwidget.h
+index e0d07048..56017cd3 100644
+--- a/dde-dock-plugins/disk-mount/diskcontrolwidget.h
++++ b/dde-dock-plugins/disk-mount/diskcontrolwidget.h
+@@ -31,7 +31,6 @@ private slots:
+     void onVolume_removed(const QDiskInfo &diskInfo);
+     void onVolume_changed(const QDiskInfo &diskInfo);
+     void unmountDisk(const QString &diskId) const;
+-    void addMountDiskInfo(const QDiskInfo &diskInfo);
+ 
+ private:
+     QVBoxLayout *m_centralLayout;

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-07-31 15:16:13 UTC (rev 247131)
+++ community-x86_64/PKGBUILD	2017-07-31 15:16:40 UTC (rev 247132)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-file-manager
-pkgver=4.2.2
-pkgrel=1
-epoch=1
-pkgdesc='Deepin File Manager'
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/dde-file-manager"
-license=('GPL3')
-depends=('deepin-tool-kit' 'gtk2' 'gsettings-qt' 'libsecret' 'qt5-svg' 'file' 'polkit-qt5'
-         'deepin-shortcut-viewer' 'poppler' 'ffmpegthumbnailer' 'deepin-manual' 'file-roller'
-         'deepin-qt-dbus-factory' 'treefrog-framework' 'deepin-terminal' 'gst-plugins-good' 'mpv')
-makedepends=('qt5-tools' 'deepin-dock' 'deepin-gettext-tools')
-groups=('deepin')
-provides=('deepin-desktop')
-conflicts=('deepin-desktop')
-replaces=('deepin-desktop')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz")
-sha512sums=('07a1814f97c5abf63d9800453ec38fbb5d60b9ec1eae3e3be282c076f3a88e0f74399de1a965fbc3c234617aa2584be05caa47a6def486fb792810932f61aafb')
-
-build() {
-  cd dde-file-manager-$pkgver
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=
-  make
-}
-
-package() {
-  cd dde-file-manager-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: deepin-file-manager/repos/community-x86_64/PKGBUILD (from rev 247131, deepin-file-manager/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-07-31 15:16:40 UTC (rev 247132)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-file-manager
+pkgver=4.2.2
+pkgrel=2
+epoch=1
+pkgdesc='Deepin File Manager'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/dde-file-manager"
+license=('GPL3')
+depends=('deepin-tool-kit' 'gtk2' 'gsettings-qt' 'libsecret' 'qt5-svg' 'file' 'polkit-qt5'
+         'deepin-shortcut-viewer' 'poppler' 'ffmpegthumbnailer' 'deepin-manual' 'file-roller'
+         'deepin-qt-dbus-factory' 'treefrog-framework' 'deepin-terminal' 'gst-plugins-good' 'mpv')
+makedepends=('qt5-tools' 'deepin-dock' 'deepin-gettext-tools')
+groups=('deepin')
+provides=('deepin-desktop')
+conflicts=('deepin-desktop')
+replaces=('deepin-desktop')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
+        remove-unimplemented-slots.patch)
+sha512sums=('07a1814f97c5abf63d9800453ec38fbb5d60b9ec1eae3e3be282c076f3a88e0f74399de1a965fbc3c234617aa2584be05caa47a6def486fb792810932f61aafb'
+            '73c7a008322fa771f7d0defae487461e4ec9c6c08c02160df985653b320bcb47a353e7a16b7407c5516077f8aa4e059ddb2d11db5f39f94b7fc1b0f88f9ddbb6')
+
+prepare() {
+  cd dde-file-manager-$pkgver
+  patch -p1 -i ../remove-unimplemented-slots.patch
+}
+
+build() {
+  cd dde-file-manager-$pkgver
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=
+  make
+}
+
+package() {
+  cd dde-file-manager-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Copied: deepin-file-manager/repos/community-x86_64/remove-unimplemented-slots.patch (from rev 247131, deepin-file-manager/trunk/remove-unimplemented-slots.patch)
===================================================================
--- community-x86_64/remove-unimplemented-slots.patch	                        (rev 0)
+++ community-x86_64/remove-unimplemented-slots.patch	2017-07-31 15:16:40 UTC (rev 247132)
@@ -0,0 +1,24 @@
+commit fba6ea12ec4d7f9c547d61fb76bc48710fc98f55
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Mon Jul 31 13:06:16 2017 +0800
+
+    Remove unimplemented slots
+    
+    The names are not used, and defining them in the headers will break
+    plugin loading with CXXFLAGS -fno-plt and LDFLAGS -z,now enabled,
+    causing a symbol not found error.
+    
+    Change-Id: I23c0cddbb856f645008c0306bf3ecefd27cae61f
+
+diff --git a/dde-dock-plugins/disk-mount/diskcontrolwidget.h b/dde-dock-plugins/disk-mount/diskcontrolwidget.h
+index e0d07048..56017cd3 100644
+--- a/dde-dock-plugins/disk-mount/diskcontrolwidget.h
++++ b/dde-dock-plugins/disk-mount/diskcontrolwidget.h
+@@ -31,7 +31,6 @@ private slots:
+     void onVolume_removed(const QDiskInfo &diskInfo);
+     void onVolume_changed(const QDiskInfo &diskInfo);
+     void unmountDisk(const QString &diskId) const;
+-    void addMountDiskInfo(const QDiskInfo &diskInfo);
+ 
+ private:
+     QVBoxLayout *m_centralLayout;



More information about the arch-commits mailing list