Compare commits
6 commits
rawhide
...
git-develo
| Author | SHA1 | Date | |
|---|---|---|---|
| 8e82a0c71c | |||
| d1902730c3 | |||
| b3d9f84188 | |||
| 5b195f073f | |||
| 13684f64ef | |||
| 691bc247e4 |
3 changed files with 44 additions and 23 deletions
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (ugene-free-53.1.tar.gz) = 5d2a1d9fac81a14fd7916c33223704aaaedfc29bd39086561202766f87cebbc7739775eccabe6a789a2381e14384bd7f8f4f7a9dfde334811190fe47dbbcc455
|
||||
SHA512 (ugene-free-20260906T1440.tar.gz) = fc0890fc79acb337959450119b81b5178ba0f3ff3fb7502e1450d12d0e4f18a8a0586b5b6256d9d97c42f21251bbc54c97d215a23fb68d1e3fd33368fe1da37f
|
||||
|
|
|
|||
17
ugene-53.1.x-qmin-arg-signness.patch
Normal file
17
ugene-53.1.x-qmin-arg-signness.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/src/plugins/pcr/src/InSilicoPcrTask.cpp b/src/plugins/pcr/src/InSilicoPcrTask.cpp
|
||||
index c2e106cd9..a5febc83e 100644
|
||||
--- a/src/plugins/pcr/src/InSilicoPcrTask.cpp
|
||||
+++ b/src/plugins/pcr/src/InSilicoPcrTask.cpp
|
||||
@@ -66,10 +66,10 @@ namespace {
|
||||
int getMaxError(const InSilicoPcrTaskSettings* settings, U2Strand::Direction direction) {
|
||||
int res = 0;
|
||||
if (direction == U2Strand::Direct) {
|
||||
- res = qMin((qsizetype)settings->forwardMismatches, settings->forwardPrimer.length() - settings->perfectMatch);
|
||||
+ res = qMin((qsizetype)settings->forwardMismatches, settings->forwardPrimer.length() - (qsizetype)settings->perfectMatch);
|
||||
res = qMin(res, settings->forwardPrimer.length() - 1);
|
||||
} else {
|
||||
- res = qMin((qsizetype)settings->reverseMismatches, settings->reversePrimer.length() - settings->perfectMatch);
|
||||
+ res = qMin((qsizetype)settings->reverseMismatches, settings->reversePrimer.length() - (qsizetype)settings->perfectMatch);
|
||||
res = qMin(res, settings->reversePrimer.length() - 1);
|
||||
}
|
||||
return qMax(0, res);
|
||||
48
ugene.spec
48
ugene.spec
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
%if 0%{?use_release_branch} < 1
|
||||
# master
|
||||
%global gitdate 20260228
|
||||
%global gitcommit 77338a76808d0e1b36461a94d16f0a45c83b64e9
|
||||
%global gitdate 20260905
|
||||
%global gitcommit 0a5caecdcd44ea72e322524032ee8bc8b94f901a
|
||||
# New git commit with non-free part removed using "git filter-branch"
|
||||
%global gitcommit_free 6812b00935495786e28ebe901bfb8304dbee457c
|
||||
%global gitcommit_free 84beedcc4e5b93b227a96cc8303a4d56ac82ca64
|
||||
%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 20260301
|
||||
%global tarballtime 1637
|
||||
%global tarballdate 20260906
|
||||
%global tarballtime 1440
|
||||
|
||||
%global use_release 1
|
||||
%global use_gitbare 0
|
||||
%global use_release 0
|
||||
%global use_gitbare 1
|
||||
|
||||
%if 0%{?use_gitbare} < 1
|
||||
# force
|
||||
|
|
@ -50,7 +50,7 @@ Name: ugene
|
|||
Summary: Integrated bioinformatics toolkit
|
||||
|
||||
Version: %{fedoraver}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
|
||||
#The entire source code is GPLv2+ except:
|
||||
#file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2
|
||||
|
|
@ -73,6 +73,7 @@ Source2: create-%{name}-git-bare-tarball.sh
|
|||
Source10: ugene.wrapper
|
||||
Patch1: ugene-49.1-narrowing-for-unsigned-char.patch
|
||||
Patch3: ugene-52.1.x-QObject-connect-overload.patch
|
||||
Patch4: ugene-53.1.x-qmin-arg-signness.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
|
||||
|
|
@ -91,20 +92,21 @@ BuildRequires: desktop-file-utils
|
|||
BuildRequires: %{_bindir}/git
|
||||
%endif
|
||||
|
||||
BuildRequires: cmake(Qt5Core)
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5LinguistTools)
|
||||
BuildRequires: cmake(Qt5Network)
|
||||
BuildRequires: cmake(Qt5NetworkAuth)
|
||||
BuildRequires: cmake(Qt5PrintSupport)
|
||||
BuildRequires: cmake(Qt5Script)
|
||||
BuildRequires: cmake(Qt5ScriptTools)
|
||||
BuildRequires: cmake(Qt5Sql)
|
||||
BuildRequires: cmake(Qt5Svg)
|
||||
BuildRequires: cmake(Qt5Test)
|
||||
BuildRequires: cmake(Qt5WebSockets)
|
||||
BuildRequires: cmake(Qt5Widgets)
|
||||
BuildRequires: cmake(Qt5Xml)
|
||||
BuildRequires: cmake(Qt6Core)
|
||||
BuildRequires: cmake(Qt6Core5Compat)
|
||||
BuildRequires: cmake(Qt6CorePrivate)
|
||||
BuildRequires: cmake(Qt6Gui)
|
||||
BuildRequires: cmake(Qt6LinguistTools)
|
||||
BuildRequires: cmake(Qt6Network)
|
||||
BuildRequires: cmake(Qt6NetworkAuth)
|
||||
BuildRequires: cmake(Qt6OpenGL)
|
||||
BuildRequires: cmake(Qt6OpenGLWidgets)
|
||||
BuildRequires: cmake(Qt6PrintSupport)
|
||||
BuildRequires: cmake(Qt6Svg)
|
||||
BuildRequires: cmake(Qt6Test)
|
||||
BuildRequires: cmake(Qt6WebSockets)
|
||||
BuildRequires: cmake(Qt6Widgets)
|
||||
BuildRequires: cmake(Qt6Xml)
|
||||
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(glu)
|
||||
|
|
@ -140,6 +142,8 @@ git config user.email "%{name}-maintainers@fedoraproject.org"
|
|||
%GIT commit -m "Fix narrowing on arch where default char is unsigned" -a
|
||||
%patch -P3 -p1 -b .include
|
||||
%GIT commit -m "RegionSelectorController: specify overloaded function" -a
|
||||
%patch -P4 -p1 -b .signness
|
||||
%GIT commit -m "Fix signness for qMin argument" -a
|
||||
%patch -P102 -p1 -b .sys_mmap -Z
|
||||
%GIT commit -m "libs_3rdparty/breakpad: use C function instead of directly using syscall assemble code" -a
|
||||
%patch -P103 -p1 -b .unwind -Z
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue