Date: Monday, August 14, 2017 @ 06:10:26 Author: felixonmars Revision: 250180
archrelease: copy trunk to community-i686, community-x86_64 Added: deepin-file-manager/repos/community-i686/PKGBUILD (from rev 250179, deepin-file-manager/trunk/PKGBUILD) deepin-file-manager/repos/community-x86_64/PKGBUILD (from rev 250179, deepin-file-manager/trunk/PKGBUILD) Deleted: deepin-file-manager/repos/community-i686/PKGBUILD deepin-file-manager/repos/community-i686/remove-unimplemented-slots.patch deepin-file-manager/repos/community-x86_64/PKGBUILD deepin-file-manager/repos/community-x86_64/remove-unimplemented-slots.patch ---------------------------------------------------+ /PKGBUILD | 68 ++++++++++++++++++++ community-i686/PKGBUILD | 41 ------------ community-i686/remove-unimplemented-slots.patch | 24 ------- community-x86_64/PKGBUILD | 41 ------------ community-x86_64/remove-unimplemented-slots.patch | 24 ------- 5 files changed, 68 insertions(+), 130 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-08-14 06:09:56 UTC (rev 250179) +++ community-i686/PKGBUILD 2017-08-14 06:10:26 UTC (rev 250180) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@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=3 -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' 'avfs' '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/PKGBUILD (from rev 250179, deepin-file-manager/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-08-14 06:10:26 UTC (rev 250180) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@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.3 +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' 'avfs' '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=('f1bf6cf12e4e9a44612468405c5117f0e31ff9857f8f8cee27d1021b45aa83b5d3bace46c007678b12b1b5dc41352834347409eadca08b26633b6efda4d1e0ad') + +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 +} Deleted: community-i686/remove-unimplemented-slots.patch =================================================================== --- community-i686/remove-unimplemented-slots.patch 2017-08-14 06:09:56 UTC (rev 250179) +++ community-i686/remove-unimplemented-slots.patch 2017-08-14 06:10:26 UTC (rev 250180) @@ -1,24 +0,0 @@ -commit fba6ea12ec4d7f9c547d61fb76bc48710fc98f55 -Author: Felix Yan <felixonm...@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-08-14 06:09:56 UTC (rev 250179) +++ community-x86_64/PKGBUILD 2017-08-14 06:10:26 UTC (rev 250180) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@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=3 -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' 'avfs' '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/PKGBUILD (from rev 250179, deepin-file-manager/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-08-14 06:10:26 UTC (rev 250180) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@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.3 +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' 'avfs' '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=('f1bf6cf12e4e9a44612468405c5117f0e31ff9857f8f8cee27d1021b45aa83b5d3bace46c007678b12b1b5dc41352834347409eadca08b26633b6efda4d1e0ad') + +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 +} Deleted: community-x86_64/remove-unimplemented-slots.patch =================================================================== --- community-x86_64/remove-unimplemented-slots.patch 2017-08-14 06:09:56 UTC (rev 250179) +++ community-x86_64/remove-unimplemented-slots.patch 2017-08-14 06:10:26 UTC (rev 250180) @@ -1,24 +0,0 @@ -commit fba6ea12ec4d7f9c547d61fb76bc48710fc98f55 -Author: Felix Yan <felixonm...@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;