From 731b4c7b7a4d173a10e148bbdaa665811b79864e Mon Sep 17 00:00:00 2001 From: Moritz Schlarb Date: Thu, 10 Jan 2019 11:16:40 +0000 Subject: [PATCH] Import seafile-client_6.2.9-2.debian.tar.xz [dgit import tarball seafile-client 6.2.9-2 seafile-client_6.2.9-2.debian.tar.xz] --- README.Debian | 6 + changelog | 224 ++++++++++++++++++ compat | 1 + control | 49 ++++ copyright | 172 ++++++++++++++ gbp.conf | 8 + gitlab-ci.yml | 16 ++ .../0001-Add-Keywords-to-.desktop-file.patch | 17 ++ patches/0002-Don-t-use-bundled-QuaZip.patch | 70 ++++++ ...gent-approach-for-QtWebEngine-QtWebK.patch | 40 ++++ ...t-close-event-instead-of-ignoring-it.patch | 22 ++ patches/series | 4 + rules | 25 ++ seafile-gui.install | 4 + source/format | 1 + watch | 4 + 16 files changed, 663 insertions(+) create mode 100644 README.Debian create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 gbp.conf create mode 100644 gitlab-ci.yml create mode 100644 patches/0001-Add-Keywords-to-.desktop-file.patch create mode 100644 patches/0002-Don-t-use-bundled-QuaZip.patch create mode 100644 patches/0004-Use-more-intelligent-approach-for-QtWebEngine-QtWebK.patch create mode 100644 patches/0005-Accept-close-event-instead-of-ignoring-it.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 seafile-gui.install create mode 100644 source/format create mode 100644 watch diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000..adf92c9 --- /dev/null +++ b/README.Debian @@ -0,0 +1,6 @@ +Seafile +------- + +For more information about Seafile, please visit http://seafile.com + + -- plt Fri, 30 March 2012 16:43:10 +0800 diff --git a/changelog b/changelog new file mode 100644 index 0000000..213ce54 --- /dev/null +++ b/changelog @@ -0,0 +1,224 @@ +seafile-client (6.2.9-2) unstable; urgency=medium + + * Add Patch from #988: Accept close event instead of ignoring it + + -- Moritz Schlarb Thu, 10 Jan 2019 12:16:40 +0100 + +seafile-client (6.2.9-1) unstable; urgency=medium + + * Add some Files-Excluded to d/copyright + * New upstream version 6.2.9 + + -- Moritz Schlarb Tue, 11 Dec 2018 15:30:07 +0100 + +seafile-client (6.2.7-1) unstable; urgency=medium + + * New upstream version 6.2.7 + + -- Moritz Schlarb Sun, 25 Nov 2018 21:02:28 +0100 + +seafile-client (6.2.5-6) unstable; urgency=medium + + * Add Salsa Pipeline (https://salsa.debian.org/salsa-ci-team/pipeline) + * Be more strict and explicit about dependency versions. + * Remove DEP-8 Test Suite for now. + + -- Moritz Schlarb Mon, 12 Nov 2018 14:55:54 +0100 + +seafile-client (6.2.5-5) unstable; urgency=medium + + * Fix DEP-8 test suite + + -- Moritz Schlarb Fri, 09 Nov 2018 21:03:42 +0100 + +seafile-client (6.2.5-4) unstable; urgency=medium + + * Use more intelligent approach for QtWebEngine/QtWebKit detection + * Add basic (superficial) autopkgtest suite + + -- Moritz Schlarb Fri, 09 Nov 2018 12:38:41 +0100 + +seafile-client (6.2.5-3) unstable; urgency=medium + + * Explicitly list arch-dependent dependencies on qtwebengine or qtwebkit + + -- Moritz Schlarb Fri, 09 Nov 2018 09:31:12 +0100 + +seafile-client (6.2.5-2) unstable; urgency=medium + + * Allow building with qtwebkit when qtwebengine is not available + - should fix builds for armel, mips, mips64el, ppc64el, s390x et. al. + + -- Moritz Schlarb Thu, 08 Nov 2018 21:58:18 +0100 + +seafile-client (6.2.5-1) unstable; urgency=medium + + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + * d/changelog: Remove trailing whitespaces + + [ Moritz Schlarb ] + * Change Maintainer to Debian Seafile Team + * New upstream version 6.2.5 + * Update Standards-Version + * Update dependency version of libsearpc + + -- Moritz Schlarb Thu, 08 Nov 2018 11:59:07 +0100 + +seafile-client (6.2.4-1) unstable; urgency=medium + + * New upstream version 6.2.4 + + -- Moritz Schlarb Tue, 07 Aug 2018 10:58:27 +0200 + +seafile-client (6.2.0-1) unstable; urgency=medium + + * New upstream version 6.2.0 + * Use qtwebengine instead of qtwebkit + * Build and run test suite + * Remove ccnet dependency and raise versioned deps + + -- Moritz Schlarb Wed, 27 Jun 2018 20:39:54 +0200 + +seafile-client (6.1.8-1) unstable; urgency=medium + + * Add Suggests: seafile-cli + * Streamline d/copyright and d/rules + * New upstream version 6.1.8 + * Don't use bundled QuaZip + + -- Moritz Schlarb Sat, 02 Jun 2018 14:38:58 +0200 + +seafile-client (6.1.7-1) unstable; urgency=medium + + * Move Vcs-* to Salsa + * New upstream version 6.1.7 + * Update and cleanup d/{control,rules} + * Add Patch to add Keywords to .desktop file + + -- Moritz Schlarb Tue, 24 Apr 2018 10:42:38 +0200 + +seafile-client (6.1.5-1) unstable; urgency=medium + + * New upstream version 6.1.5 + + -- Moritz Schlarb Fri, 16 Feb 2018 09:23:40 +0100 + +seafile-client (6.1.4-1) unstable; urgency=medium + + * New upstream version 6.1.4 + + -- Moritz Schlarb Wed, 20 Dec 2017 16:06:11 +0100 + +seafile-client (6.1.3-2) unstable; urgency=medium + + * add OpenSSL 1.1 patch from + https://github.com/haiwen/seafile-client/commit/10feb6038a1197a532cf7e47cbe0a977a72da1b0 + and + https://github.com/haiwen/seafile-client/commit/3a547b8ab392e0419488eb4aa633f9b31f0ccaf4 + (closes: #859716) + + -- Christoph Martin Thu, 23 Nov 2017 15:34:31 +0100 + +seafile-client (6.1.3-1) unstable; urgency=medium + + * New upstream version 6.1.3 + + -- Christoph Martin Tue, 21 Nov 2017 16:18:01 +0100 + +seafile-client (6.1.1-1) unstable; urgency=medium + + * New upstream version 6.1.1 + + -- Moritz Schlarb Mon, 25 Sep 2017 14:28:37 +0200 + +seafile-client (6.1.0-2) unstable; urgency=medium + + * Add patch to remove mismatching icon file + + -- Moritz Schlarb Wed, 09 Aug 2017 15:03:09 +0200 + +seafile-client (6.1.0-1) UNRELEASED; urgency=medium + + * New upstream version 6.1.0 + + -- Moritz Schlarb Tue, 08 Aug 2017 10:32:15 +0200 + +seafile-client (6.0.7-1) unstable; urgency=medium + + * New upstream version 6.0.7 + * Migration from -dbg to -dbgsym packages + * add hardening flags + + -- Christoph Martin Wed, 26 Jul 2017 14:28:48 +0200 + +seafile-client (6.0.6-1) unstable; urgency=medium + + * New upstream version 6.0.6 + + -- Moritz Schlarb Wed, 10 May 2017 15:38:29 +0200 + +seafile-client (6.0.4-1) unstable; urgency=medium + + * New upstream version 6.0.4 + * Fix watch file + + -- Moritz Schlarb Sun, 12 Mar 2017 17:44:47 +0100 + +seafile-client (6.0.1+git20161227.7b0b837-2) unstable; urgency=medium + + * add license statement for fontawesome.ttf + + -- Christoph Martin Thu, 02 Mar 2017 16:21:56 +0100 + +seafile-client (6.0.1+git20161227.7b0b837-1) unstable; urgency=medium + + * initial Debian release + + -- Christoph Martin Wed, 28 Dec 2016 13:17:15 +0100 + +seafile-gui (6.0.1) unstable; urgency=low + + * new upstream release + + -- Jonathan Xu Mon, 12 Dec 2016 14:51:07 +0800 + +seafile-gui (6.0.0) unstable; urgency=low + + * new upstream release + + -- Jonathan Xu Fri, 14 Oct 2016 13:49:07 +0800 + +seafile-gui (5.1.4) unstable; urgency=low + + * new upstream release + + -- Jonathan Xu Fri, 29 Jul 2016 14:06:38 +0800 + +seafile-gui (5.1.3-1ubuntu1) UNRELEASED; urgency=medium + + * new upstream release + + -- m.eik michalke Fri, 01 Jul 2016 00:04:38 +0200 + +seafile-gui (5.1.2-5ubuntu2) unstable; urgency=medium + + * fixed package dependencies + + -- m.eik michalke Sat, 18 Jun 2016 12:20:04 +0200 + +seafile-gui (5.1.2-5ubuntu1) unstable; urgency=medium + + * repackaging with cleaned up orig.tar.xz archives + * improved the debian/control file + + -- m.eik michalke Fri, 17 Jun 2016 19:22:13 +0200 + +seafile-gui (5.1.2-4) unstable; urgency=medium + + * adjusted build dependencies + * updated the debian/copyright notice so people know who's responisble for the packaging + * rewrote the rules file, much simpler now + * prep for release on github + + -- m.eik michalke Thu, 16 Jun 2016 01:06:50 +0200 diff --git a/compat b/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +10 diff --git a/control b/control new file mode 100644 index 0000000..46c522a --- /dev/null +++ b/control @@ -0,0 +1,49 @@ +Source: seafile-client +Maintainer: Debian Seafile Team +Uploaders: Christoph Martin , Moritz Schlarb +Section: net +Priority: optional +Build-Depends: + cmake, + debhelper (>= 10), + intltool, + libcurl4-openssl-dev, + libevent-dev, + libglib2.0-dev, + libjansson-dev, + libquazip5-dev, + libseafile-dev (>= 6.2.0), + libsearpc-dev (>= 3.1.0), + libsqlite3-dev, + libssl-dev, + libtool, + qtbase5-dev, + qtchooser, + qttools5-dev, + qttools5-dev-tools, + qtwebengine5-dev [!armel !mips !mips64el !ppc64el !s390x !alpha !hppa !m68k !powerpc !ppc64 !sh4 !sparc64], + libqt5webkit5-dev [armel mips mips64el ppc64el s390x alpha hppa m68k powerpc ppc64 sh4 sparc64], + uuid-dev, +Standards-Version: 4.2.1 +Homepage: http://seafile.com +Vcs-Browser: https://salsa.debian.org/debian/seafile-client +Vcs-Git: https://salsa.debian.org/debian/seafile-client.git + +Package: seafile-gui +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, + libsearpc1 (>= 3.1.0), + libseafile0 (>= ${source:Upstream-Version}), + seafile-daemon (>= ${source:Upstream-Version}), +Suggests: seafile-cli +Description: Seafile Desktop Client + Seafile is a file syncing and sharing software with file encryption + and group sharing, emphasis on reliability and high performance. + . + Seafile is an open source cloud storage system with privacy protection + and teamwork features. Collections of files are called libraries. Each + library can be synced separately. A library can also be encrypted with + a user chosen password. Seafile also allows users to create groups and + easily sharing files into groups. + . + This package contains the graphical Desktop Client for Seafile. diff --git a/copyright b/copyright new file mode 100644 index 0000000..27a4306 --- /dev/null +++ b/copyright @@ -0,0 +1,172 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: seafile-client +Upstream-Contact: Seafile Ltd. +Source: https://github.com/haiwen/seafile-client +Files-Excluded: appcast.example.xml + third_party/quazip + +Files: * +Copyright: 2012-2018 Seafile Ltd. +License: Apache-2.0 + +Files: fsplugin/FinderSync.h fsplugin/FinderSync.mm + fsplugin/FinderSyncClient.h fsplugin/FinderSyncClient.mm +Copyright: 2015 Haiwen +License: Apache-2.0 + +Files: third_party/QtAwesome/QtAwesome.cpp + third_party/QtAwesome/QtAwesome.h +Copyright: 2013 Reliable Bits Software by Blommers IT +License: MIT + +Files: third_party/QtAwesome/fonts/fontawesome.ttf +Copyright: 2013 Reliable Bits Software by Blommers IT +License: SIL + +Files: debian/* +Copyright: 2016 m.eik michalke + 2016 Christoph Martin + 2016-2018 Moritz Schlarb +License: GPL-2 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache 2.0 License + can be found in /usr/share/common-licenses/Apache-2.0 file. + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License: GPL-2 + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This software is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. + . + You should have received a copy of the license with your Debian system, + in the file /usr/share/common-licenses/GPL-2, or with the + source package as the file COPYING or LICENSE. + +License: SIL + This Font Software is licensed under the SIL Open Font License, Version 1.1. + This license is copied below, and is also available with a FAQ at: + http://scripts.sil.org/OFL + . + ----------------------------------------------------------- + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + ----------------------------------------------------------- + . + PREAMBLE + The goals of the Open Font License (OFL) are to stimulate worldwide + development of collaborative font projects, to support the font creation + efforts of academic and linguistic communities, and to provide a free and + open framework in which fonts may be shared and improved in partnership + with others. + . + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. The + fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that any reserved + names are not used by derivative works. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply + to any document created using the fonts or their derivatives. + . + DEFINITIONS + "Font Software" refers to the set of files released by the Copyright + Holder(s) under this license and clearly marked as such. This may + include source files, build scripts and documentation. + . + "Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + . + "Original Version" refers to the collection of Font Software components as + distributed by the Copyright Holder(s). + . + "Modified Version" refers to any derivative made by adding to, deleting, + or substituting -- in part or in whole -- any of the components of the + Original Version, by changing formats or by porting the Font Software to a + new environment. + . + "Author" refers to any designer, engineer, programmer, technical + writer or other person who contributed to the Font Software. + . + PERMISSION & CONDITIONS + Permission is hereby granted, free of charge, to any person obtaining + a copy of the Font Software, to use, study, copy, merge, embed, modify, + redistribute, and sell modified and unmodified copies of the Font + Software, subject to the following conditions: + . + 1) Neither the Font Software nor any of its individual components, + in Original or Modified Versions, may be sold by itself. + . + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + . + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the corresponding + Copyright Holder. This restriction only applies to the primary font name as + presented to the users. + . + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + . + 5) The Font Software, modified or unmodified, in part or in whole, + must be distributed entirely under this license, and must not be + distributed under any other license. The requirement for fonts to + remain under this license does not apply to any document created + using the Font Software. + . + TERMINATION + This license becomes null and void if any of the above conditions are + not met. + . + DISCLAIMER + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM + OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..e4ba015 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +debian-branch=master +upstream-branch=upstream +pristine-tar=True + +[import-orig] +# those files should not be in the tarball +filter = ['debian/*','.gitignore'] diff --git a/gitlab-ci.yml b/gitlab-ci.yml new file mode 100644 index 0000000..b7dc52a --- /dev/null +++ b/gitlab-ci.yml @@ -0,0 +1,16 @@ +include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + +build: + extends: .build-unstable + +reprotest: + extends: .test-reprotest + +lintian: + extends: .test-lintian + +autopkgtest: + extends: .test-autopkgtest + +piuparts: + extends: .test-piuparts diff --git a/patches/0001-Add-Keywords-to-.desktop-file.patch b/patches/0001-Add-Keywords-to-.desktop-file.patch new file mode 100644 index 0000000..34f2a89 --- /dev/null +++ b/patches/0001-Add-Keywords-to-.desktop-file.patch @@ -0,0 +1,17 @@ +From: Moritz Schlarb +Date: Tue, 24 Apr 2018 10:39:26 +0200 +Subject: Add Keywords to .desktop file + +--- + data/seafile.desktop | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/seafile.desktop b/data/seafile.desktop +index 0a47bd9..0d7a4dc 100644 +--- a/data/seafile.desktop ++++ b/data/seafile.desktop +@@ -6,3 +6,4 @@ Exec=seafile-applet + Icon=seafile + Type=Application + Categories=Network;FileTransfer; ++Keywords=Sync;Share;Cloud;Network;FileTransfer;Library;Online;Copy;Send diff --git a/patches/0002-Don-t-use-bundled-QuaZip.patch b/patches/0002-Don-t-use-bundled-QuaZip.patch new file mode 100644 index 0000000..2c32588 --- /dev/null +++ b/patches/0002-Don-t-use-bundled-QuaZip.patch @@ -0,0 +1,70 @@ +From: Moritz Schlarb +Date: Thu, 24 May 2018 16:28:02 +0200 +Subject: Don't use bundled QuaZip + +--- + CMakeLists.txt | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ffb4bcb..5229317 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,8 +206,6 @@ if (APPLE) + SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") + endif() + +-ADD_DEFINITIONS(-DQUAZIP_STATIC) +- + # MOC FILES + SET(moc_headers + src/seafile-applet.h +@@ -293,7 +291,6 @@ SET(moc_headers + src/filebrowser/transfer-mgr.h + src/filebrowser/thumbnail-service.h + third_party/QtAwesome/QtAwesome.h +- third_party/quazip/quazipfile.h + ${platform_specific_moc_headers} + ) + +@@ -498,7 +495,6 @@ INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_SOURCE_DIR}/third_party/QtAwesome +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/quazip + ) + + FOREACH(USE_QT_LIBRARY ${USE_QT_LIBRARIES}) +@@ -591,27 +587,12 @@ ENDIF() + + ADD_SC_LIBRARY(utils ${utils_sources}) + +-# library quazip +-LIST(APPEND quazip_sources +- third_party/quazip/JlCompress.cpp +- third_party/quazip/quazip.cpp +- third_party/quazip/quazipfile.cpp +- third_party/quazip/quazipfileinfo.cpp +- third_party/quazip/quaziodevice.cpp +- third_party/quazip/quagzipfile.cpp +- third_party/quazip/quazipnewinfo.cpp +- third_party/quazip/quaadler32.cpp +- third_party/quazip/quazipdir.cpp +- third_party/quazip/quacrc32.cpp +- third_party/quazip/qioapi.cpp +- third_party/quazip/zip.c +- third_party/quazip/unzip.c +- ) +- +-ADD_SC_LIBRARY(quazip ${quazip_sources}) ++SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/usr/share/quazip") ++FIND_PACKAGE(QuaZip5 REQUIRED) ++INCLUDE_DIRECTORIES(${QUAZIP_INCLUDE_DIRS}) ++SET(EXTRA_LIBS ${EXTRA_LIBS} ${QUAZIP_LIBRARIES}) + +-SET(SC_LIBS utils quazip) +-#SET(SC_LIBS utils) ++SET(SC_LIBS utils) + + #################### + ###### end: lib diff --git a/patches/0004-Use-more-intelligent-approach-for-QtWebEngine-QtWebK.patch b/patches/0004-Use-more-intelligent-approach-for-QtWebEngine-QtWebK.patch new file mode 100644 index 0000000..3dbf554 --- /dev/null +++ b/patches/0004-Use-more-intelligent-approach-for-QtWebEngine-QtWebK.patch @@ -0,0 +1,40 @@ +From: Moritz Schlarb +Date: Fri, 9 Nov 2018 11:33:46 +0100 +Subject: Use more intelligent approach for QtWebEngine/QtWebKit detection + +--- + CMakeLists.txt | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5229317..bfd3e88 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,21 +158,16 @@ SET(QT_VERSION_MAJOR 5) + # have to keep using QtWebKit on windows because QtWebEngine can't be + # compiled in msys2/mingw (QtWebEnigne is based on chrome, which has to be + # compiled with MSVC.) +-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe) +-EXECUTE_PROCESS(COMMAND +- bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'" +- OUTPUT_VARIABLE DETECTED_QT_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-MESSAGE("qt5 version: ${DETECTED_QT_VERSION}") +-IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0) +- ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT) +- SET(WEBKIT_NAME "WebKit") +- SET(WEBKIT_WIDGETS_NAME "WebKitWidgets") +-ELSE() ++FIND_PACKAGE(Qt5WebEngine) ++IF(Qt5WebEngine_FOUND) + SET(WEBKIT_NAME "WebEngine") + SET(WEBENGINE_CORE "WebEngineCore") + SET(WEBKIT_WIDGETS_NAME "WebEngineWidgets") + SET(SHIB_EXTRA_HEADER "src/shib/shib-helper.h") ++ELSE() ++ ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT) ++ SET(WEBKIT_NAME "WebKit") ++ SET(WEBKIT_WIDGETS_NAME "WebKitWidgets") + ENDIF() + + SET(USE_QT_LIBRARIES diff --git a/patches/0005-Accept-close-event-instead-of-ignoring-it.patch b/patches/0005-Accept-close-event-instead-of-ignoring-it.patch new file mode 100644 index 0000000..94dba4d --- /dev/null +++ b/patches/0005-Accept-close-event-instead-of-ignoring-it.patch @@ -0,0 +1,22 @@ +From 09b468874e8a5cdc7567fa43ed6a4be164d455c8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bartosz=20S=C5=82awianowski?= +Date: Sun, 8 Oct 2017 17:55:03 +0200 +Subject: [PATCH] Accept close event instead of ignoring it + +--- + src/ui/main-window.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ui/main-window.cpp b/src/ui/main-window.cpp +index 45e2a88f9..023bb9a0f 100644 +--- a/src/ui/main-window.cpp ++++ b/src/ui/main-window.cpp +@@ -112,7 +112,7 @@ void MainWindow::hide() + + void MainWindow::closeEvent(QCloseEvent *event) + { +- event->ignore(); ++ event->accept(); + hide(); + } + diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..c60e312 --- /dev/null +++ b/patches/series @@ -0,0 +1,4 @@ +0001-Add-Keywords-to-.desktop-file.patch +0002-Don-t-use-bundled-QuaZip.patch +0004-Use-more-intelligent-approach-for-QtWebEngine-QtWebK.patch +0005-Accept-close-event-instead-of-ignoring-it.patch diff --git a/rules b/rules new file mode 100755 index 0000000..8544bf6 --- /dev/null +++ b/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +export QT_SELECT=5 + +%: + dh $@ --builddirectory=build + +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DBUILD_SHIBBOLETH_SUPPORT=ON + +override_dh_strip: + dh_strip --dbgsym-migration='seafile-gui-dbg (<< 6.0.7-1)' diff --git a/seafile-gui.install b/seafile-gui.install new file mode 100644 index 0000000..0144571 --- /dev/null +++ b/seafile-gui.install @@ -0,0 +1,4 @@ +#usr/bin/seafile-applet +#usr/share/pixmaps/seafile.png +#usr/share/applications/seafile.desktop +#usr/share/icons/hicolor/*/apps/seafile.png diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..32aa44c --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=3 + +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/seafile-client-$1\.tar\.gz/ \ + https://github.com/haiwen/seafile-client/tags .*/v?(\d[\d.]*)\.tar\.gz -- 2.30.2