Date: Monday, November 11, 2013 @ 11:58:12
Author: spupykin
Revision: 100807
archrelease: copy trunk to community-i686, community-x86_64
Added:
parcellite/repos/community-i686/PKGBUILD
(from rev 100806, parcellite/trunk/PKGBUILD)
parcellite/repos/community-i686/fix-crash.patch
(from rev 100806, parcellite/trunk/fix-crash.patch)
parcellite/repos/community-x86_64/PKGBUILD
(from rev 100806, parcellite/trunk/PKGBUILD)
parcellite/repos/community-x86_64/fix-crash.patch
(from rev 100806, parcellite/trunk/fix-crash.patch)
Deleted:
parcellite/repos/community-i686/PKGBUILD
parcellite/repos/community-i686/history_menu_crash_patch
parcellite/repos/community-x86_64/PKGBUILD
parcellite/repos/community-x86_64/history_menu_crash_patch
-------------------------------------------+
/PKGBUILD | 66 ++++++++++++++++++++++++++++
community-i686/PKGBUILD | 26 -----------
community-i686/fix-crash.patch | 11 ++++
community-i686/history_menu_crash_patch | 39 ----------------
community-x86_64/PKGBUILD | 26 -----------
community-x86_64/fix-crash.patch | 11 ++++
community-x86_64/history_menu_crash_patch | 39 ----------------
7 files changed, 88 insertions(+), 130 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-11-11 10:57:58 UTC (rev 100806)
+++ community-i686/PKGBUILD 2013-11-11 10:58:12 UTC (rev 100807)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=parcellite
-pkgver=1.1.7
-pkgrel=1
-pkgdesc="Lightweight GTK+ clipboard manager"
-arch=('i686' 'x86_64')
-url="http://parcellite.sourceforge.net/";
-license=('GPL3')
-depends=('gtk2')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz)
-md5sums=('a542aab0df50ac7a7de6501957e78fb3')
-
-build() {
- cd "$srcdir/parcellite-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd "$srcdir/parcellite-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: parcellite/repos/community-i686/PKGBUILD (from rev 100806,
parcellite/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-11-11 10:58:12 UTC (rev 100807)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Alexander Fehr <pizzapunk gmail com>
+
+pkgname=parcellite
+pkgver=1.1.7
+pkgrel=2
+pkgdesc="Lightweight GTK+ clipboard manager"
+arch=('i686' 'x86_64')
+url="http://parcellite.sourceforge.net/";
+license=('GPL3')
+depends=('gtk2')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz
+ fix-crash.patch)
+md5sums=('a542aab0df50ac7a7de6501957e78fb3'
+ 'f2cc1986e573d49c92ea3d81efd5d574')
+
+prepare() {
+ cd "$srcdir/parcellite-$pkgver"
+ patch -Np1 <$srcdir/fix-crash.patch
+}
+
+build() {
+ cd "$srcdir/parcellite-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd "$srcdir/parcellite-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Copied: parcellite/repos/community-i686/fix-crash.patch (from rev 100806,
parcellite/trunk/fix-crash.patch)
===================================================================
--- community-i686/fix-crash.patch (rev 0)
+++ community-i686/fix-crash.patch 2013-11-11 10:58:12 UTC (rev 100807)
@@ -0,0 +1,11 @@
+--- a/src/preferences.c.orig 2013-11-11 14:39:32.000000000 +0400
++++ b/src/preferences.c 2013-11-11 14:40:03.970776522 +0400
+@@ -381,7 +381,7 @@
+ }
+ /**now go through and make sure we have no duplicates */
+ for (i=0;NULL != keylist[i].name; ++i){
+- if(0 != keylist[i].keyval[0]){
++ if(NULL != keylist[i].keyval && 0 != keylist[i].keyval[0]){
+ /**see if it exists elsewhere */
+ for (l=0;NULL != keylist[l].name; ++l){
+ if(l!=i && 0 != keylist[l].keyval[0]){
Deleted: community-i686/history_menu_crash_patch
===================================================================
--- community-i686/history_menu_crash_patch 2013-11-11 10:57:58 UTC (rev
100806)
+++ community-i686/history_menu_crash_patch 2013-11-11 10:58:12 UTC (rev
100807)
@@ -1,39 +0,0 @@
-Index: main.c
-===================================================================
---- main.c (revision 232)
-+++ main.c (working copy)
-@@ -1199,24 +1199,28 @@
- {
- GString* string = g_string_new((gchar*)element->data);
- /* Ellipsize text */
-- if (string->len > prefs.item_length)
-+ glong len = g_utf8_strlen(string->str, string->len);
-+ if (len > prefs.item_length)
- {
- switch (prefs.ellipsize)
- {
- case PANGO_ELLIPSIZE_START:
-- string = g_string_erase(string, 0,
string->len-(prefs.item_length));
-+ string = g_string_erase(string, 0,
g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str);
- string = g_string_prepend(string, "...");
- break;
- case PANGO_ELLIPSIZE_MIDDLE:
-- string = g_string_erase(string, (prefs.item_length/2),
string->len-(prefs.item_length));
-- string = g_string_insert(string, (string->len/2), "...");
-+ ; /* to avoid wierd gcc error */
-+ gchar* p1 = g_utf8_offset_to_pointer(string->str,
prefs.item_length / 2);
-+ gchar* p2 = g_utf8_offset_to_pointer(string->str, len -
prefs.item_length / 2);
-+ string = g_string_erase(string, p1 - string->str, p2 - p1);
-+ string = g_string_insert(string, p1 - string->str, "...");
- break;
- case PANGO_ELLIPSIZE_END:
-- string = g_string_truncate(string, prefs.item_length);
-+ string = g_string_truncate(string,
g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str);
- string = g_string_append(string, "...");
- break;
- }
-- }
-+ }
- /* Remove control characters */
- gsize i = 0;
- while (i < string->len)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-11-11 10:57:58 UTC (rev 100806)
+++ community-x86_64/PKGBUILD 2013-11-11 10:58:12 UTC (rev 100807)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=parcellite
-pkgver=1.1.7
-pkgrel=1
-pkgdesc="Lightweight GTK+ clipboard manager"
-arch=('i686' 'x86_64')
-url="http://parcellite.sourceforge.net/";
-license=('GPL3')
-depends=('gtk2')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz)
-md5sums=('a542aab0df50ac7a7de6501957e78fb3')
-
-build() {
- cd "$srcdir/parcellite-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd "$srcdir/parcellite-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: parcellite/repos/community-x86_64/PKGBUILD (from rev 100806,
parcellite/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-11-11 10:58:12 UTC (rev 100807)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Alexander Fehr <pizzapunk gmail com>
+
+pkgname=parcellite
+pkgver=1.1.7
+pkgrel=2
+pkgdesc="Lightweight GTK+ clipboard manager"
+arch=('i686' 'x86_64')
+url="http://parcellite.sourceforge.net/";
+license=('GPL3')
+depends=('gtk2')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz
+ fix-crash.patch)
+md5sums=('a542aab0df50ac7a7de6501957e78fb3'
+ 'f2cc1986e573d49c92ea3d81efd5d574')
+
+prepare() {
+ cd "$srcdir/parcellite-$pkgver"
+ patch -Np1 <$srcdir/fix-crash.patch
+}
+
+build() {
+ cd "$srcdir/parcellite-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd "$srcdir/parcellite-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Copied: parcellite/repos/community-x86_64/fix-crash.patch (from rev 100806,
parcellite/trunk/fix-crash.patch)
===================================================================
--- community-x86_64/fix-crash.patch (rev 0)
+++ community-x86_64/fix-crash.patch 2013-11-11 10:58:12 UTC (rev 100807)
@@ -0,0 +1,11 @@
+--- a/src/preferences.c.orig 2013-11-11 14:39:32.000000000 +0400
++++ b/src/preferences.c 2013-11-11 14:40:03.970776522 +0400
+@@ -381,7 +381,7 @@
+ }
+ /**now go through and make sure we have no duplicates */
+ for (i=0;NULL != keylist[i].name; ++i){
+- if(0 != keylist[i].keyval[0]){
++ if(NULL != keylist[i].keyval && 0 != keylist[i].keyval[0]){
+ /**see if it exists elsewhere */
+ for (l=0;NULL != keylist[l].name; ++l){
+ if(l!=i && 0 != keylist[l].keyval[0]){
Deleted: community-x86_64/history_menu_crash_patch
===================================================================
--- community-x86_64/history_menu_crash_patch 2013-11-11 10:57:58 UTC (rev
100806)
+++ community-x86_64/history_menu_crash_patch 2013-11-11 10:58:12 UTC (rev
100807)
@@ -1,39 +0,0 @@
-Index: main.c
-===================================================================
---- main.c (revision 232)
-+++ main.c (working copy)
-@@ -1199,24 +1199,28 @@
- {
- GString* string = g_string_new((gchar*)element->data);
- /* Ellipsize text */
-- if (string->len > prefs.item_length)
-+ glong len = g_utf8_strlen(string->str, string->len);
-+ if (len > prefs.item_length)
- {
- switch (prefs.ellipsize)
- {
- case PANGO_ELLIPSIZE_START:
-- string = g_string_erase(string, 0,
string->len-(prefs.item_length));
-+ string = g_string_erase(string, 0,
g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str);
- string = g_string_prepend(string, "...");
- break;
- case PANGO_ELLIPSIZE_MIDDLE:
-- string = g_string_erase(string, (prefs.item_length/2),
string->len-(prefs.item_length));
-- string = g_string_insert(string, (string->len/2), "...");
-+ ; /* to avoid wierd gcc error */
-+ gchar* p1 = g_utf8_offset_to_pointer(string->str,
prefs.item_length / 2);
-+ gchar* p2 = g_utf8_offset_to_pointer(string->str, len -
prefs.item_length / 2);
-+ string = g_string_erase(string, p1 - string->str, p2 - p1);
-+ string = g_string_insert(string, p1 - string->str, "...");
- break;
- case PANGO_ELLIPSIZE_END:
-- string = g_string_truncate(string, prefs.item_length);
-+ string = g_string_truncate(string,
g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str);
- string = g_string_append(string, "...");
- break;
- }
-- }
-+ }
- /* Remove control characters */
- gsize i = 0;
- while (i < string->len)
