Commit Graph

18 Commits

Author SHA1 Message Date
nicole mazzuca
7e3f9817bc
Revert "[qt-advanced-docking-system] update and use qt6 (#21998)" (#22350)
This reverts commit 91e1ce34a5.
2022-01-04 14:45:21 -08:00
Alexander Neumann
91e1ce34a5
[qt-advanced-docking-system] update and use qt6 (#21998)
* update port

* format-manifest

* version stuff

* version stuff

* fix arm windows

* version stuff
2022-01-04 14:42:55 -08:00
vincent-nv
de0afd063a
UPDATE Qt-Advanced-Docking-System to v3.8.0 (#21802) 2021-12-09 16:55:57 -08:00
vincent-nv
fddd13e36e
UPDATE Qt-Advanced-Docking-System to v3.7.2 (#21801)
* UPDATE Qt-Advanced-Docking-System to v3.7.2

* MR + change old cmake functions names

* MR

* MR
2021-12-06 20:18:38 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986)
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
2021-09-09 01:24:04 -07:00
NancyLi1013
097a31d4c3
[qt-advanced-docking-system] Update hash (#14714) 2020-11-23 10:51:06 -08:00
Lily
a20ed34098
[qt-advanced-docking-system] Update to version 3.6.3 (#14347) 2020-11-02 13:56:37 -08:00
Stijn Herfst
0ad0d1ec6b
[qt-advanced-docking-system] update to 3.6.1 (#13340)
* update to 3.6.1

* remove unneeded changes

* fix qt5-x11extras linux dependency

* add dependency for osx

* make requested changes

* change hash
2020-09-14 17:02:31 -07:00
Alexander Neumann
3bffe1c049
[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (#11596)
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core].

* [qt5] update and remove patches

* [baseline] skip qt5-canvas3d due to deprecation

* [qwt] update to 6.1.4 and fix build issues

* [qt5-webengine] remove old patches

* [qwt] fix static patch

* [qt5-location] add a message that the port has a sprious failure

* [qt5-webengine] fix filename of patch

* [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors)

* [qt5-winextras] depend on qt5-base[core]

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* [qt5-base] update latest feature (latest=core)

* [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now

* [qt5-base] make qt5-base fail to get logs.

* [angle] include missing egl sources.

* [qt5-base] patch egl detection logic.

* [baseline] remove qt-x11extras:x64-linux=fail

* [qt5-base] need to be explicit about xcb to build qt5-x11extras

* [CI] add necessary system libraries to linux CI

* [qt5-base] remove comment to retry on linux

* [qt5-base] add static_init patch for MSVC

* [qt5-base] refined workaround to not regress linux and osx due to

* [paraview] remove unnecessary patches with newer qt versions

* [vcpkg/baseline] add webengine back to skip

* [vtk] fix missing include regression using patch from upstream

* [vtk] fix patch

* [qt5-base] replace with patch from upstream

* [paraview] use hdf5 1.10 api.

* [paraview] bump control

* Add more packages to Linux machines.

* [qt5-base] forgot to add the patch

* Delete 6943.diff

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-07-08 15:34:35 -07:00
Billy Robert O'Neal III
85c3904a65 [qt-advanced-docking-system] Patch qt-advanced-docking-system to not install LICENSE. 2020-04-30 21:51:31 -07:00
Stijn Herfst
657becf609
[qt-advanced-docking-system] updated qt-advanced-docking-system to 3.2.1 (#10170)
* updated qt-advanced-docking-system to 3.2.1

* fixed source hash

* made requested changes

* fix linux build

* Update to 3.2.5, fix hash discrepancy
2020-04-27 06:54:16 -07:00
Phoebe
cbaafe76d6
Fix ci baseline (#10390)
* Rebuild failed ports on ci baseline

* Remove passed port osg-qt:x64-linux from ci baseline file

* Add mirrors for qt5
2020-03-19 10:33:59 -07:00
Stijn Herfst
531009c799 disabled examples 2019-08-21 14:50:17 +02:00
Stijn Herfst
cdcb4eaaa8 fixed static build 2019-08-14 11:09:49 +02:00
Stijn Herfst
7481330ea2 remove space character from patch file 2019-08-14 10:31:41 +02:00
Stijn Herfst
a47efa0cd4 Retrigger faulty CI/CD 2019-08-09 22:04:24 +02:00
Stijn Herfst
29938e73d8 Added qt dependency 2019-08-09 21:43:57 +02:00
Stijn Herfst
8fccec58a6 [qt-advanced-docking-system] Add new port 2019-08-09 21:36:36 +02:00