Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
2fdacd5eb6
20 changed files with 1011 additions and 31 deletions
|
@ -1301,6 +1301,8 @@ libkntlm.so.4 kdelibs-4.10.4_1
|
|||
libkprintutils.so.4 kdelibs-4.10.4_1
|
||||
libnepomuk.so.4 kdelibs-4.10.4_1
|
||||
libnepomukutils.so.4 kdelibs-4.10.4_1
|
||||
libknewstuff2.so.4 kdelibs-4.10.4_1
|
||||
libnepomukquery.so.4 kdelibs-4.10.4_1
|
||||
libkholidays.so.4 kdepimlibs-4.10.4_1
|
||||
libkcalcore.so.4 kdepimlibs-4.10.4_1
|
||||
libkcalutils.so.4 kdepimlibs-4.10.4_1
|
||||
|
@ -1352,3 +1354,8 @@ libkgapi2.so.2 libkgapi-2.0.1_1
|
|||
libqoauth.so.1 qoauth-1.0.1_1
|
||||
libIrrlicht.so.1.8 irrlicht-1.8_1
|
||||
libsnappy.so.1 snappy-1.1.0_1
|
||||
libkonq.so.5 kde-baseapps-4.10.4_1
|
||||
libktorrent.so.5 libktorrent-1.3.1_1
|
||||
libvncserver.so.0 libvncserver-0.9.9_1
|
||||
libvncclient.so.0 libvncserver-0.9.9_1
|
||||
libotr3.so.2 libotr3-3.2.1_1
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'bitcoin'
|
||||
pkgname=bitcoin
|
||||
version=0.8.2
|
||||
version=0.8.3
|
||||
revision=1
|
||||
wrksrc="${pkgname}-${version}-linux"
|
||||
hostmakedepends="which"
|
||||
|
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
license="MIT"
|
||||
homepage="http://www.bitcoin.org/"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-linux.tar.gz"
|
||||
checksum=e15d3134f4efd8d60e243c7177edba06ac471619674ca07a42a1dced5f498728
|
||||
checksum=c6003a6af947e6978b13ab55d7bb7ec97aedc55022fb4924d08792a8d4f83a35
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
# XXX -qt subpkg
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'kdelibs'
|
||||
pkgname=kdelibs
|
||||
version=4.10.4
|
||||
revision=2
|
||||
revision=3
|
||||
short_desc="KDE core libraries"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
|
@ -26,8 +26,6 @@ makedepends="openssl-devel libSM-devel libXext-devel libXScrnSaver-devel
|
|||
kdelibs-devel_package() {
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/bin/kde4-config
|
||||
vmove usr/share/man/man1/kde4-config.1
|
||||
vmove usr/include
|
||||
vmove usr/share/apps/cmake
|
||||
}
|
||||
|
|
1
srcpkgs/kdenetwork-devel
Symbolic link
1
srcpkgs/kdenetwork-devel
Symbolic link
|
@ -0,0 +1 @@
|
|||
kdenetwork
|
67
srcpkgs/kdenetwork/patches/use-libotr3.patch
Normal file
67
srcpkgs/kdenetwork/patches/use-libotr3.patch
Normal file
|
@ -0,0 +1,67 @@
|
|||
--- kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
|
||||
+++ kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
|
||||
@@ -13,13 +13,13 @@
|
||||
SET(LIBOTR_FIND_QUIETLY TRUE)
|
||||
ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
|
||||
|
||||
-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
|
||||
+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
|
||||
|
||||
-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
|
||||
+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
|
||||
|
||||
-# Determine version information from libotr/version.h
|
||||
+# Determine version information from libotr3/version.h
|
||||
IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
|
||||
- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
|
||||
+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
|
||||
STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
|
||||
STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
|
||||
# Check if version is at least 3.2.0
|
||||
--- kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
|
||||
+++ kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
|
||||
@@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
extern "C"{
|
||||
-#include "libotr/proto.h"
|
||||
+#include "libotr3/proto.h"
|
||||
}
|
||||
|
||||
#include "kopetechatsession.h"
|
||||
--- kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
|
||||
+++ kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
|
||||
@@ -36,10 +36,10 @@
|
||||
#include "authenticationwizard.h"
|
||||
|
||||
extern "C" {
|
||||
-#include <libotr/privkey.h>
|
||||
-#include <libotr/proto.h>
|
||||
-#include <libotr/message.h>
|
||||
-#include <libotr/userstate.h>
|
||||
+#include <libotr3/privkey.h>
|
||||
+#include <libotr3/proto.h>
|
||||
+#include <libotr3/message.h>
|
||||
+#include <libotr3/userstate.h>
|
||||
}
|
||||
|
||||
|
||||
--- kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
|
||||
+++ kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
|
||||
@@ -32,11 +32,11 @@
|
||||
#include <kopetechatsession.h>
|
||||
|
||||
extern "C" {
|
||||
-#include <libotr/privkey.h>
|
||||
-#include <libotr/proto.h>
|
||||
-#include <libotr/message.h>
|
||||
-#include <libotr/userstate.h>
|
||||
-#include <libotr/context.h>
|
||||
+#include <libotr3/privkey.h>
|
||||
+#include <libotr3/proto.h>
|
||||
+#include <libotr3/message.h>
|
||||
+#include <libotr3/userstate.h>
|
||||
+#include <libotr3/context.h>
|
||||
}
|
||||
|
||||
class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
|
39
srcpkgs/kdenetwork/template
Normal file
39
srcpkgs/kdenetwork/template
Normal file
|
@ -0,0 +1,39 @@
|
|||
# Template file for 'kdenetwork'
|
||||
pkgname=kdenetwork
|
||||
version=4.10.4
|
||||
revision=2
|
||||
short_desc="KDE network applications/libraries"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=e681cd08ec512303b08fddb847f26b612c10dee51b6746b32be30c4bed71a9ba
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DWITH_Xmms=OFF -DWITH_LibMeanwhile=OFF
|
||||
-DWITH_qq=OFF -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/"
|
||||
|
||||
# XXX libgadu, libmsn, telepathy-qt.
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
makedepends="openssl-devel qt-devel phonon-devel strigi-devel gpgme-devel
|
||||
soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version}
|
||||
nepomuk-core-devel>=${version} kde-workspace-devel>=${version} qimageblitz-devel
|
||||
libXtst-devel libXdamage-devel qca-devel v4l-utils-devel jasper-devel expat-devel
|
||||
sqlite-devel libmms-devel>=0.6.2 speex-devel libidn-devel giflib-devel libxslt-devel
|
||||
boost-devel libktorrent-devel libvncserver-devel libotr3-devel>=3.2.1_2 ppp-devel
|
||||
kde-baseapps-devel>=${version}"
|
||||
|
||||
kdenetwork-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
}
|
||||
}
|
||||
|
||||
kdenetwork_package() {
|
||||
depends="ppp"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
29
srcpkgs/konsole/template
Normal file
29
srcpkgs/konsole/template
Normal file
|
@ -0,0 +1,29 @@
|
|||
# Template file for 'konsole'
|
||||
pkgname=konsole
|
||||
version=4.10.4
|
||||
revision=1
|
||||
short_desc="KDE's Terminal Emulator"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=a46d78a3e0b5b24f68b26011f95735ced645918eedfcc1f5ef5c9bc318237b4f
|
||||
long_desc="
|
||||
As well as being a standalone program, it is also used by other KDE programs
|
||||
such as the Kate editor and KDevelop development environment to provide easy
|
||||
access to a terminal window. Konsole's features and usage are explained and
|
||||
illustrated in the Konsole handbook, which can be accessed by browsing to
|
||||
"help:/konsole" in Konqueror"
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
|
||||
soprano-devel kdelibs-devel>=${version} kde-baseapps-devel>=${version}"
|
||||
|
||||
konsole_package() {
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
1
srcpkgs/libktorrent-devel
Symbolic link
1
srcpkgs/libktorrent-devel
Symbolic link
|
@ -0,0 +1 @@
|
|||
libktorrent
|
28
srcpkgs/libktorrent/template
Normal file
28
srcpkgs/libktorrent/template
Normal file
|
@ -0,0 +1,28 @@
|
|||
# Template file for 'libktorrent'
|
||||
pkgname=libktorrent
|
||||
version=1.3.1
|
||||
revision=1
|
||||
build_style=cmake
|
||||
hostmakedepends="cmake automoc4"
|
||||
makedepends="boost-devel qt-devel phonon-devel libgcrypt-devel qca-devel kdelibs-devel"
|
||||
short_desc="A BitTorrent protocol implementation"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
homepage="http://ktorrent.org"
|
||||
distfiles="http://ktorrent.org/downloads/4.3.1/${pkgname}-${version}.tar.bz2"
|
||||
checksum=2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725
|
||||
|
||||
libktorrent-devel_package() {
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/share/apps/cmake
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
libktorrent_package() {
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
|
@ -1,7 +1,8 @@
|
|||
# Template file for 'libmms'
|
||||
pkgname=libmms
|
||||
version=0.6
|
||||
revision=6
|
||||
version=0.6.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libglib-devel"
|
||||
short_desc="MMS stream protocol library"
|
||||
|
@ -9,24 +10,11 @@ homepage="http://sourceforge.net/projects/libmms/"
|
|||
license="LGPL-2.1"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
|
||||
checksum=1f894f33b5e0334bd7c75343480bdf3a9cf79232aa92085c03f1a67e7d4ceb9d
|
||||
checksum=01931b62172d7d7050fc9ef9b1b64162f3b6e9f6cc4415170192a32a0b7ea432
|
||||
long_desc="
|
||||
libmms is a library for downloading (streaming) media files using the mmst
|
||||
and mmsh protocols."
|
||||
|
||||
do_configure() {
|
||||
export CFLAGS="$CFLAGS -fPIC -DPIC"
|
||||
./configure ${configure_args}
|
||||
}
|
||||
|
||||
do_build() {
|
||||
make ${makejobs}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
make DESTDIR=${DESTDIR} install
|
||||
}
|
||||
|
||||
libmms-devel_package() {
|
||||
depends="libglib-devel libmms>=${version}"
|
||||
short_desc+=" - development files"
|
||||
|
@ -34,6 +22,7 @@ libmms-devel_package() {
|
|||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
1
srcpkgs/libotr3-devel
Symbolic link
1
srcpkgs/libotr3-devel
Symbolic link
|
@ -0,0 +1 @@
|
|||
libotr3
|
1
srcpkgs/libotr3-progs
Symbolic link
1
srcpkgs/libotr3-progs
Symbolic link
|
@ -0,0 +1 @@
|
|||
libotr3
|
683
srcpkgs/libotr3/patches/libotr3-soname.patch
Normal file
683
srcpkgs/libotr3/patches/libotr3-soname.patch
Normal file
|
@ -0,0 +1,683 @@
|
|||
--- configure 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ configure 2012-11-02 04:53:47.533538908 -0400
|
||||
@@ -791,7 +791,7 @@
|
||||
LDFLAGS
|
||||
CFLAGS
|
||||
CC
|
||||
-LIBOTR_LIBTOOL_VERSION
|
||||
+LIBOTR3_LIBTOOL_VERSION
|
||||
am__untar
|
||||
am__tar
|
||||
AMTAR
|
||||
@@ -2674,7 +2674,7 @@
|
||||
|
||||
|
||||
# Define the identity of the package.
|
||||
- PACKAGE=libotr
|
||||
+ PACKAGE=libotr3
|
||||
VERSION=3.2.1
|
||||
|
||||
|
||||
@@ -2715,7 +2715,7 @@
|
||||
|
||||
|
||||
|
||||
-LIBOTR_LIBTOOL_VERSION="4:1:2"
|
||||
+LIBOTR3_LIBTOOL_VERSION="4:1:2"
|
||||
|
||||
|
||||
|
||||
@@ -10461,7 +10461,7 @@
|
||||
|
||||
|
||||
|
||||
-ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr.pc"
|
||||
+ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr3.pc"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -11434,7 +11434,7 @@
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
||||
"toolkit/Makefile") CONFIG_FILES="$CONFIG_FILES toolkit/Makefile" ;;
|
||||
- "libotr.pc") CONFIG_FILES="$CONFIG_FILES libotr.pc" ;;
|
||||
+ "libotr3.pc") CONFIG_FILES="$CONFIG_FILES libotr3.pc" ;;
|
||||
|
||||
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||
esac
|
||||
--- libotr3.m4 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ libotr3.m4 2012-11-02 04:53:59.983891029 -0400
|
||||
@@ -0,0 +1,134 @@
|
||||
+dnl
|
||||
+dnl Off-the-Record Messaging library
|
||||
+dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov
|
||||
+dnl <otr@cypherpunks.ca>
|
||||
+dnl
|
||||
+dnl This library is free software; you can redistribute it and/or
|
||||
+dnl modify it under the terms of version 2.1 of the GNU Lesser General
|
||||
+dnl Public License as published by the Free Software Foundation.
|
||||
+dnl
|
||||
+dnl This library is distributed in the hope that it will be useful,
|
||||
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+dnl Lesser General Public License for more details.
|
||||
+dnl
|
||||
+dnl You should have received a copy of the GNU Lesser General Public
|
||||
+dnl License along with this library; if not, write to the Free Software
|
||||
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+dnl
|
||||
+
|
||||
+dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
+dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate.
|
||||
+dnl enables arguments --with-libotr3-prefix=
|
||||
+dnl --with-libotr3-inc-prefix=
|
||||
+dnl
|
||||
+dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
|
||||
+dnl
|
||||
+dnl Adapted from alsa.m4, originally by
|
||||
+dnl Richard Boulton <richard-alsa@tartarus.org>
|
||||
+dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
|
||||
+dnl Jaroslav Kysela <perex@suse.cz>
|
||||
+
|
||||
+AC_DEFUN([AM_PATH_LIBOTR3],
|
||||
+[dnl Save the original CFLAGS, LDFLAGS, and LIBS
|
||||
+libotr3_save_CFLAGS="$CFLAGS"
|
||||
+libotr3_save_LDFLAGS="$LDFLAGS"
|
||||
+libotr3_save_LIBS="$LIBS"
|
||||
+libotr3_found=yes
|
||||
+
|
||||
+dnl
|
||||
+dnl Get the cflags and libraries for libotr3
|
||||
+dnl
|
||||
+AC_ARG_WITH(libotr3-prefix,
|
||||
+[ --with-libotr3-prefix=PFX Prefix where libotr3 is installed(optional)],
|
||||
+[libotr3_prefix="$withval"], [libotr3_prefix=""])
|
||||
+
|
||||
+AC_ARG_WITH(libotr3-inc-prefix,
|
||||
+[ --with-libotr3-inc-prefix=PFX Prefix where libotr3 includes are (optional)],
|
||||
+[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""])
|
||||
+
|
||||
+dnl Add any special include directories
|
||||
+AC_MSG_CHECKING(for libotr3 CFLAGS)
|
||||
+if test "$libotr3_inc_prefix" != "" ; then
|
||||
+ LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix"
|
||||
+ CFLAGS="$CFLAGS $LIBOTR3_CFLAGS"
|
||||
+fi
|
||||
+AC_MSG_RESULT($LIBOTR3_CFLAGS)
|
||||
+
|
||||
+dnl add any special lib dirs
|
||||
+AC_MSG_CHECKING(for libotr3 LIBS)
|
||||
+if test "$libotr3_prefix" != "" ; then
|
||||
+ LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix"
|
||||
+ LDFLAGS="$LDFLAGS $LIBOTR3_LIBS"
|
||||
+fi
|
||||
+
|
||||
+dnl add the libotr3 library
|
||||
+LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3"
|
||||
+LIBS="$LIBOTR3_LIBS $LIBS"
|
||||
+AC_MSG_RESULT($LIBOTR3_LIBS)
|
||||
+
|
||||
+dnl Check for a working version of libotr3 that is of the right version.
|
||||
+min_libotr3_version=ifelse([$1], ,3.0.0,$1)
|
||||
+no_libotr3=""
|
||||
+ libotr3_min_major_version=`echo $min_libotr3_version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
+ libotr3_min_minor_version=`echo $min_libotr3_version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
+ libotr3_min_sub_version=`echo $min_libotr3_version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
+AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version)
|
||||
+
|
||||
+AC_LANG_SAVE
|
||||
+AC_LANG_C
|
||||
+AC_TRY_COMPILE([
|
||||
+#include <stdlib.h>
|
||||
+#include <libotr3/version.h>
|
||||
+], [
|
||||
+# if(OTRL_VERSION_MAJOR != $libotr3_min_major_version)
|
||||
+# error not present
|
||||
+# else
|
||||
+
|
||||
+# if(OTRL_VERSION_MINOR > $libotr3_min_minor_version)
|
||||
+ exit(0);
|
||||
+# else
|
||||
+# if(OTRL_VERSION_MINOR < $libotr3_min_minor_version)
|
||||
+# error not present
|
||||
+# endif
|
||||
+
|
||||
+# if(OTRL_VERSION_SUB < $libotr3_min_sub_version)
|
||||
+# error not present
|
||||
+# endif
|
||||
+# endif
|
||||
+# endif
|
||||
+exit(0);
|
||||
+],
|
||||
+ [AC_MSG_RESULT(found.)],
|
||||
+ [AC_MSG_RESULT(not present.)
|
||||
+ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)])
|
||||
+ libotr3_found=no]
|
||||
+)
|
||||
+AC_LANG_RESTORE
|
||||
+
|
||||
+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
|
||||
+AC_CHECK_LIB([otr], [otrl_message_receiving],,
|
||||
+ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)])
|
||||
+ libotr3_found=no],
|
||||
+ $LIBGCRYPT_LIBS
|
||||
+)
|
||||
+
|
||||
+LDFLAGS="$libotr3_save_LDFLAGS"
|
||||
+LIBS="$libotr3_save_LIBS"
|
||||
+
|
||||
+if test "x$libotr3_found" = "xyes" ; then
|
||||
+ ifelse([$2], , :, [$2])
|
||||
+else
|
||||
+ LIBOTR3_CFLAGS=""
|
||||
+ LIBOTR3_LIBS=""
|
||||
+ ifelse([$3], , :, [$3])
|
||||
+fi
|
||||
+
|
||||
+dnl That should be it. Now just export our symbols:
|
||||
+AC_SUBST(LIBOTR3_CFLAGS)
|
||||
+AC_SUBST(LIBOTR3_LIBS)
|
||||
+])
|
||||
+
|
||||
--- libotr3.pc.in 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ libotr3.pc.in 2012-11-02 04:53:59.983891029 -0400
|
||||
@@ -0,0 +1,11 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+
|
||||
+Name: libotr3
|
||||
+Description: Off-the-Record Messaging Library
|
||||
+Version: 3.1.0
|
||||
+URL: http://otr.cypherpunks.ca/
|
||||
+Libs: -L${libdir} -lotr3
|
||||
+Cflags: -I${includedir}
|
||||
--- libotr.m4 2012-11-02 04:53:36.606563083 -0400
|
||||
+++ libotr.m4 1969-12-31 19:00:00.000000000 -0500
|
||||
@@ -1,134 +0,0 @@
|
||||
-dnl
|
||||
-dnl Off-the-Record Messaging library
|
||||
-dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov
|
||||
-dnl <otr@cypherpunks.ca>
|
||||
-dnl
|
||||
-dnl This library is free software; you can redistribute it and/or
|
||||
-dnl modify it under the terms of version 2.1 of the GNU Lesser General
|
||||
-dnl Public License as published by the Free Software Foundation.
|
||||
-dnl
|
||||
-dnl This library is distributed in the hope that it will be useful,
|
||||
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
-dnl Lesser General Public License for more details.
|
||||
-dnl
|
||||
-dnl You should have received a copy of the GNU Lesser General Public
|
||||
-dnl License along with this library; if not, write to the Free Software
|
||||
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
-dnl
|
||||
-
|
||||
-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
|
||||
-dnl enables arguments --with-libotr-prefix=
|
||||
-dnl --with-libotr-inc-prefix=
|
||||
-dnl
|
||||
-dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
|
||||
-dnl
|
||||
-dnl Adapted from alsa.m4, originally by
|
||||
-dnl Richard Boulton <richard-alsa@tartarus.org>
|
||||
-dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
|
||||
-dnl Jaroslav Kysela <perex@suse.cz>
|
||||
-
|
||||
-AC_DEFUN([AM_PATH_LIBOTR],
|
||||
-[dnl Save the original CFLAGS, LDFLAGS, and LIBS
|
||||
-libotr_save_CFLAGS="$CFLAGS"
|
||||
-libotr_save_LDFLAGS="$LDFLAGS"
|
||||
-libotr_save_LIBS="$LIBS"
|
||||
-libotr_found=yes
|
||||
-
|
||||
-dnl
|
||||
-dnl Get the cflags and libraries for libotr
|
||||
-dnl
|
||||
-AC_ARG_WITH(libotr-prefix,
|
||||
-[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)],
|
||||
-[libotr_prefix="$withval"], [libotr_prefix=""])
|
||||
-
|
||||
-AC_ARG_WITH(libotr-inc-prefix,
|
||||
-[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)],
|
||||
-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
|
||||
-
|
||||
-dnl Add any special include directories
|
||||
-AC_MSG_CHECKING(for libotr CFLAGS)
|
||||
-if test "$libotr_inc_prefix" != "" ; then
|
||||
- LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
|
||||
- CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
|
||||
-fi
|
||||
-AC_MSG_RESULT($LIBOTR_CFLAGS)
|
||||
-
|
||||
-dnl add any special lib dirs
|
||||
-AC_MSG_CHECKING(for libotr LIBS)
|
||||
-if test "$libotr_prefix" != "" ; then
|
||||
- LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
|
||||
- LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
|
||||
-fi
|
||||
-
|
||||
-dnl add the libotr library
|
||||
-LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
|
||||
-LIBS="$LIBOTR_LIBS $LIBS"
|
||||
-AC_MSG_RESULT($LIBOTR_LIBS)
|
||||
-
|
||||
-dnl Check for a working version of libotr that is of the right version.
|
||||
-min_libotr_version=ifelse([$1], ,3.0.0,$1)
|
||||
-no_libotr=""
|
||||
- libotr_min_major_version=`echo $min_libotr_version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
- libotr_min_minor_version=`echo $min_libotr_version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
- libotr_min_sub_version=`echo $min_libotr_version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
|
||||
-
|
||||
-AC_LANG_SAVE
|
||||
-AC_LANG_C
|
||||
-AC_TRY_COMPILE([
|
||||
-#include <stdlib.h>
|
||||
-#include <libotr/version.h>
|
||||
-], [
|
||||
-# if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
|
||||
-# error not present
|
||||
-# else
|
||||
-
|
||||
-# if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
|
||||
- exit(0);
|
||||
-# else
|
||||
-# if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
|
||||
-# error not present
|
||||
-# endif
|
||||
-
|
||||
-# if(OTRL_VERSION_SUB < $libotr_min_sub_version)
|
||||
-# error not present
|
||||
-# endif
|
||||
-# endif
|
||||
-# endif
|
||||
-exit(0);
|
||||
-],
|
||||
- [AC_MSG_RESULT(found.)],
|
||||
- [AC_MSG_RESULT(not present.)
|
||||
- ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
|
||||
- libotr_found=no]
|
||||
-)
|
||||
-AC_LANG_RESTORE
|
||||
-
|
||||
-dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
|
||||
-AC_CHECK_LIB([otr], [otrl_message_receiving],,
|
||||
- [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
|
||||
- libotr_found=no],
|
||||
- $LIBGCRYPT_LIBS
|
||||
-)
|
||||
-
|
||||
-LDFLAGS="$libotr_save_LDFLAGS"
|
||||
-LIBS="$libotr_save_LIBS"
|
||||
-
|
||||
-if test "x$libotr_found" = "xyes" ; then
|
||||
- ifelse([$2], , :, [$2])
|
||||
-else
|
||||
- LIBOTR_CFLAGS=""
|
||||
- LIBOTR_LIBS=""
|
||||
- ifelse([$3], , :, [$3])
|
||||
-fi
|
||||
-
|
||||
-dnl That should be it. Now just export our symbols:
|
||||
-AC_SUBST(LIBOTR_CFLAGS)
|
||||
-AC_SUBST(LIBOTR_LIBS)
|
||||
-])
|
||||
-
|
||||
--- libotr.m4.orig 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ libotr.m4.orig 2012-08-14 08:15:56.000000000 -0400
|
||||
@@ -0,0 +1,134 @@
|
||||
+dnl
|
||||
+dnl Off-the-Record Messaging library
|
||||
+dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov
|
||||
+dnl <otr@cypherpunks.ca>
|
||||
+dnl
|
||||
+dnl This library is free software; you can redistribute it and/or
|
||||
+dnl modify it under the terms of version 2.1 of the GNU Lesser General
|
||||
+dnl Public License as published by the Free Software Foundation.
|
||||
+dnl
|
||||
+dnl This library is distributed in the hope that it will be useful,
|
||||
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+dnl Lesser General Public License for more details.
|
||||
+dnl
|
||||
+dnl You should have received a copy of the GNU Lesser General Public
|
||||
+dnl License along with this library; if not, write to the Free Software
|
||||
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+dnl
|
||||
+
|
||||
+dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
+dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
|
||||
+dnl enables arguments --with-libotr-prefix=
|
||||
+dnl --with-libotr-inc-prefix=
|
||||
+dnl
|
||||
+dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
|
||||
+dnl
|
||||
+dnl Adapted from alsa.m4, originally by
|
||||
+dnl Richard Boulton <richard-alsa@tartarus.org>
|
||||
+dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
|
||||
+dnl Jaroslav Kysela <perex@suse.cz>
|
||||
+
|
||||
+AC_DEFUN([AM_PATH_LIBOTR],
|
||||
+[dnl Save the original CFLAGS, LDFLAGS, and LIBS
|
||||
+libotr_save_CFLAGS="$CFLAGS"
|
||||
+libotr_save_LDFLAGS="$LDFLAGS"
|
||||
+libotr_save_LIBS="$LIBS"
|
||||
+libotr_found=yes
|
||||
+
|
||||
+dnl
|
||||
+dnl Get the cflags and libraries for libotr
|
||||
+dnl
|
||||
+AC_ARG_WITH(libotr-prefix,
|
||||
+[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)],
|
||||
+[libotr_prefix="$withval"], [libotr_prefix=""])
|
||||
+
|
||||
+AC_ARG_WITH(libotr-inc-prefix,
|
||||
+[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)],
|
||||
+[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
|
||||
+
|
||||
+dnl Add any special include directories
|
||||
+AC_MSG_CHECKING(for libotr CFLAGS)
|
||||
+if test "$libotr_inc_prefix" != "" ; then
|
||||
+ LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
|
||||
+ CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
|
||||
+fi
|
||||
+AC_MSG_RESULT($LIBOTR_CFLAGS)
|
||||
+
|
||||
+dnl add any special lib dirs
|
||||
+AC_MSG_CHECKING(for libotr LIBS)
|
||||
+if test "$libotr_prefix" != "" ; then
|
||||
+ LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
|
||||
+ LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
|
||||
+fi
|
||||
+
|
||||
+dnl add the libotr library
|
||||
+LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
|
||||
+LIBS="$LIBOTR_LIBS $LIBS"
|
||||
+AC_MSG_RESULT($LIBOTR_LIBS)
|
||||
+
|
||||
+dnl Check for a working version of libotr that is of the right version.
|
||||
+min_libotr_version=ifelse([$1], ,3.0.0,$1)
|
||||
+no_libotr=""
|
||||
+ libotr_min_major_version=`echo $min_libotr_version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
+ libotr_min_minor_version=`echo $min_libotr_version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
+ libotr_min_sub_version=`echo $min_libotr_version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
+AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
|
||||
+
|
||||
+AC_LANG_SAVE
|
||||
+AC_LANG_C
|
||||
+AC_TRY_COMPILE([
|
||||
+#include <stdlib.h>
|
||||
+#include <libotr/version.h>
|
||||
+], [
|
||||
+# if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
|
||||
+# error not present
|
||||
+# else
|
||||
+
|
||||
+# if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
|
||||
+ exit(0);
|
||||
+# else
|
||||
+# if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
|
||||
+# error not present
|
||||
+# endif
|
||||
+
|
||||
+# if(OTRL_VERSION_SUB < $libotr_min_sub_version)
|
||||
+# error not present
|
||||
+# endif
|
||||
+# endif
|
||||
+# endif
|
||||
+exit(0);
|
||||
+],
|
||||
+ [AC_MSG_RESULT(found.)],
|
||||
+ [AC_MSG_RESULT(not present.)
|
||||
+ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
|
||||
+ libotr_found=no]
|
||||
+)
|
||||
+AC_LANG_RESTORE
|
||||
+
|
||||
+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
|
||||
+AC_CHECK_LIB([otr], [otrl_message_receiving],,
|
||||
+ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
|
||||
+ libotr_found=no],
|
||||
+ $LIBGCRYPT_LIBS
|
||||
+)
|
||||
+
|
||||
+LDFLAGS="$libotr_save_LDFLAGS"
|
||||
+LIBS="$libotr_save_LIBS"
|
||||
+
|
||||
+if test "x$libotr_found" = "xyes" ; then
|
||||
+ ifelse([$2], , :, [$2])
|
||||
+else
|
||||
+ LIBOTR_CFLAGS=""
|
||||
+ LIBOTR_LIBS=""
|
||||
+ ifelse([$3], , :, [$3])
|
||||
+fi
|
||||
+
|
||||
+dnl That should be it. Now just export our symbols:
|
||||
+AC_SUBST(LIBOTR_CFLAGS)
|
||||
+AC_SUBST(LIBOTR_LIBS)
|
||||
+])
|
||||
+
|
||||
--- libotr.pc.in 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ libotr.pc.in 1969-12-31 19:00:00.000000000 -0500
|
||||
@@ -1,11 +0,0 @@
|
||||
-prefix=@prefix@
|
||||
-exec_prefix=@exec_prefix@
|
||||
-libdir=@libdir@
|
||||
-includedir=@includedir@
|
||||
-
|
||||
-Name: libotr
|
||||
-Description: Off-the-Record Messaging Library
|
||||
-Version: 3.1.0
|
||||
-URL: http://otr.cypherpunks.ca/
|
||||
-Libs: -L${libdir} -lotr
|
||||
-Cflags: -I${includedir}
|
||||
--- Makefile.am 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ Makefile.am 2012-11-02 04:53:47.536872337 -0400
|
||||
@@ -1,9 +1,9 @@
|
||||
SUBDIRS = src toolkit
|
||||
|
||||
-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
|
||||
+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
|
||||
|
||||
aclocaldir = $(datadir)/aclocal
|
||||
-aclocal_DATA = libotr.m4
|
||||
+aclocal_DATA = libotr3.m4
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
-pkgconfig_DATA = libotr.pc
|
||||
+pkgconfig_DATA = libotr3.pc
|
||||
--- Makefile.in 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ Makefile.in 2012-11-02 04:53:47.536872337 -0400
|
||||
@@ -37,7 +37,7 @@
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
- $(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \
|
||||
+ $(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \
|
||||
COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \
|
||||
depcomp install-sh ltmain.sh missing
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@@ -48,7 +48,7 @@
|
||||
configure.lineno config.status.lineno
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = config.h
|
||||
-CONFIG_CLEAN_FILES = libotr.pc
|
||||
+CONFIG_CLEAN_FILES = libotr3.pc
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
@@ -162,7 +162,7 @@
|
||||
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
|
||||
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
|
||||
+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
@@ -243,11 +243,11 @@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
SUBDIRS = src toolkit
|
||||
-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
|
||||
+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
|
||||
aclocaldir = $(datadir)/aclocal
|
||||
-aclocal_DATA = libotr.m4
|
||||
+aclocal_DATA = libotr3.m4
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
-pkgconfig_DATA = libotr.pc
|
||||
+pkgconfig_DATA = libotr3.pc
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@@ -303,7 +303,7 @@
|
||||
|
||||
distclean-hdr:
|
||||
-rm -f config.h stamp-h1
|
||||
-libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in
|
||||
+libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
|
||||
mostlyclean-libtool:
|
||||
--- src/Makefile.am 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ src/Makefile.am 2012-11-02 04:53:47.536872337 -0400
|
||||
@@ -1,13 +1,13 @@
|
||||
INCLUDES = @LIBGCRYPT_CFLAGS@
|
||||
|
||||
-lib_LTLIBRARIES = libotr.la
|
||||
+lib_LTLIBRARIES = libotr3.la
|
||||
|
||||
-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
|
||||
+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
|
||||
userstate.c tlv.c auth.c sm.c
|
||||
|
||||
-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
|
||||
+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
|
||||
|
||||
-otrincdir = $(includedir)/libotr
|
||||
+otrincdir = $(includedir)/libotr3
|
||||
|
||||
otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
|
||||
version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
|
||||
--- src/Makefile.in 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ /src/Makefile.in 2012-11-02 04:53:47.536872337 -0400
|
||||
@@ -69,13 +69,13 @@
|
||||
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
||||
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)"
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
-libotr_la_LIBADD =
|
||||
-am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
|
||||
+libotr3_la_LIBADD =
|
||||
+am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
|
||||
mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo
|
||||
-libotr_la_OBJECTS = $(am_libotr_la_OBJECTS)
|
||||
-libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
+libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS)
|
||||
+libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
- $(libotr_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
+ $(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@@ -89,8 +89,8 @@
|
||||
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
-SOURCES = $(libotr_la_SOURCES)
|
||||
-DIST_SOURCES = $(libotr_la_SOURCES)
|
||||
+SOURCES = $(libotr3_la_SOURCES)
|
||||
+DIST_SOURCES = $(libotr3_la_SOURCES)
|
||||
HEADERS = $(otrinc_HEADERS)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
@@ -130,7 +130,7 @@
|
||||
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
|
||||
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
|
||||
+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
@@ -211,12 +211,12 @@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
INCLUDES = @LIBGCRYPT_CFLAGS@
|
||||
-lib_LTLIBRARIES = libotr.la
|
||||
-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
|
||||
+lib_LTLIBRARIES = libotr3.la
|
||||
+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
|
||||
userstate.c tlv.c auth.c sm.c
|
||||
|
||||
-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
|
||||
-otrincdir = $(includedir)/libotr
|
||||
+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
|
||||
+otrincdir = $(includedir)/libotr3
|
||||
otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
|
||||
version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
|
||||
|
||||
@@ -285,8 +285,8 @@
|
||||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
-libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES)
|
||||
- $(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS)
|
||||
+libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES)
|
||||
+ $(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
--- toolkit/Makefile.am 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ toolkit/Makefile.am 2012-11-02 04:53:47.536872337 -0400
|
||||
@@ -6,7 +6,7 @@
|
||||
otr_modify otr_remac
|
||||
|
||||
COMMON_S = parse.c sha1hmac.c
|
||||
-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
|
||||
+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
|
||||
|
||||
otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
|
||||
otr_parse_LDADD = $(COMMON_LD)
|
||||
--- toolkit/Makefile.in 2012-11-02 04:53:36.609896510 -0400
|
||||
+++ toolkit/Makefile.in 2012-11-02 04:53:47.536872337 -0400
|
||||
@@ -55,7 +55,7 @@
|
||||
am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \
|
||||
$(am__objects_1)
|
||||
otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS)
|
||||
-am__DEPENDENCIES_1 = ../src/libotr.la
|
||||
+am__DEPENDENCIES_1 = ../src/libotr3.la
|
||||
otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \
|
||||
$(am__objects_1)
|
||||
@@ -159,7 +159,7 @@
|
||||
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
|
||||
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
|
||||
+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
@@ -242,7 +242,7 @@
|
||||
INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@
|
||||
noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h
|
||||
COMMON_S = parse.c sha1hmac.c
|
||||
-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
|
||||
+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
|
||||
otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
|
||||
otr_parse_LDADD = $(COMMON_LD)
|
||||
otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S)
|
47
srcpkgs/libotr3/template
Normal file
47
srcpkgs/libotr3/template
Normal file
|
@ -0,0 +1,47 @@
|
|||
# Template build file for 'libotr3'.
|
||||
pkgname=libotr3
|
||||
version=3.2.1
|
||||
revision=2
|
||||
wrksrc="libotr-${version}"
|
||||
build_style=gnu-configure
|
||||
configure_args="--program-transform-name='s/otr/otr3/'"
|
||||
makedepends="libgcrypt-devel"
|
||||
short_desc="Off-the-Record Messaging Library and Toolkit (version 3.X)"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.cypherpunks.ca/otr/"
|
||||
license="GPL-2, LGPL-2.1"
|
||||
distfiles="http://www.cypherpunks.ca/otr/libotr-${version}.tar.gz"
|
||||
checksum=d428eaa584984baa09450cca07742e0ac8fc62401f3a1c556e3025023369cdf4
|
||||
|
||||
post_install() {
|
||||
for i in parse sesskeys mackey readforge modify remac; do
|
||||
rm ${DESTDIR}/usr/share/man/man1/otr_${i}.1
|
||||
ln -sf otr3_toolkit.1 ${DESTDIR}/usr/share/man/man1/otr3_${i}.1
|
||||
done
|
||||
}
|
||||
|
||||
libotr3-progs_package() {
|
||||
short_desc+=" - applications"
|
||||
pkg_install() {
|
||||
vmove usr/bin
|
||||
vmove usr/share/man/man1
|
||||
}
|
||||
}
|
||||
|
||||
libotr3-devel_package() {
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/share/aclocal
|
||||
}
|
||||
}
|
||||
|
||||
libotr3_package() {
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
}
|
||||
}
|
1
srcpkgs/libvncserver-devel
Symbolic link
1
srcpkgs/libvncserver-devel
Symbolic link
|
@ -0,0 +1 @@
|
|||
libvncserver
|
33
srcpkgs/libvncserver/template
Normal file
33
srcpkgs/libvncserver/template
Normal file
|
@ -0,0 +1,33 @@
|
|||
# Template build file for 'libvncserver'.
|
||||
pkgname=libvncserver
|
||||
version=0.9.9
|
||||
revision=1
|
||||
wrksrc="LibVNCServer-${version}"
|
||||
build_style=gnu-configure
|
||||
makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
|
||||
short_desc="C libraries to easily implement VNC server or client functionality"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://libvncserver.sourceforge.net/"
|
||||
license="GPL-2"
|
||||
distfiles="${SOURCEFORGE_SITE}/$pkgname/LibVNCServer-${version}.tar.gz"
|
||||
checksum=cf060d3525c2fb92be2fa18bbc697fb355592b52484e60745f3bcac5c3f803f9
|
||||
|
||||
libvncserver-devel_package() {
|
||||
depends="zlib-devel libpng-devel libjpeg-turbo-devel
|
||||
libgcrypt-devel openssl-devel
|
||||
${sourcepkg}-${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/bin/libvncserver-config
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
||||
|
||||
libvncserver_package() {
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
}
|
||||
}
|
|
@ -1,23 +1,24 @@
|
|||
# Template file for 'nvidia'
|
||||
pkgname=nvidia
|
||||
version=319.23
|
||||
version=319.32
|
||||
revision=1
|
||||
short_desc="NVIDIA drivers for linux -- libraries and utilities"
|
||||
short_desc="NVIDIA drivers for linux - libraries and utilities"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="Propietary NVIDIA license"
|
||||
homepage="http://www.nvidia.com"
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
create_wrksrc=yes
|
||||
noextract=yes
|
||||
|
||||
if [ "$XBPS_MACHINE" = "i686" ]; then
|
||||
_pkg="NVIDIA-Linux-x86-${version}"
|
||||
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"
|
||||
checksum=200dcaec7ec09b7d3bb22eadcd049a4172338bbb04e7de00cf05ce07db452fb8
|
||||
checksum=ee63bdb16ff8cc42c0ed487db37d1a612fffdd969fce8c0155afa6f57e8c320b
|
||||
else
|
||||
_pkg="NVIDIA-Linux-x86_64-${version}"
|
||||
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}.run"
|
||||
checksum=d130dd0a9d889063d0dbad0a27789af756076af879a68a5dbc1175821542fa78
|
||||
checksum=204a00728c3cfbe3dcb12a9dae5bf0371a1e5b2c48dedf86a2bb6c881e901e2a
|
||||
fi
|
||||
|
||||
do_extract() {
|
||||
|
@ -133,7 +134,7 @@ nvidia-dkms_package() {
|
|||
triggers="dkms"
|
||||
dkms_modules="nvidia ${version}"
|
||||
depends="dkms"
|
||||
short_desc="NVIDIA drivers for linux -- DKMS kernel module"
|
||||
short_desc="NVIDIA drivers for linux - DKMS kernel module"
|
||||
pkg_install() {
|
||||
vmove usr/src
|
||||
vmove usr/lib/modules-load.d
|
||||
|
@ -143,7 +144,7 @@ nvidia-dkms_package() {
|
|||
|
||||
nvidia-opencl_package() {
|
||||
nonfree=yes
|
||||
short_desc="NVIDIA drivers for linux -- OpenCL implementation"
|
||||
short_desc="NVIDIA drivers for linux - OpenCL implementation"
|
||||
provides="libOpenCL-${version}"
|
||||
replaces="libOpenCL>=0"
|
||||
pkg_install() {
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
# Template file for 'soprano'
|
||||
pkgname=soprano
|
||||
version=2.9.2
|
||||
revision=4
|
||||
revision=5
|
||||
build_style=cmake
|
||||
configure_args="-DCMAKE_SKIP_RPATH=OFF"
|
||||
configure_args="-DCMAKE_SKIP_RPATH=OFF -DSOPRANO_DISABLE_CLUCENE_INDEX=ON"
|
||||
hostmakedepends="cmake pkg-config"
|
||||
makedepends="qt-devel liblrdf-devel raptor-devel clucene-devel>=2.3.3.4
|
||||
redland-devel libiodbc-devel"
|
||||
makedepends="qt-devel raptor-devel redland-devel libiodbc-devel virtuoso-base"
|
||||
short_desc="Highly usable object-oriented C++/Qt4 framework for RDF data"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2, LGPL-2.1"
|
||||
|
@ -25,6 +24,7 @@ soprano-devel_package() {
|
|||
}
|
||||
|
||||
soprano_package() {
|
||||
depends="virtuoso-base redland-storage-virtuoso"
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
}
|
||||
|
|
1
srcpkgs/virtuoso-base
Symbolic link
1
srcpkgs/virtuoso-base
Symbolic link
|
@ -0,0 +1 @@
|
|||
virtuoso
|
53
srcpkgs/virtuoso/template
Normal file
53
srcpkgs/virtuoso/template
Normal file
|
@ -0,0 +1,53 @@
|
|||
# Template file for 'virtuoso'
|
||||
pkgname=virtuoso
|
||||
version=6.1.6
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--without-internal-zlib --with-readline
|
||||
--with-layout=debian --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'"
|
||||
wrksrc="${pkgname}-opensource-${version}"
|
||||
hostmakedepends="flex gperf net-tools"
|
||||
makedepends="libldap-devel readline-devel libxml2-devel openssl-devel mit-krb5-devel"
|
||||
short_desc="A scalable cross-platform server of virtuoso"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-opensource-${version}.tar.gz"
|
||||
checksum=c6bfa6817b3dad5f87577b68f4cf554d1bfbff48178a734084ac3dcbcea5a037
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
makedepends+=" libfl-devel"
|
||||
fi
|
||||
|
||||
virtuoso-base_package() {
|
||||
short_desc+=" (very minimal installation)"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/binsrc/virtuoso
|
||||
make DESTDIR=$PKGDESTDIR install
|
||||
cd ${wrksrc}/binsrc/driver
|
||||
make DESTDIR=$PKGDESTDIR install
|
||||
# Install some useful tools; rename to avoid conflicts with unixodbc
|
||||
for bin in isql isqlw; do
|
||||
install -Dm755 ${wrksrc}/binsrc/tests/$bin \
|
||||
${PKGDESTDIR}/usr/bin/${bin}-vt
|
||||
done
|
||||
# Remove static libs and libtool archives.
|
||||
rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
|
||||
}
|
||||
}
|
||||
|
||||
virtuoso_package() {
|
||||
pkg_install() {
|
||||
vmove all
|
||||
# remove conflicts with virtuoso-base
|
||||
rm ${PKGDESTDIR}/usr/bin/isql{,w}
|
||||
rm ${PKGDESTDIR}/usr/bin/virtuoso-t
|
||||
rm ${PKGDESTDIR}/usr/lib/libvirtuoso-t.a
|
||||
rm ${PKGDESTDIR}/usr/lib/virtodbc.{a,so}
|
||||
rm ${PKGDESTDIR}/usr/lib/virtodbc_r.{a,so}
|
||||
rm ${PKGDESTDIR}/usr/lib/virtodbcu.{a,so}
|
||||
rm ${PKGDESTDIR}/usr/lib/virtodbcu_r.{a,so}
|
||||
# remove static libs.
|
||||
rm -f ${PKGDESTDIR}/usr/lib/virtuoso/hosting/*.a
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue