June 2021 - openSUSE Commits - openSUSE Mailing Lists

commit python3-pyside2 for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python3-pyside2 for openSUSE:Factory checked in at 2021-06-29 22:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-pyside2 (Old) and /work/SRC/openSUSE:Factory/.python3-pyside2.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-pyside2" Tue Jun 29 22:42:51 2021 rev:14 rq:902706 version:5.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python3-pyside2/python3-pyside2.changes 2021-04-24 23:09:35.211431601 +0200 +++ /work/SRC/openSUSE:Factory/.python3-pyside2.new.2625/python3-pyside2.changes 2021-06-29 22:42:56.214848074 +0200 @@ -1,0 +2,5 @@ +Sun Jun 27 17:11:23 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Drop the QtWebKit build dependency. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-pyside2.spec ++++++ --- /var/tmp/diff_new_pack.5Wrqjc/_old 2021-06-29 22:42:56.698848713 +0200 +++ /var/tmp/diff_new_pack.5Wrqjc/_new 2021-06-29 22:42:56.702848718 +0200 @@ -92,8 +92,6 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5XmlPatterns) -# FreeCAD 0.18 still uses Qt5Webkit -BuildRequires: cmake(Qt5WebKit) BuildRequires: clang-devel >= 3.9 BuildRequires: libxslt-devel

1 0

commit seadrive-gui for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package seadrive-gui for openSUSE:Factory checked in at 2021-06-29 22:42:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seadrive-gui (Old) and /work/SRC/openSUSE:Factory/.seadrive-gui.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seadrive-gui" Tue Jun 29 22:42:50 2021 rev:6 rq:902683 version:2.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/seadrive-gui/seadrive-gui.changes 2021-06-01 10:37:53.476856924 +0200 +++ /work/SRC/openSUSE:Factory/.seadrive-gui.new.2625/seadrive-gui.changes 2021-06-29 22:42:53.850844954 +0200 @@ -1,0 +2,7 @@ +Sun Jun 27 19:27:34 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Stop using QtWebKit. It's dead upstream and will be removed + from openSUSE Factory soon. +- Use cmake() style BuildRequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seadrive-gui.spec ++++++ --- /var/tmp/diff_new_pack.CrsnMs/_old 2021-06-29 22:42:54.442845736 +0200 +++ /var/tmp/diff_new_pack.CrsnMs/_new 2021-06-29 22:42:54.446845741 +0200 @@ -46,19 +46,17 @@ BuildRequires: qt5-qtwebkit BuildRequires: sqlite-devel %else -BuildRequires: libqt5-linguist-devel -BuildRequires: libqt5-qtbase-common-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Designer) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Help) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5WebEngineCore) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Designer) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Help) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5UiTools) +BuildRequires: cmake(Qt5WebEngineCore) +BuildRequires: cmake(Qt5WebEngineWidgets) BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(sqlite3) %endif @@ -76,8 +74,8 @@ export CFLAGS="%{optflags} -fPIE -pie" export CXXFLAGS="%{optflags} -fPIE -pie" %cmake \ - -DBUILD_ENABLE_WARNINGS=OFF \ - -DUSE_QT_WEBKIT=ON .. + -DBUILD_ENABLE_WARNINGS=OFF + %cmake_build %install

1 0

commit seafile-client for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package seafile-client for openSUSE:Factory checked in at 2021-06-29 22:42:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seafile-client (Old) and /work/SRC/openSUSE:Factory/.seafile-client.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seafile-client" Tue Jun 29 22:42:49 2021 rev:8 rq:902682 version:8.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/seafile-client/seafile-client.changes 2021-06-02 22:11:38.648128374 +0200 +++ /work/SRC/openSUSE:Factory/.seafile-client.new.2625/seafile-client.changes 2021-06-29 22:42:52.558843249 +0200 @@ -1,0 +2,8 @@ +Sun Jun 27 18:51:28 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Drop the unused QtWebKit dependency. +- Use cmake() style BuildRequires +- Update to 8.0.3: + * Update i18n + +------------------------------------------------------------------- Old: ---- v8.0.2.tar.gz New: ---- v8.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seafile-client.spec ++++++ --- /var/tmp/diff_new_pack.cYW2GD/_old 2021-06-29 22:42:53.686844738 +0200 +++ /var/tmp/diff_new_pack.cYW2GD/_new 2021-06-29 22:42:53.686844738 +0200 @@ -17,7 +17,7 @@ Name: seafile-client -Version: 8.0.2 +Version: 8.0.3 Release: 0 Summary: Cloud storage client License: GPL-3.0-only @@ -55,19 +55,17 @@ BuildRequires: qt5-qtwebkit BuildRequires: sqlite-devel %else -BuildRequires: libqt5-linguist-devel -BuildRequires: libqt5-qtbase-common-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Designer) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Help) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5WebEngineCore) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Designer) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Help) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5UiTools) +BuildRequires: cmake(Qt5WebEngineCore) +BuildRequires: cmake(Qt5WebEngineWidgets) BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(sqlite3) %endif ++++++ v8.0.2.tar.gz -> v8.0.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/seafile-client/v8.0.2.tar.gz /work/SRC/openSUSE:Factory/.seafile-client.new.2625/v8.0.3.tar.gz differ: char 22, line 1

1 0

