b6048abdeb
The package recipe has been rewritten. The autotools/FHS patch from pidgin has been applied. The package is now buildable.
83 lines
3.1 KiB
Diff
83 lines
3.1 KiB
Diff
diff -aurN 003/source/configure.ac 004/source/configure.ac
|
|
--- 003/source/configure.ac
|
|
+++ 004/source/configure.ac
|
|
@@ -703,7 +703,7 @@
|
|
if test "x$enable_consoleui" = "xyes"; then
|
|
dnl # Some distros put the headers in ncursesw/, some don't
|
|
found_ncurses_h=no
|
|
- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
|
|
+ for location in $ac_ncurses_includes $NCURSES_HEADERS ${prefix}/include/ncursesw ${prefix}/include
|
|
do
|
|
f="$location/ncurses.h"
|
|
orig_CFLAGS="$CFLAGS"
|
|
@@ -809,11 +809,11 @@
|
|
[AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
|
|
enable_gst="$enableval", enable_gst="yes")
|
|
if test "x$enable_gst" != "xno"; then
|
|
- PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], [
|
|
+ PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [
|
|
AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
|
|
AC_SUBST(GSTREAMER_CFLAGS)
|
|
AC_SUBST(GSTREAMER_LIBS)
|
|
- AC_CHECK_LIB(gstreamer-0.10, gst_registry_fork_set_enabled,
|
|
+ AC_CHECK_LIB(gstreamer-1.0, gst_registry_fork_set_enabled,
|
|
[ AC_DEFINE(GST_CAN_DISABLE_FORKING, [],
|
|
[Define if gst_registry_fork_set_enabled exists])],
|
|
[], [$GSTREAMER_LIBS])
|
|
diff -aurN 003/source/libpurple/dbus-server.h 004/source/libpurple/dbus-server.h
|
|
--- 003/source/libpurple/dbus-server.h
|
|
+++ 004/source/libpurple/dbus-server.h
|
|
@@ -199,7 +199,9 @@
|
|
|
|
*/
|
|
|
|
+#ifndef HAVE_DBUS
|
|
#define DBUS_EXPORT
|
|
+#endif
|
|
|
|
/*
|
|
Here we include the list of #PURPLE_DBUS_DECLARE_TYPE statements for
|
|
diff -aurN 003/source/pidgin/Makefile.am 004/source/pidgin/Makefile.am
|
|
--- 003/source/pidgin/Makefile.am
|
|
+++ 004/source/pidgin/Makefile.am
|
|
@@ -194,10 +194,10 @@
|
|
win32/gtkdocklet-win32.c \
|
|
win32/gtkwin32dep.c \
|
|
win32/untar.c \
|
|
- win32/wspell.c \
|
|
- win32/pidgin_dll_rc.rc
|
|
+ win32/wspell.c
|
|
|
|
-libpidgin_la_LDFLAGS = $(AVOID_VERSION) $(NO_UNDEFINED)
|
|
+libpidgin_la_DEPENDENCIES = win32/pidgin_dll_rc.o
|
|
+libpidgin_la_LDFLAGS = $(AVOID_VERSION) $(NO_UNDEFINED) -Wl,win32/pidgin_dll_rc.o
|
|
libpidgin_la_LIBADD = $(common_LDADD) -lz -lwinmm -lgdi32
|
|
|
|
pidgin_LDFLAGS = -mwindows
|
|
diff -aurN 003/source/pidgin/plugins/musicmessaging/Makefile.am 004/source/pidgin/plugins/musicmessaging/Makefile.am
|
|
--- 003/source/pidgin/plugins/musicmessaging/Makefile.am
|
|
+++ 004/source/pidgin/plugins/musicmessaging/Makefile.am
|
|
@@ -7,7 +7,7 @@
|
|
musicmessagingdir = $(libdir)/pidgin
|
|
endif
|
|
|
|
-musicmessaging_la_LDFLAGS = -module -avoid-version
|
|
+musicmessaging_la_LDFLAGS = -module -avoid-version -no-undefined
|
|
|
|
if PLUGINS
|
|
if ENABLE_DBUS
|
|
diff -aurN 003/source/pidgin/win32/pidgin_dll_rc.rc.in 004/source/pidgin/win32/pidgin_dll_rc.rc.in
|
|
--- 003/source/pidgin/win32/pidgin_dll_rc.rc.in
|
|
+++ 004/source/pidgin/win32/pidgin_dll_rc.rc.in
|
|
@@ -4,8 +4,8 @@
|
|
#include "pidgin.h"
|
|
|
|
VS_VERSION_INFO VERSIONINFO
|
|
- FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
|
|
- PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
|
|
+ FILEVERSION @PURPLE_MAJOR_VERSION@,@PURPLE_MINOR_VERSION@,@PURPLE_MICRO_VERSION@,0
|
|
+ PRODUCTVERSION @PURPLE_MAJOR_VERSION@,@PURPLE_MINOR_VERSION@,@PURPLE_MICRO_VERSION@,0
|
|
FILEFLAGSMASK 0
|
|
FILEFLAGS 0
|
|
FILEOS VOS__WINDOWS32
|