diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-05-04 20:00:41 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-05-04 20:00:41 +0000 |
commit | b2c353d874b85e06f355a9419852e2616613c7d0 (patch) | |
tree | f0773e0a930d308198ef5036d4f74e7f53015e6e /community-testing/dee | |
parent | 0a24fb835cac4007388213ad0afb15257b035b14 (diff) |
Fri May 4 20:00:31 UTC 2012
Diffstat (limited to 'community-testing/dee')
-rw-r--r-- | community-testing/dee/PKGBUILD | 30 | ||||
-rw-r--r-- | community-testing/dee/fix-crash.patch | 86 |
2 files changed, 0 insertions, 116 deletions
diff --git a/community-testing/dee/PKGBUILD b/community-testing/dee/PKGBUILD deleted file mode 100644 index 0b9480261..000000000 --- a/community-testing/dee/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 69402 2012-04-15 21:43:27Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=dee -pkgver=1.0.10 -pkgrel=1 -pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" -arch=('i686' 'x86_64') -url="https://launchpad.net/dee" -license=('LGPL') -depends=('glib2' 'icu') -makedepends=('python2' 'gobject-introspection' 'vala') -options=('!libtool') -source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('17b715147e1721ce9624557949408d15') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-tests \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/dee/fix-crash.patch b/community-testing/dee/fix-crash.patch deleted file mode 100644 index 9ce664e10..000000000 --- a/community-testing/dee/fix-crash.patch +++ /dev/null @@ -1,86 +0,0 @@ -=== modified file 'src/dee-shared-model.c' ---- src/dee-shared-model.c 2012-03-12 11:49:53 +0000 -+++ src/dee-shared-model.c 2012-03-29 12:04:44 +0000 -@@ -1183,6 +1183,7 @@ - guint32 pos; - guchar change_type; - gint i, j; -+ gboolean transaction_error; - - g_return_if_fail (DEE_IS_SHARED_MODEL (self)); - g_return_if_fail (transaction != NULL); -@@ -1249,48 +1250,56 @@ - g_variant_get (tt, "(tt)", &seqnum_before, &seqnum_after); - g_variant_unref (tt); - -+ transaction_error = FALSE; - /* If this is our first transaction we accept anything, if not the - * incoming seqnums must align with our own records */ - current_seqnum = dee_serializable_model_get_seqnum (DEE_MODEL (self)); -- if (current_seqnum != 0 && -- current_seqnum != seqnum_before) -- { -+ -+ if (current_seqnum != 0 && current_seqnum != seqnum_before) -+ { - g_warning ("Transaction from %s is in the %s. Expected seqnum %"G_GUINT64_FORMAT - ", but got %"G_GUINT64_FORMAT". Ignoring transaction.", - sender_name, - current_seqnum < seqnum_before ? "future" : "past", - current_seqnum, seqnum_before); -- if (dee_shared_model_is_leader (self)) -- { -- g_warning ("Invalidating %s", sender_name); -- invalidate_peer (self, sender_name, NULL); -- } -- -- g_variant_unref (transaction); -- g_variant_unref (aav); -- g_variant_unref (au); -- g_variant_unref (ay); -- return; -- } -+ transaction_error = TRUE; -+ } - - /* Check that the lengths of all the arrays match up */ - n_rows = g_variant_n_children (aav); -+ - if (n_rows != g_variant_n_children (au)) - { - g_warning ("Commit from %s has illegal position vector", - sender_name); -- // FIXME cleanup -+ transaction_error = TRUE; - } - if (n_rows != g_variant_n_children (ay)) - { - g_warning ("Commit from %s has illegal change type vector", - sender_name); -- // FIXME cleanup -+ transaction_error = TRUE; - } - if (n_rows > (seqnum_after - seqnum_before)) - { - g_warning ("Commit from %s has illegal seqnum count.", - sender_name); -+ transaction_error = TRUE; -+ } -+ -+ if (transaction_error) -+ { -+ if (dee_shared_model_is_leader (self)) -+ { -+ g_warning ("Invalidating %s", sender_name); -+ invalidate_peer (self, sender_name, NULL); -+ } -+ -+ g_variant_unref (transaction); -+ g_variant_unref (aav); -+ g_variant_unref (au); -+ g_variant_unref (ay); -+ return; - } - - /* Allocate an array on the stack as a temporary row data buffer */ - |