commit seafile for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package seafile for openSUSE:Factory checked in at 2021-06-29 22:42:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seafile (Old) and /work/SRC/openSUSE:Factory/.seafile.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seafile" Tue Jun 29 22:42:49 2021 rev:8 rq:902681 version:8.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/seafile/seafile.changes 2021-06-01 10:38:55.188961990 +0200 +++ /work/SRC/openSUSE:Factory/.seafile.new.2625/seafile.changes 2021-06-29 22:42:51.710842130 +0200 @@ -1,0 +2,5 @@ +Sun Jun 27 19:06:20 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Update to 8.0.3. No changelog. + +------------------------------------------------------------------- Old: ---- v8.0.2.tar.gz New: ---- v8.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seafile.spec ++++++ --- /var/tmp/diff_new_pack.WuYJYC/_old 2021-06-29 22:42:52.286842890 +0200 +++ /var/tmp/diff_new_pack.WuYJYC/_new 2021-06-29 22:42:52.290842895 +0200 @@ -17,7 +17,7 @@ Name: seafile -Version: 8.0.2 +Version: 8.0.3 Release: 0 Summary: Cloud storage client License: GPL-2.0-only ++++++ v8.0.2.tar.gz -> v8.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/common/fs-mgr.c new/seafile-8.0.3/common/fs-mgr.c --- old/seafile-8.0.2/common/fs-mgr.c 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/common/fs-mgr.c 2021-06-24 08:03:18.000000000 +0200 @@ -390,6 +390,16 @@ seaf_warning ("Failed to rename %s to %s: %s. " "Failed to move backup file to conflict file.\n", backup_path, conflict_path, strerror(errno)); + if (mtime > 0) { + /* + * Set the checked out file mtime to what it has to be. + */ + if (seaf_set_file_time (file_path, mtime) < 0) { + seaf_warning ("Failed to set mtime for %s.\n", file_path); + } + } + //Don't delete local file when failed to rename backup file to conflict file. + goto out; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/configure.ac new/seafile-8.0.3/configure.ac --- old/seafile-8.0.2/configure.ac 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/configure.ac 2021-06-24 08:03:18.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) -AC_INIT([seafile], [8.0.2], [info(a)seafile.com]) +AC_INIT([seafile], [8.0.3], [info(a)seafile.com]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/daemon/http-tx-mgr.c new/seafile-8.0.3/daemon/http-tx-mgr.c --- old/seafile-8.0.2/daemon/http-tx-mgr.c 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/daemon/http-tx-mgr.c 2021-06-24 08:03:18.000000000 +0200 @@ -38,10 +38,12 @@ #define HTTP_OK 200 #define HTTP_BAD_REQUEST 400 +#define HTTP_REQUEST_TIME_OUT 408 #define HTTP_FORBIDDEN 403 #define HTTP_NOT_FOUND 404 #define HTTP_NO_QUOTA 443 #define HTTP_REPO_DELETED 444 +#define HTTP_REPO_TOO_LARGE 447 #define HTTP_REPO_CORRUPTED 445 #define HTTP_INTERNAL_SERVER_ERROR 500 @@ -1089,6 +1091,8 @@ return SYNC_ERROR_ID_SERVER_REPO_DELETED; else if (status == HTTP_REPO_CORRUPTED) return SYNC_ERROR_ID_SERVER_REPO_CORRUPT; + else if (status == HTTP_REPO_TOO_LARGE || status == HTTP_REQUEST_TIME_OUT) + return SYNC_ERROR_ID_LIBRARY_TOO_LARGE; else return SYNC_ERROR_ID_GENERAL_ERROR; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/daemon/seafile-error.c new/seafile-8.0.3/daemon/seafile-error.c --- old/seafile-8.0.2/daemon/seafile-error.c 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/daemon/seafile-error.c 2021-06-24 08:03:18.000000000 +0200 @@ -169,6 +169,11 @@ SYNC_ERROR_LEVEL_FILE, "File or directory is invalid on Windows" }, + { + SYNC_ERROR_ID_LIBRARY_TOO_LARGE, + SYNC_ERROR_LEVEL_REPO, + "Library is too large to sync" + }, }; const char * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/debian/changelog new/seafile-8.0.3/debian/changelog --- old/seafile-8.0.2/debian/changelog 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/debian/changelog 2021-06-24 08:03:18.000000000 +0200 @@ -1,3 +1,8 @@ +seafile-daemon (8.0.3) unstable; urgency=low + + * new upstream release + + -- Jonathan Xu <jonathan.xu(a)seafile.com> Tue, 24 Jun 2021 11:26:24 +0800 seafile-daemon (8.0.2) unstable; urgency=low * new upstream release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/include/seafile-error.h new/seafile-8.0.3/include/seafile-error.h --- old/seafile-8.0.2/include/seafile-error.h 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/include/seafile-error.h 2021-06-24 08:03:18.000000000 +0200 @@ -61,6 +61,7 @@ #define SYNC_ERROR_ID_NO_ERROR 29 #define SYNC_ERROR_ID_REMOVE_UNCOMMITTED_FOLDER 30 #define SYNC_ERROR_ID_INVALID_PATH_ON_WINDOWS 31 -#define N_SYNC_ERROR_ID 32 +#define SYNC_ERROR_ID_LIBRARY_TOO_LARGE 32 +#define N_SYNC_ERROR_ID 33 #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/msi/Includes.wxi new/seafile-8.0.3/msi/Includes.wxi --- old/seafile-8.0.2/msi/Includes.wxi 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/msi/Includes.wxi 2021-06-24 08:03:18.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Include Id="SeafileInclude"> - <?define CurrentSeafileVersion="8.0.2" ?> + <?define CurrentSeafileVersion="8.0.3" ?>  <?define CurrentUpdateGuid="65DED1C8-A5F1-4C49-8E7E-B0A8A5A6535C" ?> @@ -145,7 +145,8 @@    - <?define ProductGuid="8F8A6FBA-EAD1-4B16-B074-03C1BA4E1109" ?> +  + <?define ProductGuid="82A1C721-6B4E-473B-B515-8D0B9242C6A6" ?> <?define GuidOfCustomComponent="AD201805-3CBD-4834-9097-5D934F7E0000" ?> <?define GuidOfAutoStartComponent="AD201805-3CBD-4834-9097-5D934F7E0001" ?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/scripts/build/build-mac-local.py new/seafile-8.0.3/scripts/build/build-mac-local.py --- old/seafile-8.0.2/scripts/build/build-mac-local.py 1970-01-01 01:00:00.000000000 +0100 +++ new/seafile-8.0.3/scripts/build/build-mac-local.py 2021-06-24 08:03:18.000000000 +0200 @@ -0,0 +1,884 @@ +#!/usr/bin/env python +# coding: UTF-8 + +'''This script builds the seafile mac client. +''' + +import atexit +import logging +import commands +from contextlib import contextmanager +import glob +import multiprocessing +import optparse +import os +from os.path import abspath, basename, dirname, join, exists, expanduser +import re +import shutil +import subprocess +import sys +import tempfile + +FINAL_APP = 'Seafile Client.app' +FSPLUGIN_APPEX_NAME = 'Seafile FinderSync.appex' +CERT_ID = '79AB1AF435DD2CBC5FDB3EBBD45B0DA17727B299' + +BUILDDIR = join(os.getcwd(), "../../../") + +#################### +### Requires Python 2.6+ +#################### +if sys.version_info[0] == 3: + print 'Python 3 not supported yet. Quit now.' + sys.exit(1) +if sys.version_info[1] < 6: + print 'Python 2.6 or above is required. Quit now.' + sys.exit(1) + +#################### +### Global variables +#################### +# command line configuartion +conf = {} + +# key names in the conf dictionary. +# pylint: disable=bad-whitespace +CONF_VERSION = 'version' +CONF_NO_STRIP = 'nostrip' +CONF_BRAND = 'brand' + +NUM_CPU = multiprocessing.cpu_count() +PID = os.getpid() + +#################### +### Common helper functions +#################### +def highlight(content, is_error=False): + '''Add ANSI color to content to get it highlighted on terminal''' + if is_error: + return '\x1b[1;31m%s\x1b[m' % content + else: + return '\x1b[1;32m%s\x1b[m' % content + +def info(msg): + logging.info(highlight('[INFO][{}] ').format(msg)) + +@contextmanager +def cd(path): + oldpwd = os.getcwd() + os.chdir(path) + try: + yield + finally: + os.chdir(oldpwd) + +def exist_in_path(prog): + '''Test whether prog exists in system path''' + return bool(find_in_path(prog)) + +def prepend_env_value(name, value, seperator=':'): + '''append a new value to a list''' + try: + current_value = os.environ[name] + except KeyError: + current_value = '' + + new_value = value + if current_value: + new_value += seperator + current_value + + os.environ[name] = new_value + +def find_in_path(prog): + '''Find a file in system path''' + dirs = os.environ['PATH'].split(':') + for d in dirs: + if d == '': + continue + path = join(d, prog) + if exists(path): + return path + + return None + +def error(msg=None, usage=None): + if msg: + print highlight('[ERROR] ') + msg + if usage: + print usage + sys.exit(1) + +def run_argv(argv, cwd=None, env=None, suppress_stdout=False, suppress_stderr=False): + '''Run a program and wait it to finish, and return its exit code. The + standard output of this program is supressed. + + ''' + info('running %s, cwd=%s' % (' '.join(['"{}"'.format(a) for a in argv]), cwd or os.getcwd())) + with open(os.devnull, 'w') as devnull: + if suppress_stdout: + stdout = devnull + else: + stdout = sys.stdout + + if suppress_stderr: + stderr = devnull + else: + stderr = sys.stderr + + proc = subprocess.Popen(argv, + cwd=cwd, + stdout=stdout, + stderr=stderr, + env=env) + return proc.wait() + +def run(cmdline, cwd=None, env=None, suppress_stdout=False, suppress_stderr=False): + '''Like run_argv but specify a command line string instead of argv''' + info('running %s, cwd=%s' % (cmdline, cwd or os.getcwd())) + with open(os.devnull, 'w') as devnull: + if suppress_stdout: + stdout = devnull + else: + stdout = sys.stdout + + if suppress_stderr: + stderr = devnull + else: + stderr = sys.stderr + + proc = subprocess.Popen(cmdline, + cwd=cwd, + stdout=stdout, + stderr=stderr, + env=env, + shell=True) + return proc.wait() + +def must_run(cmdline, *a, **kw): + ret = run(cmdline, *a, **kw) + if ret != 0: + error('failed to run %s' % cmdline) + +def check_remove(path): + """ + Remove the file/dir specified by `path`, if exists. + """ + path = abspath(path) + assert path.count('/') >= 2 + if exists(path): + is_dir = os.path.isdir(path) + info('removing {} {}'.format('dir' if is_dir else 'file', path)) + if is_dir: + shutil.rmtree(path) + else: + os.unlink(path) + +def must_mkdir(path): + '''Create a directory, exit on failure''' + try: + if not exists(path): + os.mkdir(path) + except OSError, e: + error('failed to create directory %s:%s' % (path, e)) + +def must_copy(src, dst): + '''Copy src to dst, exit on failure''' + try: + shutil.copy(src, dst) + except Exception, e: + error('failed to copy %s to %s: %s' % (src, dst, e)) + +def must_copytree(src, dst): + '''Copy src tree to dst, exit on failure''' + try: + shutil.copytree(src, dst) + except Exception, e: + error('failed to copy %s to %s: %s' % (src, dst, e)) + +def check_project_version(version): + '''A valid version must be like 1.2.2, 1.3''' + if not re.match(r'^[0-9]+(\.[0-9]+)+$', version): + error('%s is not a valid version' % version, usage="build-mac-local.py 8.0.0") + +def check_cmd_para(): + args = sys.argv + if len(args) != 2: + error('The number of parameters is incorrect', usage="build-mac-local.py 8.0.0") + global version + version = args[1] + check_project_version(version) + + +class Project(object): + '''Base class for a project''' + # Probject name, i.e. libseaprc/seafile/ + name = '' + + # A list of shell commands to configure/build the project + build_commands = [] + + def __init__(self): + # the path to pass to --prefix=/<prefix> + self.prefix = join(BUILDDIR, 'usr') + # project dir, like <builddir>/seafile/ + self.projdir = join(BUILDDIR, '{}' .format(self.name)) + + def get_version(self): + # libsearpc can have different versions from seafile. + raise NotImplementedError + + def get_source_commit_id(self): + '''By convetion, we record the commit id of the source code in the + file "<projdir>/latest_commit" + + ''' + latest_commit_file = join(self.projdir, 'latest_commit') + with open(latest_commit_file, 'r') as fp: + commit_id = fp.read().strip('\n\r\t ') + + return commit_id + + def append_cflags(self, macros): + cflags = ' '.join(['-D%s=%s' % (k, macros[k]) for k in macros]) + prepend_env_value('CPPFLAGS', + cflags, + seperator=' ') + + def before_build(self): + '''Hook method to do project-specific stuff before running build commands''' + pass + + def build(self): + '''Build the source''' + self.before_build() + info('Building %s' % self.name) + for cmd in self.build_commands: + if run(cmd, cwd=self.projdir) != 0: + error('error when running command:\n\t%s\n' % cmd) + +def concurrent_make(): + return 'make -j%s' % NUM_CPU + +class Libsearpc(Project): + name = 'libsearpc' + + def __init__(self): + Project.__init__(self) + self.build_commands = [ + './autogen.sh', + './configure --prefix=%s --disable-compile-demo' % self.prefix, + concurrent_make(), + 'make install' + ] + +class Seafile(Project): + name = 'seafile' + def __init__(self): + Project.__init__(self) + self.build_commands = [ + './autogen.sh', + './configure --prefix=%s --disable-fuse' % self.prefix, + concurrent_make(), + 'make install' + ] + + def update_cli_version(self): + '''Substitute the version number in seaf-cli''' + cli_py = join(self.projdir, 'app', 'seaf-cli') + with open(cli_py, 'r') as fp: + lines = fp.readlines() + + ret = [] + for line in lines: + old = '''SEAF_CLI_VERSION = ""''' + new = '''SEAF_CLI_VERSION = "%s"''' %conf[CONF_VERSION] + line = line.replace(old, new) + ret.append(line) + + with open(cli_py, 'w') as fp: + fp.writelines(ret) + + def before_build(self): + self.update_cli_version() + macros = {} + # SET SEAFILE_SOURCE_COMMIT_ID, so it can be printed in the log + # macros['SEAFILE_SOURCE_COMMIT_ID'] = '\\"%s\\"' % self.get_source_commit_id() + # self.append_cflags(macros) + +class SeafileClient(Project): + + name = 'seafile-client' + + def __init__(self): + Project.__init__(self) + cmake_defines = { + 'CMAKE_OSX_ARCHITECTURES': 'x86_64', + 'CMAKE_OSX_DEPLOYMENT_TARGET': '10.9', + 'CMAKE_BUILD_TYPE': 'Release', + 'BUILD_SHIBBOLETH_SUPPORT': 'ON', + 'BUILD_SPARKLE_SUPPORT': 'ON', + } + cmake_defines_formatted = ' '.join(['-D{}={}'.format(k, v) for k, v in cmake_defines.iteritems()]) + self.build_commands = [ + 'rm -f CMakeCache.txt', + 'cmake -GXcode {}'.format(cmake_defines_formatted), + 'xcodebuild -target seafile-applet -configuration Release -jobs {}'.format(NUM_CPU), + 'rm -rf seafile-applet.app', + 'cp -r Release/seafile-applet.app seafile-applet.app', + 'mkdir -p seafile-applet.app/Contents/Frameworks', + 'macdeployqt seafile-applet.app', + ] + + def before_build(self): + pass + +class SeafileDMGLayout(Seafile): + + def __init__(self): + Seafile.__init__(self) + self.build_commands = [ + ] + +class SeafileFinderSyncPlugin(SeafileClient): + + def __init__(self): + SeafileClient.__init__(self) + self.build_commands = [ + 'fsplugin/build.sh' + ] + +def prepare_builddir(builddir): + must_mkdir(builddir) + + # if not conf[CONF_KEEP]: + # def remove_builddir(): + # '''Remove the builddir when exit''' + # info('remove builddir before exit') + # shutil.rmtree(builddir, ignore_errors=True) + # atexit.register(remove_builddir) + + os.chdir(builddir) + + must_mkdir(join(builddir, 'usr')) + +def parse_args(): + parser = optparse.OptionParser() + def long_opt(opt): + return '--' + opt + + parser.add_option(long_opt(CONF_VERSION), + dest=CONF_VERSION, + nargs=1, + help='the version to build. Must be digits delimited by dots, like 1.3.0') + + parser.add_option(long_opt(CONF_NO_STRIP), + dest=CONF_NO_STRIP, + action='store_true', + help='''do not strip debug symbols''') + + parser.add_option(long_opt(CONF_BRAND), + dest=CONF_BRAND, + help='the brand') + + usage = parser.format_help() + options, remain = parser.parse_args() + if remain: + error(usage=usage) + + validate_args(usage, options) + +def validate_args(usage, options): + required_args = [ + CONF_VERSION, + CONF_NO_STRIP, + CONF_BRAND, + ] + + # fist check required args + for optname in required_args: + if getattr(options, optname, None) is None: + error('%s must be specified' % optname, usage=usage) + + def get_option(optname): + return getattr(options, optname) + + # [ version ] + def check_project_version(version): + '''A valid version must be like 1.2.2, 1.3''' + if not re.match(r'^[0-9]+(\.[0-9]+)+$', version): + error('%s is not a valid version' % version, usage=usage) + + version = get_option(CONF_VERSION) + check_project_version(version) + + # [ no strip] + nostrip = get_option(CONF_NO_STRIP) + + brand = get_option(CONF_BRAND) + + conf[CONF_VERSION] = version + conf[CONF_NO_STRIP] = nostrip + conf[CONF_BRAND] = brand + +def setup_build_env(): + '''Setup environment variables, such as export PATH=$BUILDDDIR/bin:$PATH''' + # os.environ.update({ + # }) + prefix = join(BUILDDIR, 'usr') + + prepend_env_value('CFLAGS', + '-Wall -O2 -g -DNDEBUG -I/opt/local/include -mmacosx-version-min=10.7', + seperator=' ') + + prepend_env_value('CXXFLAGS', + '-Wall -O2 -g -DNDEBUG -I/opt/local/include -mmacosx-version-min=10.7', + seperator=' ') + + prepend_env_value('CPPFLAGS', + '-I%s' % join(prefix, 'include'), + seperator=' ') + + prepend_env_value('CPPFLAGS', + '-DSEAFILE_CLIENT_VERSION=\\"%s\\"' % conf[CONF_VERSION], + seperator=' ') + + if conf[CONF_NO_STRIP]: + prepend_env_value('CPPFLAGS', + '-g -O0', + seperator=' ') + + prepend_env_value('LDFLAGS', + '-L%s' % join(prefix, 'lib'), + seperator=' ') + + prepend_env_value('LDFLAGS', + '-L%s' % join(prefix, 'lib64'), + seperator=' ') + + prepend_env_value('LDFLAGS', + '-L/opt/local/lib -Wl,-headerpad_max_install_names -mmacosx-version-min=10.7', + seperator=' ') + + prepend_env_value('PATH', join(prefix, 'bin')) + prepend_env_value('PKG_CONFIG_PATH', join(prefix, 'lib', 'pkgconfig')) + prepend_env_value('PKG_CONFIG_PATH', join(prefix, 'lib64', 'pkgconfig')) + +path_pattern = re.compile(r'^\s+(\S+)\s+\(compatibility.*') +def get_dependent_libs(executable): + def is_syslib(lib): + if lib.startswith('/usr/lib'): + return True + if lib.startswith('/System/'): + return True + return False + + otool_output = commands.getoutput('otool -L %s' % executable) + libs = set() + for line in otool_output.splitlines(): + m = path_pattern.match(line) + if not m: + continue + path = m.group(1) + if not is_syslib(path): + libs.add(path) + return libs + +def copy_shared_libs(): + '''copy shared c libs, such as libevent, glib''' + builddir = BUILDDIR + frameworks_dir = join(SeafileClient().projdir, 'seafile-applet.app/Contents/Frameworks') + + must_mkdir(frameworks_dir) + seafile_path = join(builddir, 'usr/bin/seaf-daemon') + + libs = set() + libs.update(get_dependent_libs(seafile_path)) + + # Get deps of deps recursively until no more deps can be included + while True: + newlibs = set(libs) + for lib in libs: + newlibs.update(get_dependent_libs(lib)) + if newlibs == libs: + break + libs = newlibs + + for lib in libs: + dst_file = join(frameworks_dir, basename(lib)) + if exists(dst_file): + continue + info('Copying %s' % lib) + shutil.copy(lib, frameworks_dir) + + change_rpaths() + +def change_rpaths(): + """ + Chagne the rpath of the referenced dylibs so the app can be relocated + anywhere in the user's system. + See: + - https://blogs.oracle.com/dipol/entry/dynamic_libraries_rpath_and_mac + - https://developer.apple.com/library/content/documentation/DeveloperTools/Co… + """ + contents_dir = join(SeafileClient().projdir, 'seafile-applet.app/Contents') + frameworks_dir = join(contents_dir, 'Frameworks') + resources_dir = join(contents_dir, 'Resources') + macos_dir = join(contents_dir, 'MacOS') + + seafile_applet = join(macos_dir, 'seafile-applet') + binaries = [ + seafile_applet, + join(resources_dir, 'seaf-daemon') + ] + + RPATH_RE = re.compile(r'^path\s+(\S+)\s+\(offset .*$') + def get_rpaths(fn): + rpaths = [] + output = commands.getoutput('otool -l {} | grep -A2 RPATH || true'.format(fn)) + # The output is like + # cmd LC_RPATH + # cmdsize 24 + # path /usr/local (offset 12) + # -- + # cmd LC_RPATH + # cmdsize 48 + # path @executable_path/../Frameworks (offset 12) + for line in output.splitlines(): + m = RPATH_RE.match(line.strip()) + if m: + rpaths.append(m.group(1)) + return rpaths + + def has_rpath(fn, path): + return path in get_rpaths(fn) + + def add_frameworks_dir_to_rpath(fn, executable=True): + relpath = 'executable_path' if executable else 'loader_path' + relative_frameworks_dir = '@{}/../Frameworks'.format(relpath) + if not has_rpath(fn, relative_frameworks_dir): + must_run('install_name_tool -add_rpath {} {}' .format(relative_frameworks_dir, fn)) + + def remove_local_rpaths(fn): + local_paths = ['/usr/local/lib', '/opt/local/lib'] + for path in local_paths: + if has_rpath(fn, path): + must_run('install_name_tool -delete_rpath {} {}'.format(path, fn)) + + def change_deps_rpath(fn): + deps = get_dependent_libs(fn) + for dep in deps: + bn = basename(dep) + if 'framework' in bn or bn.startswith('Qt') or bn == 'Sparkle': + continue + must_run('install_name_tool -change {} @rpath/{} {}'.format(dep, basename(dep), fn)) + + for binary in binaries: + add_frameworks_dir_to_rpath(binary) + remove_local_rpaths(binary) + change_deps_rpath(binary) + + libs = os.listdir(frameworks_dir) + for lib_name in libs: + lib = join(frameworks_dir, lib_name) + if os.path.isdir(lib): + continue + must_run('install_name_tool -id @rpath/{} {}'.format(basename(lib), lib)) + add_frameworks_dir_to_rpath(lib, executable=False) + change_deps_rpath(lib) + remove_local_rpaths(lib) + +DROPDMG = '/Applications/DropDMG.app/Contents/Frameworks/DropDMGFramework.framework/Versions/A/dropdmg' + +def gen_dmg(): + output_dmg = 'app-{}.dmg'.format(conf[CONF_VERSION]) + parentdir = 'app-{}'.format(conf[CONF_VERSION]) + appdir = join(parentdir, 'seafile-applet.app') + app_plugins_dir = join(appdir, 'Contents/PlugIns') + + layout = SeafileDMGLayout() + layout_folder = join(layout.projdir, 'dmg/seafileLayout') + + args = [ + DROPDMG, + parentdir, + '--format', 'bzip2', + '--layout-folder', layout_folder, + '--volume-name', conf[CONF_BRAND] or 'Seafile Client', + ] + + with cd(BUILDDIR): + check_remove(parentdir) + check_remove(output_dmg) + must_mkdir(parentdir) + must_run('tar xf seafile-applet.app.tar.gz -C {}'.format(parentdir)) + # Remove the Qt Bearer plugin because it would run a background thread + # to scan wifi networks. See + # https://trello.com/c/j28eOIo1/359-explicitly-exclude-qt-bearer-plugins-for-… + # for details. + must_run('rm -rf "{}"'.format(join(app_plugins_dir, 'bearer'))) + # fsplugin must be copied before we sign the final .app dir + copy_fsplugin(app_plugins_dir) + sign_files(appdir) + + # Rename the .app dir to 'Seafile Client.app', and create the shortcut + # to '/Applications' so the user can drag into it when opening the DMG. + brand = conf.get('CONF_BRAND') + if brand: + final_app = '{}.app'.format(brand) + else: + final_app = FINAL_APP + must_run('mv {}/seafile-applet.app "{}/{}"'.format(parentdir, parentdir, final_app)) + must_run('ln -sf /Applications {}/'.format(parentdir)) + + # Open DropDMG manually, or dropdmg command line may fail. + run(''' osascript -e 'tell application "DropDMG" to quit' || true ''') + run(''' osascript -e 'open application "DropDMG"' || true ''') + run(''' osascript -e 'activate application "DropDMG"' || true ''') + + # Sometimes DropDmg would fail if there are two many Finder windows. + run(''' osascript -e 'tell application "Finder" to close every window' ''') + if run_argv(args) != 0: + error('failed to run {}'.format(args)) + +def sign_in_parallel(files_to_sign): + import threading + import Queue + queue = Queue.Queue() + POISON_PILL = '' + + class SignThread(threading.Thread): + def __init__(self, index): + threading.Thread.__init__(self) + self.index = index + + def run(self): + info('sign thread {} started'.format(self.index)) + while True: + try: + fn = queue.get(timeout=1) + except Queue.Empty: + continue + else: + if fn == POISON_PILL: + break + else: + do_sign(fn) + info('sign thread {} stopped'.format(self.index)) + + TOTAL_THREADS = max(NUM_CPU / 2, 1) + threads = [] + for i in xrange(TOTAL_THREADS): + t = SignThread(i) + t.start() + threads.append(t) + + for fn in files_to_sign: + queue.put(fn) + + for _ in xrange(TOTAL_THREADS): + queue.put(POISON_PILL) + + for i in xrange(TOTAL_THREADS): + threads[i].join() + +def sign_files(appdir): + webengine_app = join( + appdir, + 'Contents/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app' + ) + + def _glob(pattern, *a, **kw): + return glob.glob(join(appdir, pattern), *a, **kw) + + # The webengine app must be signed first, otherwise the sign of + # QtWebengineCore.framework would fail. + if exists(webengine_app): + entitlements = join(Seafile().projdir, 'scripts/build/osx.entitlements') + do_sign( + webengine_app, + extra_args=['--entitlements', entitlements] + ) + + # Strip the get-task-allow entitlements for Sparkle binaries + for fn in _glob('Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/*'): + do_sign(fn, preserve_entitlemenets=False) + + # Sign the nested contents of Sparkle before we sign + # Sparkle.Framework in the thread pool. + for fn in ( + 'Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app', + 'Contents/Frameworks/Sparkle.framework/Versions/A/Sparkle', + ): + do_sign(join(appdir, fn)) + + patterns = [ + 'Contents/Frameworks/*.framework', + 'Contents/PlugIns/*/*.dylib', + 'Contents/Frameworks/*.dylib', + 'Contents/Resources/seaf-daemon', + 'Contents/MacOS/seadrive-gui', + ] + + files_to_sign = [] + for p in patterns: + files_to_sign.extend(_glob(p)) + + info('{} files to sign'.format(len(files_to_sign))) + + sign_in_parallel(files_to_sign) + # for fn in files_to_sign: + # do_sign(fn) + + do_sign(appdir) + # do_sign(appdir, extra_args=['--deep']) + +_keychain_unlocked = False +def unlock_keychain(): + """ + Unlock the keychain when we're using ssh instead of using the terminal from + GUI. See http://stackoverflow.com/a/20208104/1467959 + """ + global _keychain_unlocked + if not _keychain_unlocked: + _keychain_unlocked = True + run('security -v unlock-keychain -p vagrant || true') + +def do_sign(path, extra_args=None, preserve_entitlemenets=True): + unlock_keychain() + args = [ + 'codesign', + '--verbose=4', + '-o', 'runtime', + '--timestamp', + '--verify', + # '--no-strict', + '--force', + '-s', CERT_ID, + ] + if preserve_entitlemenets: + args += ['--preserve-metadata=entitlements'] + extra_args = extra_args or [] + if extra_args: + args.extend(extra_args) + + args.append(path) + + if run_argv(args) != 0: + error('failed to sign {}'.format(path)) + +def copy_dmg(): + brand = 'seafile-client' + branded_dmg = '{}-{}.dmg'.format(brand, conf[CONF_VERSION]) + src_dmg = os.path.join(BUILDDIR, 'app-{}.dmg'.format(conf[CONF_VERSION])) + dst_dmg = os.path.join(BUILDDIR, branded_dmg) + + # move msi to outputdir + must_copy(src_dmg, dst_dmg) + + print '---------------------------------------------' + print 'The build is successfully. Output is:' + print '>>\t%s' % dst_dmg + print '---------------------------------------------' + +def notarize_dmg(): + pkg = os.path.join(BUILDDIR, 'app-{}.dmg'.format(conf[CONF_VERSION])) + info('Try to notarize {}'.format(pkg)) + notarize_script = join(Seafile().projdir, 'scripts/build/notarize.sh') + cmdline = '{} {}'.format(notarize_script, pkg) + ret = run(cmdline) + if ret != 0: + error('failed to notarize: %s' % cmdline) + info('Successfully notarized {}'.format(pkg)) + +def build_and_sign_fsplugin(): + """ + Build and sign the fsplugin. The final output would be "${buildder}/Seafile FinderSync.appex" + """ + fsplugin = SeafileFinderSyncPlugin() + fsplugin.build() + with cd(fsplugin.projdir): + appex_src = 'fsplugin/{}'.format(FSPLUGIN_APPEX_NAME) + appex_dst = join(BUILDDIR, basename(appex_src)) + + check_remove(appex_dst) + must_copytree(appex_src, appex_dst) + + entitlements_src = 'fsplugin/seafile-fsplugin.entitlements' + entitlements_dst = join(BUILDDIR, basename(entitlements_src)) + + check_remove(entitlements_dst) + must_copy(entitlements_src, entitlements_dst) + + do_sign( + appex_dst, + extra_args=['--entitlements', entitlements_dst] + ) + +def copy_fsplugin(plugins_dir): + src = join(BUILDDIR, FSPLUGIN_APPEX_NAME) + dst = join(plugins_dir, FSPLUGIN_APPEX_NAME) + check_remove(dst) + must_copytree(src, dst) + +def copy_sparkle_framework(): + src = '/usr/local/Sparkle.framework' + dst = join(SeafileClient().projdir, 'seafile-applet.app/Contents/Frameworks', basename(src)) + check_remove(dst) + # Here we use the `cp` command instead of shutil to do the copy, because `cp + # -P` would keep symlinks as is. + must_run('cp -R -P "{}" "{}"'.format(src, dst)) + +def build_projects(): + prepare_builddir(BUILDDIR) + libsearpc = Libsearpc() + seafile = Seafile() + seafile_client = SeafileClient() + + libsearpc.build() + + seafile.build() + + seafile_client.build() + + copy_sparkle_framework() + + copy_shared_libs() + +def local_workflow(): + build_projects() + generate_app_tar_gz() + + build_and_sign_fsplugin() + gen_dmg() + notarize_dmg() + copy_dmg() + + +def generate_app_tar_gz(): + output_app_tgz = join(BUILDDIR, 'seafile-applet.app.tar.gz') + with cd(SeafileClient().projdir): + run('tar czf {} seafile-applet.app'.format(output_app_tgz)) + +def setup_logging(level=logging.INFO): + kw = { + 'format': '[%(asctime)s][%(module)s]: %(message)s', + 'datefmt': '%m/%d/%Y %H:%M:%S', + 'level': level, + 'stream': sys.stdout + } + + logging.basicConfig(**kw) + logging.getLogger('requests.packages.urllib3.connectionpool').setLevel( + logging.WARNING) + +def main(): + setup_logging() + parse_args() + # check_cmd_para() + info('{} script started'.format(abspath(__file__))) + info('NUM_CPU = {}'.format(NUM_CPU)) + setup_build_env() + local_workflow() + +if __name__ == '__main__': + main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/scripts/build/build-mac.py new/seafile-8.0.3/scripts/build/build-mac.py --- old/seafile-8.0.2/scripts/build/build-mac.py 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/scripts/build/build-mac.py 2021-06-24 08:03:18.000000000 +0200 @@ -221,13 +221,6 @@ except Exception, e: error('failed to copy %s to %s: %s' % (src, dst, e)) -def must_rmtree(path): - '''Recurse rm dir, exit on failure''' - try: - shutil.rmtree(path) - except Exception as e: - error('failed rm dir %s : %s' % (path, e)) - class Project(object): '''Base class for a project''' # Probject name, i.e. libseaprc/seafile/ @@ -795,17 +788,6 @@ must_run('rm -rf "{}"'.format(join(app_plugins_dir, 'bearer'))) # fsplugin must be copied before we sign the final .app dir copy_fsplugin(app_plugins_dir) - - # Delete ~/seafpkg/build/seafile-mac-build/app-8.0.1/seafile-applet.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app - - # Copy new QtWebEngineCoreProcess.app from Qt dir - # ~/Qt/5.15.1/clang_64/lib/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app - - webengineprocess_path = join(appdir, 'Contents/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app') - QT_WEBENGINEPROCESS_PATH = '/Users/vagrant/Qt/5.15.1/clang_64/lib/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app' - must_rmtree(webengineprocess_path) - must_copytree(QT_WEBENGINEPROCESS_PATH, webengineprocess_path) - sign_files(appdir) # Rename the .app dir to 'Seafile Client.app', and create the shortcut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-8.0.2/seafile.vcxproj new/seafile-8.0.3/seafile.vcxproj --- old/seafile-8.0.2/seafile.vcxproj 2021-05-27 03:58:11.000000000 +0200 +++ new/seafile-8.0.3/seafile.vcxproj 2021-06-24 08:03:18.000000000 +0200 @@ -92,7 +92,7 @@ <WarningLevel>Level3</WarningLevel> <SDLCheck> </SDLCheck> - <PreprocessorDefinitions>WIN32;UNICODE;WIN32_LEAN_AND_MEAN;SEAFILE_CLIENT;PACKAGE_VERSION="8.0.2";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;WIN32_LEAN_AND_MEAN;SEAFILE_CLIENT;PACKAGE_VERSION="8.0.3";%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>false</ConformanceMode> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>$(ProjectDir)..\libsearpc\lib;$(ProjectDir)common;$(ProjectDir)lib;$(ProjectDir)include;$(ProjectDir)daemon;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -110,7 +110,7 @@ <WarningLevel>Level1</WarningLevel> <SDLCheck> </SDLCheck> - <PreprocessorDefinitions>WIN32;UNICODE;WIN32_LEAN_AND_MEAN;SEAFILE_CLIENT;PACKAGE_VERSION="8.0.2";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;WIN32_LEAN_AND_MEAN;SEAFILE_CLIENT;PACKAGE_VERSION="8.0.3";%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>false</ConformanceMode> <LanguageStandard>stdcpp17</LanguageStandard> <AdditionalIncludeDirectories>$(ProjectDir)..\libsearpc\lib;$(ProjectDir)common;$(ProjectDir)include;$(ProjectDir)daemon;$(ProjectDir)lib;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -131,7 +131,7 @@ <IntrinsicFunctions>false</IntrinsicFunctions> <SDLCheck> </SDLCheck> - <PreprocessorDefinitions>WIN32;PACKAGE_VERSION="8.0.2";WIN32_LEAN_AND_MEAN;UNICODE;SEAFILE_CLIENT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;PACKAGE_VERSION="8.0.3";WIN32_LEAN_AND_MEAN;UNICODE;SEAFILE_CLIENT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>false</ConformanceMode> <LanguageStandard>stdcpp17</LanguageStandard> <AdditionalIncludeDirectories>$(ProjectDir)..\libsearpc\lib;$(ProjectDir);$(ProjectDir)daemon;$(ProjectDir)include;$(ProjectDir)lib;$(ProjectDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -158,7 +158,7 @@ <IntrinsicFunctions>false</IntrinsicFunctions> <SDLCheck> </SDLCheck> - <PreprocessorDefinitions>WIN32;PACKAGE_VERSION="8.0.2";WIN32_LEAN_AND_MEAN;UNICODE;SEAFILE_CLIENT;ENABLE_BREAKPAD;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;PACKAGE_VERSION="8.0.3";WIN32_LEAN_AND_MEAN;UNICODE;SEAFILE_CLIENT;ENABLE_BREAKPAD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>false</ConformanceMode> <LanguageStandard>stdcpp17</LanguageStandard> <AdditionalIncludeDirectories>$(ProjectDir)..\libsearpc\lib;$(ProjectDir);$(ProjectDir)common;$(ProjectDir)lib;$(ProjectDir)include;$(ProjectDir)daemon;$(ProjectDir)..\breakpad\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

1 0

commit nextcloud-desktop for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nextcloud-desktop for openSUSE:Factory checked in at 2021-06-29 22:42:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nextcloud-desktop (Old) and /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nextcloud-desktop" Tue Jun 29 22:42:48 2021 rev:18 rq:902650 version:3.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/nextcloud-desktop/nextcloud-desktop.changes 2021-06-25 15:02:46.680256973 +0200 +++ /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2625/nextcloud-desktop.changes 2021-06-29 22:42:50.594840657 +0200 @@ -1,0 +2,5 @@ +Sun Jun 27 16:49:55 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Remove the unneeded QtWebKit build dependency. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nextcloud-desktop.spec ++++++ --- /var/tmp/diff_new_pack.6JftJI/_old 2021-06-29 22:42:51.550841919 +0200 +++ /var/tmp/diff_new_pack.6JftJI/_new 2021-06-29 22:42:51.550841919 +0200 @@ -56,7 +56,6 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5WebEngineWidgets) -BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5WebSockets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(cloudproviders)

1 0

commit cage for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cage for openSUSE:Factory checked in at 2021-06-29 22:42:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cage (Old) and /work/SRC/openSUSE:Factory/.cage.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cage" Tue Jun 29 22:42:48 2021 rev:7 rq:902828 version:0.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/cage/cage.changes 2021-06-25 15:02:11.244213748 +0200 +++ /work/SRC/openSUSE:Factory/.cage.new.2625/cage.changes 2021-06-29 22:42:49.906839749 +0200 @@ -1,0 +2,7 @@ +Sun Jun 27 09:51:03 UTC 2021 - Michael Vetter <mvetter(a)suse.com> + +- Update to 1.4: + * Compatibility release to track wlroots 0.14.0 +- Drop cage-wlroots-0140.patch: upstreamed + +------------------------------------------------------------------- Old: ---- cage-wlroots-0140.patch v0.1.3.tar.gz New: ---- v0.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cage.spec ++++++ --- /var/tmp/diff_new_pack.3HSWBM/_old 2021-06-29 22:42:50.366840356 +0200 +++ /var/tmp/diff_new_pack.3HSWBM/_new 2021-06-29 22:42:50.366840356 +0200 @@ -17,14 +17,13 @@ Name: cage -Version: 0.1.3 +Version: 0.1.4 Release: 0 Summary: Wayland Kiosk License: MIT Group: System/GUI/Other URL: https://www.hjdskes.nl/projects/cage/ Source: https://github.com/Hjdskes/cage/archive/v%{version}.tar.gz -Patch0: cage-wlroots-0140.patch BuildRequires: meson >= 0.43.0 BuildRequires: pkgconfig BuildRequires: scdoc @@ -39,7 +38,6 @@ %prep %setup -q -%patch0 -p1 %build %meson ++++++ v0.1.3.tar.gz -> v0.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/.builds/alpine.yml new/cage-0.1.4/.builds/alpine.yml --- old/cage-0.1.3/.builds/alpine.yml 2021-04-16 14:01:38.000000000 +0200 +++ new/cage-0.1.4/.builds/alpine.yml 2021-06-26 09:39:40.000000000 +0200 @@ -19,7 +19,7 @@ # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - git checkout 0.13.0 + git checkout 0.14.0 meson --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/.builds/archlinux.yml new/cage-0.1.4/.builds/archlinux.yml --- old/cage-0.1.3/.builds/archlinux.yml 2021-04-16 14:01:38.000000000 +0200 +++ new/cage-0.1.4/.builds/archlinux.yml 2021-06-26 09:39:40.000000000 +0200 @@ -18,7 +18,7 @@ # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - git checkout 0.13.0 + git checkout 0.14.0 meson --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/.builds/freebsd.yml new/cage-0.1.4/.builds/freebsd.yml --- old/cage-0.1.3/.builds/freebsd.yml 2021-04-16 14:01:38.000000000 +0200 +++ new/cage-0.1.4/.builds/freebsd.yml 2021-06-26 09:39:40.000000000 +0200 @@ -21,7 +21,7 @@ # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - git checkout 0.13.0 + git checkout 0.14.0 meson --prefix=/usr/local build -Dexamples=false ninja -C build sudo ninja -C build install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/contrib/increment-version new/cage-0.1.4/contrib/increment-version --- old/cage-0.1.3/contrib/increment-version 1970-01-01 01:00:00.000000000 +0100 +++ new/cage-0.1.4/contrib/increment-version 2021-06-26 09:39:40.000000000 +0200 @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +if [ "$#" -ne 1 ]; then + echo "usage: $0 <new-version>" >&2 + exit 1 +fi + +new_version="$1" + +if [ "$new_version" != "${new_version#v}" ]; then + echo "Error: The new version shouldn't be prefixed with a \"v\"." >&2 + exit 1 +fi + +set -x + +sed -i meson.build -e "s/^ version: '.*'/ version: '$new_version'/" + +echo -n "Minimum wlroots version? " +read -r wlr_version_min + +sed -i meson.build -e "s/'wlroots', version: '.*'/'wlroots', version: '>= $wlr_version_min'/" + +git add meson.build +git commit -m "Update version to $new_version" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/contrib/release new/cage-0.1.4/contrib/release --- old/cage-0.1.3/contrib/release 1970-01-01 01:00:00.000000000 +0100 +++ new/cage-0.1.4/contrib/release 2021-06-26 09:39:40.000000000 +0200 @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +if [ "$#" -ne 1 ]; then + echo "usage: $0 <new-version>" >&2 + exit 1 +fi + +new_version="$1" + +if [ "$new_version" != "${new_version#v}" ]; then + echo "Error: The new version shouldn't be prefixed with a \"v\"." >&2 + exit 1 +fi + +set -x + +./increment_version "$new_version" +./tag-release "$new_version" +./sign-release + +git push --tags \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/contrib/sign-release new/cage-0.1.4/contrib/sign-release --- old/cage-0.1.3/contrib/sign-release 1970-01-01 01:00:00.000000000 +0100 +++ new/cage-0.1.4/contrib/sign-release 2021-06-26 09:39:40.000000000 +0200 @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -x + +project="$(basename "$(pwd)")" +last=$(git describe --tags --abbrev=0) + +prefix="$project-${last#v}" +archive="$prefix.tar.gz" + +git archive --prefix="$prefix/" -o "$archive" "$last" +gpg --output "$archive".sig --detach-sig "$archive" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/contrib/tag-release new/cage-0.1.4/contrib/tag-release --- old/cage-0.1.3/contrib/tag-release 1970-01-01 01:00:00.000000000 +0100 +++ new/cage-0.1.4/contrib/tag-release 2021-06-26 09:39:40.000000000 +0200 @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -x + +if [ "$#" -ne 1 ]; then + echo "usage: $0 <new-version>" >&2 + exit 1 +fi + +last=$(git describe --tags --abbrev=0) +echo "Last release was $last" + +next="v$1" + +shortlog="$(git shortlog --no-merges "$last"..)" + +printf "Shortlog: \n\n%s\n\nRelease $next? [y/N] " "$shortlog" +read -r answer + +if [ "$answer" != "y" ]; then + exit 0 +fi + +project="$(basename "$(pwd)")" + +(echo "$project $next"; echo ""; echo "$shortlog") | git tag "$next" -ase -F - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/meson.build new/cage-0.1.4/meson.build --- old/cage-0.1.3/meson.build 2021-04-16 14:01:38.000000000 +0200 +++ new/cage-0.1.4/meson.build 2021-06-26 09:39:40.000000000 +0200 @@ -1,5 +1,5 @@ project('cage', 'c', - version: '0.1.3', + version: '0.1.4', license: 'MIT', default_options: [ 'c_std=c11', @@ -34,7 +34,7 @@ ) endif -wlroots = dependency('wlroots', version: '>= 0.13.0') +wlroots = dependency('wlroots', version: '>= 0.14.0') wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') pixman = dependency('pixman-1') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.3/view.c new/cage-0.1.4/view.c --- old/cage-0.1.3/view.c 2021-04-16 14:01:38.000000000 +0200 +++ new/cage-0.1.4/view.c 2021-06-26 09:39:40.000000000 +0200 @@ -235,7 +235,10 @@ view->wlr_surface = surface; struct wlr_subsurface *subsurface; - wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces, parent_link) { + wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) { + subsurface_create(view, subsurface); + } + wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) { subsurface_create(view, subsurface); }

1 0

commit e2fsprogs for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2021-06-29 22:42:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "e2fsprogs" Tue Jun 29 22:42:47 2021 rev:119 rq:902396 version:1.46.2 Changes: -------- --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-05-16 11:38:36.051360994 +0200 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2625/e2fsprogs.changes 2021-06-29 22:42:48.446837822 +0200 @@ -1,0 +2,6 @@ +Wed Jun 2 08:31:22 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Fix the %doc files. RELEASE-NOTES is a symlink to + doc/RelNotes/v%version. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.b44dNy/_old 2021-06-29 22:42:49.042838608 +0200 +++ /var/tmp/diff_new_pack.b44dNy/_new 2021-06-29 22:42:49.046838614 +0200 @@ -395,7 +395,7 @@ %files -f e2fsprogs.lang %defattr(-, root, root) -%doc RELEASE-NOTES README +%doc doc/RelNotes/v%{version}.txt README %if 0%{?sle_version} > 120200 %license NOTICE %endif

1 0

commit kiwi-images-wsl for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kiwi-images-wsl for openSUSE:Factory checked in at 2021-06-29 22:42:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-images-wsl (Old) and /work/SRC/openSUSE:Factory/.kiwi-images-wsl.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-images-wsl" Tue Jun 29 22:42:47 2021 rev:9 rq:901227 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-images-wsl/kiwi-images-wsl.changes 2021-06-04 00:33:28.640887062 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-images-wsl.new.2625/kiwi-images-wsl.changes 2021-06-29 22:42:49.294838941 +0200 @@ -1,0 +2,9 @@ +Wed Jun 2 16:58:47 UTC 2021 - Jeff Kowalczyk <jkowalczyk(a)suse.com> + +- Use new kiwi_metainfo_helper variables %OS_VENDOR% and + %OS_PRETTY_NAME_BEFORE_PAREN_DASHED% to reduce incidental diff + between SLE, Leap and Tumbleweed KIWI definitions. With this + change, diff is now limited to package elements included in each + OS flavor. Requires obs-service-kiwi_metainfo_helper >= 0.3. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-images-wsl.kiwi ++++++ --- /var/tmp/diff_new_pack.ar2TI1/_old 2021-06-29 22:42:49.726839511 +0200 +++ /var/tmp/diff_new_pack.ar2TI1/_new 2021-06-29 22:42:49.726839511 +0200 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<image schemaversion="6.1" name="openSUSE-Leap-%OS_VERSION_ID%-WSL"> +<image schemaversion="6.1" name="%OS_PRETTY_NAME_BEFORE_PAREN_DASHED%-%OS_VERSION_ID%-WSL"> <description type="system"> <author>SUSE WSL Team</author> <contact>wsl(a)suse.com</contact> - <specification>openSUSE WSL Image</specification> + <specification>%OS_VENDOR% WSL Image</specification> </description> <preferences> <type image="appx" metadata_path="/usr/share/wsl-appx"/>

1 0

commit pam for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pam for openSUSE:Factory checked in at 2021-06-29 22:42:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam (Old) and /work/SRC/openSUSE:Factory/.pam.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pam" Tue Jun 29 22:42:46 2021 rev:113 rq:902310 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pam/pam.changes 2021-06-20 19:37:53.201505752 +0200 +++ /work/SRC/openSUSE:Factory/.pam.new.2625/pam.changes 2021-06-29 22:42:47.322836338 +0200 @@ -1,0 +2,5 @@ +Fri Jun 25 08:07:04 UTC 2021 - Callum Farmer <gmbr3(a)opensuse.org> + +- Create /run/motd.d + +------------------------------------------------------------------- New: ---- motd.tmpfiles ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.G1U04y/_old 2021-06-29 22:42:48.046837294 +0200 +++ /var/tmp/diff_new_pack.G1U04y/_new 2021-06-29 22:42:48.050837299 +0200 @@ -58,6 +58,7 @@ Source10: unix2_chkpwd.c Source11: unix2_chkpwd.8 Source12: pam-login_defs-check.sh +Source13: motd.tmpfiles Patch2: pam-limit-nproc.patch Patch4: pam-hostnames-in-access_conf.patch Patch5: pam-xauth_ownership.patch @@ -264,7 +265,9 @@ # rpm macros mkdir -p %{buildroot}/usr/lib/rpm/macros.d echo "%%_pamdir %pamdir" > %{buildroot}%{_prefix}/lib/rpm/macros.d/macros.pam -# Create filelist with translatins +# /run/motd.d +install -Dm0644 %{SOURCE13} %{buildroot}%{_tmpfilesdir}/motd.conf +# Create filelist with translations %find_lang Linux-PAM %verifyscript @@ -275,6 +278,7 @@ /sbin/ldconfig %set_permissions %{sbindir}/unix_chkpwd %set_permissions %{sbindir}/unix2_chkpwd +%tmpfiles_create %{_tmpfilesdir}/motd.conf %postun -p /sbin/ldconfig %pre @@ -295,6 +299,7 @@ %dir %{_sysconfdir}/security %dir %{_sysconfdir}/security/limits.d %dir %{_prefix}/lib/motd.d +%ghost %dir %{_rundir}/motd.d %if %{defined config_noreplace} %config(noreplace) %{_sysconfdir}/pam.d/other %config(noreplace) %{_sysconfdir}/pam.d/common-* @@ -437,6 +442,7 @@ %verify(not mode) %attr(4755,root,shadow) %{sbindir}/unix2_chkpwd %attr(0700,root,root) %{sbindir}/unix_update %{_unitdir}/pam_namespace.service +%{_tmpfilesdir}/motd.conf %files -n pam_unix %defattr(-,root,root,755) ++++++ motd.tmpfiles ++++++ #Type Path Mode User Group Age Argument d /run/motd.d 0755 root root - -

1 0

commit 000update-repos for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2021-06-29 21:10:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Tue Jun 29 21:10:59 2021 rev:1722 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- 15.2:update_1624990778.packages.xz factory:non-oss_2767.3.packages.xz factory_20210628.packages.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0