diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
| commit | b63a03da360e5a18e9044e7058ae69898db5ffb0 (patch) | |
| tree | 2901728a2c53e2eb590d577db1531ee2976a2cbf /extra/dasher | |
| parent | 73346505421c2d923e13e2020dd31ddd764b8fe4 (diff) | |
| parent | 26ac5932cb02318206fa6a528ed4bd82ad6af87c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/blender/PKGBUILD
community/cdfs/PKGBUILD
community/cdfs/cdfs.install
community/mc/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/open-vm-tools-modules/modprobe.conf
community/open-vm-tools-modules/open-vm-tools-modules.install
community/open-vm-tools/PKGBUILD
community/open-vm-tools/open-vm-tools.conf.d
community/open-vm-tools/open-vm-tools.rc.d
community/open-vm-tools/scripts-network-FS19541.patch
community/pekwm/PKGBUILD
community/r8168-lts/PKGBUILD
community/simutrans/PKGBUILD
community/spectrwm/PKGBUILD
community/supertuxkart/PKGBUILD
community/tp_smapi/PKGBUILD
community/tp_smapi/tp_smapi.install
community/vhba-module/PKGBUILD
community/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/fcgi/PKGBUILD
extra/gst-plugins-bad/PKGBUILD
extra/imap/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/lirc/PKGBUILD
extra/lirc/lirc.install
extra/llvm/PKGBUILD
extra/nvidia-304xx-utils/PKGBUILD
extra/ruby/PKGBUILD
extra/xscreensaver/PKGBUILD
Diffstat (limited to 'extra/dasher')
| -rw-r--r-- | extra/dasher/PKGBUILD | 24 | ||||
| -rw-r--r-- | extra/dasher/error-format-security.patch | 12 | ||||
| -rw-r--r-- | extra/dasher/fix-binutils-gold.patch | 28 |
3 files changed, 54 insertions, 10 deletions
diff --git a/extra/dasher/PKGBUILD b/extra/dasher/PKGBUILD index e6da6487b..cca246e30 100644 --- a/extra/dasher/PKGBUILD +++ b/extra/dasher/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 137741 2011-09-10 14:49:04Z pierre $ +# $Id: PKGBUILD 173935 2012-12-28 11:59:58Z jgc $ # Maintainer: damir <damir@archlinux.org> pkgname=dasher -pkgver=4.10.1 -pkgrel=3 +pkgver=4.11 +pkgrel=1 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils') +depends=('at-spi' 'gnome-speech' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils' 'libgnomeui') url="http://www.gnome.org" -groups=('gnome-extra') options=('!emptydirs') install=dasher.install -source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2") -md5sums=('83e556690ac54c4bb8c49c050510259e') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.11/${pkgname}-${pkgver}.tar.bz2 + error-format-security.patch + fix-binutils-gold.patch) +sha256sums=('fb21cc4ef606e10a8e5deffebe8695a376eabb0766d7d1bdf80abc5f03f4fed2' + '7aeba2667972e408f38b8337f972ff589f05cdf244dec5674f138fc5110405df' + 'f9e2a661e6d0b873e9a5d491b1b70f3a05ea4edda693e078e2e206451c265daf') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/error-format-security.patch" + patch -Np1 -i "${srcdir}/fix-binutils-gold.patch" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper --enable-speech + --localstatedir=/var --disable-scrollkeeper --enable-speech make } diff --git a/extra/dasher/error-format-security.patch b/extra/dasher/error-format-security.patch new file mode 100644 index 000000000..db40d7b86 --- /dev/null +++ b/extra/dasher/error-format-security.patch @@ -0,0 +1,12 @@ +Index: dasher-4.11/Src/Gtk2/game_mode_helper.cpp +=================================================================== +--- dasher-4.11.orig/Src/Gtk2/game_mode_helper.cpp 2009-12-18 13:40:29.000000000 -0500 ++++ dasher-4.11/Src/Gtk2/game_mode_helper.cpp 2011-11-11 12:33:12.349741593 -0500 +@@ -324,6 +324,7 @@ + GTK_DIALOG_MODAL, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, ++ "%s", + message); + gtk_dialog_run (GTK_DIALOG (pDialog)); + gtk_widget_destroy (pDialog); diff --git a/extra/dasher/fix-binutils-gold.patch b/extra/dasher/fix-binutils-gold.patch new file mode 100644 index 000000000..ab87a7633 --- /dev/null +++ b/extra/dasher/fix-binutils-gold.patch @@ -0,0 +1,28 @@ +Description: Fix build failures with binutils-gold.
+Author: Mònica Ramírez Arceda <monica@probeta.net>
+Las-Update: 2011-07-17
+
+--- a/Src/Makefile.am
++++ b/Src/Makefile.am
+@@ -34,7 +34,8 @@
+ $(GTK2BUILD_LIBS) \
+ -lexpat \
+ $(POPT_LIBS) \
+- $(GPELIB)
++ $(GPELIB) \
++ -lX11
+ #endif
+
+ #if DOQTE
+--- a/Src/Makefile.in
++++ b/Src/Makefile.in
+@@ -295,7 +295,8 @@
+ $(GTK2BUILD_LIBS) \
+ -lexpat \
+ $(POPT_LIBS) \
+- $(GPELIB)
++ $(GPELIB) \
++ -lX11
+
+ all: all-recursive
+
|