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

Refresh patches

Browse Source 
Gbp-Dch: Ignore
This commit is contained in:
Jeremy Bicha
2022-02-16 07:32:19 -05:00
parent 8131b388d1
commit 3db5292f77
2 changed files with 82 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,13 +29,12 @@ Forwarded: no
src/shell/CMakeLists.txt | 5 +++++
src/smime/gui/CMakeLists.txt | 5 +++++
src/smime/lib/CMakeLists.txt | 5 +++++
src/web-extensions/CMakeLists.txt | 5 +++++
19 files changed, 93 insertions(+)
18 files changed, 88 insertions(+)
Index: evolution/src/addressbook/gui/contact-editor/CMakeLists.txt
===================================================================
--- evolution.orig/src/addressbook/gui/contact-editor/CMakeLists.txt
+++ evolution/src/addressbook/gui/contact-editor/CMakeLists.txt
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
@@ -30,6 +30,11 @@ add_dependencies(econtacteditor
${DEPENDENCIES}
)
@ -48,10 +47,10 @@ Index: evolution/src/addressbook/gui/contact-editor/CMakeLists.txt
target_compile_definitions(econtacteditor PRIVATE
-DG_LOG_DOMAIN=\"e-contact-editor\"
)
Index: evolution/src/addressbook/gui/contact-list-editor/CMakeLists.txt
===================================================================
--- evolution.orig/src/addressbook/gui/contact-list-editor/CMakeLists.txt
+++ evolution/src/addressbook/gui/contact-list-editor/CMakeLists.txt
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
@@ -25,6 +25,11 @@ add_dependencies(econtactlisteditor
${DEPENDENCIES}
)
@ -64,10 +63,10 @@ Index: evolution/src/addressbook/gui/contact-list-editor/CMakeLists.txt
target_compile_definitions(econtactlisteditor PRIVATE
-DG_LOG_DOMAIN=\"e-contact-list-editor\"
)
Index: evolution/src/addressbook/gui/widgets/CMakeLists.txt
===================================================================
--- evolution.orig/src/addressbook/gui/widgets/CMakeLists.txt
+++ evolution/src/addressbook/gui/widgets/CMakeLists.txt
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
@@ -74,6 +74,12 @@ add_dependencies(eabwidgets
${DEPENDENCIES}
)
@ -81,11 +80,11 @@ Index: evolution/src/addressbook/gui/widgets/CMakeLists.txt
target_compile_definitions(eabwidgets PRIVATE
-DG_LOG_DOMAIN=\"eabwidgets\"
-DEVOLUTION_ETSPECDIR=\"${etspecdir}\"
Index: evolution/src/addressbook/importers/CMakeLists.txt
===================================================================
--- evolution.orig/src/addressbook/importers/CMakeLists.txt
+++ evolution/src/addressbook/importers/CMakeLists.txt
@@ -19,6 +19,11 @@ add_dependencies(evolution-addressbook-i
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
${DEPENDENCIES}
)
@ -97,10 +96,10 @@ Index: evolution/src/addressbook/importers/CMakeLists.txt
target_compile_definitions(evolution-addressbook-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-addressbook-importers\"
)
Index: evolution/src/addressbook/printing/CMakeLists.txt
===================================================================
--- evolution.orig/src/addressbook/printing/CMakeLists.txt
+++ evolution/src/addressbook/printing/CMakeLists.txt
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
@@ -25,6 +25,11 @@ add_dependencies(econtactprint
${DEPENDENCIES}
)
@ -113,10 +112,10 @@ Index: evolution/src/addressbook/printing/CMakeLists.txt
target_compile_definitions(econtactprint PRIVATE
-DG_LOG_DOMAIN=\"addressbook-printing\"
-DEVOLUTION_ECPSDIR=\"${ecpsdir}\"
Index: evolution/src/addressbook/util/CMakeLists.txt
===================================================================
--- evolution.orig/src/addressbook/util/CMakeLists.txt
+++ evolution/src/addressbook/util/CMakeLists.txt
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
@@ -16,6 +16,11 @@ add_dependencies(eabutil
${DEPENDENCIES}
)
@ -129,11 +128,11 @@ Index: evolution/src/addressbook/util/CMakeLists.txt
target_compile_definitions(eabutil PRIVATE
-DG_LOG_DOMAIN=\"eabutil\"
)
Index: evolution/src/calendar/gui/CMakeLists.txt
===================================================================
--- evolution.orig/src/calendar/gui/CMakeLists.txt
+++ evolution/src/calendar/gui/CMakeLists.txt
@@ -183,6 +183,11 @@ add_dependencies(evolution-calendar
diff --git a/src/calendar/gui/CMakeLists.txt b/src/calendar/gui/CMakeLists.txt
index 6116840..7d67f96 100644
--- a/src/calendar/gui/CMakeLists.txt
+++ b/src/calendar/gui/CMakeLists.txt
@@ -187,6 +187,11 @@ add_dependencies(evolution-calendar
${DEPENDENCIES}
)
@ -145,11 +144,11 @@ Index: evolution/src/calendar/gui/CMakeLists.txt
target_compile_definitions(evolution-calendar PRIVATE
-DG_LOG_DOMAIN=\"evolution-calendar\"
-DEVOLUTION_ETSPECDIR=\"${etspecdir}\"
Index: evolution/src/calendar/importers/CMakeLists.txt
===================================================================
--- evolution.orig/src/calendar/importers/CMakeLists.txt
+++ evolution/src/calendar/importers/CMakeLists.txt
@@ -16,6 +16,11 @@ add_dependencies(evolution-calendar-impo
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
${DEPENDENCIES}
)
@ -161,10 +160,10 @@ Index: evolution/src/calendar/importers/CMakeLists.txt
target_compile_definitions(evolution-calendar-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-calendar-importers\"
-DEVOLUTION_SOUNDDIR=\"${soundsdir}\"
Index: evolution/src/composer/CMakeLists.txt
===================================================================
--- evolution.orig/src/composer/CMakeLists.txt
+++ evolution/src/composer/CMakeLists.txt
diff --git a/src/composer/CMakeLists.txt b/src/composer/CMakeLists.txt
index b609d8d..6476737 100644
--- a/src/composer/CMakeLists.txt
+++ b/src/composer/CMakeLists.txt
@@ -49,6 +49,11 @@ add_dependencies(evolution-mail-composer
${DEPENDENCIES}
)
@ -177,11 +176,11 @@ Index: evolution/src/composer/CMakeLists.txt
target_compile_definitions(evolution-mail-composer PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-composer\"
-DEVOLUTION_UIDIR=\"${uidir}\"
Index: evolution/src/e-util/CMakeLists.txt
===================================================================
--- evolution.orig/src/e-util/CMakeLists.txt
+++ evolution/src/e-util/CMakeLists.txt
@@ -593,6 +593,11 @@ add_dependencies(evolution-util
diff --git a/src/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt
index cc8c06c..2146130 100644
--- a/src/e-util/CMakeLists.txt
+++ b/src/e-util/CMakeLists.txt
@@ -603,6 +603,11 @@ add_dependencies(evolution-util
${DEPENDENCIES}
)
@ -193,11 +192,11 @@ Index: evolution/src/e-util/CMakeLists.txt
target_compile_definitions(evolution-util PRIVATE
-DG_LOG_DOMAIN=\"evolution-util\"
-DEVOLUTION_BINDIR=\"${BIN_INSTALL_DIR}\"
Index: evolution/src/em-format/CMakeLists.txt
===================================================================
--- evolution.orig/src/em-format/CMakeLists.txt
+++ evolution/src/em-format/CMakeLists.txt
@@ -110,6 +110,11 @@ add_dependencies(evolution-mail-formatte
diff --git a/src/em-format/CMakeLists.txt b/src/em-format/CMakeLists.txt
index 9b215d4..b1b3036 100644
--- a/src/em-format/CMakeLists.txt
+++ b/src/em-format/CMakeLists.txt
@@ -117,6 +117,11 @@ add_dependencies(evolution-mail-formatter
${DEPENDENCIES}
)
@ -209,10 +208,10 @@ Index: evolution/src/em-format/CMakeLists.txt
target_compile_definitions(evolution-mail-formatter PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-formatter\"
-DEVOLUTION_IMAGESDIR=\"${imagesdir}\"
Index: evolution/src/libemail-engine/CMakeLists.txt
===================================================================
--- evolution.orig/src/libemail-engine/CMakeLists.txt
+++ evolution/src/libemail-engine/CMakeLists.txt
diff --git a/src/libemail-engine/CMakeLists.txt b/src/libemail-engine/CMakeLists.txt
index 65c0488..9fef269 100644
--- a/src/libemail-engine/CMakeLists.txt
+++ b/src/libemail-engine/CMakeLists.txt
@@ -56,6 +56,11 @@ add_dependencies(email-engine
${DEPENDENCIES}
)
@ -225,11 +224,11 @@ Index: evolution/src/libemail-engine/CMakeLists.txt
target_compile_definitions(email-engine PRIVATE
-DG_LOG_DOMAIN=\"e-mail-engine\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
Index: evolution/src/libgnomecanvas/CMakeLists.txt
===================================================================
--- evolution.orig/src/libgnomecanvas/CMakeLists.txt
+++ evolution/src/libgnomecanvas/CMakeLists.txt
@@ -50,6 +50,8 @@ target_compile_options(gnomecanvas PUBLI
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
)
set_target_properties(gnomecanvas PROPERTIES
@ -238,11 +237,11 @@ Index: evolution/src/libgnomecanvas/CMakeLists.txt
INSTALL_RPATH ""
)
Index: evolution/src/mail/CMakeLists.txt
===================================================================
--- evolution.orig/src/mail/CMakeLists.txt
+++ evolution/src/mail/CMakeLists.txt
@@ -221,6 +221,11 @@ add_dependencies(evolution-mail
diff --git a/src/mail/CMakeLists.txt b/src/mail/CMakeLists.txt
index d2b0bcc..40e44fa 100644
--- a/src/mail/CMakeLists.txt
+++ b/src/mail/CMakeLists.txt
@@ -223,6 +223,11 @@ add_dependencies(evolution-mail
${DEPENDENCIES}
)
@ -254,11 +253,11 @@ Index: evolution/src/mail/CMakeLists.txt
target_compile_definitions(evolution-mail PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
Index: evolution/src/mail/importers/CMakeLists.txt
===================================================================
--- evolution.orig/src/mail/importers/CMakeLists.txt
+++ evolution/src/mail/importers/CMakeLists.txt
@@ -24,6 +24,11 @@ add_dependencies(evolution-mail-importer
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
${DEPENDENCIES}
)
@ -270,10 +269,10 @@ Index: evolution/src/mail/importers/CMakeLists.txt
target_compile_definitions(evolution-mail-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-importers\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
Index: evolution/src/shell/CMakeLists.txt
===================================================================
--- evolution.orig/src/shell/CMakeLists.txt
+++ evolution/src/shell/CMakeLists.txt
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 9a3307c..ae25b7d 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -60,6 +60,11 @@ add_dependencies(evolution-shell
${DEPENDENCIES}
)
@ -286,10 +285,10 @@ Index: evolution/src/shell/CMakeLists.txt
target_compile_definitions(evolution-shell PRIVATE
-DG_LOG_DOMAIN=\"evolution-shell\"
-DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
Index: evolution/src/smime/gui/CMakeLists.txt
===================================================================
--- evolution.orig/src/smime/gui/CMakeLists.txt
+++ evolution/src/smime/gui/CMakeLists.txt
diff --git a/src/smime/gui/CMakeLists.txt b/src/smime/gui/CMakeLists.txt
index 89ed22f..7b7b73a 100644
--- a/src/smime/gui/CMakeLists.txt
+++ b/src/smime/gui/CMakeLists.txt
@@ -25,6 +25,11 @@ add_dependencies(evolution-smime
${DEPENDENCIES}
)
@ -302,10 +301,10 @@ Index: evolution/src/smime/gui/CMakeLists.txt
target_compile_definitions(evolution-smime PRIVATE
-DG_LOG_DOMAIN=\"evolution-smime\"
)
Index: evolution/src/smime/lib/CMakeLists.txt
===================================================================
--- evolution.orig/src/smime/lib/CMakeLists.txt
+++ evolution/src/smime/lib/CMakeLists.txt
diff --git a/src/smime/lib/CMakeLists.txt b/src/smime/lib/CMakeLists.txt
index 7f15427..5f0a480 100644
--- a/src/smime/lib/CMakeLists.txt
+++ b/src/smime/lib/CMakeLists.txt
@@ -21,6 +21,11 @@ add_dependencies(essmime
${DEPENDENCIES}
)

2
debian/patches/ubuntu_gettext_domain.patch vendored
View File

@ -10,7 +10,7 @@ Bug: https://bugzilla.gnome.org/784877
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2339e4f..2a1ba7f 100644
index 262409b..0da5fb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ else(_is_devel_version EQUAL 1)