ring: clean old patches for 20230206.0~ds2 now at unstable
This commit is contained in:
Luis Guzmán
parent
ef6a9516c6
commit
4832dd58be
11 changed files with 2 additions and 6913 deletions
|
|
@ -1,28 +0,0 @@
|
||||||
From 27da2eb5717b33acdf27457b11d4bc98e8cc35de Mon Sep 17 00:00:00 2001
|
|
||||||
From: Amin Bandali <bandali@gnu.org>
|
|
||||||
Date: Tue, 21 Feb 2023 01:08:08 -0500
|
|
||||||
Subject: [PATCH] * debian/rules: Remove usr/lib/pkgconfig/jami.pc.
|
|
||||||
|
|
||||||
We currently don't ship the Jami daemon as a library, so it doesn't
|
|
||||||
make much sense to ship the jami.pc pkg-config file either.
|
|
||||||
---
|
|
||||||
debian/changelog | 4 +++-
|
|
||||||
debian/rules | 2 ++
|
|
||||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
|
||||||
index 621d0cec..08ae06aa 100755
|
|
||||||
--- a/debian/rules
|
|
||||||
+++ b/debian/rules
|
|
||||||
@@ -132,6 +132,8 @@ override_dh_auto_install:
|
|
||||||
rm -rfv $(CURDIR)/debian/jami-daemon/usr/include
|
|
||||||
rm -rfv $(CURDIR)/debian/jami-daemon/usr/lib/*.a
|
|
||||||
rm -rfv $(CURDIR)/debian/jami-daemon/usr/lib/*.la
|
|
||||||
+ rm -rfv $(CURDIR)/debian/jami-daemon/usr/lib/pkgconfig
|
|
||||||
+ rm -rv $(CURDIR)/debian/jami-daemon/usr/lib
|
|
||||||
# CMake files
|
|
||||||
rm -rfv $(CURDIR)/debian/jami/usr/lib/cmake
|
|
||||||
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
From 219296f6363a9d7425180b67b4bb83a6a801a6bd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petter Reinholdtsen <pere@debian.org>
|
|
||||||
Date: Tue, 21 Feb 2023 04:13:52 +0100
|
|
||||||
Subject: [PATCH] Added 1000-appstream-categories.patch to fix warning from
|
|
||||||
appstream generator.
|
|
||||||
|
|
||||||
---
|
|
||||||
.../patches/1000-appstream-categories.patch | 23 +++++++++++++++++++
|
|
||||||
debian/patches/series | 1 +
|
|
||||||
2 files changed, 24 insertions(+)
|
|
||||||
create mode 100644 debian/patches/1000-appstream-categories.patch
|
|
||||||
|
|
||||||
diff --git a/debian/patches/1000-appstream-categories.patch b/debian/patches/1000-appstream-categories.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..404f5c02
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/debian/patches/1000-appstream-categories.patch
|
|
||||||
@@ -0,0 +1,23 @@
|
|
||||||
+Description: Remove appstream metadata categories not recognized by validator
|
|
||||||
+ The Communication and Productivity categories are not listed in the
|
|
||||||
+ XDG Menu Specification.
|
|
||||||
+Author: Petter Reinholdtsen
|
|
||||||
+Forwarded: no
|
|
||||||
+
|
|
||||||
+diff --git a/daemon/net.jami.daemon.metainfo.xml.in b/daemon/net.jami.daemon.metainfo.xml.in
|
|
||||||
+index f30a8ac6..99c70f7a 100644
|
|
||||||
+--- a/daemon/net.jami.daemon.metainfo.xml.in
|
|
||||||
++++ b/daemon/net.jami.daemon.metainfo.xml.in
|
|
||||||
+@@ -67,12 +67,10 @@
|
|
||||||
+ <!-- https://specifications.freedesktop.org/menu-spec/latest/apas02.html -->
|
|
||||||
+ <categories>
|
|
||||||
+ <category>Chat</category>
|
|
||||||
+- <category>Communication</category>
|
|
||||||
+ <category>FileTransfer</category>
|
|
||||||
+ <category>InstantMessaging</category>
|
|
||||||
+ <category>Network</category>
|
|
||||||
+ <category>P2P</category>
|
|
||||||
+- <category>Productivity</category>
|
|
||||||
+ </categories>
|
|
||||||
+
|
|
||||||
+ <content_rating type="oars-1.1">
|
|
||||||
diff --git a/debian/patches/series b/debian/patches/series
|
|
||||||
index 997c9a39..ea657633 100644
|
|
||||||
--- a/debian/patches/series
|
|
||||||
+++ b/debian/patches/series
|
|
||||||
@@ -1,3 +1,4 @@
|
|
||||||
+1000-appstream-categories.patch
|
|
||||||
2000-jsoncpp-rename.patch
|
|
||||||
2010-dont-build-gnutls.patch
|
|
||||||
2020-dont-build-msgpack.patch
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
From 4d64f33d99d8a2521bcb4ff7d06a5b1dabb2621e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Amin Bandali <bandali@gnu.org>
|
|
||||||
Date: Mon, 20 Feb 2023 19:31:40 -0500
|
|
||||||
Subject: [PATCH] Add missing libqt6sql6-sqlite dependency, fix some lintian
|
|
||||||
warnings/errors
|
|
||||||
|
|
||||||
---
|
|
||||||
debian/changelog | 11 +++++++++++
|
|
||||||
debian/control | 1 +
|
|
||||||
debian/copyright | 8 --------
|
|
||||||
debian/source/lintian-overrides | 5 +++--
|
|
||||||
4 files changed, 15 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/debian/control b/debian/control
|
|
||||||
index 0b486037..ac39eaa6 100644
|
|
||||||
--- a/debian/control
|
|
||||||
+++ b/debian/control
|
|
||||||
@@ -95,6 +95,7 @@ Architecture: any
|
|
||||||
Depends: ${shlibs:Depends},
|
|
||||||
${misc:Depends},
|
|
||||||
jami-daemon (=${binary:Version}),
|
|
||||||
+ libqt6sql6-sqlite,
|
|
||||||
qml6-module-qt-labs-platform,
|
|
||||||
qml6-module-qt-labs-qmlmodels,
|
|
||||||
qml6-module-qt5compat-graphicaleffects,
|
|
||||||
diff --git a/debian/copyright b/debian/copyright
|
|
||||||
index e5b88470..59cca73f 100644
|
|
||||||
--- a/debian/copyright
|
|
||||||
+++ b/debian/copyright
|
|
||||||
@@ -76,13 +76,6 @@ License: Expat
|
|
||||||
|
|
||||||
# Jami daemon
|
|
||||||
|
|
||||||
-Files: daemon/doc/dbus-api/tools/devhelp.xsl
|
|
||||||
- daemon/doc/dbus-api/tools/doc-generator.py
|
|
||||||
- daemon/doc/dbus-api/tools/doc-generator.xsl
|
|
||||||
- daemon/doc/dbus-api/tools/specparser.py
|
|
||||||
-Copyright: 2009 Collabora Ltd.
|
|
||||||
-License: LGPL-2.1+
|
|
||||||
-
|
|
||||||
Files: daemon/compat/msvc/dlfcn.h
|
|
||||||
daemon/compat/msvc/dlfcn.c
|
|
||||||
Copyright: 2007 Ramiro Polla
|
|
||||||
@@ -113,7 +106,6 @@ Copyright: 2003-2011 the VideoLAN team
|
|
||||||
License: GPL-2+
|
|
||||||
|
|
||||||
Files: daemon/m4/ax_cxx_compile_stdcxx.m4
|
|
||||||
- daemon/m4/dolt.m4
|
|
||||||
Copyright: 2008 Benjamin Kosnik <bkoz@redhat.com>
|
|
||||||
2012 Zack Weinberg <zackw@panix.com>
|
|
||||||
2013 Roy Stogner <roystgnr@ices.utexas.edu>
|
|
||||||
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
|
|
||||||
index 0339fc0c..93f5703f 100644
|
|
||||||
--- a/debian/source/lintian-overrides
|
|
||||||
+++ b/debian/source/lintian-overrides
|
|
||||||
@@ -1,3 +1,4 @@
|
|
||||||
# The full commented source is there.
|
|
||||||
-source-is-missing lrc/src/web-chatview/linkify.js *
|
|
||||||
-source-is-missing lrc/src/web-chatview/jed.js *
|
|
||||||
+source-is-missing [src/libclient/web-chatview/linkify.j]
|
|
||||||
+source-is-missing [src/libclient/web-chatview/jed.js]
|
|
||||||
+source-is-missing [3rdparty/SortFilterProxyModel/docs/*.html]
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
From 1ed26e451022e941627c5e1eb499eb876e3ac50e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petter Reinholdtsen <pere@debian.org>
|
|
||||||
Date: Tue, 21 Feb 2023 04:14:07 +0100
|
|
||||||
Subject: [PATCH] Fixed typo in d//source/lintian-overrides.
|
|
||||||
|
|
||||||
---
|
|
||||||
debian/source/lintian-overrides | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
|
|
||||||
index 93f5703f..30d220df 100644
|
|
||||||
--- a/debian/source/lintian-overrides
|
|
||||||
+++ b/debian/source/lintian-overrides
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
# The full commented source is there.
|
|
||||||
-source-is-missing [src/libclient/web-chatview/linkify.j]
|
|
||||||
+source-is-missing [src/libclient/web-chatview/linkify.js]
|
|
||||||
source-is-missing [src/libclient/web-chatview/jed.js]
|
|
||||||
source-is-missing [3rdparty/SortFilterProxyModel/docs/*.html]
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,116 +0,0 @@
|
||||||
From 94d4869554ebf9bb23cf0d54cdf7693c2ce741d6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Amin Bandali <bandali@gnu.org>
|
|
||||||
Date: Sat, 25 Feb 2023 12:23:01 -0500
|
|
||||||
Subject: [PATCH] Build without Qt WebEngine on all architectures
|
|
||||||
|
|
||||||
---
|
|
||||||
debian/control | 8 +-------
|
|
||||||
debian/copyright | 11 +++++++++++
|
|
||||||
debian/rules | 11 +----------
|
|
||||||
debian/source/lintian-overrides | 3 ---
|
|
||||||
4 files changed, 13 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
#diff --git a/debian/control b/debian/control
|
|
||||||
#index dda52abc..9d8b2f0f 100644
|
|
||||||
#--- a/debian/control
|
|
||||||
#+++ b/debian/control
|
|
||||||
@@ -32,8 +32,6 @@
|
|
||||||
qml6-module-qtquick-shapes,
|
|
||||||
qml6-module-qtquick-templates,
|
|
||||||
qml6-module-qtquick-window,
|
|
||||||
- qml6-module-qtwebengine [amd64 arm64 armhf i386],
|
|
||||||
- qml6-module-qtwebchannel [amd64 arm64 armhf i386],
|
|
||||||
qt6-base-dev,
|
|
||||||
qt6-declarative-dev,
|
|
||||||
qt6-l10n-tools,
|
|
||||||
@@ -41,8 +39,6 @@
|
|
||||||
qt6-positioning-dev,
|
|
||||||
qt6-tools-dev,
|
|
||||||
qt6-tools-dev-tools,
|
|
||||||
- qt6-webengine-dev [amd64 arm64 armhf i386],
|
|
||||||
- qt6-webengine-dev-tools [amd64 arm64 armhf i386],
|
|
||||||
# daemon
|
|
||||||
libdbus-1-dev,
|
|
||||||
libdbus-c++-dev,
|
|
||||||
@@ -115,9 +111,7 @@
|
|
||||||
qml6-module-qtquick-layouts,
|
|
||||||
qml6-module-qtquick-shapes,
|
|
||||||
qml6-module-qtquick-templates,
|
|
||||||
- qml6-module-qtquick-window,
|
|
||||||
- qml6-module-qtwebengine [amd64 arm64 armhf i386],
|
|
||||||
- qml6-module-qtwebchannel [amd64 arm64 armhf i386]
|
|
||||||
+ qml6-module-qtquick-window
|
|
||||||
Provides: jami-qt
|
|
||||||
Description: Secure and distributed voice, video, and chat platform - desktop client
|
|
||||||
Jami is an end-to-end encrypted secure and distributed voice, video,
|
|
||||||
diff --git a/debian/copyright b/debian/copyright
|
|
||||||
index 59cca73f..1ac996ad 100644
|
|
||||||
--- a/debian/copyright
|
|
||||||
+++ b/debian/copyright
|
|
||||||
@@ -30,6 +30,17 @@ Files-Excluded: daemon/contrib/tarballs/argon2*
|
|
||||||
daemon/contrib/tarballs/x264*
|
|
||||||
daemon/contrib/tarballs/yaml-cpp*
|
|
||||||
daemon/contrib/tarballs/zlib*
|
|
||||||
+ src/app/webengine/*
|
|
||||||
+ src/app/previewengine.cpp
|
|
||||||
+ src/libclient/web-chatview/*
|
|
||||||
+ src/libclient/webresources.qrc
|
|
||||||
+Comment: Reasons for above exclusions:
|
|
||||||
+ The daemon/contrib/tarballs exclusions are for dependencies bundled
|
|
||||||
+ in release tarballs by upstream that are already packaged in Debian,
|
|
||||||
+ with the exception of pjproject which we keep (more details below).
|
|
||||||
+ The web-related exclusions are for omitting web-related files, some
|
|
||||||
+ of which minified JavaScript, since we build without Qt WebEngine,
|
|
||||||
+ and thus do not need those files.
|
|
||||||
|
|
||||||
|
|
||||||
Files: *
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
|
||||||
index 08ae06aa..41170fc2 100755
|
|
||||||
--- a/debian/rules
|
|
||||||
+++ b/debian/rules
|
|
||||||
@@ -19,13 +19,6 @@ ifeq ($(NO_CPUS),0)
|
|
||||||
NO_CPUS=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
-# Build with Qt WebEngine on supported arches
|
|
||||||
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386))
|
|
||||||
-webengine := true
|
|
||||||
-else
|
|
||||||
-webengine := false
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
%:
|
|
||||||
dh $@ --without autoreconf
|
|
||||||
|
|
||||||
@@ -88,17 +81,15 @@ endif
|
|
||||||
--disable-shared
|
|
||||||
|
|
||||||
# Qt client configure
|
|
||||||
-ifeq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386))
|
|
||||||
# Stopgap workaround to disable building with Qt WebEngine
|
|
||||||
sed -i 's/set(WITH_WEBENGINE true)/#&/' CMakeLists.txt
|
|
||||||
-endif
|
|
||||||
mkdir build
|
|
||||||
cd build && \
|
|
||||||
cmake \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DWITH_DAEMON_SUBMODULE=true \
|
|
||||||
- -DWITH_WEBENGINE=$(webengine) \
|
|
||||||
+ -DWITH_WEBENGINE=false \
|
|
||||||
..
|
|
||||||
|
|
||||||
dh_auto_configure
|
|
||||||
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
|
|
||||||
index 30d220df..c699956a 100644
|
|
||||||
--- a/debian/source/lintian-overrides
|
|
||||||
+++ b/debian/source/lintian-overrides
|
|
||||||
@@ -1,4 +1 @@
|
|
||||||
-# The full commented source is there.
|
|
||||||
-source-is-missing [src/libclient/web-chatview/linkify.js]
|
|
||||||
-source-is-missing [src/libclient/web-chatview/jed.js]
|
|
||||||
source-is-missing [3rdparty/SortFilterProxyModel/docs/*.html]
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
From 6f4d2dc3e3172290231b39e87b547fc2bbb92c11 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Amin Bandali <bandali@gnu.org>
|
|
||||||
Date: Sat, 25 Feb 2023 12:40:53 -0500
|
|
||||||
Subject: [PATCH] Use the right Debian Source (ds) number in orig tarball name
|
|
||||||
|
|
||||||
---
|
|
||||||
debian/rules | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
|
||||||
index 41170fc2..f414d029 100755
|
|
||||||
--- a/debian/rules
|
|
||||||
+++ b/debian/rules
|
|
||||||
@@ -135,6 +135,8 @@ override_dh_auto_install:
|
|
||||||
tmp_dir := $(shell mktemp -d)
|
|
||||||
version := $(shell dpkg-parsechangelog -ldebian/changelog | perl -ne \
|
|
||||||
'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\~ds.+)(?:\-\d+.*)};')
|
|
||||||
+ds := $(shell dpkg-parsechangelog -ldebian/changelog | perl -ne \
|
|
||||||
+ 'print $$1 if m{^Version:\s+(?:\d+:)?(?:\d.*)(\~ds.+)(?:\-\d+.*)};')
|
|
||||||
pj := $(tmp_dir)/jami-*/daemon/contrib/tarballs-unpacked/pjproject-*/pjproject-*
|
|
||||||
|
|
||||||
# Work around dak not liking files with timestamps too far in the past
|
|
||||||
@@ -194,7 +196,7 @@ get-orig-source:
|
|
||||||
# Create the new tarball
|
|
||||||
cd $(tmp_dir) && \
|
|
||||||
tar -czf \
|
|
||||||
- $(CURDIR)/../ring_$(version)~ds1.orig.tar.gz \
|
|
||||||
+ $(CURDIR)/../ring_$(version)$(ds).orig.tar.gz \
|
|
||||||
jami-*
|
|
||||||
|
|
||||||
# Remove the temporary directory
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,110 +0,0 @@
|
||||||
From 20ae9de49089f52d7a8988a7aa18524f4b6637b6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Amin Bandali <bandali@gnu.org>
|
|
||||||
Date: Sat, 25 Feb 2023 14:52:30 -0500
|
|
||||||
Subject: [PATCH] Add patch to change two CMake variables into proper options
|
|
||||||
|
|
||||||
---
|
|
||||||
debian/patches/1010-cmake-options.patch | 80 +++++++++++++++++++++++++
|
|
||||||
debian/patches/series | 1 +
|
|
||||||
2 files changed, 81 insertions(+)
|
|
||||||
create mode 100644 debian/patches/1010-cmake-options.patch
|
|
||||||
|
|
||||||
diff --git a/debian/patches/1010-cmake-options.patch b/debian/patches/1010-cmake-options.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..4640e58c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/debian/patches/1010-cmake-options.patch
|
|
||||||
@@ -0,0 +1,80 @@
|
|
||||||
+From a6367d50826811caf7cf315f33e7d6cde9677911 Mon Sep 17 00:00:00 2001
|
|
||||||
+From: Amin Bandali <amin.bandali@savoirfairelinux.com>
|
|
||||||
+Date: Sat, 25 Feb 2023 14:42:02 -0500
|
|
||||||
+Subject: [PATCH] cmake: Change two variables into proper options.
|
|
||||||
+Forwarded: no
|
|
||||||
+Last-Update: 2023-02-25
|
|
||||||
+
|
|
||||||
+Make WITH_DAEMON_SUBMODULE and WITH_WEBENGINE into proper options.
|
|
||||||
+Also, pass src/libclient/webresource.qrc to qt_add_executable only
|
|
||||||
+if WITH_WEBENGINE.
|
|
||||||
+---
|
|
||||||
+ CMakeLists.txt | 22 +++++++++-------------
|
|
||||||
+ 1 file changed, 9 insertions(+), 13 deletions(-)
|
|
||||||
+
|
|
||||||
+diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
+index d4e24da0..fc023d96 100644
|
|
||||||
+--- a/CMakeLists.txt
|
|
||||||
++++ b/CMakeLists.txt
|
|
||||||
+@@ -38,16 +38,16 @@ set(CMAKE_AUTORCC ON)
|
|
||||||
+ set(CMAKE_AUTOUIC ON)
|
|
||||||
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
||||||
+
|
|
||||||
++option(WITH_DAEMON_SUBMODULE "Build with the daemon submodule" OFF)
|
|
||||||
++option(WITH_WEBENGINE "Build with Qt WebEngine" ON)
|
|
||||||
++
|
|
||||||
+ # Main project directories:
|
|
||||||
+
|
|
||||||
+ # jami-daemon
|
|
||||||
+-if(NOT DEFINED WITH_DAEMON_SUBMODULE)
|
|
||||||
+- set(WITH_DAEMON_SUBMODULE false)
|
|
||||||
+- # daemon
|
|
||||||
+- set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
|
|
||||||
+-else()
|
|
||||||
+- # daemon
|
|
||||||
++if(WITH_DAEMON_SUBMODULE)
|
|
||||||
+ set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
|
|
||||||
++else()
|
|
||||||
++ set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
|
|
||||||
+ endif()
|
|
||||||
+ # src
|
|
||||||
+ set(LIBCLIENT_SRC_DIR ${PROJECT_SOURCE_DIR}/src/libclient)
|
|
||||||
+@@ -96,17 +96,12 @@ set(QT_MODULES
|
|
||||||
+ Widgets
|
|
||||||
+ Positioning)
|
|
||||||
+
|
|
||||||
+-if(NOT DEFINED WITH_WEBENGINE)
|
|
||||||
+- set(WITH_WEBENGINE true)
|
|
||||||
+-endif()
|
|
||||||
+-
|
|
||||||
+ if(WITH_WEBENGINE)
|
|
||||||
+ list(APPEND QT_MODULES
|
|
||||||
+ WebEngineCore
|
|
||||||
+ WebEngineQuick
|
|
||||||
+ WebChannel
|
|
||||||
+- WebEngineWidgets
|
|
||||||
+- )
|
|
||||||
++ WebEngineWidgets)
|
|
||||||
+ endif()
|
|
||||||
+
|
|
||||||
+ set(CMAKE_CXX_FLAGS
|
|
||||||
+@@ -286,6 +281,7 @@ set(COMMON_HEADERS
|
|
||||||
+ if(WITH_WEBENGINE)
|
|
||||||
+ list(APPEND COMMON_SOURCES
|
|
||||||
+ ${APP_SRC_DIR}/previewengine.cpp)
|
|
||||||
++ set(QML_WEBRESOURCES ${LIBCLIENT_SRC_DIR}/webresource.qrc)
|
|
||||||
+ add_definitions(-DWITH_WEBENGINE)
|
|
||||||
+ else()
|
|
||||||
+ list(APPEND COMMON_SOURCES
|
|
||||||
+@@ -492,7 +488,7 @@ qt_add_executable(
|
|
||||||
+ ${COMMON_SOURCES}
|
|
||||||
+ ${QML_RESOURCES}
|
|
||||||
+ ${QML_RESOURCES_QML}
|
|
||||||
+- ${LIBCLIENT_SRC_DIR}/webresource.qrc
|
|
||||||
++ ${QML_WEBRESOURCES}
|
|
||||||
+ ${SFPM_OBJECTS})
|
|
||||||
+
|
|
||||||
+ foreach(MODULE ${QT_MODULES})
|
|
||||||
+--
|
|
||||||
+2.39.2
|
|
||||||
+
|
|
||||||
diff --git a/debian/patches/series b/debian/patches/series
|
|
||||||
index ea657633..42ab30cd 100644
|
|
||||||
--- a/debian/patches/series
|
|
||||||
+++ b/debian/patches/series
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
1000-appstream-categories.patch
|
|
||||||
+1010-cmake-options.patch
|
|
||||||
2000-jsoncpp-rename.patch
|
|
||||||
2010-dont-build-gnutls.patch
|
|
||||||
2020-dont-build-msgpack.patch
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
From a19b53082f27c8af402d5284694beb7b6bc8bdfc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Amin Bandali <bandali@gnu.org>
|
|
||||||
Date: Sun, 26 Feb 2023 01:00:03 -0500
|
|
||||||
Subject: [PATCH] Use dh_auto_* tools for the client
|
|
||||||
|
|
||||||
Also the stopgap sed workaround for building without Qt WebEngine is
|
|
||||||
no longer necessary. The issue was calling out to dh_auto_configure
|
|
||||||
but without the right flags, which would then overwrite/interfere with
|
|
||||||
the flags specified in the earlier manual call to cmake.
|
|
||||||
---
|
|
||||||
debian/rules | 36 ++++++++++++------------------------
|
|
||||||
1 file changed, 12 insertions(+), 24 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
|
||||||
index f414d029..03522721 100755
|
|
||||||
--- a/debian/rules
|
|
||||||
+++ b/debian/rules
|
|
||||||
@@ -81,18 +81,9 @@ endif
|
|
||||||
--disable-shared
|
|
||||||
|
|
||||||
# Qt client configure
|
|
||||||
-# Stopgap workaround to disable building with Qt WebEngine
|
|
||||||
- sed -i 's/set(WITH_WEBENGINE true)/#&/' CMakeLists.txt
|
|
||||||
- mkdir build
|
|
||||||
- cd build && \
|
|
||||||
- cmake \
|
|
||||||
- -DCMAKE_INSTALL_PREFIX=/usr \
|
|
||||||
- -DCMAKE_BUILD_TYPE=Release \
|
|
||||||
- -DWITH_DAEMON_SUBMODULE=true \
|
|
||||||
- -DWITH_WEBENGINE=false \
|
|
||||||
- ..
|
|
||||||
-
|
|
||||||
- dh_auto_configure
|
|
||||||
+ dh_auto_configure -- \
|
|
||||||
+ -DWITH_DAEMON_SUBMODULE=true \
|
|
||||||
+ -DWITH_WEBENGINE=false
|
|
||||||
|
|
||||||
override_dh_auto_build:
|
|
||||||
# Daemon build
|
|
||||||
@@ -100,7 +91,7 @@ override_dh_auto_build:
|
|
||||||
pod2man daemon/man/jamid.pod > daemon/jamid.1
|
|
||||||
|
|
||||||
# Qt client build
|
|
||||||
- make -C build -j$(NO_CPUS) V=1
|
|
||||||
+ dh_auto_build
|
|
||||||
|
|
||||||
override_dh_auto_clean:
|
|
||||||
# Generated contrib tarballs
|
|
||||||
@@ -113,9 +104,7 @@ override_dh_auto_clean:
|
|
||||||
rm -rfv daemon/jamid.1
|
|
||||||
|
|
||||||
# Qt client clean
|
|
||||||
- [ -f build/Makefile ] && \
|
|
||||||
- make -C build clean || true
|
|
||||||
- rm -rfv build
|
|
||||||
+ dh_auto_clean
|
|
||||||
|
|
||||||
override_dh_auto_install:
|
|
||||||
# Daemon install
|
|
||||||
@@ -129,8 +118,13 @@ override_dh_auto_install:
|
|
||||||
rm -rfv $(CURDIR)/debian/jami/usr/lib/cmake
|
|
||||||
|
|
||||||
# Qt client install
|
|
||||||
- cd build && \
|
|
||||||
- make DESTDIR=$(CURDIR)/debian/jami install
|
|
||||||
+ dh_auto_install --destdir=$(CURDIR)/debian/jami
|
|
||||||
+
|
|
||||||
+# Work around dak not liking files with timestamps too far in the past
|
|
||||||
+execute_before_dh_strip_nondeterminism:
|
|
||||||
+ find $(CURDIR)/debian/jami/ ! -newermt "jan 01, 2000" \
|
|
||||||
+ -exec touch --date="@$(SOURCE_DATE_EPOCH)" {} +
|
|
||||||
+
|
|
||||||
|
|
||||||
tmp_dir := $(shell mktemp -d)
|
|
||||||
version := $(shell dpkg-parsechangelog -ldebian/changelog | perl -ne \
|
|
||||||
@@ -139,12 +133,6 @@ ds := $(shell dpkg-parsechangelog -ldebian/changelog | perl -ne \
|
|
||||||
'print $$1 if m{^Version:\s+(?:\d+:)?(?:\d.*)(\~ds.+)(?:\-\d+.*)};')
|
|
||||||
pj := $(tmp_dir)/jami-*/daemon/contrib/tarballs-unpacked/pjproject-*/pjproject-*
|
|
||||||
|
|
||||||
-# Work around dak not liking files with timestamps too far in the past
|
|
||||||
-execute_before_dh_strip_nondeterminism:
|
|
||||||
- find $(CURDIR)/debian/jami/ ! -newermt "jan 01, 2000" \
|
|
||||||
- -exec touch --date="@$(SOURCE_DATE_EPOCH)" {} +
|
|
||||||
-
|
|
||||||
-
|
|
||||||
# Repack the tarball with contrib tarballs unpacked
|
|
||||||
get-orig-source:
|
|
||||||
# Download jami tarball
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
From 174ec6666308bcf1e8083ba37bde653941dd8ebd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Amin Bandali <bandali@gnu.org>
|
|
||||||
Date: Sat, 25 Feb 2023 14:57:23 -0500
|
|
||||||
Subject: [PATCH] * debian/jami.lintian-overrides: Drop vestigial file.
|
|
||||||
|
|
||||||
This was previously added likely because the jami package used to ship
|
|
||||||
a libringclient.a static library for use by the client, but after an
|
|
||||||
upstream refactoring merging the Jami libclient sources into
|
|
||||||
jami-client-qt.git, that is no longer needed.
|
|
||||||
---
|
|
||||||
debian/jami.lintian-overrides | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
delete mode 100644 debian/jami.lintian-overrides
|
|
||||||
|
|
||||||
diff --git a/debian/jami.lintian-overrides b/debian/jami.lintian-overrides
|
|
||||||
deleted file mode 100644
|
|
||||||
index 8ab14fe9..00000000
|
|
||||||
--- a/debian/jami.lintian-overrides
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1,3 +0,0 @@
|
|
||||||
-# We are shipping a .so, but this isn't a library package
|
|
||||||
-package-name-doesnt-match-sonames
|
|
||||||
-no-symbols-control-file
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
EXTERNAL='deb-src http://ftp.debian.org/debian unstable main'
|
EXTERNAL='deb-src http://ftp.debian.org/debian unstable main'
|
||||||
REPOKEY=04EE7237B7D453EC
|
REPOKEY=04EE7237B7D453EC
|
||||||
VERSION=4
|
VERSION=1
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
|
|
@ -38,7 +38,6 @@ done
|
||||||
for i in "libqt6multimediaquick6" \
|
for i in "libqt6multimediaquick6" \
|
||||||
"libqt6quickshapes6" \
|
"libqt6quickshapes6" \
|
||||||
"libqt6quicktemplates2-6" \
|
"libqt6quicktemplates2-6" \
|
||||||
"libqt6webenginecore6-bin [amd64 armhf arm64]" \
|
|
||||||
"qt6-qpa-plugins"
|
"qt6-qpa-plugins"
|
||||||
do
|
do
|
||||||
sed -i "/jami-daemon (=/i \ \ \ \ \ \ \ \ \ $i," debian/control
|
sed -i "/jami-daemon (=/i \ \ \ \ \ \ \ \ \ $i," debian/control
|
||||||
|
|
@ -63,6 +62,6 @@ echo "Applying $patch"
|
||||||
patch -Np1 < $patch
|
patch -Np1 < $patch
|
||||||
done
|
done
|
||||||
|
|
||||||
changelog "Backport ring/jammi to aramo from debian: 20230206.0~ds2"
|
changelog "Backport ring/jammi to aramo from debian unstable"
|
||||||
|
|
||||||
compile
|
compile
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue