From 9b4356a4ce894946739f7fff9411f62be0fbc122 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 5 Aug 2012 00:04:11 +0000 Subject: Sun Aug 5 00:04:11 UTC 2012 --- extra/mercurial/PKGBUILD | 6 +++--- extra/mysql/PKGBUILD | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'extra') diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 60740c4fb..c5ab2c39f 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162864 2012-07-02 14:49:26Z giovanni $ +# $Id: PKGBUILD 164703 2012-08-03 16:21:32Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.2.3 +pkgver=2.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('f4c70af3892d964b83b2718bde44c2f8' +md5sums=('8d9f776e432239571dfab2b5f88b3675' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index d595f927f..c7be9147d 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 163038 2012-07-06 07:38:34Z andrea $ +# $Id: PKGBUILD 164697 2012-08-03 07:57:29Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Douglas Soares de Andrade pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.25.a -_pkgver=5.5.25a +pkgver=5.5.27 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="https://www.mysql.com/products/community/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${_pkgver}.tar.gz" +source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('0841fbc79872c5f467d8c8842f45257a' +md5sums=('82baf46acfced6eef072e9d8a479c86e' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -27,7 +26,7 @@ build() { # CFLAGS/CXXFLAGS as suggested upstream - cmake ../${pkgbase}-${_pkgver} \ + cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -78,7 +77,7 @@ package_libmysqlclient(){ install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ install -d "${pkgdir}"/usr/share/man/man1 for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done } @@ -92,7 +91,7 @@ package_mysql-clients(){ # install man pages install -d "${pkgdir}"/usr/share/man/man1 for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done # provided by mysql -- cgit v1.2.3-54-g00ecf From 3c4d46227f477bcac2d83f48df5ae1c3b969598a Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 11:44:38 +0200 Subject: Fix alsa-plugins build: _GNU_SOURCE must be defined before including standard headers. --- extra/alsa-plugins/PKGBUILD | 7 +++++-- extra/alsa-plugins/gcc-4.7.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 extra/alsa-plugins/gcc-4.7.patch (limited to 'extra') diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 72a71e092..59b2238d7 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -20,15 +20,18 @@ optdepends=('libpulse: PulseAudio plugin' options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) + alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch + gcc-4.7.patch) md5sums=('038c023eaa51171f018fbf7141255185' '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9') + '697c6275f678d86ded2e5092d8a154c9' + '3b76ed6c9b59eccca0b33a731641350d') build() { cd $pkgname-$pkgver patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch + patch -Np1 -i "$srcdir/gcc-4.7.patch" ./configure --prefix=/usr make } diff --git a/extra/alsa-plugins/gcc-4.7.patch b/extra/alsa-plugins/gcc-4.7.patch new file mode 100644 index 000000000..1518b2afb --- /dev/null +++ b/extra/alsa-plugins/gcc-4.7.patch @@ -0,0 +1,13 @@ +diff -ru alsa-plugins-1.0.25.orig/usb_stream/pcm_usb_stream.c alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c +--- alsa-plugins-1.0.25.orig/usb_stream/pcm_usb_stream.c 2012-08-05 11:24:22.652219959 +0200 ++++ alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c 2012-08-05 11:25:08.599688184 +0200 +@@ -18,8 +18,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include + #define _GNU_SOURCE ++#include + #include + #include + #include -- cgit v1.2.3-54-g00ecf From c5acd40a763f8688aa564679643e6d5458425d4d Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 14:16:59 +0200 Subject: Use a patch from Gentoo to fix lftp build. --- extra/lftp/PKGBUILD | 8 ++++++-- extra/lftp/lftp-4.3.8-gets.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 extra/lftp/lftp-4.3.8-gets.patch (limited to 'extra') diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 9afb5e56f..53c5482b6 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -12,11 +12,15 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('adced9c3e0f6b96821811dc87c0a1eeb') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 + lftp-4.3.8-gets.patch) +md5sums=('adced9c3e0f6b96821811dc87c0a1eeb' + '932db2d498846be7ba90780ee4fcb158') build() { cd ${srcdir}/${pkgname}-${pkgver} + # A patch from Gentoo fixing build with newer glibc. + patch -Np1 -i "$srcdir/lftp-4.3.8-gets.patch" ./configure --prefix=/usr --with-gnutls \ --without-openssl --disable-static make diff --git a/extra/lftp/lftp-4.3.8-gets.patch b/extra/lftp/lftp-4.3.8-gets.patch new file mode 100644 index 000000000..0c2cb7c8a --- /dev/null +++ b/extra/lftp/lftp-4.3.8-gets.patch @@ -0,0 +1,15 @@ +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -702,10 +702,12 @@ + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning; besides, C11 + removed it. */ ++#ifdef gets + #undef gets + #if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + #endif ++#endif + + + #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ -- cgit v1.2.3-54-g00ecf From 8fbd202239b8833af79e1deefcadc128b7e979eb Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 14:38:49 +0200 Subject: Fix libsrtp using a predefined constant as a variable. --- extra/libsrtp/PKGBUILD | 9 +++++--- extra/libsrtp/mips.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 extra/libsrtp/mips.patch (limited to 'extra') diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD index 13f8142c3..1013f6bc8 100644 --- a/extra/libsrtp/PKGBUILD +++ b/extra/libsrtp/PKGBUILD @@ -9,13 +9,16 @@ pkgver=1.4.4 pkgrel=2 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" url="http://srtp.sourceforge.net/srtp.html" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('BSD') -source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz") -md5sums=('9b449edb011c934ca97009e7e0566d22') +source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz" + "mips.patch") +md5sums=('9b449edb011c934ca97009e7e0566d22' + 'bfb3ec203daf786b9ffb33f30cb126ea') build() { cd "${srcdir}"/srtp + patch -Np1 -i "$srcdir/mips.patch" ./configure --prefix=/usr make CFLAGS="${CFLAGS} -fPIC" } diff --git a/extra/libsrtp/mips.patch b/extra/libsrtp/mips.patch new file mode 100644 index 000000000..a1b549fe5 --- /dev/null +++ b/extra/libsrtp/mips.patch @@ -0,0 +1,55 @@ +diff -ru srtp.orig/test/srtp_driver.c srtp/test/srtp_driver.c +--- srtp.orig/test/srtp_driver.c 2012-08-05 14:26:28.703145796 +0200 ++++ srtp/test/srtp_driver.c 2012-08-05 14:27:12.003981862 +0200 +@@ -314,7 +314,7 @@ + if (do_codec_timing) { + srtp_policy_t policy; + int ignore; +- double mips = mips_estimate(1000000000, &ignore); ++ double mips_ = mips_estimate(1000000000, &ignore); + + crypto_policy_set_rtp_default(&policy.rtp); + crypto_policy_set_rtcp_default(&policy.rtcp); +@@ -323,33 +323,33 @@ + policy.key = test_key; + policy.next = NULL; + +- printf("mips estimate: %e\n", mips); ++ printf("mips estimate: %e\n", mips_); + + printf("testing srtp processing time for voice codecs:\n"); + printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n"); + printf("G.711\t\t%d\t\t\t%e\n", 80, +- (double) mips * (80 * 8) / ++ (double) mips_ * (80 * 8) / + srtp_bits_per_second(80, &policy) / .01 ); + printf("G.711\t\t%d\t\t\t%e\n", 160, +- (double) mips * (160 * 8) / ++ (double) mips_ * (160 * 8) / + srtp_bits_per_second(160, &policy) / .02); + printf("G.726-32\t%d\t\t\t%e\n", 40, +- (double) mips * (40 * 8) / ++ (double) mips_ * (40 * 8) / + srtp_bits_per_second(40, &policy) / .01 ); + printf("G.726-32\t%d\t\t\t%e\n", 80, +- (double) mips * (80 * 8) / ++ (double) mips_ * (80 * 8) / + srtp_bits_per_second(80, &policy) / .02); + printf("G.729\t\t%d\t\t\t%e\n", 10, +- (double) mips * (10 * 8) / ++ (double) mips_ * (10 * 8) / + srtp_bits_per_second(10, &policy) / .01 ); + printf("G.729\t\t%d\t\t\t%e\n", 20, +- (double) mips * (20 * 8) / ++ (double) mips_ * (20 * 8) / + srtp_bits_per_second(20, &policy) / .02 ); + printf("Wideband\t%d\t\t\t%e\n", 320, +- (double) mips * (320 * 8) / ++ (double) mips_ * (320 * 8) / + srtp_bits_per_second(320, &policy) / .01 ); + printf("Wideband\t%d\t\t\t%e\n", 640, +- (double) mips * (640 * 8) / ++ (double) mips_ * (640 * 8) / + srtp_bits_per_second(640, &policy) / .02 ); + } + -- cgit v1.2.3-54-g00ecf From 18abbef27710354cceefd9170a7b9f0cc27755b2 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 15:00:50 +0200 Subject: Update nx-common source IPs. --- extra/nx-common/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extra') diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD index 05b539888..ee36eb8f2 100644 --- a/extra/nx-common/PKGBUILD +++ b/extra/nx-common/PKGBUILD @@ -11,8 +11,8 @@ license=('GPL') url="http://nomachine.com/" depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' makedepends=('xorg-server-devel' 'nx-headers') -source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz +source=(http://64.34.173.142/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz + http://64.34.173.142/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz nxcompsh-gcc43.patch) options=('!libtool') md5sums=('84ade443b79ea079380b754aba9d392e' -- cgit v1.2.3-54-g00ecf From 64c49aaead7b39bf371f20dfa5df8562f89eed4f Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 15:27:11 +0200 Subject: Fix ode md5sums. --- extra/ode/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extra') diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD index 806f35f4f..a7233d7c2 100644 --- a/extra/ode/PKGBUILD +++ b/extra/ode/PKGBUILD @@ -12,7 +12,7 @@ license=('LGPL' 'BSD') depends=('gcc-libs' 'bash') source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') -md5sums=('48fdd41fae1a7e7831feeded09826599') +md5sums=('83766cae59692c2843d9afccc1768988') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3-54-g00ecf From d189e847ff97e93c2b4b249ddc0d4e9f2cb8e84b Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 15:56:14 +0200 Subject: Fix ossp build. --- extra/ossp/PKGBUILD | 2 ++ 1 file changed, 2 insertions(+) (limited to 'extra') diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 3bca792c3..28f73b367 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -25,6 +25,8 @@ md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' build() { cd "$srcdir/$pkgname-$pkgver" + # Many implicit libraries. + export LDFLAGS="$LDFLAGS -lrt -lpthread" make } -- cgit v1.2.3-54-g00ecf From 889e7389bc412de1da7ec9057d31e72457f098be Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 16:44:10 +0200 Subject: Disable -Werror in putty. --- extra/putty/PKGBUILD | 1 + 1 file changed, 1 insertion(+) (limited to 'extra') diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD index c8fe95255..880aa82b3 100644 --- a/extra/putty/PKGBUILD +++ b/extra/putty/PKGBUILD @@ -16,6 +16,7 @@ sha1sums=('5898438614117ee7e3704fc3f30a3c4bf2041380' build() { cd "${srcdir}/${pkgname}-${pkgver}/unix" + sed -i 's/-Werror//' configure ./configure --prefix=/usr make } -- cgit v1.2.3-54-g00ecf From 295a0c10b8148abf85cd84483ba2280285975b3b Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 16:55:33 +0200 Subject: Add a patch based on an upstream commit to fix python-telepathy. --- extra/python-telepathy/PKGBUILD | 8 ++++++-- .../telepathy-python-generated-errors.patch | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 extra/python-telepathy/telepathy-python-generated-errors.patch (limited to 'extra') diff --git a/extra/python-telepathy/PKGBUILD b/extra/python-telepathy/PKGBUILD index 9b1b9f5eb..e518e21ff 100644 --- a/extra/python-telepathy/PKGBUILD +++ b/extra/python-telepathy/PKGBUILD @@ -10,11 +10,15 @@ url="http://telepathy.freedesktop.org" license=('LGPL') depends=('dbus-python') makedepends=('libxslt') -source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz) -md5sums=('f7ca25ab3c88874015b7e9728f7f3017') +source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz + telepathy-python-generated-errors.patch) +md5sums=('f7ca25ab3c88874015b7e9728f7f3017' + '2dfa69cd0548661dbbb5ae53b1c19e0f') build() { cd "${srcdir}/telepathy-python-${pkgver}" + patch -Np1 -i "$srcdir/telepathy-python-generated-errors.patch" + autoreconf ./configure --prefix=/usr make } diff --git a/extra/python-telepathy/telepathy-python-generated-errors.patch b/extra/python-telepathy/telepathy-python-generated-errors.patch new file mode 100644 index 000000000..d52861d89 --- /dev/null +++ b/extra/python-telepathy/telepathy-python-generated-errors.patch @@ -0,0 +1,18 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 135f2f0..ede1fc3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,10 +13,12 @@ telepathy_PYTHON = \ + spec_dir = $(top_srcdir)/spec + spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)) + ++# We leave _generated/errors.py out of here because there exists a ++# spec/errors.xml file, so that means there'll be a ++# _generated/errors.py in $(spec_files). See fd.o#32526 + BUILT_SOURCES = \ + _generated/interfaces.py \ + _generated/constants.py \ +- _generated/errors.py \ + _generated/__init__.py \ + $(spec_files) + -- cgit v1.2.3-54-g00ecf From 084cd8cbce75d0b0eeb4aa6690cbf1cd5cdd0d07 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 17:06:57 +0200 Subject: Fix scim-chwing source URL. --- extra/scim-chewing/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extra') diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD index 7c2b1319d..be143ae81 100644 --- a/extra/scim-chewing/PKGBUILD +++ b/extra/scim-chewing/PKGBUILD @@ -13,7 +13,7 @@ options=('!libtool') arch=('i686' 'x86_64' 'mips64el') makedepends=('intltool') depends=('scim' 'libchewing') -source=("http://chewing.csie.net/download/scim/${pkgname}-${pkgver}.tar.bz2") +source=("https://github.com/downloads/chewing/scim-chewing/scim-chewing-${pkgver}.tar.bz2") sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05') build() { -- cgit v1.2.3-54-g00ecf From ae30753c6d386130aadfc8709c7f215a5eac9694 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 17:37:10 +0200 Subject: Fix libhangul source URL. --- extra/libhangul/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'extra') diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD index a3a99a4cd..0bd75b576 100644 --- a/extra/libhangul/PKGBUILD +++ b/extra/libhangul/PKGBUILD @@ -11,8 +11,7 @@ arch=('i686' 'x86_64' 'mips64el') url='http://kldp.net/projects/hangul/' license=('LGPL') options=('!libtool') -DLAGENTS=("http::/usr/bin/curl -A '' -fLC - --retry 3 --retry-delay 3 -o %o %u") # moronic httpd bans curl's user-agent -source=("http://kldp.net/frs/download.php/${_filecode}/${pkgname}-${pkgver}.tar.gz") +source=("https://libhangul.googlecode.com/files/libhangul-${pkgver}.tar.gz") sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77') build() { -- cgit v1.2.3-54-g00ecf From 261bb7327f6a4fef24494be9d8647ce8c1260e4c Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 5 Aug 2012 17:59:16 +0200 Subject: Fix scim-hangul build. --- extra/scim-hangul/PKGBUILD | 7 +++++-- extra/scim-hangul/unistd.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 extra/scim-hangul/unistd.patch (limited to 'extra') diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD index 081538425..3f0ceaf22 100644 --- a/extra/scim-hangul/PKGBUILD +++ b/extra/scim-hangul/PKGBUILD @@ -12,13 +12,16 @@ license=('GPL') depends=('libhangul' 'scim') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz" - 'gcc43.patch') + 'gcc43.patch' + 'unistd.patch') sha1sums=('d1f4a2114d284c926d64fbfe8ea83307b8d8e2ec' - '956bb2b6bd75b3d2756895f8ade429f95bacc0ff') + '956bb2b6bd75b3d2756895f8ade429f95bacc0ff' + '1cfce9a7d5240f6d19aea008edcd9c6989e94e62') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../gcc43.patch + patch -p1 -i "$srcdir/unistd.patch" ./bootstrap # skim complains; it's alright ./configure --prefix=/usr --enable-skim-support make diff --git a/extra/scim-hangul/unistd.patch b/extra/scim-hangul/unistd.patch new file mode 100644 index 000000000..44ee7331c --- /dev/null +++ b/extra/scim-hangul/unistd.patch @@ -0,0 +1,11 @@ +diff -ru scim-hangul-0.3.2.orig/src/scim_hangul_imengine.cpp scim-hangul-0.3.2/src/scim_hangul_imengine.cpp +--- scim-hangul-0.3.2.orig/src/scim_hangul_imengine.cpp 2012-08-05 17:49:59.369710152 +0200 ++++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp 2012-08-05 17:50:16.401614147 +0200 +@@ -34,6 +34,7 @@ + #endif + + #include ++#include + #include + #include "scim_hangul_imengine.h" + -- cgit v1.2.3-54-g00ecf