1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183
|
Author: Jordi Mallach <jordi@debian.org>
Description: Revert 160006402248075b95c98e9e34d4538670ba7480
Revert upstream patch that adds -avoid-version to all libevolution
libs, making them versionless. This is a massive WTF.
Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=591436
Forwarded: no
---
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -23,7 +23,7 @@
e-contact-quick-add.c \
e-contact-quick-add.h
-libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
libecontacteditor_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -19,7 +19,7 @@
e-contact-list-model.c \
e-contact-list-model.h
-libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED)
libecontactlisteditor_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -18,7 +18,7 @@
evolution-csv-importer.c \
evolution-addressbook-importers.h
-libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_addressbook_importers_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -19,7 +19,7 @@
eab-book-util.c \
eab-book-util.h
-libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libeabutil_la_LDFLAGS = $(NO_UNDEFINED)
libeabutil_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -209,7 +209,7 @@
$(GTKHTML_LIBS) \
$(LIBSOUP_LIBS)
-libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED)
EXTRA_DIST = \
$(ui_DATA) \
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -15,7 +15,7 @@
evolution-calendar-importer.h \
icalendar-importer.c
-libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -52,7 +52,7 @@
e-composer-text-header.c \
e-msg-composer.c
-libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_composer_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_mail_composer_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -581,7 +581,7 @@
$(PLATFORM_SOURCES) \
$(NULL)
-libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_util_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_util_la_LIBADD = \
$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -124,7 +124,7 @@
e-mail-stripsig-filter.c \
$(SMIME_EXTENSIONS)
-libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_formatter_la_LDFLAGS = $(NO_UNDEFINED)
if ENABLE_SMIME
SMIME_LIBS = \
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -83,7 +83,7 @@
$(GTKHTML_LIBS) \
$(NULL)
-libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libemail_engine_la_LDFLAGS = $(NO_UNDEFINED)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libemail-engine.pc
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -53,7 +53,7 @@
$(GNOME_PLATFORM_LIBS) \
$(MATH_LIB)
-libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
BUILT_SOURCES = $(MARSHAL_GENERATED)
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -226,7 +226,7 @@
$(LIBSOUP_LIBS) \
$(NULL)
-libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -18,7 +18,7 @@
pine-importer.c \
evolution-mbox-importer.c
-libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_mail_importers_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -85,7 +85,7 @@
evo-version.h \
$(NULL)
-libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_shell_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_shell_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -42,7 +42,7 @@
$(GTKHTML_LIBS) \
$(CERT_UI_LIBS)
-libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED)
ui_DATA = smime-ui.ui
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -34,6 +34,6 @@
$(GTKHTML_LIBS) \
$(CERT_UI_LIBS)
-libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libessmime_la_LDFLAGS = $(NO_UNDEFINED)
-include $(top_srcdir)/git.mk
|