Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
c740dc2c
Unverified
Commit
c740dc2c
authored
3 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
packaging: use Qt 6.2.3
Change-Id: I996b402c5eb9b03ea18a0309818c6a52c9d6e236
parent
2ca0e939
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+2
-2
2 additions, 2 deletions
Makefile
packaging/rules/debian/control
+3
-3
3 additions, 3 deletions
packaging/rules/debian/control
scripts/build-package-rpm.sh
+2
-2
2 additions, 2 deletions
scripts/build-package-rpm.sh
with
7 additions
and
7 deletions
Makefile
+
2
−
2
View file @
c740dc2c
...
@@ -47,8 +47,8 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc
...
@@ -47,8 +47,8 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc
# Qt versions
# Qt versions
QT_MAJOR
:=
6
QT_MAJOR
:=
6
QT_MINOR
:=
2
QT_MINOR
:=
2
QT_PATCH
:=
2
QT_PATCH
:=
3
QT_TARBALL_CHECKSUM
:=
907994f78d42b30bdea95e290e91930c2d9b593f3f8dd994f44157e387feee0f
QT_TARBALL_CHECKSUM
:=
f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771
DEBIAN_QT_VERSION
:=
$(
QT_MAJOR
)
.
$(
QT_MINOR
)
.
$(
QT_PATCH
)
-1
DEBIAN_QT_VERSION
:=
$(
QT_MAJOR
)
.
$(
QT_MINOR
)
.
$(
QT_PATCH
)
-1
DEBIAN_QT_DSC_FILENAME
:=
libqt-jami_
$(
DEBIAN_QT_VERSION
)
.dsc
DEBIAN_QT_DSC_FILENAME
:=
libqt-jami_
$(
DEBIAN_QT_VERSION
)
.dsc
QT_JAMI_PREFIX
:=
/usr/lib/libqt-jami
QT_JAMI_PREFIX
:=
/usr/lib/libqt-jami
...
...
This diff is collapsed.
Click to expand it.
packaging/rules/debian/control
+
3
−
3
View file @
c740dc2c
...
@@ -77,7 +77,7 @@ Depends: gnupg,
...
@@ -77,7 +77,7 @@ Depends: gnupg,
Replaces: jami,
Replaces: jami,
jami-libclient,
jami-libclient,
jami-daemon,
jami-daemon,
libqt-jami (>= 6),
libqt-jami (>= 6
.2.3
),
Conflicts: jami,
Conflicts: jami,
jami-libclient,
jami-libclient,
jami-daemon,
jami-daemon,
...
@@ -93,7 +93,7 @@ Architecture: any
...
@@ -93,7 +93,7 @@ Architecture: any
Depends: ${shlibs:Depends},
Depends: ${shlibs:Depends},
${misc:Depends},
${misc:Depends},
jami-libclient (=${binary:Version}),
jami-libclient (=${binary:Version}),
libqt-jami (>= 6)
libqt-jami (>= 6
.2.3
)
Provides: jami-qt
Provides: jami-qt
Replaces: jami-all
Replaces: jami-all
Conflicts: jami-all
Conflicts: jami-all
...
@@ -121,7 +121,7 @@ Architecture: any
...
@@ -121,7 +121,7 @@ Architecture: any
Depends: ${shlibs:Depends},
Depends: ${shlibs:Depends},
${misc:Depends},
${misc:Depends},
jami-daemon (=${binary:Version}),
jami-daemon (=${binary:Version}),
libqt-jami (>= 6)
libqt-jami (>= 6
.2.3
)
Description: Secure and distributed voice, video and chat platform - daemon
Description: Secure and distributed voice, video and chat platform - daemon
Jami (jami.net) is a secure and distributed voice, video and chat communication
Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
platform that requires no centralized server and leaves the power of privacy
...
...
This diff is collapsed.
Click to expand it.
scripts/build-package-rpm.sh
+
2
−
2
View file @
c740dc2c
...
@@ -43,7 +43,7 @@ PKG_CONFIG_PATH="${QT_JAMI_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
...
@@ -43,7 +43,7 @@ PKG_CONFIG_PATH="${QT_JAMI_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
CMAKE_PREFIX_PATH
=
"
${
QT_JAMI_PREFIX
}
/lib/cmake:
${
CMAKE_PREFIX_PATH
}
"
CMAKE_PREFIX_PATH
=
"
${
QT_JAMI_PREFIX
}
/lib/cmake:
${
CMAKE_PREFIX_PATH
}
"
QT_MAJOR
=
6
QT_MAJOR
=
6
QT_MINOR
=
2
QT_MINOR
=
2
QT_PATCH
=
1
QT_PATCH
=
3
QT_MAJOR_MINOR
=
${
QT_MAJOR
}
.
${
QT_MINOR
}
QT_MAJOR_MINOR
=
${
QT_MAJOR
}
.
${
QT_MINOR
}
QT_MAJOR_MINOR_PATCH
=
${
QT_MAJOR
}
.
${
QT_MINOR
}
.
${
QT_PATCH
}
QT_MAJOR_MINOR_PATCH
=
${
QT_MAJOR
}
.
${
QT_MINOR
}
.
${
QT_PATCH
}
...
@@ -51,7 +51,7 @@ QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
...
@@ -51,7 +51,7 @@ QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
QT_TARBALL_URL
=
https://download.qt.io/archive/qt/
$QT_MAJOR_MINOR
/
\
QT_TARBALL_URL
=
https://download.qt.io/archive/qt/
$QT_MAJOR_MINOR
/
\
$QT_MAJOR_MINOR_PATCH
/single/qt-everywhere-src-
$QT_MAJOR_MINOR_PATCH
.tar.xz
$QT_MAJOR_MINOR_PATCH
/single/qt-everywhere-src-
$QT_MAJOR_MINOR_PATCH
.tar.xz
QT_TARBALL_SHA256
=
"
e03fffc5c3b5fea09dcc161444df7dfbbe24e8a8ce9377014ec21b66f48d43cd
"
QT_TARBALL_SHA256
=
"
f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771
"
QT_TARBALL_FILE_NAME
=
$(
basename
"
$QT_TARBALL_URL
"
)
QT_TARBALL_FILE_NAME
=
$(
basename
"
$QT_TARBALL_URL
"
)
CACHED_QT_TARBALL
=
$TARBALLS
/
$QT_TARBALL_FILE_NAME
CACHED_QT_TARBALL
=
$TARBALLS
/
$QT_TARBALL_FILE_NAME
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment