Compare commits
8 commits
rawhide
...
git-develo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b2f439f92 | ||
|
|
660030f91f | ||
|
|
7cc586bb86 | ||
|
|
8c74b6abd7 | ||
|
|
9ddef6af2a | ||
|
|
93d1b3e7e8 | ||
|
|
e0871aedb2 | ||
|
|
5d0c0cc3e0 |
4 changed files with 35 additions and 22 deletions
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (ugene-free-53.0.tar.gz) = 233c857d9a0ea42005efaa53e5ba5162e76a149f01d7406a73bd9215b96c096b3c379cc3b14c7d7b83c61df5ea2435412f6d43c71aef84b23d1d683d5a172b30
|
||||
SHA512 (ugene-free-20260112T1631.tar.gz) = d5f0781caf63ee18f0645d067320191f72f1e06194de76db01268546db745eac80dae063c17b155ce5b74603e3aa4d6f85af165d36e22e380783e8f179e4762f
|
||||
|
|
|
|||
26
ugene-52.1.x-QObject-connect-overload.patch
Normal file
26
ugene-52.1.x-QObject-connect-overload.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp b/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
|
||||
index 0b7076cf5..d5f6b7304 100644
|
||||
--- a/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
|
||||
+++ b/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
|
||||
@@ -337,7 +337,7 @@ void RegionSelectorController::connectSlots() {
|
||||
|
||||
connect(gui.startLineEdit, &QLineEdit::textEdited, this, &RegionSelectorController::sl_onRegionChanged);
|
||||
connect(gui.endLineEdit, &QLineEdit::textEdited, this, &RegionSelectorController::sl_onRegionChanged);
|
||||
- connect(gui.presetsComboBox, &QComboBox::activated, this, &RegionSelectorController::sl_onPresetChanged);
|
||||
+ connect(gui.presetsComboBox, QOverload<int>::of(&QComboBox::activated), this, &RegionSelectorController::sl_onPresetChanged);
|
||||
|
||||
if (settings.selection != nullptr) {
|
||||
connect(settings.selection, SIGNAL(si_onSelectionChanged(GSelection*)), SLOT(sl_onSelectionChanged(GSelection*)));
|
||||
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
|
||||
index 531d21d1d..89a2314b4 100644
|
||||
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
|
||||
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
|
||||
@@ -485,7 +485,7 @@ void FindPatternWidget::connectSlots() {
|
||||
connect(annotatedDnaView->getActiveSequenceContext()->getSequenceObject(), SIGNAL(si_sequenceChanged()), this, SLOT(sl_onSequenceModified()));
|
||||
|
||||
connect(loadFromFileToolButton, SIGNAL(clicked()), SLOT(sl_onFileSelectorClicked()));
|
||||
- connect(patternSelectorBG, &QButtonGroup::buttonToggled, this, &FindPatternWidget::sl_onFileSelectorToggled);
|
||||
+ connect(patternSelectorBG, QOverload<QAbstractButton*, bool>::of(&QButtonGroup::buttonToggled), this, &FindPatternWidget::sl_onFileSelectorToggled);
|
||||
|
||||
usePatternFromTextEditRadioButton->setChecked(true);
|
||||
updatePatternSourceControlsUiState();
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp b/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
|
||||
index f052b9122..d0fdfeb0d 100644
|
||||
--- a/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
|
||||
+++ b/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
|
||||
@@ -339,7 +339,7 @@ void RegionSelectorController::connectSlots() {
|
||||
|
||||
connect(gui.startLineEdit, &QLineEdit::textEdited, this, &RegionSelectorController::sl_onRegionChanged);
|
||||
connect(gui.endLineEdit, &QLineEdit::textEdited, this, &RegionSelectorController::sl_onRegionChanged);
|
||||
- connect(gui.presetsComboBox, &QComboBox::activated, this, &RegionSelectorController::sl_onPresetChanged);
|
||||
+ connect(gui.presetsComboBox, QOverload<int>::of(&QComboBox::activated), this, &RegionSelectorController::sl_onPresetChanged);
|
||||
|
||||
if (settings.selection != nullptr) {
|
||||
connect(settings.selection, SIGNAL(si_onSelectionChanged(GSelection*)), SLOT(sl_onSelectionChanged(GSelection*)));
|
||||
16
ugene.spec
16
ugene.spec
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
%if 0%{?use_release_branch} < 1
|
||||
# master
|
||||
%global gitdate 20251211
|
||||
%global gitcommit b50ca792f254939978f0ffd3126e3d9ab770a10a
|
||||
%global gitdate 20251230
|
||||
%global gitcommit 71bdfafe45ac07c04c40ee7bb90456f96b3d8bbc
|
||||
# New git commit with non-free part removed using "git filter-branch"
|
||||
%global gitcommit_free 7e674061492924b3dfbc884c4c9503ecab9887b2
|
||||
%global gitcommit_free 0a64d3f2396f1924ef932aed51a50b221e68a88d
|
||||
%else
|
||||
# currently 41.0 branch
|
||||
%global gitdate 20250313
|
||||
|
|
@ -18,11 +18,11 @@
|
|||
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
|
||||
%global git_version %{gitdate}git%{shortcommit}
|
||||
|
||||
%global tarballdate 20251211
|
||||
%global tarballtime 2210
|
||||
%global tarballdate 20260112
|
||||
%global tarballtime 1631
|
||||
|
||||
%global use_release 1
|
||||
%global use_gitbare 0
|
||||
%global use_release 0
|
||||
%global use_gitbare 1
|
||||
|
||||
%if 0%{?use_gitbare} < 1
|
||||
# force
|
||||
|
|
@ -72,7 +72,7 @@ Source2: create-%{name}-git-bare-tarball.sh
|
|||
# This is not installed
|
||||
Source10: ugene.wrapper
|
||||
Patch1: ugene-49.1-narrowing-for-unsigned-char.patch
|
||||
Patch3: ugene-52.1.x-RegionSelectorController-overload.patch
|
||||
Patch3: ugene-52.1.x-QObject-connect-overload.patch
|
||||
# Currently distro-specific
|
||||
Patch102: ugene-44.x-libs_3rdparty-breakpad-sys_mmap_use_system_mmap.patch
|
||||
Patch103: ugene-40.1-libs_3rdparty-breakpad-unwind-nonsupported-arch.patch
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue