Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
a79d95c1c8dab144f6cb179bae9e72028da170a0
MINGW-packages/mingw-w64-pidgin++/002-autotools-and-fhs-pidgin++.patch
Renato Silva b6048abdeb pidgin++: Reimplement and build. 
The package recipe has been rewritten. The autotools/FHS patch from
pidgin has been applied. The package is now buildable.
2016-04-17 23:23:03 -03:00

190 lines
7.4 KiB
Diff
Raw Blame History

diff -aurN 001/source/finch/finch.c 002/source/finch/finch.c
--- 001/source/finch/finch.c
+++ 002/source/finch/finch.c
@@ -377,7 +377,7 @@
purple_idle_set_ui_ops(finch_idle_get_ui_ops());
plugin_search_path_add_user_directories();
- purple_plugins_add_search_path(LIBDIR);
+ purple_plugins_add_search_path(FINCH_LIBDIR);
if (!purple_core_init(FINCH_UI))
{
diff -aurN 001/source/pidgin/gtkmain.c 002/source/pidgin/gtkmain.c
--- 001/source/pidgin/gtkmain.c
+++ 002/source/pidgin/gtkmain.c
@@ -807,7 +807,7 @@
* in user's home directory.
*/
plugin_search_path_add_user_directories();
- purple_plugins_add_search_path(LIBDIR);
+ purple_plugins_add_search_path(PIDGIN_LIBDIR);
if (!purple_core_init(PIDGIN_UI)) {
fprintf(stderr,
diff -aurN 001/source/pidgin/Makefile.am 002/source/pidgin/Makefile.am
--- 001/source/pidgin/Makefile.am
+++ 002/source/pidgin/Makefile.am
@@ -7,19 +7,8 @@
data/pidgin.desktop.in \
data/pidgin.pc.in \
data/pidgin-uninstalled.pc.in \
- win32/MinimizeToTray.h \
- win32/MinimizeToTray.c \
win32/pidgin_dll_rc.rc.in \
win32/pidgin_exe_rc.rc.in \
- win32/gtkdocklet-win32.c \
- win32/gtkwin32dep.c \
- win32/gtkwin32dep.h \
- win32/resource.h \
- win32/untar.c \
- win32/untar.h \
- win32/winpidgin.c \
- win32/wspell.c \
- win32/wspell.h \
win32/nsis/integrate_gtk.sh \
win32/nsis/rpm2zip.sh \
win32/nsis/pixmaps/pidgin-header.bmp \
diff -aurN 001/source/pidgin/plugins/Makefile.am 002/source/pidgin/plugins/Makefile.am
--- 001/source/pidgin/plugins/Makefile.am
+++ 002/source/pidgin/plugins/Makefile.am
@@ -27,28 +27,33 @@
$(MUSICMESSAGING_DIR) \
$(PERL_DIR) \
disco \
- ticker
+ ticker \
+ win32
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+else
plugindir = $(libdir)/pidgin
+endif
-convcolors_la_LDFLAGS = -module -avoid-version
-contact_priority_la_LDFLAGS = -module -avoid-version
-extplacement_la_LDFLAGS = -module -avoid-version
-gtk_signals_test_la_LDFLAGS = -module -avoid-version
-gtkbuddynote_la_LDFLAGS = -module -avoid-version
-history_la_LDFLAGS = -module -avoid-version
-iconaway_la_LDFLAGS = -module -avoid-version
-markerline_la_LDFLAGS = -module -avoid-version
-notify_la_LDFLAGS = -module -avoid-version
-pidginrc_la_LDFLAGS = -module -avoid-version
-sendbutton_la_LDFLAGS = -module -avoid-version
-spellchk_la_LDFLAGS = -module -avoid-version
-themeedit_la_LDFLAGS = -module -avoid-version
-timestamp_la_LDFLAGS = -module -avoid-version
-timestamp_format_la_LDFLAGS = -module -avoid-version
-unity_la_LDFLAGS = -module -avoid-version
-vvconfig_la_LDFLAGS = -module -avoid-version
-xmppconsole_la_LDFLAGS = -module -avoid-version
+convcolors_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+contact_priority_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+extplacement_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+gtk_signals_test_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+gtkbuddynote_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+history_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+iconaway_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)
+sendbutton_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+spellchk_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+themeedit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+timestamp_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+timestamp_format_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+unity_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+vvconfig_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+xmppconsole_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if PLUGINS
@@ -99,41 +104,34 @@
vvconfig_la_SOURCES = vvconfig.c
xmppconsole_la_SOURCES = xmppconsole.c
-convcolors_la_LIBADD = $(GTK_LIBS)
-contact_priority_la_LIBADD = $(GTK_LIBS)
-extplacement_la_LIBADD = $(GTK_LIBS)
-gtk_signals_test_la_LIBADD = $(GTK_LIBS)
-gtkbuddynote_la_LIBADD = $(GTK_LIBS)
-history_la_LIBADD = $(GTK_LIBS)
-iconaway_la_LIBADD = $(GTK_LIBS)
-markerline_la_LIBADD = $(GTK_LIBS)
-notify_la_LIBADD = $(GTK_LIBS)
-pidginrc_la_LIBADD = $(GTK_LIBS)
-sendbutton_la_LIBADD = $(GTK_LIBS)
-spellchk_la_LIBADD = $(GTK_LIBS)
-themeedit_la_LIBADD = $(GTK_LIBS)
-timestamp_la_LIBADD = $(GTK_LIBS)
-timestamp_format_la_LIBADD = $(GTK_LIBS)
-unity_la_LIBADD = $(GTK_LIBS) $(UNITY_LIBS)
-vvconfig_la_LIBADD = $(GTK_LIBS) $(GSTREAMER_LIBS)
-xmppconsole_la_LIBADD = $(GTK_LIBS)
+convcolors_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+contact_priority_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+extplacement_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+gtk_signals_test_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+gtkbuddynote_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+history_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+iconaway_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)
+sendbutton_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+spellchk_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+themeedit_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+timestamp_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+timestamp_format_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+unity_la_LIBADD = $(GTK_LIBS) $(UNITY_LIBS) $(PIDGIN_LIBS)
+vvconfig_la_LIBADD = $(GTK_LIBS) $(GSTREAMER_LIBS) $(PIDGIN_LIBS)
+xmppconsole_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
endif # PLUGINS
EXTRA_DIST = \
- Makefile.mingw \
mailchk.c \
pidgininc.c \
- raw.c \
- win32/transparency/Makefile.mingw \
- win32/transparency/win2ktrans.c \
- win32/winprefs/gtkappbar.c \
- win32/winprefs/gtkappbar.h \
- win32/winprefs/Makefile.mingw \
- win32/winprefs/winprefs.c
+ raw.c
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/pidgin \
diff -aurN 001/source/pidgin/win32/gtkdocklet-win32.c 002/source/pidgin/win32/gtkdocklet-win32.c
--- 001/source/pidgin/win32/gtkdocklet-win32.c
+++ 002/source/pidgin/win32/gtkdocklet-win32.c
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02111-1301, USA.
*/
-#define _WIN32_IE 0x0500
+#define _WIN32_IE 0x0501
#include "internal.h"
#include <windows.h>
#include <gdk/gdkwin32.h>
diff -aurN 001/source/pidgin/win32/pidgin_exe_rc.rc.in 002/source/pidgin/win32/pidgin_exe_rc.rc.in
--- 001/source/pidgin/win32/pidgin_exe_rc.rc.in
+++ 002/source/pidgin/win32/pidgin_exe_rc.rc.in
@@ -24,7 +24,7 @@
VALUE "FileVersion", "@APPLICATION_VERSION@"
VALUE "InternalName", "pidgin"
VALUE "LegalCopyright", "Copyright (C) 1998-2015 The @APPLICATION_NAME@ developer community"
- VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
+ VALUE "OriginalFilename", "pidgin.exe"
VALUE "ProductName", "@APPLICATION_NAME@"
VALUE "ProductVersion", "@DISPLAY_VERSION_FULL@"
END
Reference in New Issue View Git Blame Copy Permalink