diff options
| author | Taylor Smith <tsmith@tsmithcreative.com> | 2017-10-04 09:03:12 +0300 |
|---|---|---|
| committer | Taylor Smith <tsmith@tsmithcreative.com> | 2017-10-04 09:08:55 +0300 |
| commit | 1a2593bea2834f416c497cf1129f48e28a03c8d9 (patch) | |
| tree | 0b7f74082a0b7cd7582a717d70d38ed5046d28a5 | |
| parent | dd252401b188147416125aa001925e1065db009b (diff) | |
Add a description to the patch per guidelines in the icons patch; add note to README build instructions
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | win/opensuse-mingw-repo-location.patch | 11 | ||||
| -rwxr-xr-x | win/travis-build.sh | 8 |
3 files changed, 24 insertions, 3 deletions
@@ -181,6 +181,14 @@ Build it: docker build -t nextcloud-client-win32:<version> client/admin/win/docker/ ``` +_Note: if you encounter an error at this step that the MinGW repository was not found, apply the patch at_ `win/opensuse-mingw-repo-location.patch` _and try again:_ + +```bash +cd client +patch -p1 < ../win/opensuse-mingw-repo-location.patch +cd .. +``` + ### Building the binary ```bash diff --git a/win/opensuse-mingw-repo-location.patch b/win/opensuse-mingw-repo-location.patch index 834598a..da57941 100644 --- a/win/opensuse-mingw-repo-location.patch +++ b/win/opensuse-mingw-repo-location.patch @@ -1,3 +1,14 @@ +Description: Update the repository location for MinGW. + + Windows builds failed because this dependency was not at the specified + location. This patch can be applied to the client submodule to update the + Dockerfile with a path to MinGW for openSUSE Leap instead. This change has + been applied upstream in owncloud/client at 6be122e (PR owncloud/client#5900) + but is not included in the 2.3.3 release. + +Last-Update: 2017-10-04 +Author: Taylor Smith <tsmith@tsmithcreative.com> + diff --git a/admin/win/docker/Dockerfile b/admin/win/docker/Dockerfile index 8e40a49..1629b97 100644 --- a/admin/win/docker/Dockerfile diff --git a/win/travis-build.sh b/win/travis-build.sh index 3dcae9a..a1f0685 100755 --- a/win/travis-build.sh +++ b/win/travis-build.sh @@ -30,9 +30,11 @@ if [ "$TRAVIS_BUILD_STEP" == "install" ]; then fi # @TODO: This patch updates the repo location of mingw _in the origin repo_ - # because repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo does not - # exist anymore but it does exist in openSUSE Leap 42.1. This should be removed - # and the patch deleted when it is no longer needed to build. + # because repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo has + # been moved to openSUSE Leap 42.1. This has been applied upstream but is + # not included in their 2.3.3 tag. This should be removed and the patch + # deleted when it is no longer needed to build, presumably in the next + # release. See owncloud/client at 6be122e (PR owncloud/client#5900). cd client patch -p1 < ../win/opensuse-mingw-repo-location.patch cd .. |