Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

pidgin-hg: Some improvements.

Browse Source 
* Build the finch client.
* Fix license information.
* Specify libpurple and finch in provides.
This commit is contained in:
Renato Silva
2016-04-16 19:25:44 -03:00
parent a8717873c3
commit d6c5b5030d
3 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mingw-w64-pidgin-hg/001-win.patch → mingw-w64-pidgin-hg/001-build-fixes.patch
View File

@@ -1,6 +1,7 @@
--- ./libpurple/Makefile.am.orig 2015-05-17 21:54:49.202429500 +0200
+++ ./libpurple/Makefile.am 2015-05-17 23:06:31.848670500 +0200
@@ -463,6 +463,7 @@
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
@@ -8,7 +9,7 @@
if HAVE_INTROSPECTION
introspection_sources = \
@@ -480,7 +481,7 @@
@@ -484,7 +485,7 @@
endif
Purple_3_0_gir_CFLAGS = \
@@ -17,7 +18,7 @@
$(INCLUDES) \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
@@ -506,10 +507,10 @@
@@ -510,10 +511,10 @@
Purple_3_0_gir_FILES = $(introspection_sources)
INTROSPECTION_GIRS += Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
@@ -30,8 +31,25 @@
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
--- ./pidgin/Makefile.am.orig 2015-05-17 21:54:49.224430000 +0200
+++ ./pidgin/Makefile.am 2015-05-17 23:07:16.130585900 +0200
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

25
mingw-w64-pidgin-hg/002-finch-fixes.patch Normal file
View File

@@ -0,0 +1,25 @@
diff -aurN 001/configure.ac 002/configure.ac
--- 001/configure.ac
+++ 002/configure.ac
@@ -828,7 +828,7 @@
[enable_consoleui=no], [$GNT_LIBS])
if test "x$is_win32" = "xyes" ; then
- ncurses_sys_prefix="/usr/$host/sys-root/mingw"
+ ncurses_sys_prefix="$(cygpath --mixed $prefix)"
else
ncurses_sys_prefix="/usr"
fi
diff -aurN 001/finch/libgnt/Makefile.am 002/finch/libgnt/Makefile.am
--- 001/finch/libgnt/Makefile.am
+++ 002/finch/libgnt/Makefile.am
@@ -90,7 +90,8 @@
$(GNT_LIBS) \
$(LIBXML_LIBS) \
$(INTROSPECTION_LIBS) \
- $(PY_LIBS)
+ $(PY_LIBS) \
+ -lncursesw
if IS_WIN32

26
mingw-w64-pidgin-hg/PKGBUILD
View File

@@ -1,16 +1,21 @@
# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
# Contributor: Renato Silva <br.renatosilva@gmail.com>
_realname=pidgin
pkgbase=mingw-w64-${_realname}-hg
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-hg"
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=r37207.e666f49a3e86
provides=(${MINGW_PACKAGE_PREFIX}-${_realname}
${MINGW_PACKAGE_PREFIX}-libpurple
${MINGW_PACKAGE_PREFIX}-finch)
conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}
${MINGW_PACKAGE_PREFIX}-libpurple
${MINGW_PACKAGE_PREFIX}-finch)
pkgver=r37643+.90e4018f26ea+
pkgrel=1
pkgdesc="Multi-protocol instant messaging client (mingw-w64)"
arch=('any')
url="http://pidgin.im/"
license=("GPL")
license=(GPL2 partial:'GPL2+') # GPL2+, but Novell and SILC are GPL2-only
makedepends=("${MINGW_PACKAGE_PREFIX}-doxygen"
"${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
@@ -37,9 +42,11 @@ options=(!libtool strip staticlibs)
source=(${_realname}::"hg+https://hg.pidgin.im/pidgin/main"
#"https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.bz2"
001-win.patch)
001-build-fixes.patch
002-finch-fixes.patch)
sha256sums=('SKIP'
'65bc5f9e8dab874c483e08745a324c6c0e958e9ef3004f1cd8bf574fd7fe3712')
'9b23f36083330994637f286da6206020e5771164bfa4565c28285ae995a93685'
'0f4a19b31e8a947c57aa648e2bba0724bbef019fad46fd9345d1a6280c5e6ae0')
pkgver() {
cd "${_realname}"
@@ -49,7 +56,8 @@ pkgver() {
prepare() {
cd ${_realname}
patch -b -V simple -p1 -i ${srcdir}/001-win.patch
patch -b -V simple -p1 -i ${srcdir}/001-build-fixes.patch
patch -b -V simple -p1 -i ${srcdir}/002-finch-fixes.patch
NOCONFIGURE=1 ./autogen.sh
}
@@ -58,7 +66,7 @@ build() {
cd "${srcdir}/${_realname}"
sed -i "s#env python#env python2#" */plugins/*.py
sed -i "s#env python#env python2#" libpurple/purple-{remote,notifications-example,url-handler}
./configure \
INTLTOOL_PERL=/usr/bin/perl ./configure \
--prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
@@ -68,9 +76,11 @@ build() {
--disable-screensaver \
--disable-sm \
--disable-nm \
--disable-dbus \
--with-python=${MINGW_PREFIX}/bin/python2 \
--with-system-ssl-certs=${MINGW_PREFIX}/ssl/certs \
--with-win32-dirs=fhs \
--enable-consoleui \
#--enable-cyrus-sasl
make