[arch-commits] Commit in dasher/repos (12 files)
Jan de Groot
jgc at archlinux.org
Fri Dec 28 11:59:58 UTC 2012
Date: Friday, December 28, 2012 @ 06:59:58
Author: jgc
Revision: 173935
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
dasher/repos/extra-i686/PKGBUILD
(from rev 173934, dasher/trunk/PKGBUILD)
dasher/repos/extra-i686/dasher.install
(from rev 173934, dasher/trunk/dasher.install)
dasher/repos/extra-i686/error-format-security.patch
(from rev 173934, dasher/trunk/error-format-security.patch)
dasher/repos/extra-i686/fix-binutils-gold.patch
(from rev 173934, dasher/trunk/fix-binutils-gold.patch)
dasher/repos/extra-x86_64/PKGBUILD
(from rev 173934, dasher/trunk/PKGBUILD)
dasher/repos/extra-x86_64/dasher.install
(from rev 173934, dasher/trunk/dasher.install)
dasher/repos/extra-x86_64/error-format-security.patch
(from rev 173934, dasher/trunk/error-format-security.patch)
dasher/repos/extra-x86_64/fix-binutils-gold.patch
(from rev 173934, dasher/trunk/fix-binutils-gold.patch)
Deleted:
dasher/repos/extra-i686/PKGBUILD
dasher/repos/extra-i686/dasher.install
dasher/repos/extra-x86_64/PKGBUILD
dasher/repos/extra-x86_64/dasher.install
------------------------------------------+
extra-i686/PKGBUILD | 72 +++++++++++++++--------------
extra-i686/dasher.install | 44 ++++++++---------
extra-i686/error-format-security.patch | 12 ++++
extra-i686/fix-binutils-gold.patch | 28 +++++++++++
extra-x86_64/PKGBUILD | 72 +++++++++++++++--------------
extra-x86_64/dasher.install | 44 ++++++++---------
extra-x86_64/error-format-security.patch | 12 ++++
extra-x86_64/fix-binutils-gold.patch | 28 +++++++++++
8 files changed, 200 insertions(+), 112 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-12-28 11:59:21 UTC (rev 173934)
+++ extra-i686/PKGBUILD 2012-12-28 11:59:58 UTC (rev 173935)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: damir <damir at archlinux.org>
-
-pkgname=dasher
-pkgver=4.10.1
-pkgrel=3
-pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-scrollkeeper --enable-speech
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
Copied: dasher/repos/extra-i686/PKGBUILD (from rev 173934, dasher/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-12-28 11:59:58 UTC (rev 173935)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: damir <damir at archlinux.org>
+
+pkgname=dasher
+pkgver=4.11
+pkgrel=1
+pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('at-spi' 'gnome-speech' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils' 'libgnomeui')
+url="http://www.gnome.org"
+options=('!emptydirs')
+install=dasher.install
+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
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
Deleted: extra-i686/dasher.install
===================================================================
--- extra-i686/dasher.install 2012-12-28 11:59:21 UTC (rev 173934)
+++ extra-i686/dasher.install 2012-12-28 11:59:58 UTC (rev 173935)
@@ -1,22 +0,0 @@
-pkgname=dasher
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
Copied: dasher/repos/extra-i686/dasher.install (from rev 173934, dasher/trunk/dasher.install)
===================================================================
--- extra-i686/dasher.install (rev 0)
+++ extra-i686/dasher.install 2012-12-28 11:59:58 UTC (rev 173935)
@@ -0,0 +1,22 @@
+pkgname=dasher
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
Copied: dasher/repos/extra-i686/error-format-security.patch (from rev 173934, dasher/trunk/error-format-security.patch)
===================================================================
--- extra-i686/error-format-security.patch (rev 0)
+++ extra-i686/error-format-security.patch 2012-12-28 11:59:58 UTC (rev 173935)
@@ -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);
Copied: dasher/repos/extra-i686/fix-binutils-gold.patch (from rev 173934, dasher/trunk/fix-binutils-gold.patch)
===================================================================
--- extra-i686/fix-binutils-gold.patch (rev 0)
+++ extra-i686/fix-binutils-gold.patch 2012-12-28 11:59:58 UTC (rev 173935)
@@ -0,0 +1,28 @@
+Description: Fix build failures with binutils-gold.
+Author: Mònica Ramírez Arceda <monica at 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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-12-28 11:59:21 UTC (rev 173934)
+++ extra-x86_64/PKGBUILD 2012-12-28 11:59:58 UTC (rev 173935)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: damir <damir at archlinux.org>
-
-pkgname=dasher
-pkgver=4.10.1
-pkgrel=3
-pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-scrollkeeper --enable-speech
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
Copied: dasher/repos/extra-x86_64/PKGBUILD (from rev 173934, dasher/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-12-28 11:59:58 UTC (rev 173935)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: damir <damir at archlinux.org>
+
+pkgname=dasher
+pkgver=4.11
+pkgrel=1
+pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('at-spi' 'gnome-speech' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils' 'libgnomeui')
+url="http://www.gnome.org"
+options=('!emptydirs')
+install=dasher.install
+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
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
Deleted: extra-x86_64/dasher.install
===================================================================
--- extra-x86_64/dasher.install 2012-12-28 11:59:21 UTC (rev 173934)
+++ extra-x86_64/dasher.install 2012-12-28 11:59:58 UTC (rev 173935)
@@ -1,22 +0,0 @@
-pkgname=dasher
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
Copied: dasher/repos/extra-x86_64/dasher.install (from rev 173934, dasher/trunk/dasher.install)
===================================================================
--- extra-x86_64/dasher.install (rev 0)
+++ extra-x86_64/dasher.install 2012-12-28 11:59:58 UTC (rev 173935)
@@ -0,0 +1,22 @@
+pkgname=dasher
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
Copied: dasher/repos/extra-x86_64/error-format-security.patch (from rev 173934, dasher/trunk/error-format-security.patch)
===================================================================
--- extra-x86_64/error-format-security.patch (rev 0)
+++ extra-x86_64/error-format-security.patch 2012-12-28 11:59:58 UTC (rev 173935)
@@ -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);
Copied: dasher/repos/extra-x86_64/fix-binutils-gold.patch (from rev 173934, dasher/trunk/fix-binutils-gold.patch)
===================================================================
--- extra-x86_64/fix-binutils-gold.patch (rev 0)
+++ extra-x86_64/fix-binutils-gold.patch 2012-12-28 11:59:58 UTC (rev 173935)
@@ -0,0 +1,28 @@
+Description: Fix build failures with binutils-gold.
+Author: Mònica Ramírez Arceda <monica at 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
+
More information about the arch-commits
mailing list