summaryrefslogtreecommitdiff
path: root/graphics/libchamplain/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/libchamplain/files')
-rw-r--r--graphics/libchamplain/files/patch-champlain-gtk_Makefile.in34
1 files changed, 16 insertions, 18 deletions
diff --git a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
index 44e96bce19aa..4f7ef42e5f24 100644
--- a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
+++ b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
@@ -1,6 +1,17 @@
---- champlain-gtk/Makefile.in.orig 2012-03-15 20:21:20.000000000 -0500
-+++ champlain-gtk/Makefile.in 2012-03-15 20:35:27.000000000 -0500
-@@ -370,15 +370,15 @@
+--- champlain-gtk/Makefile.in.orig 2014-07-02 09:20:14.564390009 +0000
++++ champlain-gtk/Makefile.in 2014-07-02 09:22:14.312426331 +0000
+@@ -141,8 +141,8 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_DEPENDENCIES = \
+- $(am__DEPENDENCIES_1) \
+- $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
++ $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la \
++ $(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am__objects_2 = gtk-champlain-embed.lo
+ am_libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_OBJECTS = \
+@@ -405,15 +405,15 @@
$(libchamplain_gtk_sources_built)
libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LIBADD = \
@@ -14,21 +25,8 @@
-no-undefined \
-export-symbols-regex ^gtk_champlain_.*
--AM_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
-+AM_CPPFLAGS = -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION $(GTK_CFLAGS) $(WARN_CFLAGS)
+-AM_CPPFLAGS = $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
++AM_CPPFLAGS = -I$(top_srcdir) $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -DCHAMPLAIN_GTK_COMPILATION
lib_LTLIBRARIES = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la
libchamplain_gtkdir = $(includedir)/libchamplain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk
libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_public)
-@@ -394,9 +394,9 @@
- @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
- @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-2.0 Champlain-@CHAMPLAIN_API_VERSION@
- @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
--@HAVE_INTROSPECTION_TRUE@ $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS) \
--@HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) -I$(top_builddir)\
--@HAVE_INTROSPECTION_TRUE@ -DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION
-+@HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) -I$(top_builddir) \
-+@HAVE_INTROSPECTION_TRUE@ -DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION \
-+@HAVE_INTROSPECTION_TRUE@ $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS)
-
- @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)