diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
commit | 513c776d74c56a49781a09a5a772f4ea6d6bb401 (patch) | |
tree | 161509e3271db459f14f8c69de7c52d4902ba107 /extra/gjs | |
parent | 8183144fe6e064d80985ac810f6178a3cf289d0d (diff) | |
parent | e191a289464c21aafe7478065ea7ed3ddda0766f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arm-elf-binutils/PKGBUILD
community/bird/PKGBUILD
community/cantata/PKGBUILD
community/dbmail/PKGBUILD
community/ekg2/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/gigedit/PKGBUILD
community/gimp-refocus/PKGBUILD
community/gmime24/PKGBUILD
community/gmpc/PKGBUILD
community/gnash/PKGBUILD
community/id3lib-rcc/PKGBUILD
community/linuxsampler/PKGBUILD
community/lwm/PKGBUILD
community/midori/PKGBUILD
community/mplayer2/PKGBUILD
community/mtpaint/PKGBUILD
community/nestopia/PKGBUILD
community/preload/PKGBUILD
community/projectm/PKGBUILD
community/rusxmms/PKGBUILD
community/taglib-rcc/PKGBUILD
community/the_silver_searcher/PKGBUILD
community/xnee/PKGBUILD
core/libgcrypt/PKGBUILD
core/libusbx/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
extra/a2ps/PKGBUILD
extra/a52dec/PKGBUILD
extra/abook/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cln/PKGBUILD
extra/exempi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/fluxter/PKGBUILD
extra/fontforge/PKGBUILD
extra/glib/PKGBUILD
extra/gnet/PKGBUILD
extra/gnome-vfs/PKGBUILD
extra/gnutls/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk/PKGBUILD
extra/idnkit/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imake/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/libdatrie/PKGBUILD
extra/libmbim/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/libqmi/PKGBUILD
extra/libtxc_dxtn/PKGBUILD
extra/libxfont/PKGBUILD
extra/mesa/PKGBUILD
extra/modemmanager/PKGBUILD
extra/nedit/PKGBUILD
extra/nmap/PKGBUILD
extra/openexr/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/qemu/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/subversion/PKGBUILD
extra/transmission/PKGBUILD
extra/truecrypt/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/wxmaxima/PKGBUILD
extra/x264/PKGBUILD
extra/xorg-iceauth/PKGBUILD
extra/xorg-mkfontscale/PKGBUILD
extra/xorg-xfd/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/clementine-libre/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/gjs')
-rw-r--r-- | extra/gjs/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/gjs/gettext-typo.patch | 22 |
2 files changed, 32 insertions, 4 deletions
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index 4de85bfcd..8777035fc 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,18 +1,24 @@ -# $Id: PKGBUILD 183533 2013-04-22 15:40:22Z heftig $ +# $Id: PKGBUILD 191784 2013-07-30 19:02:00Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gjs pkgver=1.36.1 -pkgrel=1 +pkgrel=2 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64') url="http://live.gnome.org/Gjs" license=(GPL) depends=(cairo gobject-introspection 'js>=17.0.0') options=('!libtool') -source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2) -sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27') +source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2 + gettext-typo.patch) +sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27' + 'c2c3ca377d9d69511d5784599ea33d754aed776d5ceefaf384b8e303b54fd038') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../gettext-typo.patch +} build() { cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static diff --git a/extra/gjs/gettext-typo.patch b/extra/gjs/gettext-typo.patch new file mode 100644 index 000000000..9a07b9a71 --- /dev/null +++ b/extra/gjs/gettext-typo.patch @@ -0,0 +1,22 @@ +From 178c810b7797ff2fca0440e519ddf4dbede589a1 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Sun, 12 May 2013 16:46:19 +0000 +Subject: gettext: fix typo + +https://bugzilla.gnome.org/show_bug.cgi?id=700336 +--- +diff --git a/modules/gettext.js b/modules/gettext.js +index 8f73c13..60991e1 100644 +--- a/modules/gettext.js ++++ b/modules/gettext.js +@@ -46,7 +46,7 @@ function gettext(msgid) { + return GLib.dgettext(null, msgid); + } + function dgettext(domain, msgid) { +- return GLib.dgetext(domain, msgid); ++ return GLib.dgettext(domain, msgid); + } + function dcgettext(domain, msgid, category) { + return GLib.dcgettext(domain, msgid, category); +-- +cgit v0.9.2 |