Accepting request 1096922 from network
OBS-URL: https://build.opensuse.org/request/show/1096922 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nextcloud-desktop?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
055e137ced
@ -1,28 +0,0 @@
|
||||
diff -burNE desktop-3.0.0.orig/doc/conf.py desktop-3.0.0/doc/conf.py
|
||||
--- desktop-3.0.0.orig/doc/conf.py 2020-08-21 22:36:32.434056247 +0200
|
||||
+++ desktop-3.0.0/doc/conf.py 2020-08-21 22:36:57.345005233 +0200
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
|
||||
# using the given strftime format.
|
||||
-html_last_updated_fmt = '%b %d, %Y'
|
||||
+#html_last_updated_fmt = '%b %d, %Y'
|
||||
|
||||
# If true, SmartyPants will be used to convert quotes and dashes to
|
||||
# typographically correct entities.
|
||||
diff -burNE desktop-3.0.0.orig/src/libsync/theme.cpp desktop-3.0.0/src/libsync/theme.cpp
|
||||
--- desktop-3.0.0.orig/src/libsync/theme.cpp 2020-08-21 22:36:34.789956849 +0200
|
||||
+++ desktop-3.0.0/src/libsync/theme.cpp 2020-08-21 22:36:57.349005064 +0200
|
||||
@@ -338,11 +338,9 @@
|
||||
const QString gitSha1(QLatin1String(GIT_SHA1));
|
||||
devString = QCoreApplication::translate("nextcloudTheme::about()",
|
||||
"<p><small>Built from Git revision <a href=\"%1\">%2</a>"
|
||||
- " on %3, %4 using Qt %5, %6</small></p>")
|
||||
+ " using Qt %3, %4</small></p>")
|
||||
.arg(githubPrefix + gitSha1)
|
||||
.arg(gitSha1.left(6))
|
||||
- .arg(__DATE__)
|
||||
- .arg(__TIME__)
|
||||
.arg(qVersion())
|
||||
.arg(QSslSocket::sslLibraryVersionString());
|
||||
#endif
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 29 18:50:15 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Add nextcloud-fix-HiDPI-window-size.patch -- Fix huge sized
|
||||
windows for nextcloud client settings and crash-reporter on
|
||||
HiDPI systems.
|
||||
- Set SOURCE_DATE_EPOCH from the last modified time of source
|
||||
files to avoid non-reproducible builds due to __DATE__/__TIME__;
|
||||
this replaces nextcloud-desktop-remove-datetime.patch which is
|
||||
therefore dropped. Requires cmake >= 3.8.0. Using
|
||||
SOURCE_DATE_EPOCH seems to be a better solution than the patch
|
||||
as this still preserves the date and time shown on the Settings
|
||||
window and could prove useful for debugging upstream. On the
|
||||
contrary, the patch simply removed __DATE__/__TIME__ from the
|
||||
sources and was not going to be accepted by upstream anyway.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 23 07:41:23 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
@ -27,10 +27,10 @@ Group: Productivity/Networking/File-Sharing
|
||||
URL: https://nextcloud.com/
|
||||
Source: https://github.com/nextcloud/desktop/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: sysctl-sync-inotify.conf
|
||||
# PATCH-FIX-OPENSUSE nextcloud-desktop-remove-datetime.patch sor.alexei@meowr.ru -- Remove __TIME__ and __DATE__.
|
||||
Patch1: nextcloud-desktop-remove-datetime.patch
|
||||
# PATCH-FIX-UPSTREAM nextcloud-fix-HiDPI-window-size.patch badshah400@gmail.com -- Fix huge size of the nextcloud client settings and crash-reporter windows on HiDPI systems
|
||||
Patch0: nextcloud-fix-HiDPI-window-size.patch
|
||||
BuildRequires: AppStream
|
||||
BuildRequires: cmake >= 3.2
|
||||
BuildRequires: cmake >= 3.8.0
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -201,7 +201,8 @@ This package provides Nextcloud's command-line sync utility.
|
||||
cp -a %{SOURCE1} sysctl-sync-inotify.conf
|
||||
|
||||
%build
|
||||
|
||||
# Set SOURCE_DATE_EPOCH to set __DATE__/__TIME__ based on tarball creation date and make build reproducible
|
||||
export SOURCE_DATE_EPOCH=`date -r VERSION.cmake +"%s"`
|
||||
%cmake \
|
||||
%if 0%{?is_opensuse}
|
||||
-DWITH_DOC=ON \
|
||||
|
||||
27
nextcloud-fix-HiDPI-window-size.patch
Normal file
27
nextcloud-fix-HiDPI-window-size.patch
Normal file
@ -0,0 +1,27 @@
|
||||
Index: desktop-3.9.0/src/gui/main.cpp
|
||||
===================================================================
|
||||
--- desktop-3.9.0.orig/src/gui/main.cpp
|
||||
+++ desktop-3.9.0/src/gui/main.cpp
|
||||
@@ -65,6 +65,8 @@ int main(int argc, char **argv)
|
||||
|
||||
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
|
||||
+ QApplication::setHighDpiScaleFactorRoundingPolicy(
|
||||
+ Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
||||
#ifdef Q_OS_MAC
|
||||
Mac::CocoaInitializer cocoaInit; // RIIA
|
||||
#endif
|
||||
Index: desktop-3.9.0/src/crashreporter/main.cpp
|
||||
===================================================================
|
||||
--- desktop-3.9.0.orig/src/crashreporter/main.cpp
|
||||
+++ desktop-3.9.0/src/crashreporter/main.cpp
|
||||
@@ -25,6 +25,8 @@
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
||||
+ QApplication::setHighDpiScaleFactorRoundingPolicy(
|
||||
+ Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
||||
#ifdef Q_OS_WIN
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
|
||||
#endif // !Q_OS_WIN
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user