d6c5b5030d
* Build the finch client. * Fix license information. * Specify libpurple and finch in provides.
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
diff -aurN 000/libpurple/Makefile.am 001/libpurple/Makefile.am
|
|
--- 000/libpurple/Makefile.am
|
|
+++ 001/libpurple/Makefile.am
|
|
@@ -467,6 +467,7 @@
|
|
INTROSPECTION_GIRS =
|
|
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(prefix)/share/gir-1.0 --warn-all
|
|
INTROSPECTION_COMPILER_ARGS = --includedir=$(prefix)/share/gir-1.0
|
|
+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
|
|
|
|
if HAVE_INTROSPECTION
|
|
introspection_sources = \
|
|
@@ -484,7 +485,7 @@
|
|
endif
|
|
|
|
Purple_3_0_gir_CFLAGS = \
|
|
- -I$(srcdir) \
|
|
+ -I$(top_srcdir) \
|
|
$(INCLUDES) \
|
|
-DDATADIR=\"$(datadir)\" \
|
|
-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
|
|
@@ -510,10 +511,10 @@
|
|
Purple_3_0_gir_FILES = $(introspection_sources)
|
|
INTROSPECTION_GIRS += Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
|
|
|
|
-girdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_GIRDIR)
|
|
+girdir = $(datadir)/gir-1.0
|
|
gir_DATA = $(INTROSPECTION_GIRS)
|
|
|
|
-typelibdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_TYPELIBDIR)
|
|
+typelibdir = $(libdir)/girepository-1.0
|
|
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
|
|
|
|
CLEANFILES += $(gir_DATA) $(typelib_DATA)
|
|
diff -aurN 000/pidgin/libpidgin.c 001/pidgin/libpidgin.c
|
|
--- 000/pidgin/libpidgin.c
|
|
+++ 001/pidgin/libpidgin.c
|
|
@@ -441,11 +441,11 @@
|
|
GIOChannel *signal_channel;
|
|
GIOStatus signal_status;
|
|
guint signal_channel_watcher;
|
|
- GError *error;
|
|
#ifndef DEBUG
|
|
char *segfault_message_tmp;
|
|
#endif /* DEBUG */
|
|
#endif /* HAVE_SIGNAL_N */
|
|
+ GError *error;
|
|
int opt;
|
|
gboolean gui_check;
|
|
gboolean debug_enabled, debug_colored;
|
|
diff -aurN 000/pidgin/Makefile.am 001/pidgin/Makefile.am
|
|
--- 000/pidgin/Makefile.am
|
|
+++ 001/pidgin/Makefile.am
|
|
@@ -266,6 +266,7 @@
|
|
INTROSPECTION_GIRS =
|
|
INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple --add-include-path=$(prefix)/share/gir-1.0
|
|
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple --includedir=$(prefix)/share/gir-1.0
|
|
+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
|
|
|
|
if HAVE_INTROSPECTION
|
|
introspection_sources = $(libpidgininclude_HEADERS)
|
|
@@ -300,10 +301,10 @@
|
|
Pidgin_3_0_gir_FILES = $(introspection_sources)
|
|
INTROSPECTION_GIRS += Pidgin-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
|
|
|
|
-girdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_GIRDIR)
|
|
+girdir = $(datadir)/gir-1.0
|
|
gir_DATA = $(INTROSPECTION_GIRS)
|
|
|
|
-typelibdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_TYPELIBDIR)
|
|
+typelibdir = $(libdir)/girepository-1.0
|
|
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
|
|
|
|
CLEANFILES += $(gir_DATA) $(typelib_DATA)
|