callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New upstream release

Browse Source
This commit is contained in:
Sebastien Bacher
2020-02-25 17:28:19 +01:00
parent c2ddaa568e
commit 01e472b4ec
2 changed files with 85 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
evolution (3.35.91-1) UNRELEASED; urgency=medium
* New upstream release
-- Sebastien Bacher <seb128@ubuntu.com> Tue, 25 Feb 2020 17:28:19 +0100
evolution (3.34.1-4) unstable; urgency=medium
* debian/control.in: Also switch to libenchant-2-dev for evolution-dev

174
debian/patches/10_revert_libevolution_avoid-version.patch vendored
View File

@ -32,10 +32,10 @@ Forwarded: no
src/web-extensions/CMakeLists.txt | 5 +++++
19 files changed, 93 insertions(+)
diff --git a/src/addressbook/gui/contact-editor/CMakeLists.txt b/src/addressbook/gui/contact-editor/CMakeLists.txt
index aca6e8f..64d5574 100644
--- a/src/addressbook/gui/contact-editor/CMakeLists.txt
+++ b/src/addressbook/gui/contact-editor/CMakeLists.txt
Index: evolution-3.35.91/src/addressbook/gui/contact-editor/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/addressbook/gui/contact-editor/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/gui/contact-editor/CMakeLists.txt
@@ -30,6 +30,11 @@ add_dependencies(econtacteditor
${DEPENDENCIES}
)
@ -48,10 +48,10 @@ index aca6e8f..64d5574 100644
target_compile_definitions(econtacteditor PRIVATE
-DG_LOG_DOMAIN=\"e-contact-editor\"
)
diff --git a/src/addressbook/gui/contact-list-editor/CMakeLists.txt b/src/addressbook/gui/contact-list-editor/CMakeLists.txt
index 02d3806..81c8261 100644
--- a/src/addressbook/gui/contact-list-editor/CMakeLists.txt
+++ b/src/addressbook/gui/contact-list-editor/CMakeLists.txt
Index: evolution-3.35.91/src/addressbook/gui/contact-list-editor/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/addressbook/gui/contact-list-editor/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/gui/contact-list-editor/CMakeLists.txt
@@ -25,6 +25,11 @@ add_dependencies(econtactlisteditor
${DEPENDENCIES}
)
@ -64,10 +64,10 @@ index 02d3806..81c8261 100644
target_compile_definitions(econtactlisteditor PRIVATE
-DG_LOG_DOMAIN=\"e-contact-list-editor\"
)
diff --git a/src/addressbook/gui/widgets/CMakeLists.txt b/src/addressbook/gui/widgets/CMakeLists.txt
index cc48c41..e3f7961 100644
--- a/src/addressbook/gui/widgets/CMakeLists.txt
+++ b/src/addressbook/gui/widgets/CMakeLists.txt
Index: evolution-3.35.91/src/addressbook/gui/widgets/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/addressbook/gui/widgets/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/gui/widgets/CMakeLists.txt
@@ -74,6 +74,12 @@ add_dependencies(eabwidgets
${DEPENDENCIES}
)
@ -81,11 +81,11 @@ index cc48c41..e3f7961 100644
target_compile_definitions(eabwidgets PRIVATE
-DG_LOG_DOMAIN=\"eabwidgets\"
-DEVOLUTION_ETSPECDIR=\"${etspecdir}\"
diff --git a/src/addressbook/importers/CMakeLists.txt b/src/addressbook/importers/CMakeLists.txt
index f8ce906..155ef60 100644
--- a/src/addressbook/importers/CMakeLists.txt
+++ b/src/addressbook/importers/CMakeLists.txt
@@ -19,6 +19,11 @@ add_dependencies(evolution-addressbook-importers
Index: evolution-3.35.91/src/addressbook/importers/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/addressbook/importers/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/importers/CMakeLists.txt
@@ -19,6 +19,11 @@ add_dependencies(evolution-addressbook-i
${DEPENDENCIES}
)
@ -97,10 +97,10 @@ index f8ce906..155ef60 100644
target_compile_definitions(evolution-addressbook-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-addressbook-importers\"
)
diff --git a/src/addressbook/printing/CMakeLists.txt b/src/addressbook/printing/CMakeLists.txt
index 169c333..cb10224 100644
--- a/src/addressbook/printing/CMakeLists.txt
+++ b/src/addressbook/printing/CMakeLists.txt
Index: evolution-3.35.91/src/addressbook/printing/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/addressbook/printing/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/printing/CMakeLists.txt
@@ -25,6 +25,11 @@ add_dependencies(econtactprint
${DEPENDENCIES}
)
@ -113,10 +113,10 @@ index 169c333..cb10224 100644
target_compile_definitions(econtactprint PRIVATE
-DG_LOG_DOMAIN=\"addressbook-printing\"
-DEVOLUTION_ECPSDIR=\"${ecpsdir}\"
diff --git a/src/addressbook/util/CMakeLists.txt b/src/addressbook/util/CMakeLists.txt
index 2753f15..4e76f67 100644
--- a/src/addressbook/util/CMakeLists.txt
+++ b/src/addressbook/util/CMakeLists.txt
Index: evolution-3.35.91/src/addressbook/util/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/addressbook/util/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/util/CMakeLists.txt
@@ -16,6 +16,11 @@ add_dependencies(eabutil
${DEPENDENCIES}
)
@ -129,10 +129,10 @@ index 2753f15..4e76f67 100644
target_compile_definitions(eabutil PRIVATE
-DG_LOG_DOMAIN=\"eabutil\"
)
diff --git a/src/calendar/gui/CMakeLists.txt b/src/calendar/gui/CMakeLists.txt
index dcf5fe1..744f61e 100644
--- a/src/calendar/gui/CMakeLists.txt
+++ b/src/calendar/gui/CMakeLists.txt
Index: evolution-3.35.91/src/calendar/gui/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/calendar/gui/CMakeLists.txt
+++ evolution-3.35.91/src/calendar/gui/CMakeLists.txt
@@ -182,6 +182,11 @@ add_dependencies(evolution-calendar
${DEPENDENCIES}
)
@ -145,11 +145,11 @@ index dcf5fe1..744f61e 100644
target_compile_definitions(evolution-calendar PRIVATE
-DG_LOG_DOMAIN=\"evolution-calendar\"
-DEVOLUTION_ETSPECDIR=\"${etspecdir}\"
diff --git a/src/calendar/importers/CMakeLists.txt b/src/calendar/importers/CMakeLists.txt
index d0bc817..6cb94ea 100644
--- a/src/calendar/importers/CMakeLists.txt
+++ b/src/calendar/importers/CMakeLists.txt
@@ -16,6 +16,11 @@ add_dependencies(evolution-calendar-importers
Index: evolution-3.35.91/src/calendar/importers/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/calendar/importers/CMakeLists.txt
+++ evolution-3.35.91/src/calendar/importers/CMakeLists.txt
@@ -16,6 +16,11 @@ add_dependencies(evolution-calendar-impo
${DEPENDENCIES}
)
@ -161,10 +161,10 @@ index d0bc817..6cb94ea 100644
target_compile_definitions(evolution-calendar-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-calendar-importers\"
-DEVOLUTION_SOUNDDIR=\"${soundsdir}\"
diff --git a/src/composer/CMakeLists.txt b/src/composer/CMakeLists.txt
index 4335920..34334fb 100644
--- a/src/composer/CMakeLists.txt
+++ b/src/composer/CMakeLists.txt
Index: evolution-3.35.91/src/composer/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/composer/CMakeLists.txt
+++ evolution-3.35.91/src/composer/CMakeLists.txt
@@ -49,6 +49,11 @@ add_dependencies(evolution-mail-composer
${DEPENDENCIES}
)
@ -177,11 +177,11 @@ index 4335920..34334fb 100644
target_compile_definitions(evolution-mail-composer PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-composer\"
-DEVOLUTION_UIDIR=\"${uidir}\"
diff --git a/src/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt
index ceed0a4..19603df 100644
--- a/src/e-util/CMakeLists.txt
+++ b/src/e-util/CMakeLists.txt
@@ -588,6 +588,11 @@ add_dependencies(evolution-util
Index: evolution-3.35.91/src/e-util/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/e-util/CMakeLists.txt
+++ evolution-3.35.91/src/e-util/CMakeLists.txt
@@ -595,6 +595,11 @@ add_dependencies(evolution-util
${DEPENDENCIES}
)
@ -193,11 +193,11 @@ index ceed0a4..19603df 100644
target_compile_definitions(evolution-util PRIVATE
-DG_LOG_DOMAIN=\"evolution-util\"
-DEVOLUTION_BINDIR=\"${BIN_INSTALL_DIR}\"
diff --git a/src/em-format/CMakeLists.txt b/src/em-format/CMakeLists.txt
index 7b6a3d9..b43c8ef 100644
--- a/src/em-format/CMakeLists.txt
+++ b/src/em-format/CMakeLists.txt
@@ -110,6 +110,11 @@ add_dependencies(evolution-mail-formatter
Index: evolution-3.35.91/src/em-format/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/em-format/CMakeLists.txt
+++ evolution-3.35.91/src/em-format/CMakeLists.txt
@@ -110,6 +110,11 @@ add_dependencies(evolution-mail-formatte
${DEPENDENCIES}
)
@ -209,10 +209,10 @@ index 7b6a3d9..b43c8ef 100644
target_compile_definitions(evolution-mail-formatter PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-formatter\"
-DEVOLUTION_IMAGESDIR=\"${imagesdir}\"
diff --git a/src/libemail-engine/CMakeLists.txt b/src/libemail-engine/CMakeLists.txt
index 9029cc7..90efa3f 100644
--- a/src/libemail-engine/CMakeLists.txt
+++ b/src/libemail-engine/CMakeLists.txt
Index: evolution-3.35.91/src/libemail-engine/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/libemail-engine/CMakeLists.txt
+++ evolution-3.35.91/src/libemail-engine/CMakeLists.txt
@@ -56,6 +56,11 @@ add_dependencies(email-engine
${DEPENDENCIES}
)
@ -225,11 +225,11 @@ index 9029cc7..90efa3f 100644
target_compile_definitions(email-engine PRIVATE
-DG_LOG_DOMAIN=\"e-mail-engine\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
diff --git a/src/libgnomecanvas/CMakeLists.txt b/src/libgnomecanvas/CMakeLists.txt
index 6b4f3bf..9364739 100644
--- a/src/libgnomecanvas/CMakeLists.txt
+++ b/src/libgnomecanvas/CMakeLists.txt
@@ -50,6 +50,8 @@ target_compile_options(gnomecanvas PUBLIC
Index: evolution-3.35.91/src/libgnomecanvas/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/libgnomecanvas/CMakeLists.txt
+++ evolution-3.35.91/src/libgnomecanvas/CMakeLists.txt
@@ -50,6 +50,8 @@ target_compile_options(gnomecanvas PUBLI
)
set_target_properties(gnomecanvas PROPERTIES
@ -238,11 +238,11 @@ index 6b4f3bf..9364739 100644
INSTALL_RPATH ""
)
diff --git a/src/mail/CMakeLists.txt b/src/mail/CMakeLists.txt
index a51c1ed..31c1c5e 100644
--- a/src/mail/CMakeLists.txt
+++ b/src/mail/CMakeLists.txt
@@ -219,6 +219,11 @@ add_dependencies(evolution-mail
Index: evolution-3.35.91/src/mail/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/mail/CMakeLists.txt
+++ evolution-3.35.91/src/mail/CMakeLists.txt
@@ -221,6 +221,11 @@ add_dependencies(evolution-mail
${DEPENDENCIES}
)
@ -254,11 +254,11 @@ index a51c1ed..31c1c5e 100644
target_compile_definitions(evolution-mail PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
diff --git a/src/mail/importers/CMakeLists.txt b/src/mail/importers/CMakeLists.txt
index a91d154..ba27911 100644
--- a/src/mail/importers/CMakeLists.txt
+++ b/src/mail/importers/CMakeLists.txt
@@ -24,6 +24,11 @@ add_dependencies(evolution-mail-importers
Index: evolution-3.35.91/src/mail/importers/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/mail/importers/CMakeLists.txt
+++ evolution-3.35.91/src/mail/importers/CMakeLists.txt
@@ -24,6 +24,11 @@ add_dependencies(evolution-mail-importer
${DEPENDENCIES}
)
@ -270,10 +270,10 @@ index a91d154..ba27911 100644
target_compile_definitions(evolution-mail-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-importers\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 86d4437..c2afd0e 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
Index: evolution-3.35.91/src/shell/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/shell/CMakeLists.txt
+++ evolution-3.35.91/src/shell/CMakeLists.txt
@@ -60,6 +60,11 @@ add_dependencies(evolution-shell
${DEPENDENCIES}
)
@ -286,10 +286,10 @@ index 86d4437..c2afd0e 100644
target_compile_definitions(evolution-shell PRIVATE
-DG_LOG_DOMAIN=\"evolution-shell\"
-DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
diff --git a/src/smime/gui/CMakeLists.txt b/src/smime/gui/CMakeLists.txt
index 5efcb42..667b4b4 100644
--- a/src/smime/gui/CMakeLists.txt
+++ b/src/smime/gui/CMakeLists.txt
Index: evolution-3.35.91/src/smime/gui/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/smime/gui/CMakeLists.txt
+++ evolution-3.35.91/src/smime/gui/CMakeLists.txt
@@ -25,6 +25,11 @@ add_dependencies(evolution-smime
${DEPENDENCIES}
)
@ -302,10 +302,10 @@ index 5efcb42..667b4b4 100644
target_compile_definitions(evolution-smime PRIVATE
-DG_LOG_DOMAIN=\"evolution-smime\"
)
diff --git a/src/smime/lib/CMakeLists.txt b/src/smime/lib/CMakeLists.txt
index 0826c41..a3c2b61 100644
--- a/src/smime/lib/CMakeLists.txt
+++ b/src/smime/lib/CMakeLists.txt
Index: evolution-3.35.91/src/smime/lib/CMakeLists.txt
===================================================================
--- evolution-3.35.91.orig/src/smime/lib/CMakeLists.txt
+++ evolution-3.35.91/src/smime/lib/CMakeLists.txt
@@ -21,6 +21,11 @@ add_dependencies(essmime
${DEPENDENCIES}
)
@ -318,19 +318,3 @@ index 0826c41..a3c2b61 100644
target_compile_definitions(essmime PRIVATE
-DG_LOG_DOMAIN=\"essmime\"
)
diff --git a/src/web-extensions/CMakeLists.txt b/src/web-extensions/CMakeLists.txt
index 9e5c03d..902f9ff 100644
--- a/src/web-extensions/CMakeLists.txt
+++ b/src/web-extensions/CMakeLists.txt
@@ -15,6 +15,11 @@ add_dependencies(edomutils
${DEPENDENCIES}
)
+set_target_properties(edomutils PROPERTIES
+ VERSION 0.0.0
+ SOVERSION 0
+)
+
target_compile_definitions(edomutils PRIVATE
-DG_LOG_DOMAIN=\"edomutils\"
-DEVOLUTION_IMAGESDIR=\"${imagesdir}\"