b6048abdeb
The package recipe has been rewritten. The autotools/FHS patch from pidgin has been applied. The package is now buildable.
141 lines
5.6 KiB
Diff
141 lines
5.6 KiB
Diff
diff -aurN 002/source/configure.ac 003/source/configure.ac
|
|
--- 002/source/configure.ac
|
|
+++ 003/source/configure.ac
|
|
@@ -82,6 +82,8 @@
|
|
PURPLE_MINOR_VERSION=purple_minor_version
|
|
PURPLE_MICRO_VERSION=purple_micro_version
|
|
PURPLE_VERSION=[purple_display_version]
|
|
+APPLICATION_VERSION=purple_display_version
|
|
+AC_SUBST(APPLICATION_VERSION)
|
|
AC_SUBST(PURPLE_MAJOR_VERSION)
|
|
AC_SUBST(PURPLE_MINOR_VERSION)
|
|
AC_SUBST(PURPLE_MICRO_VERSION)
|
|
@@ -406,10 +408,17 @@
|
|
[extra version number to be displayed in Help->About and --help (for packagers)]),
|
|
EXTRA_VERSION=$withval)
|
|
|
|
+DISPLAY_VERSION_FULL='purple_version_suffix'
|
|
+DISPLAY_VERSION_FULL="${DISPLAY_VERSION_FULL#-}"
|
|
+DISPLAY_VERSION="${DISPLAY_VERSION_FULL%.0}"
|
|
+AC_SUBST(DISPLAY_VERSION_FULL)
|
|
+
|
|
if test x"$EXTRA_VERSION" != "x" ; then
|
|
- AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION-$EXTRA_VERSION", [display version info])
|
|
+ AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$DISPLAY_VERSION-$EXTRA_VERSION", [display version info])
|
|
+ AC_DEFINE_UNQUOTED(DISPLAY_VERSION_FULL, "$DISPLAY_VERSION_FULL-$EXTRA_VERSION", [display version info])
|
|
else
|
|
- AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION", [display version info])
|
|
+ AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$DISPLAY_VERSION", [display version info])
|
|
+ AC_DEFINE_UNQUOTED(DISPLAY_VERSION_FULL, "$DISPLAY_VERSION_FULL", [display version info])
|
|
fi
|
|
|
|
AC_ARG_ENABLE(missing-dependencies, [AC_HELP_STRING([--disable-missing-dependencies],
|
|
diff -aurN 002/source/libpurple/plugins/Makefile.am 003/source/libpurple/plugins/Makefile.am
|
|
--- 002/source/libpurple/plugins/Makefile.am
|
|
+++ 003/source/libpurple/plugins/Makefile.am
|
|
@@ -31,6 +31,7 @@
|
|
debug_example_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
helloworld_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
idle_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
+irchelper_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
joinpart_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
log_reader_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
newline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
@@ -52,6 +53,7 @@
|
|
autoaccept.la \
|
|
buddynote.la \
|
|
idle.la \
|
|
+ irchelper.la \
|
|
joinpart.la \
|
|
log_reader.la \
|
|
newline.la \
|
|
@@ -78,6 +80,7 @@
|
|
debug_example_la_SOURCES = debug_example.c
|
|
helloworld_la_SOURCES = helloworld.c
|
|
idle_la_SOURCES = idle.c
|
|
+irchelper_la_SOURCES = irchelper.c
|
|
joinpart_la_SOURCES = joinpart.c
|
|
log_reader_la_SOURCES = log_reader.c
|
|
newline_la_SOURCES = newline.c
|
|
@@ -96,6 +99,7 @@
|
|
ciphertest_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
|
|
codeinline_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
|
|
idle_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
|
|
+irchelper_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
|
|
joinpart_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
|
|
log_reader_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
|
|
newline_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
|
|
diff -aurN 002/source/pidgin/Makefile.am 003/source/pidgin/Makefile.am
|
|
--- 002/source/pidgin/Makefile.am
|
|
+++ 003/source/pidgin/Makefile.am
|
|
@@ -176,7 +176,10 @@
|
|
$(GTKSPELL_LIBS) \
|
|
$(LIBXML_LIBS) \
|
|
$(GTK_LIBS) \
|
|
- $(top_builddir)/libpurple/libpurple.la
|
|
+ $(top_builddir)/libpurple/libpurple.la \
|
|
+ -lwinsparkle \
|
|
+ -lcomctl32 \
|
|
+ -lexchndl
|
|
|
|
if OS_WIN32
|
|
lib_LTLIBRARIES = libpidgin.la
|
|
@@ -198,12 +201,12 @@
|
|
libpidgin_la_LIBADD = $(common_LDADD) -lz -lwinmm -lgdi32
|
|
|
|
pidgin_LDFLAGS = -mwindows
|
|
-pidgin_LDADD =
|
|
+pidgin_LDADD = -lexchndl
|
|
|
|
.rc.o:
|
|
$(WINDRES) $^ -o $@
|
|
%.o : %.rc
|
|
- $(WINDRES) -I$(top_srcdir)/pidgin -I$(top_srcdir)/pidgin/win32 -I$(top_srcdir)/libpurple -i $< -o $@
|
|
+ $(WINDRES) -I$(top_srcdir)/pidgin -I$(top_srcdir)/pidgin/win32 -I$(top_srcdir)/libpurple -I$(top_srcdir)/libpurple/win32 $(shell pkg-config --cflags-only-I gtk+-2.0) -i $< -o $@
|
|
|
|
else
|
|
pidgin_SOURCES = \
|
|
@@ -217,6 +220,7 @@
|
|
endif
|
|
|
|
AM_CPPFLAGS = \
|
|
+ -DBUILD_DATE=\"$(shell date +%Y%m%d)\" \
|
|
-DPURPLE_DATADIR=\"$(datadir)\" \
|
|
-DPIDGIN_LIBDIR=\"$(libdir)/pidgin/\" \
|
|
-DLOCALEDIR=\"$(datadir)/locale\" \
|
|
diff -aurN 002/source/pidgin/plugins/Makefile.am 003/source/pidgin/plugins/Makefile.am
|
|
--- 002/source/pidgin/plugins/Makefile.am
|
|
+++ 003/source/pidgin/plugins/Makefile.am
|
|
@@ -43,6 +43,7 @@
|
|
gtkbuddynote_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
history_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
iconaway_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
+ircaway_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
markerline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
notify_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
pidginrc_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
|
|
@@ -63,6 +64,7 @@
|
|
gtkbuddynote.la \
|
|
history.la \
|
|
iconaway.la \
|
|
+ ircaway.la \
|
|
markerline.la \
|
|
notify.la \
|
|
pidginrc.la \
|
|
@@ -92,6 +94,7 @@
|
|
gtkbuddynote_la_SOURCES = gtkbuddynote.c
|
|
history_la_SOURCES = history.c
|
|
iconaway_la_SOURCES = iconaway.c
|
|
+ircaway_la_SOURCES = ircaway.c
|
|
markerline_la_SOURCES = markerline.c
|
|
notify_la_SOURCES = notify.c
|
|
pidginrc_la_SOURCES = pidginrc.c
|
|
@@ -111,6 +114,7 @@
|
|
gtkbuddynote_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
|
|
history_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
|
|
iconaway_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
|
|
+ircaway_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
|
|
markerline_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
|
|
notify_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
|
|
pidginrc_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
|