alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

twinkle: remove

Browse source
This commit is contained in:
Robin Gloster 2017-02-14 08:59:55 +01:00
parent 72cda1667b
commit 538aed6dea
No known key found for this signature in database
GPG key ID: 5E4C836C632C2882
6 changed files with 0 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch
View file

@ -1,17 +0,0 @@
Index: twinkle-1.4.2/configure.in
===================================================================
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.160534950 -0400
+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:59.000000000 -0400
@@ -294,7 +294,11 @@
AC_CHECK_LIB(boost_regex-gcc, main, [
LIBS="-lboost_regex-gcc $LIBS"
echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])
+ [
+ AC_CHECK_LIB(boost_regex, main, [
+ LIBS="-lboost_regex $LIBS"
+ echo "LIBS += -lboost_regex" >> $QT_INCL_PRO],
+ [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
ms_CHECK_LRELEASE()

40
pkgs/applications/networking/instant-messengers/twinkle/default.nix
View file

@ -1,40 +0,0 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, commoncpp2, ccrtp, openssl, boost
, libsndfile, libxml2, libjpeg, readline, qt3, perl, file
, alsaLib, speex, libzrtpcpp, xorg }:
stdenv.mkDerivation rec {
name = "twinkle-1.4.2";
src = fetchurl {
url = "http://www.xs4all.nl/~mfnboer/twinkle/download/${name}.tar.gz";
sha256 = "19c9gqam78srsgv0463g7lfnv4mn5lvbxx3zl87bnm0vmk3qcxl0";
};
patches = [ # all from Debian
./newer-libccrtp.diff
./libgsm.patch
./localetime_r_conflict.diff
./boost_regex.patch # modified not to use "-mt" suffix
];
configureFlags = "--with-extra-includes=${libjpeg.dev}/include";
buildInputs =
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
libxml2 libjpeg readline qt3 perl file ccrtp
# optional ? :
alsaLib speex
libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
];
NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp";
#enableParallelBuilding = true; # fatal error: messageform.h: No such file or directory
meta = with stdenv.lib; {
homepage = http://www.twinklephone.com/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.marcweber ];
platforms = platforms.linux;
};
}

70
pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch
View file

@ -1,70 +0,0 @@
Index: twinkle-1.4.2/configure.in
===================================================================
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.264533206 -0400
+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:54.256533340 -0400
@@ -195,22 +195,33 @@
# This check does not work on all platforms
# Check if libgsm is available
-# AC_CHECK_LIB(gsm, sf_open, [
-# AC_CHECK_HEADER(gsm.h, [],
-# [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
-# AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
-# GSM_LIBS="-lgsm"
-# echo "LIBS += -lgsm" >> $QT_INCL_PRO
-# have_gsm="yes" ], [
-# have_gsm="no"
-# GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-# echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
-have_gsm="no"
-GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
+AC_CHECK_LIB(gsm, sf_open, [
+ AC_CHECK_HEADER(gsm.h, [],
+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
+ GSM_LIBS="-lgsm"
+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
+ have_gsm="yes" ], [
+ have_gsm="no"
+ GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+ echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+#have_gsm="no"
+#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
AC_SUBST(GSM_LIBS)
+# Check if libgsm is available
+AC_CHECK_LIB(gsm, sf_open, [
+ AC_CHECK_HEADER(gsm.h, [],
+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
+ LIBS="-lgsm $LIBS"
+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
+ have_gsm="yes" ], [
+ have_gsm="no"
+ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+
# Check if ALSA is available
AC_CHECK_LIB(asound, main, [
AC_CHECK_HEADER(alsa/asoundlib.h, [],
@@ -348,3 +359,4 @@
AC_MSG_RESULT([Speex: $have_speex])
AC_MSG_RESULT([iLBC: $have_ilbc])
AC_MSG_RESULT([ZRTP: $have_zrtp])
+AC_MSG_RESULT([Libgsm dynamic link: $have_gsm])
Index: twinkle-1.4.2/src/twinkle_config.h.in
===================================================================
--- twinkle-1.4.2.orig/src/twinkle_config.h.in 2013-07-25 11:07:54.264533206 -0400
+++ twinkle-1.4.2/src/twinkle_config.h.in 2013-07-25 11:07:54.256533340 -0400
@@ -19,6 +19,9 @@
/* Define to 1 if you have the <history.h> header file. */
#undef HAVE_HISTORY_H
+/* Define to 1 if you have the <libgsm> library. */
+#undef HAVE_GSM
+
/* Define to 1 if you have the <ilbc> library. */
#undef HAVE_ILBC

13
pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
View file

@ -1,13 +0,0 @@
Index: twinkle-1.4.2/src/log.cpp
===================================================================
--- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 09:35:28.000000000 -0500
+++ twinkle-1.4.2/src/log.cpp 2013-07-25 11:43:08.901209713 -0400
@@ -161,7 +161,7 @@
gettimeofday(&t, NULL);
date = t.tv_sec;
- localtime_r(&date, &tm);
+ ost::localtime_r(&date, &tm);
*log_stream << "+++ ";
*log_stream << tm.tm_mday;

22
pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff
View file

@ -1,22 +0,0 @@
Index: twinkle-1.4.2/configure.in
===================================================================
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:09:16.000000000 -0400
+++ twinkle-1.4.2/configure.in 2013-07-25 11:11:59.512418187 -0400
@@ -66,7 +66,7 @@
export PKG_CONFIG_PATH
-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
+PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
PKG_CHECK_MODULES(XML2, libxml-2.0)
# AC_CHECK_HEADER(libxml/tree.h, [],
@@ -136,7 +136,7 @@
#echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
# should include above flags !
-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
+echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
# get libraries specified on command line

2
pkgs/top-level/all-packages.nix
View file

@ -15343,8 +15343,6 @@ with pkgs;
twmn = qt5.callPackage ../applications/misc/twmn { };
twinkle = callPackage ../applications/networking/instant-messengers/twinkle { };
umurmur = callPackage ../applications/networking/umurmur { };
unigine-valley = callPackage ../applications/graphics/unigine-valley { };